diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:21 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:43:28 +1000 |
| commit | cc6062fe78164e347e6a37e4115666f329221808 (patch) | |
| tree | ca55332019fee1da9606e97b1b25113dfda9ec38 /bin | |
| parent | 62a077fe5664d5fccf7baf24f2bb6d09de3f61f4 (diff) | |
| download | nouveau-cc6062fe78164e347e6a37e4115666f329221808.tar.gz | |
core: remove NV_D0 family
The one place where it mattered has been replaced with a class check,
which is more appropriate anyway.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nv_disp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nv_disp.c b/bin/nv_disp.c index f96c4a0ac..b083e5219 100644 --- a/bin/nv_disp.c +++ b/bin/nv_disp.c @@ -10,7 +10,7 @@ static void nv_disp(struct nouveau_object *device, u16 mthd, u32 data) { if (nv_device(device)->card_type >= NV_50 && - nv_device(device)->card_type <= NV_C0) { + nv_device(device)->chipset < 0xd0) { u32 ctrl = nv_ro32(device, 0x610300 + (chan * 8)); nv_wo32(device, 0x610300 + (chan * 8), ctrl | 0x00000001); nv_wo32(device, 0x610304 + (chan * 8), data); @@ -18,7 +18,7 @@ nv_disp(struct nouveau_object *device, u16 mthd, u32 data) while (nv_ro32(device, 0x610300 + (chan * 8)) & 0x80000000) {} nv_wo32(device, 0x610300 + (chan * 8), ctrl); } else - if (nv_device(device)->card_type >= NV_D0 && + if (nv_device(device)->chipset >= 0xd0 && nv_device(device)->card_type <= NV_E0) { u32 ctrl = nv_ro32(device, 0x610700 + (chan * 16)); nv_wo32(device, 0x610700 + (chan * 16), ctrl | 0x00000001); |