summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_display.h
diff options
context:
space:
mode:
authorBen Skeggs2014-08-09 20:10:22 +0200
committerBen Skeggs2014-08-09 21:13:14 +0200
commit0ad72863ea426d46b2786cba9430e122a40aad0b (patch)
treebbb9346e53a5e0c16674f4e43807cad013c6cc25 /drivers/gpu/drm/nouveau/nouveau_display.h
parentdrm/nouveau: initial pass at moving to struct nvif_device (diff)
downloadkernel-qcow2-linux-0ad72863ea426d46b2786cba9430e122a40aad0b.tar.gz
kernel-qcow2-linux-0ad72863ea426d46b2786cba9430e122a40aad0b.tar.xz
kernel-qcow2-linux-0ad72863ea426d46b2786cba9430e122a40aad0b.zip
drm/nouveau: port to nvif client/device/objects
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_display.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index 37bf0d224a4c..88ca177cb1c7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -12,6 +12,8 @@ struct nouveau_framebuffer {
u32 r_handle;
u32 r_format;
u32 r_pitch;
+ struct nvif_object h_base[4];
+ struct nvif_object h_core;
};
static inline struct nouveau_framebuffer *
@@ -39,7 +41,7 @@ struct nouveau_display {
int (*fb_ctor)(struct drm_framebuffer *);
void (*fb_dtor)(struct drm_framebuffer *);
- struct nouveau_object *core;
+ struct nvif_object disp;
struct drm_property *dithering_mode;
struct drm_property *dithering_depth;