← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/nouveau/nv50_dac.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/nouveau/nv50_dac.c
41
41
{
42
42
        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
43
43
        struct drm_device *dev = encoder->dev;
44
 
        struct drm_nouveau_private *dev_priv = dev->dev_private;
45
 
        struct nouveau_channel *evo = dev_priv->evo;
 
44
        struct nouveau_channel *evo = nv50_display(dev)->master;
46
45
        int ret;
47
46
 
48
47
        if (!nv_encoder->crtc)
216
215
{
217
216
        struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
218
217
        struct drm_device *dev = encoder->dev;
219
 
        struct drm_nouveau_private *dev_priv = dev->dev_private;
220
 
        struct nouveau_channel *evo = dev_priv->evo;
 
218
        struct nouveau_channel *evo = nv50_display(dev)->master;
221
219
        struct nouveau_crtc *crtc = nouveau_crtc(encoder->crtc);
222
220
        uint32_t mode_ctl = 0, mode_ctl2 = 0;
223
221
        int ret;