diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-06-30 03:48:54 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-06-30 03:48:55 +0300 |
| commit | 078a3be79325e4a5e7e16576b3919999efadfa3f (patch) | |
| tree | 382101484373f44f5d5845503673d5aadaba4d73 /include | |
| parent | 8cdf1b56ccab969b393269a8abbf5e1d6dc700c9 (diff) | |
| parent | a775e4e4941bf2f326aa36c58f67bd6c96cac717 (diff) | |
| download | linux-078a3be79325e4a5e7e16576b3919999efadfa3f.tar.xz | |
Merge tag 'amd-drm-fixes-5.19-2022-06-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.19-2022-06-29:
amdgpu:
- GPU recovery fix
- Fix integer type usage in fourcc header for AMD modifiers
- KFD TLB flush fix for gfx9 APUs
- Display fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220629192220.5870-1-alexander.deucher@amd.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/drm/drm_fourcc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index f1972154a594..0980678d502d 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -1444,11 +1444,11 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) #define AMD_FMT_MOD_PIPE_MASK 0x7 #define AMD_FMT_MOD_SET(field, value) \ - ((uint64_t)(value) << AMD_FMT_MOD_##field##_SHIFT) + ((__u64)(value) << AMD_FMT_MOD_##field##_SHIFT) #define AMD_FMT_MOD_GET(field, value) \ (((value) >> AMD_FMT_MOD_##field##_SHIFT) & AMD_FMT_MOD_##field##_MASK) #define AMD_FMT_MOD_CLEAR(field) \ - (~((uint64_t)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT)) + (~((__u64)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT)) #if defined(__cplusplus) } |