X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fgpu%2Fdrm%2Ftilcdc%2Ftilcdc_crtc.c;h=7418dcd986d3f50f48f33d56b703cf8dc82c4be9;hb=c19b3e238d7573cbe0bb60f4578b7d1de4a13746;hp=43120fa3b6e9eba3e474bcda3b75f515c1a1a570;hpb=39de6194131c155901f96686a063212656d80c2e;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 43120fa3b6e9..7418dcd986d3 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -299,6 +299,8 @@ static int tilcdc_crtc_mode_set(struct drm_crtc *crtc,
 	 * a value of 0 as 1
 	 */
 	if (priv->rev == 2) {
+		/* clear bits we're going to set */
+		reg &= ~0x78000033;
 		reg |= ((hfp-1) & 0x300) >> 8;
 		reg |= ((hbp-1) & 0x300) >> 4;
 		reg |= ((hsw-1) & 0x3c0) << 21;