Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes

airlied · airlied · commit 855f6529c7c9 · 2016-11-24T11:17:44.000+10:00
A late issue discovered by Russell King while testing his setup on Juno.

* 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld:
  drm/arm: hdlcd: fix plane base address update
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
@@ -150,15 +150,14 @@ static void hdlcd_crtc_enable(struct drm_crtc *crtc)
 	clk_prepare_enable(hdlcd->clk);
 	hdlcd_crtc_mode_set_nofb(crtc);
 	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
+	drm_crtc_vblank_on(crtc);
 }
 
 static void hdlcd_crtc_disable(struct drm_crtc *crtc)
 {
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
-	if (!crtc->state->active)
-		return;
-
+	drm_crtc_vblank_off(crtc);
 	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);
 	clk_disable_unprepare(hdlcd->clk);
 }

Original file line number	Diff line number	Diff line change
`@@ -150,15 +150,14 @@ static void hdlcd_crtc_enable(struct drm_crtc *crtc)`
`150`	`150`	`clk_prepare_enable(hdlcd->clk);`
`151`	`151`	`hdlcd_crtc_mode_set_nofb(crtc);`
`152`	`152`	`hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);`
	`153`	`+ drm_crtc_vblank_on(crtc);`
`153`	`154`	`}`
`154`	`155`
`155`	`156`	`static void hdlcd_crtc_disable(struct drm_crtc *crtc)`
`156`	`157`	`{`
`157`	`158`	`struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);`
`158`	`159`
`159`		`- if (!crtc->state->active)`
`160`		`- return;`
`161`		`-`
	`160`	`+ drm_crtc_vblank_off(crtc);`
`162`	`161`	`hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);`
`163`	`162`	`clk_disable_unprepare(hdlcd->clk);`
`164`	`163`	`}`