From 6660b4cfa167595e4feac2e9261cabfd2b74d0d7 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 15 Jun 2012 11:55:22 -0700 Subject: [PATCH] --- yaml --- r: 318619 b: refs/heads/master c: e597dad846bafe6c9802c9ae2a94d755c5567de9 h: refs/heads/master i: 318617: 8cad22af67a8587913062f7132bb5aff6ec53296 318615: 5a511f49f4a284427c35822a4ad7dc20df91b0a0 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-gtt.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b76ac11761cb..ba2ba6dd5601 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e87c46993e30e8fe2e7a0981a532abe8bba07e62 +refs/heads/master: e597dad846bafe6c9802c9ae2a94d755c5567de9 diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c index 692610e597db..9ed92ef5829b 100644 --- a/trunk/drivers/char/agp/intel-gtt.c +++ b/trunk/drivers/char/agp/intel-gtt.c @@ -1253,6 +1253,7 @@ static int i9xx_setup(void) switch (INTEL_GTT_GEN) { case 5: case 6: + case 7: gtt_offset = MB(2); break; case 4: