On Thu, Feb 18, 2010 at 5:36 PM, Mike Lothian <m...@fireburn.co.uk> wrote:
> I'm experiencing 3 issues at the moment
[snip]
> And lastly the latest intel DRM code from drm-intel-next has the
> following issue too:
>
> CC drivers/gpu/drm/i915/intel_display.o
> drivers/gpu/drm/i915/intel_display.c: In function 'i9xx_update_wm':
> drivers/gpu/drm/i915/intel_display.c:2778: error: 'IS_I915GM'
> undeclared (first use in this function)
> drivers/gpu/drm/i915/intel_display.c:2778: error: (Each undeclared
> identifier is reported only once
> drivers/gpu/drm/i915/intel_display.c:2778: error: for each function it
> appears in.)
> make[4]: *** [drivers/gpu/drm/i915/intel_display.o] Error 1
>
Apply this:
Fixes 05b044d94f1309b48d62784d329842a2585d6421 rebase error.
diff -puNr a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_display.c 2010-02-18 18:14:11.287962137
-0500
+++ b/drivers/gpu/drm/i915/intel_display.c 2010-02-18 18:13:51.336212730
-0500
@@ -2775,7 +2775,7 @@ static void i9xx_update_wm(struct drm_de
if (IS_I945G(dev) || IS_I945GM(dev)) {
I915_WRITE(FW_BLC_SELF, I915_READ(FW_BLC_SELF)
& ~FW_BLC_SELF_EN);
- } else if (IS_I915GM) {
+ } else if (IS_I915GM(dev)) {
I915_WRITE(INSTPM, I915_READ(INSTPM) & ~INSTPM_SELF_EN);
}
}
--
Alexander Lam
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
