Re: Add GEM to i915 broke compilation on MIPS

[Eric A. <er...@an...>]

On Sat, 2009-01-10 at 19:16 +0100, Martin Michlmayr wrote:
> Eric,
> 
> Your patch "drm: Add GEM ("graphics execution manager") to i915
> driver" [1] broke compilation on MIPS because agp.h doesn't exist.
> 
>   CALL    scripts/checksyscalls.sh
>   CC [M]  drivers/gpu/drm/drm_agpsupport.o
> drivers/gpu/drm/drm_agpsupport.c:36:21: error: asm/agp.h: No such file or directory
> make[3]: *** [drivers/gpu/drm/drm_agpsupport.o] Error 1
> 
> [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=673a394b1e3b69be886ff24abfd6df97c52e8d08

Is this enough to fix it?

From 8a8d7ba9cac5f569c9b0426e583203bab1feeb73 Mon Sep 17 00:00:00 2001
From: Eric Anholt <er...@an...>
Date: Wed, 14 Jan 2009 17:16:25 -0800
Subject: [PATCH] drm: stash AGP include under the do-we-have-AGP ifdef

This should fix the MIPS with DRM build.

Signed-off-by: Eric Anholt <er...@an...>
---
 drivers/gpu/drm/drm_agpsupport.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 3d33b82..1479659 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -33,10 +33,11 @@
 
 #include "drmP.h"
 #include <linux/module.h>
-#include <asm/agp.h>
 
 #if __OS_HAS_AGP
 
+#include <asm/agp.h>
+
 /**
  * Get AGP information.
  *
-- 
1.5.6.5


-- 
Eric Anholt
er...@an...                         eri...@in...