]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
drm/tilcdc: Clear bits of register we're going to set.
authorPantelis Antoniou <panto@antoniou-consulting.com>
Fri, 21 Jun 2013 18:52:28 +0000 (13:52 -0500)
committerDave Airlie <airlied@redhat.com>
Thu, 27 Jun 2013 23:13:00 +0000 (09:13 +1000)
Bits weren't cleared so resolution changes didn't work.

Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/tilcdc/tilcdc_crtc.c

index 43120fa3b6e9eba3e474bcda3b75f515c1a1a570..7418dcd986d3f50f48f33d56b703cf8dc82c4be9 100644 (file)
@@ -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;