[PATCH] drm/i915: Fix panel fitting regression since 734b4157

[PATCH] drm/i915: Fix panel fitting regression since 734b4157

[Chris Wilson]

The crtc mode fixup is run after the encoders adjust the mode to fit on
their output, so don't reset the mode!

Fixes:

  Bug 29057 - display corruption under 800x600 on netbook
              (1024x600) with 'Full Aspect' scaling
  https://bugs.freedesktop.org/show_bug.cgi?id=29057

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 68dcf36..77e1c75 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2356,8 +2356,6 @@ static bool intel_crtc_mode_fixup(struct drm_crtc *crtc,
 		if (mode->clock * 3 > 27000 * 4)
 			return MODE_CLOCK_HIGH;
 	}
-
-	drm_mode_set_crtcinfo(adjusted_mode, 0);
 	return true;
 }
 
-- 
1.7.1

Re: [PATCH] drm/i915: Fix panel fitting regression since 734b4157

[Jesse Barnes]

On Sat, 17 Jul 2010 12:46:08 +0100
Chris Wilson <chris@chris-wilson.co.uk> wrote:

> The crtc mode fixup is run after the encoders adjust the mode to fit
> on their output, so don't reset the mode!
> 
> Fixes:
> 
>   Bug 29057 - display corruption under 800x600 on netbook
>               (1024x600) with 'Full Aspect' scaling
>   https://bugs.freedesktop.org/show_bug.cgi?id=29057
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c index 68dcf36..77e1c75 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2356,8 +2356,6 @@ static bool intel_crtc_mode_fixup(struct
> drm_crtc *crtc, if (mode->clock * 3 > 27000 * 4)
>  			return MODE_CLOCK_HIGH;
>  	}
> -
> -	drm_mode_set_crtcinfo(adjusted_mode, 0);
>  	return true;
>  }
>  

Wow old breakage, I guess we don't test the other fitting modes very
well.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [PATCH] drm/i915: Fix panel fitting regression since 734b4157

[Jin, Gordon]

Jesse Barnes wrote on Sunday, July 18, 2010 9:10 AM:
> On Sat, 17 Jul 2010 12:46:08 +0100
> Chris Wilson <chris@chris-wilson.co.uk> wrote:
> 
>> The crtc mode fixup is run after the encoders adjust the mode to fit
>> on their output, so don't reset the mode!
>> 
>> Fixes:
>> 
>>   Bug 29057 - display corruption under 800x600 on netbook
>>               (1024x600) with 'Full Aspect' scaling
>>   https://bugs.freedesktop.org/show_bug.cgi?id=29057
>> 
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
>> ---
>>  drivers/gpu/drm/i915/intel_display.c |    2 --
>>  1 files changed, 0 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_display.c
>> b/drivers/gpu/drm/i915/intel_display.c index 68dcf36..77e1c75 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -2356,8 +2356,6 @@ static bool intel_crtc_mode_fixup(struct
>> drm_crtc *crtc, if (mode->clock * 3 > 27000 * 4)
>>  			return MODE_CLOCK_HIGH;
>>  	}
>> -
>> -	drm_mode_set_crtcinfo(adjusted_mode, 0);
>>  	return true;
>>  }
>> 
> 
> Wow old breakage, I guess we don't test the other fitting modes very
> well.
> 
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Chris's patch fixes this problem on our side.

Tested-by: Xun Fang <xunx.fang@intel.com>

Thanks
Gordon