summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/tilcdc
diff options
context:
space:
mode:
authorPantelis Antoniou2013-06-21 20:52:28 +0200
committerDave Airlie2013-06-28 01:13:00 +0200
commitc19b3e238d7573cbe0bb60f4578b7d1de4a13746 (patch)
treeb3a1768de236aefb951b6cae2e8c8402541b455a /drivers/gpu/drm/tilcdc
parentdrm/tilcdc fixing i2c/slave initialization race (diff)
downloadkernel-qcow2-linux-c19b3e238d7573cbe0bb60f4578b7d1de4a13746.tar.gz
kernel-qcow2-linux-c19b3e238d7573cbe0bb60f4578b7d1de4a13746.tar.xz
kernel-qcow2-linux-c19b3e238d7573cbe0bb60f4578b7d1de4a13746.zip
drm/tilcdc: Clear bits of register we're going to set.
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>
Diffstat (limited to 'drivers/gpu/drm/tilcdc')
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_crtc.c2
1 files changed, 2 insertions, 0 deletions
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;