aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/tilcdc/tilcdc_drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_drv.c')
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_drv.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index c5b592dc1970..2b5461bcd9fb 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -75,7 +75,7 @@ static int modeset_init(struct drm_device *dev)
75 mod->funcs->modeset_init(mod, dev); 75 mod->funcs->modeset_init(mod, dev);
76 } 76 }
77 77
78 if ((priv->num_encoders = 0) || (priv->num_connectors == 0)) { 78 if ((priv->num_encoders == 0) || (priv->num_connectors == 0)) {
79 /* oh nos! */ 79 /* oh nos! */
80 dev_err(dev->dev, "no encoders/connectors found\n"); 80 dev_err(dev->dev, "no encoders/connectors found\n");
81 return -ENXIO; 81 return -ENXIO;
@@ -299,11 +299,10 @@ static int tilcdc_irq_postinstall(struct drm_device *dev)
299 struct tilcdc_drm_private *priv = dev->dev_private; 299 struct tilcdc_drm_private *priv = dev->dev_private;
300 300
301 /* enable FIFO underflow irq: */ 301 /* enable FIFO underflow irq: */
302 if (priv->rev == 1) { 302 if (priv->rev == 1)
303 tilcdc_set(dev, LCDC_RASTER_CTRL_REG, LCDC_V1_UNDERFLOW_INT_ENA); 303 tilcdc_set(dev, LCDC_RASTER_CTRL_REG, LCDC_V1_UNDERFLOW_INT_ENA);
304 } else { 304 else
305 tilcdc_set(dev, LCDC_INT_ENABLE_SET_REG, LCDC_V2_UNDERFLOW_INT_ENA); 305 tilcdc_set(dev, LCDC_INT_ENABLE_SET_REG, LCDC_V2_UNDERFLOW_INT_ENA);
306 }
307 306
308 return 0; 307 return 0;
309} 308}
@@ -363,7 +362,7 @@ static const struct {
363 uint8_t rev; 362 uint8_t rev;
364 uint8_t save; 363 uint8_t save;
365 uint32_t reg; 364 uint32_t reg;
366} registers[] = { 365} registers[] = {
367#define REG(rev, save, reg) { #reg, rev, save, reg } 366#define REG(rev, save, reg) { #reg, rev, save, reg }
368 /* exists in revision 1: */ 367 /* exists in revision 1: */
369 REG(1, false, LCDC_PID_REG), 368 REG(1, false, LCDC_PID_REG),