Commit e6bb7116 authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave 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
parents 911ad0b6 21670bd7

drivers/gpu/drm/drm_modes.c

+1 −1
Original line number Diff line number Diff line
@@ -1677,7 +1677,7 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len, 
	return 0;

}



static const char *drm_named_modes_whitelist[] = {

static const char * const drm_named_modes_whitelist[] = {

	"NTSC",

	"PAL",

};

drivers/gpu/drm/lima/lima_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -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);



	ret = drm_gem_reservation_object_wait(file, handle, write, timeout);

	if (ret == 0)

	if (ret == -ETIME)

		ret = timeout ? -ETIMEDOUT : -EBUSY;



	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE