diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 04:10:27 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-10 05:28:11 +1000 |
| commit | 648d4dfde721885737b33a06f2b73ee125acf271 (patch) | |
| tree | 5ad1a46f4de17e82d59b87c247f3b678f3ac7e41 /drivers/gpu/drm/nouveau/nouveau_display.c | |
| parent | drm/nouveau/disp: audit and version SCANOUTPOS method (diff) | |
| download | linux-dev-648d4dfde721885737b33a06f2b73ee125acf271.tar.xz linux-dev-648d4dfde721885737b33a06f2b73ee125acf271.zip | |
drm/nouveau/disp: audit and version display classes
The full object interfaces are about to be exposed to userspace, so we
need to check for any security-related issues and version the structs
to make it easier to handle any changes we may need in the future.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index f00e56c79ac4..a5a1f298c001 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -404,10 +404,10 @@ nouveau_display_create_properties(struct drm_device *dev) struct nouveau_display *disp = nouveau_display(dev); int gen; - if (disp->disp.oclass < NV50_DISP_CLASS) + if (disp->disp.oclass < NV50_DISP) gen = 0; else - if (disp->disp.oclass < NVD0_DISP_CLASS) + if (disp->disp.oclass < GF110_DISP) gen = 1; else gen = 2; @@ -479,16 +479,16 @@ nouveau_display_create(struct drm_device *dev) if (drm->vbios.dcb.entries) { static const u16 oclass[] = { - GM107_DISP_CLASS, - NVF0_DISP_CLASS, - NVE0_DISP_CLASS, - NVD0_DISP_CLASS, - NVA3_DISP_CLASS, - NV94_DISP_CLASS, - NVA0_DISP_CLASS, - NV84_DISP_CLASS, - NV50_DISP_CLASS, - NV04_DISP_CLASS, + GM107_DISP, + GK110_DISP, + GK104_DISP, + GF110_DISP, + GT214_DISP, + GT206_DISP, + GT200_DISP, + G82_DISP, + NV50_DISP, + NV04_DISP, }; int i; @@ -500,7 +500,7 @@ nouveau_display_create(struct drm_device *dev) if (ret == 0) { nouveau_display_create_properties(dev); - if (disp->disp.oclass < NV50_DISP_CLASS) + if (disp->disp.oclass < NV50_DISP) ret = nv04_display_create(dev); else ret = nv50_display_create(dev); |