summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_cursor.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-02-01 10:07:32 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-02-25 06:44:39 +1000
commitef8389a84bbd80daaf6c60a5534461d82ba22c0a (patch)
treea0f97e81eb0b74f48724ff40825b9792bdc8e29d /drivers/gpu/drm/nouveau/nv50_cursor.c
parentd82f8e6c802bb1244ce590d3877f7c66a8fb0ff0 (diff)
downloadblackbird-obmc-linux-ef8389a84bbd80daaf6c60a5534461d82ba22c0a.tar.gz
blackbird-obmc-linux-ef8389a84bbd80daaf6c60a5534461d82ba22c0a.zip
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_cursor.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_cursor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
index 1b9ce3021aa3..ba75f95ca529 100644
--- a/drivers/gpu/drm/nouveau/nv50_cursor.c
+++ b/drivers/gpu/drm/nouveau/nv50_cursor.c
@@ -36,9 +36,9 @@
static void
nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
{
- struct drm_nouveau_private *dev_priv = nv_crtc->base.dev->dev_private;
- struct nouveau_channel *evo = dev_priv->evo;
struct drm_device *dev = nv_crtc->base.dev;
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ struct nouveau_channel *evo = nv50_display(dev)->evo;
int ret;
NV_DEBUG_KMS(dev, "\n");
@@ -71,9 +71,9 @@ nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
static void
nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
{
- struct drm_nouveau_private *dev_priv = nv_crtc->base.dev->dev_private;
- struct nouveau_channel *evo = dev_priv->evo;
struct drm_device *dev = nv_crtc->base.dev;
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ struct nouveau_channel *evo = nv50_display(dev)->evo;
int ret;
NV_DEBUG_KMS(dev, "\n");
OpenPOWER on IntegriCloud