Merge tag 'drm-misc-fixes-2018-11-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

airlied · airlied · commit d10cf6da3112 · 2018-11-11T04:20:01.000+10:00
- sun4i: tcon->panel NULL deref protections (Giulio) Cc: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Dave Airlie <airlied@redhat.com> From: Sean Paul <sean@poorly.run> Link: https://patchwork.freedesktop.org/patch/msgid/20181107205051.GA27823@art_vandelay
diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c
@@ -75,7 +75,7 @@ static void sun4i_lvds_encoder_enable(struct drm_encoder *encoder)
 
 	DRM_DEBUG_DRIVER("Enabling LVDS output\n");
 
-	if (!IS_ERR(tcon->panel)) {
+	if (tcon->panel) {
 		drm_panel_prepare(tcon->panel);
 		drm_panel_enable(tcon->panel);
 	}
@@ -88,7 +88,7 @@ static void sun4i_lvds_encoder_disable(struct drm_encoder *encoder)
 
 	DRM_DEBUG_DRIVER("Disabling LVDS output\n");
 
-	if (!IS_ERR(tcon->panel)) {
+	if (tcon->panel) {
 		drm_panel_disable(tcon->panel);
 		drm_panel_unprepare(tcon->panel);
 	}
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -135,7 +135,7 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder)
 
 	DRM_DEBUG_DRIVER("Enabling RGB output\n");
 
-	if (!IS_ERR(tcon->panel)) {
+	if (tcon->panel) {
 		drm_panel_prepare(tcon->panel);
 		drm_panel_enable(tcon->panel);
 	}
@@ -148,7 +148,7 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)
 
 	DRM_DEBUG_DRIVER("Disabling RGB output\n");
 
-	if (!IS_ERR(tcon->panel)) {
+	if (tcon->panel) {
 		drm_panel_disable(tcon->panel);
 		drm_panel_unprepare(tcon->panel);
 	}
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -491,7 +491,8 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
 	sun4i_tcon0_mode_set_common(tcon, mode);
 
 	/* Set dithering if needed */
-	sun4i_tcon0_mode_set_dithering(tcon, tcon->panel->connector);
+	if (tcon->panel)
+		sun4i_tcon0_mode_set_dithering(tcon, tcon->panel->connector);
 
 	/* Adjust clock delay */
 	clk_delay = sun4i_tcon_get_clk_delay(mode, 0);
@@ -555,7 +556,7 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
 	 * Following code is a way to avoid quirks all around TCON
 	 * and DOTCLOCK drivers.
 	 */
-	if (!IS_ERR(tcon->panel)) {
+	if (tcon->panel) {
 		struct drm_panel *panel = tcon->panel;
 		struct drm_connector *connector = panel->connector;
 		struct drm_display_info display_info = connector->display_info;

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ static void sun4i_lvds_encoder_enable(struct drm_encoder *encoder)`
`75`	`75`
`76`	`76`	`DRM_DEBUG_DRIVER("Enabling LVDS output\n");`
`77`	`77`
`78`		`- if (!IS_ERR(tcon->panel)) {`
	`78`	`+ if (tcon->panel) {`
`79`	`79`	`drm_panel_prepare(tcon->panel);`
`80`	`80`	`drm_panel_enable(tcon->panel);`
`81`	`81`	`}`
`@@ -88,7 +88,7 @@ static void sun4i_lvds_encoder_disable(struct drm_encoder *encoder)`
`88`	`88`
`89`	`89`	`DRM_DEBUG_DRIVER("Disabling LVDS output\n");`
`90`	`90`
`91`		`- if (!IS_ERR(tcon->panel)) {`
	`91`	`+ if (tcon->panel) {`
`92`	`92`	`drm_panel_disable(tcon->panel);`
`93`	`93`	`drm_panel_unprepare(tcon->panel);`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder)`
`135`	`135`
`136`	`136`	`DRM_DEBUG_DRIVER("Enabling RGB output\n");`
`137`	`137`
`138`		`- if (!IS_ERR(tcon->panel)) {`
	`138`	`+ if (tcon->panel) {`
`139`	`139`	`drm_panel_prepare(tcon->panel);`
`140`	`140`	`drm_panel_enable(tcon->panel);`
`141`	`141`	`}`
`@@ -148,7 +148,7 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)`
`148`	`148`
`149`	`149`	`DRM_DEBUG_DRIVER("Disabling RGB output\n");`
`150`	`150`
`151`		`- if (!IS_ERR(tcon->panel)) {`
	`151`	`+ if (tcon->panel) {`
`152`	`152`	`drm_panel_disable(tcon->panel);`
`153`	`153`	`drm_panel_unprepare(tcon->panel);`
`154`	`154`	`}`