aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_display.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-01-31 19:24:41 -0500
committerBen Skeggs <bskeggs@redhat.com>2011-02-24 15:44:42 -0500
commit59c0f5780f21ef10428bdaccd9999879f38225bc (patch)
tree2076a40142fa4472cb4481ce98c43f0025bc8b9a /drivers/gpu/drm/nouveau/nv50_display.c
parentef8389a84bbd80daaf6c60a5534461d82ba22c0a (diff)
drm/nv50-nvc0: rename disp->evo to disp->master
More appropriate, and we're about to be using more than just the master EVO channel. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 636d3a204f0a..0f3384aa6134 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -172,7 +172,7 @@ nv50_display_init(struct drm_device *dev)
172 ret = nv50_evo_init(dev); 172 ret = nv50_evo_init(dev);
173 if (ret) 173 if (ret)
174 return ret; 174 return ret;
175 evo = nv50_display(dev)->evo; 175 evo = nv50_display(dev)->master;
176 176
177 nv_wr32(dev, NV50_PDISPLAY_OBJECTS, (evo->ramin->vinst >> 8) | 9); 177 nv_wr32(dev, NV50_PDISPLAY_OBJECTS, (evo->ramin->vinst >> 8) | 9);
178 178
@@ -202,7 +202,7 @@ static int nv50_display_disable(struct drm_device *dev)
202{ 202{
203 struct drm_nouveau_private *dev_priv = dev->dev_private; 203 struct drm_nouveau_private *dev_priv = dev->dev_private;
204 struct nv50_display *disp = nv50_display(dev); 204 struct nv50_display *disp = nv50_display(dev);
205 struct nouveau_channel *evo = disp->evo; 205 struct nouveau_channel *evo = disp->master;
206 struct drm_crtc *drm_crtc; 206 struct drm_crtc *drm_crtc;
207 int ret, i; 207 int ret, i;
208 208