diff mbox series

drm/i915: fix an error code in intel_modeset_all_tiles()

Message ID 20200107130322.gdk5b6jurifr26c2@kili.mountain (mailing list archive)
State New, archived
Headers show
Series drm/i915: fix an error code in intel_modeset_all_tiles() | expand

Commit Message

Dan Carpenter Jan. 7, 2020, 1:03 p.m. UTC
There is a cut and paste bug so we return the wrong error code.

Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Souza, Jose Jan. 7, 2020, 2:01 p.m. UTC | #1
On Tue, 2020-01-07 at 16:03 +0300, Dan Carpenter wrote:
> There is a cut and paste bug so we return the wrong error code.
> 
> Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get
> added to the state with full modeset")

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.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;
Chris Wilson Jan. 7, 2020, 2:05 p.m. UTC | #2
Quoting Souza, Jose (2020-01-07 14:01:40)
> On Tue, 2020-01-07 at 16:03 +0300, Dan Carpenter wrote:
> > There is a cut and paste bug so we return the wrong error code.
> > 
> > Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get
> > added to the state with full modeset")
> 
> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Pushed. Thanks for the patch,
-Chris
Jani Nikula Jan. 8, 2020, 2:33 p.m. UTC | #3
On Tue, 07 Jan 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Souza, Jose (2020-01-07 14:01:40)
>> On Tue, 2020-01-07 at 16:03 +0300, Dan Carpenter wrote:
>> > There is a cut and paste bug so we return the wrong error code.
>> > 
>> > Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get
>> > added to the state with full modeset")
>> 
>> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
>> 
>> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Pushed. Thanks for the patch,

Hrmh, we are still supposed to wait for CI results for every patch, no
exceptions.

If it's not "every patch", it's going to be a subjective assessment, and
I really don't like where that would lead. Who's going to say what's
going to be just fine. Even if it's "obviously correct".

As it is, this patch won't get the CI results at all now because BAT
fails with "patch already applied". Tracing any issues back to this
patch would mean bisecting the results from drm-tip runs.

---

If the problem is that CI is too heavy, slow and itself error prone for
small patches, then that's what we need to address instead of just
bypassing CI.

I also don't like the prospect of spending time on hacking dim to
double-check the patches passed CI before pushing.


BR,
Jani.
Chris Wilson Jan. 8, 2020, 2:38 p.m. UTC | #4
Quoting Jani Nikula (2020-01-08 14:33:22)
> On Tue, 07 Jan 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > Quoting Souza, Jose (2020-01-07 14:01:40)
> >> On Tue, 2020-01-07 at 16:03 +0300, Dan Carpenter wrote:
> >> > There is a cut and paste bug so we return the wrong error code.
> >> > 
> >> > Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get
> >> > added to the state with full modeset")
> >> 
> >> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> >> 
> >> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > Pushed. Thanks for the patch,
> 
> Hrmh, we are still supposed to wait for CI results for every patch, no
> exceptions.

There is no coverage of that path in CI.
-Chris
Jani Nikula Jan. 9, 2020, 11:17 a.m. UTC | #5
On Wed, 08 Jan 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2020-01-08 14:33:22)
>> On Tue, 07 Jan 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> > Quoting Souza, Jose (2020-01-07 14:01:40)
>> >> On Tue, 2020-01-07 at 16:03 +0300, Dan Carpenter wrote:
>> >> > There is a cut and paste bug so we return the wrong error code.
>> >> > 
>> >> > Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get
>> >> > added to the state with full modeset")
>> >> 
>> >> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
>> >> 
>> >> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>> >
>> > Pushed. Thanks for the patch,
>> 
>> Hrmh, we are still supposed to wait for CI results for every patch, no
>> exceptions.
>
> There is no coverage of that path in CI.

Maybe not, but making that assessment is not obvious to me.

I don't want to start on the slippery slope of people pushing untested
patches claiming "no coverage".


BR,
Jani.
diff mbox series

Patch

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;