2020-01-06 07:25:22

by Gustavo A. R. Silva

Subject: [PATCH][next] drm/i915/display: Fix inconsistent IS_ERR and PTR_ERR

Fix inconsistent IS_ERR and PTR_ERR in intel_modeset_all_tiles().

The proper pointer to be passed as argument is crtc_state.

This bug was detected with the help of Coccinelle.

Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset")
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index da5266e76738..a96bee699a5e 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14424,7 +14424,7 @@ intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id)
crtc_state = drm_atomic_get_crtc_state(&state->base,
conn_state->crtc);
if (IS_ERR(crtc_state)) {
- ret = PTR_ERR(conn_state);
+ ret = PTR_ERR(crtc_state);
break;
}
crtc_state->mode_changed = true;
--
2.23.0

2020-01-08 11:21:29

by Jani Nikula

Subject: Re: [PATCH][next] drm/i915/display: Fix inconsistent IS_ERR and PTR_ERR

On Mon, 06 Jan 2020, "Gustavo A. R. Silva" <[email protected]> wrote:
> Fix inconsistent IS_ERR and PTR_ERR in intel_modeset_all_tiles().
>
> The proper pointer to be passed as argument is crtc_state.
>
> This bug was detected with the help of Coccinelle.

Thanks, already fixed by Dan in commit 953cac3ec55f ("drm/i915: fix an
error code in intel_modeset_all_tiles()").

BR,
Jani.

>
> Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset")
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index da5266e76738..a96bee699a5e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -14424,7 +14424,7 @@ intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id)
> crtc_state = drm_atomic_get_crtc_state(&state->base,
> conn_state->crtc);
> if (IS_ERR(crtc_state)) {
> - ret = PTR_ERR(conn_state);
> + ret = PTR_ERR(crtc_state);
> break;
> }
> crtc_state->mode_changed = true;

--
Jani Nikula, Intel Open Source Graphics Center