diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-01 10:24:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:44:42 +1000 |
| commit | 59c0f5780f21ef10428bdaccd9999879f38225bc (patch) | |
| tree | 2076a40142fa4472cb4481ce98c43f0025bc8b9a /drivers/gpu/drm/nouveau/nv50_dac.c | |
| parent | ef8389a84bbd80daaf6c60a5534461d82ba22c0a (diff) | |
| download | linux-59c0f5780f21ef10428bdaccd9999879f38225bc.tar.gz linux-59c0f5780f21ef10428bdaccd9999879f38225bc.tar.bz2 linux-59c0f5780f21ef10428bdaccd9999879f38225bc.zip | |
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) { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); struct drm_device *dev = encoder->dev; - struct nouveau_channel *evo = nv50_display(dev)->evo; + struct nouveau_channel *evo = nv50_display(dev)->master; int ret; if (!nv_encoder->crtc) @@ -215,7 +215,7 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, { struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); struct drm_device *dev = encoder->dev; - struct nouveau_channel *evo = nv50_display(dev)->evo; + struct nouveau_channel *evo = nv50_display(dev)->master; struct nouveau_crtc *crtc = nouveau_crtc(encoder->crtc); uint32_t mode_ctl = 0, mode_ctl2 = 0; int ret; |