From: zhang songyi <[email protected]>
Return the mul_u32_fixed16() and div_fixed16() directly instead of
redundant variables.
Reported-by: Zeal Robot <[email protected]>
Signed-off-by: zhang songyi <[email protected]>
---
drivers/gpu/drm/i915/intel_pm.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 210c1f78cc90..a6757ed9081a 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5272,7 +5272,6 @@ skl_wm_method2(u32 pixel_rate, u32 pipe_htotal, u32 latency,
uint_fixed_16_16_t plane_blocks_per_line)
{
u32 wm_intermediate_val;
- uint_fixed_16_16_t ret;
if (latency == 0)
return FP_16_16_MAX;
@@ -5280,8 +5279,8 @@ skl_wm_method2(u32 pixel_rate, u32 pipe_htotal, u32 latency,
wm_intermediate_val = latency * pixel_rate;
wm_intermediate_val = DIV_ROUND_UP(wm_intermediate_val,
pipe_htotal * 1000);
- ret = mul_u32_fixed16(wm_intermediate_val, plane_blocks_per_line);
- return ret;
+
+ return mul_u32_fixed16(wm_intermediate_val, plane_blocks_per_line);
}
static uint_fixed_16_16_t
@@ -5290,7 +5289,6 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
u32 pixel_rate;
u32 crtc_htotal;
- uint_fixed_16_16_t linetime_us;
if (!crtc_state->hw.active)
return u32_to_fixed16(0);
@@ -5301,9 +5299,8 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
return u32_to_fixed16(0);
crtc_htotal = crtc_state->hw.pipe_mode.crtc_htotal;
- linetime_us = div_fixed16(crtc_htotal * 1000, pixel_rate);
- return linetime_us;
+ return div_fixed16(crtc_htotal * 1000, pixel_rate);
}
static int
--
2.25.1
On Fri, 02 Sep 2022, Jani Nikula <[email protected]> wrote:
> On Fri, 02 Sep 2022, [email protected] wrote:
>> From: zhang songyi <[email protected]>
>>
>> Return the mul_u32_fixed16() and div_fixed16() directly instead of
>> redundant variables.
>>
>> Reported-by: Zeal Robot <[email protected]>
>> Signed-off-by: zhang songyi <[email protected]>
>
> NAK.
And to explain this rude reply to our friendly community:
There's never *any* response to my review comments from
[email protected], so I can't be bothered to write anything more than
just "NAK".
>
>
> BR,
> Jani.
>
>
>> ---
>> drivers/gpu/drm/i915/intel_pm.c | 9 +++------
>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 210c1f78cc90..a6757ed9081a 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -5272,7 +5272,6 @@ skl_wm_method2(u32 pixel_rate, u32 pipe_htotal, u32 latency,
>> uint_fixed_16_16_t plane_blocks_per_line)
>> {
>> u32 wm_intermediate_val;
>> - uint_fixed_16_16_t ret;
>>
>> if (latency == 0)
>> return FP_16_16_MAX;
>> @@ -5280,8 +5279,8 @@ skl_wm_method2(u32 pixel_rate, u32 pipe_htotal, u32 latency,
>> wm_intermediate_val = latency * pixel_rate;
>> wm_intermediate_val = DIV_ROUND_UP(wm_intermediate_val,
>> pipe_htotal * 1000);
>> - ret = mul_u32_fixed16(wm_intermediate_val, plane_blocks_per_line);
>> - return ret;
>> +
>> + return mul_u32_fixed16(wm_intermediate_val, plane_blocks_per_line);
>> }
>>
>> static uint_fixed_16_16_t
>> @@ -5290,7 +5289,6 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
>> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
>> u32 pixel_rate;
>> u32 crtc_htotal;
>> - uint_fixed_16_16_t linetime_us;
>>
>> if (!crtc_state->hw.active)
>> return u32_to_fixed16(0);
>> @@ -5301,9 +5299,8 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
>> return u32_to_fixed16(0);
>>
>> crtc_htotal = crtc_state->hw.pipe_mode.crtc_htotal;
>> - linetime_us = div_fixed16(crtc_htotal * 1000, pixel_rate);
>>
>> - return linetime_us;
>> + return div_fixed16(crtc_htotal * 1000, pixel_rate);
>> }
>>
>> static int
--
Jani Nikula, Intel Open Source Graphics Center
On Fri, 02 Sep 2022, [email protected] wrote:
> From: zhang songyi <[email protected]>
>
> Return the mul_u32_fixed16() and div_fixed16() directly instead of
> redundant variables.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: zhang songyi <[email protected]>
NAK.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/intel_pm.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 210c1f78cc90..a6757ed9081a 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5272,7 +5272,6 @@ skl_wm_method2(u32 pixel_rate, u32 pipe_htotal, u32 latency,
> uint_fixed_16_16_t plane_blocks_per_line)
> {
> u32 wm_intermediate_val;
> - uint_fixed_16_16_t ret;
>
> if (latency == 0)
> return FP_16_16_MAX;
> @@ -5280,8 +5279,8 @@ skl_wm_method2(u32 pixel_rate, u32 pipe_htotal, u32 latency,
> wm_intermediate_val = latency * pixel_rate;
> wm_intermediate_val = DIV_ROUND_UP(wm_intermediate_val,
> pipe_htotal * 1000);
> - ret = mul_u32_fixed16(wm_intermediate_val, plane_blocks_per_line);
> - return ret;
> +
> + return mul_u32_fixed16(wm_intermediate_val, plane_blocks_per_line);
> }
>
> static uint_fixed_16_16_t
> @@ -5290,7 +5289,6 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
> u32 pixel_rate;
> u32 crtc_htotal;
> - uint_fixed_16_16_t linetime_us;
>
> if (!crtc_state->hw.active)
> return u32_to_fixed16(0);
> @@ -5301,9 +5299,8 @@ intel_get_linetime_us(const struct intel_crtc_state *crtc_state)
> return u32_to_fixed16(0);
>
> crtc_htotal = crtc_state->hw.pipe_mode.crtc_htotal;
> - linetime_us = div_fixed16(crtc_htotal * 1000, pixel_rate);
>
> - return linetime_us;
> + return div_fixed16(crtc_htotal * 1000, pixel_rate);
> }
>
> static int
--
Jani Nikula, Intel Open Source Graphics Center