diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-31 19:07:32 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 15:44:39 -0500 |
commit | ef8389a84bbd80daaf6c60a5534461d82ba22c0a (patch) | |
tree | a0f97e81eb0b74f48724ff40825b9792bdc8e29d /drivers/gpu/drm/nouveau/nouveau_drv.h | |
parent | d82f8e6c802bb1244ce590d3877f7c66a8fb0ff0 (diff) |
drm/nv50-nvc0: move non-sharable display state into private structure
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 2e3d7fb4912a..da426b95cc82 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -387,6 +387,7 @@ struct nouveau_pgraph_engine { | |||
387 | }; | 387 | }; |
388 | 388 | ||
389 | struct nouveau_display_engine { | 389 | struct nouveau_display_engine { |
390 | void *priv; | ||
390 | int (*early_init)(struct drm_device *); | 391 | int (*early_init)(struct drm_device *); |
391 | void (*late_takedown)(struct drm_device *); | 392 | void (*late_takedown)(struct drm_device *); |
392 | int (*create)(struct drm_device *); | 393 | int (*create)(struct drm_device *); |
@@ -747,14 +748,6 @@ struct drm_nouveau_private { | |||
747 | 748 | ||
748 | struct backlight_device *backlight; | 749 | struct backlight_device *backlight; |
749 | 750 | ||
750 | struct nouveau_channel *evo; | ||
751 | u32 evo_alloc; | ||
752 | struct { | ||
753 | struct dcb_entry *dcb; | ||
754 | u16 script; | ||
755 | u32 pclk; | ||
756 | } evo_irq; | ||
757 | |||
758 | struct { | 751 | struct { |
759 | struct dentry *channel_root; | 752 | struct dentry *channel_root; |
760 | } debugfs; | 753 | } debugfs; |