[Intel-gfx] [PATCH] drm/i915/glk: Fix dotclock calculation in skl_check_pipe_max_pixel_rate

[Maarten Lankhorst]

Op 01-06-17 om 15:52 schreef Ville Syrjälä:
> On Thu, Jun 01, 2017 at 12:34:13PM +0200, Maarten Lankhorst wrote:
>> Seems that GLK has a dotclock that's twice the display clock.
>> skl_max_scale checks for IS_GEMINILAKE, so perform the same check here.
>>
>> While at it, change the DRM_ERROR to DEBUG_KMS.
>>
>> Fixes: 73b0ca8ec76d ("drm/i915/skl+: consider max supported plane pixel
>> rate while scaling")
>> Cc: Mahesh Kumar <mahesh1.kumar at intel.com>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_pm.c | 12 ++++++++----
>>  1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 2042f6512e6e..88c8a3511e24 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -4122,7 +4122,7 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc,
>>  	struct drm_plane *plane;
>>  	const struct drm_plane_state *pstate;
>>  	struct intel_plane_state *intel_pstate;
>> -	int crtc_clock, cdclk;
>> +	int crtc_clock, dotclk;
>>  	uint32_t pipe_max_pixel_rate;
>>  	uint_fixed_16_16_t pipe_downscale;
>>  	uint_fixed_16_16_t max_downscale = u32_to_fixed_16_16(1);
>> @@ -4157,11 +4157,15 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc,
>>  	pipe_downscale = mul_fixed16(pipe_downscale, max_downscale);
>>  
>>  	crtc_clock = crtc_state->adjusted_mode.crtc_clock;
>> -	cdclk = to_intel_atomic_state(state)->cdclk.logical.cdclk;
>> -	pipe_max_pixel_rate = div_round_up_u32_fixed16(cdclk, pipe_downscale);
>> +	dotclk = to_intel_atomic_state(state)->cdclk.logical.cdclk;
> dotclk = cdclk. That statement doesn't make sense. It should be called
> max_dotclk or something like that.
R-B if you want to rename it to max_dotclk. :)