OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm-misc-fixes for v5.3-rc4: 

- Suspend fix for rockchip
 - Fix unterminated strncpy cmdline mode parser
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuXvWqAysSYEJGuVH/lWMcqZwE8MFAl1L4nsACgkQ/lWMcqZw
 E8OX4w//Z6fQK0l+Mq+i+AXYVhgzgCSuAFPtQqIiZ5zcr8f8jjF6X9gZW21WBxqF
 5Gmi87TvTTPWzJpe2ir46l7VaFjekV6/W76q2RJVh6m7AMKGlvZAdP5w4/qFVVSr
 Zb9TA9JaR9HtJUGsY39QYWBvPoTlxnMtNgHl/wzbw13CVTiojygMIWv1zt2vxXDa
 MwmN4XxjQujmS8ykAUc9oWucbVegsbNauVJ2auE/U2zdeAyQsUA35DKBxAZueJpz
 pOaPIb+0vKIKtlDbEVONMKfAgqUucjAZt1TOseIohA8how1QjLIcNrKuDS0pGkCN
 54KMy4qeCX4HNo3A4pBbvOpd/Kxcg5sh3EepfrU1epgx5WvVH8N1YJmr3q/Q4Yec
 HKsiM+5X0OwLCiSnDBc3ZomuVD+3EpSyciKD8/HGdlsl58SUvV76FtoXgb5jTiGL
 GEYoLJuYSt50lJ/7he7xzkDxowml6/+kKDn6toH0xnhCqxZO2jVHHOEHewYVTHjK
 WxI1+53ZX7FCDDQa259YIDBe8hAFnSQdFoq9MdbTePjPymKzFY9kovLqJpQo5kWf
 sMhOq2cDOoNKBjh4t4l7A/vj4Oz78RMJT2xd5QWixXgXNw/CDiQlUT2lMlpkXpSV
 7bQ54c2n+LgSzb8kYY0u0DMggveXO8TEktuU/tdEScdIku/kCCs=
 =z2IX
 -----END PGP SIGNATURE-----

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: Dave 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
This commit is contained in:
Dave Airlie 2019-08-09 15:45:02 +10:00
parent 6ca847a947 f7ccbed656
commit 359f1dcbae
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,

2
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
View File

@ -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
};