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

Commit d10cf6da authored Nov 11, 2018 by Dave Airlie

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



- 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

parents 7d588f90 a8939766

drivers/gpu/drm/sun4i/sun4i_lvds.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

drivers/gpu/drm/sun4i/sun4i_rgb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

drivers/gpu/drm/sun4i/sun4i_tcon.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -491,6 +491,7 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
		sun4i_tcon0_mode_set_common(tcon, mode);

		/* Set dithering if needed */
		if (tcon->panel)
		sun4i_tcon0_mode_set_dithering(tcon, tcon->panel->connector);

		/* Adjust clock delay */
		@@ -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;