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

2007-09-11 Thread Andrew Morton 
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.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-11 Thread Dave Airlie 


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.




-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-11 Thread Dave Airlie 


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.




-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-11 Thread Andrew Morton 
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.
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-10 Thread Andrew Morton 
On Thu, 6 Sep 2007 09:28:52 +0800 Zhenyu Wang <[EMAIL PROTECTED]> wrote:

> On 2007.09.05 08:19:37 +, 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.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-10 Thread Andrew Morton 
On Thu, 6 Sep 2007 09:28:52 +0800 Zhenyu Wang [EMAIL PROTECTED] wrote:

 On 2007.09.05 08:19:37 +, 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.


-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-05 Thread Zhenyu Wang 
On 2007.09.05 08:19:37 +, 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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-05 Thread Randy Dunlap 
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 ***
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-05 Thread Zhenyu Wang 

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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-05 Thread Zhenyu Wang 

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
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2007-09-05 Thread Randy Dunlap 
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 ***
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/