History

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

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>

Dave Airlie committed 7 years ago

Commit e6bb7112 parents 911ad0b 21670bd2 files · +2 −2Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/drm_modes.c +1 −1
  2. drivers/gpu/drm/lima/lima_gem.c +1 −1
drivers/gpu/drm/drm_modes.c+1−1
@@ -1677,7 +1677,7 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len, · 1676 unmodified lines
1677 return 0;1677 return 0;
1678}1678}
1679 1679
1680static const char *drm_named_modes_whitelist[] = {1680static const char * const drm_named_modes_whitelist[] = {
1681 "NTSC",1681 "NTSC",
1682 "PAL",1682 "PAL",
1683};1683};
drivers/gpu/drm/lima/lima_gem.c+1−1
@@ -342,7 +342,7 @@ int lima_gem_wait(struct drm_file *file, u32 handle, u32 op, s64 timeout_ns) · 341 unmodified lines
342 timeout = drm_timeout_abs_to_jiffies(timeout_ns);342 timeout = drm_timeout_abs_to_jiffies(timeout_ns);
343 343
344 ret = drm_gem_reservation_object_wait(file, handle, write, timeout);344 ret = drm_gem_reservation_object_wait(file, handle, write, timeout);
345 if (ret == 0)345 if (ret == -ETIME)
346 ret = timeout ? -ETIMEDOUT : -EBUSY;346 ret = timeout ? -ETIMEDOUT : -EBUSY;
347 347
348 return ret;348 return ret;