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

Commit 855f6529 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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
parents 7ad54c99 7a79279e

drivers/gpu/drm/arm/hdlcd_crtc.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

}