[PATCH] UBUNTU: SAUCE: i915: ubreak G33 GTT size calculation

[Stefan Bader]

It is a patch. But what for? Clearly not Dapper but Lucid or Maverick? ;-)

-Stefan

On 07/01/2010 10:19 PM, Kees Cook wrote:
> Upstream fixed https://bugzilla.kernel.org/show_bug.cgi?id=15733
> by correctly calculating the GTT size using aperture size
> on non-G33 hardware.  In the process, the G33 case was
> also changed, which lead to the regression documented in
> https://bugzilla.kernel.org/show_bug.cgi?id=16294
> 
> This patch reverts the G33 logic without re-breaking the non-G33 logic.
> 
> Signed-off-by: Kees Cook <kees.cook at canonical.com>
> ---
>  drivers/char/agp/intel-gtt.c |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
> index 9344216..472d9f7 100644
> --- a/drivers/char/agp/intel-gtt.c
> +++ b/drivers/char/agp/intel-gtt.c
> @@ -1229,6 +1229,13 @@ static int intel_i915_get_gtt_size(void)
>  				(gmch_ctrl & G33_PGETBL_SIZE_MASK));
>  			size = 512;
>  		}
> +		/* revert the G33 logic changes due to
> +		   https://bugzilla.kernel.org/show_bug.cgi?id=16294
> +		   without re-breaking the non-G33 case which motivated
> +		   the change from
> +		   https://bugzilla.kernel.org/show_bug.cgi?id=15733
> +		 */
> +		size = 1024;
>  	} else {
>  		/* On previous hardware, the GTT size was just what was
>  		 * required to map the aperture.