* [PATCH][next] drm/i915/display: Fix inconsistent IS_ERR and PTR_ERR
@ 2020-01-06 7:01 Gustavo A. R. Silva
2020-01-08 11:06 ` Jani Nikula
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2020-01-06 7:01 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Manasi Navare, Matt Roper
Cc: intel-gfx, dri-devel, linux-kernel, Gustavo A. R. Silva
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 <gustavo@embeddedor.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] drm/i915/display: Fix inconsistent IS_ERR and PTR_ERR
2020-01-06 7:01 [PATCH][next] drm/i915/display: Fix inconsistent IS_ERR and PTR_ERR Gustavo A. R. Silva
@ 2020-01-08 11:06 ` Jani Nikula
0 siblings, 0 replies; 2+ messages in thread
From: Jani Nikula @ 2020-01-08 11:06 UTC (permalink / raw)
To: Gustavo A. R. Silva, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Manasi Navare, Matt Roper
Cc: intel-gfx, dri-devel, linux-kernel, Gustavo A. R. Silva
On Mon, 06 Jan 2020, "Gustavo A. R. Silva" <gustavo@embeddedor.com> 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 <gustavo@embeddedor.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-08 11:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-06 7:01 [PATCH][next] drm/i915/display: Fix inconsistent IS_ERR and PTR_ERR Gustavo A. R. Silva
2020-01-08 11:06 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).