diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-01-31 19:24:41 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 15:44:42 -0500 |
commit | 59c0f5780f21ef10428bdaccd9999879f38225bc (patch) | |
tree | 2076a40142fa4472cb4481ce98c43f0025bc8b9a /drivers/gpu/drm/nouveau/nv50_dac.c | |
parent | ef8389a84bbd80daaf6c60a5534461d82ba22c0a (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_dac.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_dac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c index ca9af5b30d24..808f3ec8f827 100644 --- a/drivers/gpu/drm/nouveau/nv50_dac.c +++ b/drivers/gpu/drm/nouveau/nv50_dac.c | |||
@@ -41,7 +41,7 @@ nv50_dac_disconnect(struct drm_encoder *encoder) | |||
41 | { | 41 | { |
42 | struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); | 42 | struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); |
43 | struct drm_device *dev = encoder->dev; | 43 | struct drm_device *dev = encoder->dev; |
44 | struct nouveau_channel *evo = nv50_display(dev)->evo; | 44 | struct nouveau_channel *evo = nv50_display(dev)->master; |
45 | int ret; | 45 | int ret; |
46 | 46 | ||
47 | if (!nv_encoder->crtc) | 47 | if (!nv_encoder->crtc) |
@@ -215,7 +215,7 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, | |||
215 | { | 215 | { |
216 | struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); | 216 | struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); |
217 | struct drm_device *dev = encoder->dev; | 217 | struct drm_device *dev = encoder->dev; |
218 | struct nouveau_channel *evo = nv50_display(dev)->evo; | 218 | struct nouveau_channel *evo = nv50_display(dev)->master; |
219 | struct nouveau_crtc *crtc = nouveau_crtc(encoder->crtc); | 219 | struct nouveau_crtc *crtc = nouveau_crtc(encoder->crtc); |
220 | uint32_t mode_ctl = 0, mode_ctl2 = 0; | 220 | uint32_t mode_ctl = 0, mode_ctl2 = 0; |
221 | int ret; | 221 | int ret; |