Re: [Intel-gfx] [PATCH -next] drm/i915: remove unreachable code

Andi Shyti
2023-05-31T09:22:39Z

Hi Yang,

On Wed, May 31, 2023 at 10:17:14AM +0800, Yang Li wrote:
> The code after the return will not be executed, so remove them.
>
> Eliminate the following warning:
> drivers/gpu/drm/i915/display/intel_color.c:1808 intel_color_prepare_commit() warn: ignoring unreachable code.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=5342
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
> drivers/gpu/drm/i915/display/intel_color.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
> index 8966e6560516..0bfebac1e3e2 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -1804,11 +1804,6 @@ void intel_color_prepare_commit(struct intel_crtc_state *crtc_state)
>
> /* FIXME DSB has issues loading LUTs, disable it for now */
> return;
> -
> - if (!crtc_state->pre_csc_lut && !crtc_state->post_csc_lut)
> - return;
> -
> - crtc_state->dsb = intel_dsb_prepare(crtc, 1024);

yeah... it's an ugly bit, from my side:

Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>

but would be nice to hear from Ville who has added the return in
a first place.

Andi

> }
>
> void intel_color_cleanup_commit(struct intel_crtc_state *crtc_state)
> --
> 2.20.1.7.g153144c