From c157b7fa0a9a73dd6c182342b664f15d9f62646c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 12 Jul 2011 23:38:18 +0100 Subject: [PATCH] --- yaml --- r: 254907 b: refs/heads/master c: 780d7cc44524cd396a34757127f51ecb8ccaf2da h: refs/heads/master i: 254905: 0ceb76f243e050d2db8072db1e6ca883f6311bf5 254903: 3532a57d7424ae12a35007f1f76568fe93817793 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-agp.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d9c9595ca717..713c24b322bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4171424e66e5525d7128a2c355215ca5c66f76d5 +refs/heads/master: 780d7cc44524cd396a34757127f51ecb8ccaf2da diff --git a/trunk/drivers/char/agp/intel-agp.h b/trunk/drivers/char/agp/intel-agp.h index 999803ce10dc..5da67f165afa 100644 --- a/trunk/drivers/char/agp/intel-agp.h +++ b/trunk/drivers/char/agp/intel-agp.h @@ -90,9 +90,10 @@ #define G4x_GMCH_SIZE_MASK (0xf << 8) #define G4x_GMCH_SIZE_1M (0x1 << 8) #define G4x_GMCH_SIZE_2M (0x3 << 8) -#define G4x_GMCH_SIZE_VT_1M (0x9 << 8) -#define G4x_GMCH_SIZE_VT_1_5M (0xa << 8) -#define G4x_GMCH_SIZE_VT_2M (0xc << 8) +#define G4x_GMCH_SIZE_VT_EN (0x8 << 8) +#define G4x_GMCH_SIZE_VT_1M (G4x_GMCH_SIZE_1M | G4x_GMCH_SIZE_VT_EN) +#define G4x_GMCH_SIZE_VT_1_5M ((0x2 << 8) | G4x_GMCH_SIZE_VT_EN) +#define G4x_GMCH_SIZE_VT_2M (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN) #define GFX_FLSH_CNTL 0x2170 /* 915+ */