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/core/engine/disp/nvf0.c | |
| parent | 4952b4d339033c2019bbd00f28f422b6fc340408 (diff) | |
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/core/engine/disp/nvf0.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c index b6b01463eb6c..04bda4ac4ed3 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c @@ -25,7 +25,7 @@ #include <engine/software.h> #include <engine/disp.h> -#include <core/class.h> +#include <nvif/class.h> #include "nv50.h" @@ -35,17 +35,17 @@ static struct nouveau_oclass nvf0_disp_sclass[] = { - { NVF0_DISP_MAST_CLASS, &nvd0_disp_mast_ofuncs.base }, - { NVF0_DISP_SYNC_CLASS, &nvd0_disp_sync_ofuncs.base }, - { NVF0_DISP_OVLY_CLASS, &nvd0_disp_ovly_ofuncs.base }, - { NVF0_DISP_OIMM_CLASS, &nvd0_disp_oimm_ofuncs.base }, - { NVF0_DISP_CURS_CLASS, &nvd0_disp_curs_ofuncs.base }, + { GK110_DISP_CORE_CHANNEL_DMA, &nvd0_disp_mast_ofuncs.base }, + { GK110_DISP_BASE_CHANNEL_DMA, &nvd0_disp_sync_ofuncs.base }, + { GK104_DISP_OVERLAY_CONTROL_DMA, &nvd0_disp_ovly_ofuncs.base }, + { GK104_DISP_OVERLAY, &nvd0_disp_oimm_ofuncs.base }, + { GK104_DISP_CURSOR, &nvd0_disp_curs_ofuncs.base }, {} }; static struct nouveau_oclass nvf0_disp_base_oclass[] = { - { NVF0_DISP_CLASS, &nvd0_disp_base_ofuncs }, + { GK110_DISP, &nvd0_disp_base_ofuncs }, {} }; |