diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-08-30 19:55:52 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 16:19:09 +1000 |
| commit | 217275d03d7e1f3e62c7b0d9718df99456b7c356 (patch) | |
| tree | 18637a60e8e767f8415e03e540561db84e8296d6 /drivers/gpu/drm/nouveau/nv17_tv.c | |
| parent | 7314dec95c054258d5e5a3d1d55e1fd042f8eaad (diff) | |
| download | blackbird-op-linux-217275d03d7e1f3e62c7b0d9718df99456b7c356.tar.gz blackbird-op-linux-217275d03d7e1f3e62c7b0d9718df99456b7c356.zip | |
drm/nv40: Try to set up CRE_LCD even if it has unknown bits set.
They don't seem to do anything useful, and we really want to program
CRE_LCD if we aren't lucky enough to find the right CRTC binding
already set.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv17_tv.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv17_tv.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c index 13cdc05b7c2d..703c188c32d6 100644 --- a/drivers/gpu/drm/nouveau/nv17_tv.c +++ b/drivers/gpu/drm/nouveau/nv17_tv.c @@ -408,15 +408,10 @@ static void nv17_tv_prepare(struct drm_encoder *encoder) } - /* Some NV4x have unknown values (0x3f, 0x50, 0x54, 0x6b, 0x79, 0x7f) - * at LCD__INDEX which we don't alter - */ - if (!(*cr_lcd & 0x44)) { - if (tv_norm->kind == CTV_ENC_MODE) - *cr_lcd = 0x1 | (head ? 0x0 : 0x8); - else - *cr_lcd = 0; - } + if (tv_norm->kind == CTV_ENC_MODE) + *cr_lcd = 0x1 | (head ? 0x0 : 0x8); + else + *cr_lcd = 0; /* Set the DACCLK register */ dacclk = (NVReadRAMDAC(dev, 0, dacclk_off) & ~0x30) | 0x1; |
