[Intel-gfx] [PATCH] drm/i915: fix per-pipe reads after "cleanup"

[Jesse Barnes]

On Thu, 17 Feb 2011 22:33:38 +0100
Alexey Fisher <bug-track at fisher-privat.net> wrote:

> Am Donnerstag, den 17.02.2011, 21:08 +0000 schrieb Chris Wilson:
> > On Thu, 17 Feb 2011 10:40:53 -0800, Jesse Barnes <jbarnes at virtuousgeek.org> wrote:
> > > In a few places I replaced reads of per-pipe registers with the actual
> > > register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
> > > Alexey caught this on his 9xx machine because the cursor control write
> > > was affected.  A quick audit showed a few more places where I'd borked
> > > a read, so here's a patch to fix things up.
> > 
> > Shoot the reviewer. Thanks for finding those needles in the haystack,
> > -Chris
> > 
> 
> I get compile error:
> 
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c: In function
> ‘intel_crtc_mode_get’:
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> ‘dev_priv’ undeclared (first use in this function)
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> (Each undeclared identifier is reported only once
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> for each function it appears in.)
> 
> The patch is on the top of 9035a97a32836d0e456ddafaaf249a844e6e4b5e
> (current drm-next)

Huh, I compiled it but I must have mixed in some other changes.  You'll
need this piece too.

-- 
Jesse Barnes, Intel Open Source Technology Center

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_d
index eadb4b8..2eb251a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5746,6 +5746,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, st
 struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
                                             struct drm_crtc *crtc)
 {
+       drm_i915_private_t *dev_priv = dev->dev_private;
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        int pipe = intel_crtc->pipe;
        struct drm_display_mode *mode;