diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-18 11:00:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-18 11:00:02 -0400 |
| commit | dfdba7fd60592818078e9ceec04ffa49347e1aed (patch) | |
| tree | d3029559a75416f6fde5f3cfc177cb9cef1ead93 | |
| parent | 662af0d8228ced3c7b3d3012a73dce929fc27574 (diff) | |
| parent | 893c3e538dc338509b0c1121173355e8cfa34ff0 (diff) | |
Merge branches 'drm-3.12' and 'tda998x-3.12' into drm-tda998x-3.12
| -rw-r--r-- | drivers/gpu/drm/i2c/tda998x_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 60e84043aa34..400b0c4a10fb 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | #include <linux/hdmi.h> | ||
| 20 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 21 | 22 | ||
| 22 | #include <drm/drmP.h> | 23 | #include <drm/drmP.h> |
| @@ -549,6 +550,8 @@ tda998x_write_avi(struct drm_encoder *encoder, struct drm_display_mode *mode) | |||
| 549 | buf[HB(0)] = 0x82; | 550 | buf[HB(0)] = 0x82; |
| 550 | buf[HB(1)] = 0x02; | 551 | buf[HB(1)] = 0x02; |
| 551 | buf[HB(2)] = 13; | 552 | buf[HB(2)] = 13; |
| 553 | buf[PB(1)] = HDMI_SCAN_MODE_UNDERSCAN; | ||
| 554 | buf[PB(3)] = HDMI_QUANTIZATION_RANGE_FULL << 2; | ||
| 552 | buf[PB(4)] = drm_match_cea_mode(mode); | 555 | buf[PB(4)] = drm_match_cea_mode(mode); |
| 553 | 556 | ||
| 554 | tda998x_write_if(encoder, DIP_IF_FLAGS_IF2, REG_IF2_HB0, buf, | 557 | tda998x_write_if(encoder, DIP_IF_FLAGS_IF2, REG_IF2_HB0, buf, |