Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 359f1dcb authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-fixes for v5.3-rc4:
- Suspend fix for rockchip
- Fix unterminated strncpy cmdline mode parser

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ace294a6-6bb2-d9b1-695d-3260e1d60831@linux.intel.com
parents 6ca847a9 f7ccbed6

drivers/gpu/drm/drm_modes.c

+3 −1
Original line number Diff line number Diff line
@@ -1770,7 +1770,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, 
	}



	if (named_mode) {

		strncpy(mode->name, name, mode_end);

		if (mode_end + 1 > DRM_DISPLAY_MODE_LEN)

			return false;

		strscpy(mode->name, name, mode_end + 1);

	} else {

		ret = drm_mode_parse_cmdline_res_mode(name, mode_end,

						      parse_extras,

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int rockchip_dp_resume(struct device *dev) 


static const struct dev_pm_ops rockchip_dp_pm_ops = {

#ifdef CONFIG_PM_SLEEP

	.suspend = rockchip_dp_suspend,

	.suspend_late = rockchip_dp_suspend,

	.resume_early = rockchip_dp_resume,

#endif

};