diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-01 10:07:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:44:39 +1000 |
| commit | ef8389a84bbd80daaf6c60a5534461d82ba22c0a (patch) | |
| tree | a0f97e81eb0b74f48724ff40825b9792bdc8e29d /drivers/gpu/drm/nouveau/nv50_display.h | |
| parent | d82f8e6c802bb1244ce590d3877f7c66a8fb0ff0 (diff) | |
| download | op-kernel-dev-ef8389a84bbd80daaf6c60a5534461d82ba22c0a.zip op-kernel-dev-ef8389a84bbd80daaf6c60a5534461d82ba22c0a.tar.gz | |
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/nv50_display.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h index f0e30b78..7edd020 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.h +++ b/drivers/gpu/drm/nouveau/nv50_display.h @@ -35,6 +35,24 @@ #include "nouveau_crtc.h" #include "nv50_evo.h" +struct nv50_display { + struct nouveau_channel *evo; + u32 evo_alloc; + + struct { + struct dcb_entry *dcb; + u16 script; + u32 pclk; + } irq; +}; + +static inline struct nv50_display * +nv50_display(struct drm_device *dev) +{ + struct drm_nouveau_private *dev_priv = dev->dev_private; + return dev_priv->engine.display.priv; +} + void nv50_display_irq_handler_bh(struct work_struct *work); int nv50_display_early_init(struct drm_device *dev); void nv50_display_late_takedown(struct drm_device *dev); |
