xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'drm-misc-fixes-2019-09-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Browse Source 
drm-misc-fixes for v5.3 final:
- Constify modes whitelist harder.
- Fix lima driver gem_wait ioctl.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/99e52e7a-d4ce-6a2c-0501-bc559a710955@linux.intel.com
This commit is contained in:
Dave Airlie
2019-09-12 23:14:29 +10:00
parent 911ad0b611 21670bd78a
commit e6bb711600
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_modes.c
View File

@@ -1677,7 +1677,7 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len,
return 0; return 0;
} }
static const char *drm_named_modes_whitelist[] = { static const char * const drm_named_modes_whitelist[] = {
"NTSC", "NTSC",
"PAL", "PAL",
}; };

2
drivers/gpu/drm/lima/lima_gem.c
View File

@@ -342,7 +342,7 @@ int lima_gem_wait(struct drm_file *file, u32 handle, u32 op, s64 timeout_ns)
timeout = drm_timeout_abs_to_jiffies(timeout_ns); timeout = drm_timeout_abs_to_jiffies(timeout_ns);
ret = drm_gem_reservation_object_wait(file, handle, write, timeout); ret = drm_gem_reservation_object_wait(file, handle, write, timeout);
if (ret == 0) if (ret == -ETIME)
ret = timeout ? -ETIMEDOUT : -EBUSY; ret = timeout ? -ETIMEDOUT : -EBUSY;
return ret; return ret;