public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
@ 2007-09-05  7:11 Zhenyu Wang
  2007-09-05 15:19 ` Randy Dunlap
  0 siblings, 1 reply; 6+ messages in thread
From: Zhenyu Wang @ 2007-09-05  7:11 UTC (permalink / raw)
  To: Dave Airlie; +Cc: LKML


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 <zhenyu.z.wang@intel.com>
---
 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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
  2007-09-05  7:11 [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33 Zhenyu Wang
@ 2007-09-05 15:19 ` Randy Dunlap
  2007-09-06  1:28   ` Zhenyu Wang
  0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2007-09-05 15:19 UTC (permalink / raw)
  To: Zhenyu Wang; +Cc: Dave Airlie, LKML

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 ***

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
  2007-09-05 15:19 ` Randy Dunlap
@ 2007-09-06  1:28   ` Zhenyu Wang
  2007-09-11  5:13     ` Andrew Morton
  0 siblings, 1 reply; 6+ messages in thread
From: Zhenyu Wang @ 2007-09-06  1:28 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Dave Airlie, LKML

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 <zhenyu.z.wang@intel.com>
---
 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

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
  2007-09-06  1:28   ` Zhenyu Wang
@ 2007-09-11  5:13     ` Andrew Morton
  2007-09-11  8:08       ` Dave Airlie
  0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2007-09-11  5:13 UTC (permalink / raw)
  To: Zhenyu Wang; +Cc: Randy Dunlap, Dave Airlie, LKML

On Thu, 6 Sep 2007 09:28:52 +0800 Zhenyu Wang <zhenyu.z.wang@intel.com> 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 <zhenyu.z.wang@intel.com>
> ---
>  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.



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
  2007-09-11  5:13     ` Andrew Morton
@ 2007-09-11  8:08       ` Dave Airlie
  2007-09-11  8:21         ` Andrew Morton
  0 siblings, 1 reply; 6+ messages in thread
From: Dave Airlie @ 2007-09-11  8:08 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Zhenyu Wang, Randy Dunlap, LKML

>>
>> 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 <zhenyu.z.wang@intel.com>

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 <airlied@linux.ie>


>> ---
>>  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.
>
>
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33
  2007-09-11  8:08       ` Dave Airlie
@ 2007-09-11  8:21         ` Andrew Morton
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Morton @ 2007-09-11  8:21 UTC (permalink / raw)
  To: Dave Airlie; +Cc: Zhenyu Wang, Randy Dunlap, LKML

On Tue, 11 Sep 2007 09:08:08 +0100 (IST) Dave Airlie <airlied@linux.ie> 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 <airlied@linux.ie>

No probs, thanks.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2007-09-11  8:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-05  7:11 [PATCH] [AGPGART] intel_agp: fix stolen mem range on G33 Zhenyu Wang
2007-09-05 15:19 ` Randy Dunlap
2007-09-06  1:28   ` Zhenyu Wang
2007-09-11  5:13     ` Andrew Morton
2007-09-11  8:08       ` Dave Airlie
2007-09-11  8:21         ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox