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

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



drm-misc-fixes for v5.0-rc4:
- Small refcounting fix to sun4i's HDMI support.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/588e9ecb-d80d-2cc6-254e-e5311f04224f@linux.intel.com
parents 49a57857 5e1bc251

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -92,6 +92,8 @@ static void sun4i_hdmi_disable(struct drm_encoder *encoder) 
	val = readl(hdmi->base + SUN4I_HDMI_VID_CTRL_REG);

	val = readl(hdmi->base + SUN4I_HDMI_VID_CTRL_REG);

	val &= ~SUN4I_HDMI_VID_CTRL_ENABLE;

	val &= ~SUN4I_HDMI_VID_CTRL_ENABLE;

	writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG);

	writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG);



	clk_disable_unprepare(hdmi->tmds_clk);

}

}





static void sun4i_hdmi_enable(struct drm_encoder *encoder)

static void sun4i_hdmi_enable(struct drm_encoder *encoder)
@@ -102,6 +104,8 @@ static void sun4i_hdmi_enable(struct drm_encoder *encoder) 




	DRM_DEBUG_DRIVER("Enabling the HDMI Output\n");

	DRM_DEBUG_DRIVER("Enabling the HDMI Output\n");





	clk_prepare_enable(hdmi->tmds_clk);



	sun4i_hdmi_setup_avi_infoframes(hdmi, mode);

	sun4i_hdmi_setup_avi_infoframes(hdmi, mode);

	val |= SUN4I_HDMI_PKT_CTRL_TYPE(0, SUN4I_HDMI_PKT_AVI);

	val |= SUN4I_HDMI_PKT_CTRL_TYPE(0, SUN4I_HDMI_PKT_AVI);

	val |= SUN4I_HDMI_PKT_CTRL_TYPE(1, SUN4I_HDMI_PKT_END);

	val |= SUN4I_HDMI_PKT_CTRL_TYPE(1, SUN4I_HDMI_PKT_END);

CRA Git | Maintained and supported by SUSTech CRA and CCSE