2007-09-05 07:13:04

by Zhenyu Wang

Subject: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

Subject: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

G33 GTT stolen memory is below graphics data
stolen memory and be seperate, so don't subtract
it in stolen mem counting.

Signed-off-by: Zhenyu Wang <[email protected]>
---
drivers/char/agp/intel-agp.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 2c9ca2c..20d50d0 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void)
break;
}
} else {
+ /* G33's GTT stolen memory is seperate from gfx data
+ * stolen memory.
+ */
+ if (IS_G33)
+ size = 0;
switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
case I855_GMCH_GMS_STOLEN_1M:
gtt_entries = MB(1) - KB(size);
--
1.5.2.3

2007-09-05 15:21:52

by Randy Dunlap

Subject: Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

On Wed, 5 Sep 2007 15:11:52 +0800 Zhenyu Wang wrote:

> drivers/char/agp/intel-agp.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
> index 2c9ca2c..20d50d0 100644
> --- a/drivers/char/agp/intel-agp.c
> +++ b/drivers/char/agp/intel-agp.c
> @@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void)
> break;
> }
> } else {
> + /* G33's GTT stolen memory is seperate from gfx data

separate

> + * stolen memory.
> + */
> + if (IS_G33)
> + size = 0;
> switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
> case I855_GMCH_GMS_STOLEN_1M:
> gtt_entries = MB(1) - KB(size);

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2007-09-06 01:30:07

by Zhenyu Wang

Subject: Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

On 2007.09.05 08:19:37 +0000, Randy Dunlap wrote:
> *** Remember to use Documentation/SubmitChecklist when testing your code ***

Thanks Randy. Here's updated patch with typo and tab style
fixed. I misused x style.

Subject: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

G33 GTT stolen memory is below graphics data
stolen memory and be seperate, so don't subtract
it in stolen mem counting.

Signed-off-by: Zhenyu Wang <[email protected]>
---
drivers/char/agp/intel-agp.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 2c9ca2c..581f922 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void)
break;
}
} else {
+ /* G33's GTT stolen memory is separate from gfx data
+ * stolen memory.
+ */
+ if (IS_G33)
+ size = 0;
switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
case I855_GMCH_GMS_STOLEN_1M:
gtt_entries = MB(1) - KB(size);
--
1.5.2.3

2007-09-11 05:14:30

by Andrew Morton

Subject: Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

On Thu, 6 Sep 2007 09:28:52 +0800 Zhenyu Wang <[email protected]> wrote:

> On 2007.09.05 08:19:37 +0000, Randy Dunlap wrote:
> > *** Remember to use Documentation/SubmitChecklist when testing your code ***
>
> Thanks Randy. Here's updated patch with typo and tab style
> fixed. I misused x style.
>
> Subject: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
>
> G33 GTT stolen memory is below graphics data
> stolen memory and be seperate, so don't subtract
> it in stolen mem counting.
>
> Signed-off-by: Zhenyu Wang <[email protected]>
> ---
> drivers/char/agp/intel-agp.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
> index 2c9ca2c..581f922 100644
> --- a/drivers/char/agp/intel-agp.c
> +++ b/drivers/char/agp/intel-agp.c
> @@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void)
> break;
> }
> } else {
> + /* G33's GTT stolen memory is separate from gfx data
> + * stolen memory.
> + */
> + if (IS_G33)
> + size = 0;
> switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
> case I855_GMCH_GMS_STOLEN_1M:
> gtt_entries = MB(1) - KB(size);

When looking at a "fix" I need to work out whether it might be needed in
2.6.23. But your description of this patch didn't describe the problem
which it fixes in a way which allows me to decide this.

2007-09-11 08:08:23

by Dave Airlie

Subject: Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

>>
>> Subject: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
>>
>> G33 GTT stolen memory is below graphics data
>> stolen memory and be seperate, so don't subtract
>> it in stolen mem counting.
>>
>> Signed-off-by: Zhenyu Wang <[email protected]>

Andrew I meant to upstream these for 2.6.23 but travelling is still in
progress, so if you could send them to Linus...

Acked-by: Dave Airlie <[email protected]>


>> ---
>> drivers/char/agp/intel-agp.c | 5 +++++
>> 1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
>> index 2c9ca2c..581f922 100644
>> --- a/drivers/char/agp/intel-agp.c
>> +++ b/drivers/char/agp/intel-agp.c
>> @@ -506,6 +506,11 @@ static void intel_i830_init_gtt_entries(void)
>> break;
>> }
>> } else {
>> + /* G33's GTT stolen memory is separate from gfx data
>> + * stolen memory.
>> + */
>> + if (IS_G33)
>> + size = 0;
>> switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
>> case I855_GMCH_GMS_STOLEN_1M:
>> gtt_entries = MB(1) - KB(size);
>
> When looking at a "fix" I need to work out whether it might be needed in
> 2.6.23. But your description of this patch didn't describe the problem
> which it fixes in a way which allows me to decide this.
>
>
>

2007-09-11 08:22:08

by Andrew Morton

Subject: Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33

On Tue, 11 Sep 2007 09:08:08 +0100 (IST) Dave Airlie <[email protected]> wrote:

> Andrew I meant to upstream these for 2.6.23 but travelling is still in
> progress, so if you could send them to Linus...
>
> Acked-by: Dave Airlie <[email protected]>

No probs, thanks.