[PATCH] drm/i915: Fix an error code in i915_gem_context_open()

[PATCH] drm/i915: Fix an error code in i915_gem_context_open()

[Dan Carpenter]

If gem_context_register() fails then "ctx" is a valid pointer, not an
error pointer.  We should just return "err".

Fixes: 3aa9945a528e ("drm/i915: Separate GEM context construction and registration to userspace")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index e6f594668245..25f267a03d3d 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -709,7 +709,7 @@ int i915_gem_context_open(struct drm_i915_private *i915,
 	idr_destroy(&file_priv->context_idr);
 	mutex_destroy(&file_priv->vm_idr_lock);
 	mutex_destroy(&file_priv->context_idr_lock);
-	return PTR_ERR(ctx);
+	return err;
 }
 
 void i915_gem_context_close(struct drm_file *file)
-- 
2.17.1

[PATCH] drm/i915: Fix an error code in i915_gem_context_open()

[Dan Carpenter]

If gem_context_register() fails then "ctx" is a valid pointer, not an
error pointer.  We should just return "err".

Fixes: 3aa9945a528e ("drm/i915: Separate GEM context construction and registration to userspace")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index e6f594668245..25f267a03d3d 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -709,7 +709,7 @@ int i915_gem_context_open(struct drm_i915_private *i915,
 	idr_destroy(&file_priv->context_idr);
 	mutex_destroy(&file_priv->vm_idr_lock);
 	mutex_destroy(&file_priv->context_idr_lock);
-	return PTR_ERR(ctx);
+	return err;
 }
 
 void i915_gem_context_close(struct drm_file *file)
-- 
2.17.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Fix an error code in i915_gem_context_open()

[Chris Wilson]

Quoting Dan Carpenter (2019-03-25 09:23:49)
> If gem_context_register() fails then "ctx" is a valid pointer, not an
> error pointer.  We should just return "err".
> 
> Fixes: 3aa9945a528e ("drm/i915: Separate GEM context construction and registration to userspace")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index e6f594668245..25f267a03d3d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -709,7 +709,7 @@ int i915_gem_context_open(struct drm_i915_private *i915,
>         idr_destroy(&file_priv->context_idr);
>         mutex_destroy(&file_priv->vm_idr_lock);
>         mutex_destroy(&file_priv->context_idr_lock);
> -       return PTR_ERR(ctx);
> +       return err;

I beat you by mere moments! Thanks for the patch, will be fixed
momentarily.
-Chris

Re: [PATCH] drm/i915: Fix an error code in i915_gem_context_open()

[Chris Wilson]

Quoting Dan Carpenter (2019-03-25 09:23:49)
> If gem_context_register() fails then "ctx" is a valid pointer, not an
> error pointer.  We should just return "err".
> 
> Fixes: 3aa9945a528e ("drm/i915: Separate GEM context construction and registration to userspace")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index e6f594668245..25f267a03d3d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -709,7 +709,7 @@ int i915_gem_context_open(struct drm_i915_private *i915,
>         idr_destroy(&file_priv->context_idr);
>         mutex_destroy(&file_priv->vm_idr_lock);
>         mutex_destroy(&file_priv->context_idr_lock);
> -       return PTR_ERR(ctx);
> +       return err;

I beat you by mere moments! Thanks for the patch, will be fixed
momentarily.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: Fix an error code in i915_gem_context_open()

[Patchwork]

== Series Details ==

Series: drm/i915: Fix an error code in i915_gem_context_open()
URL   : https://patchwork.freedesktop.org/series/58518/
State : failure

== Summary ==

Applying: drm/i915: Fix an error code in i915_gem_context_open()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_context.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Dan Carpenter]

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(-)

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.11.0

[Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Dan Carpenter]

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(-)

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.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Souza, Jose]

T24gVHVlLCAyMDIwLTAxLTA3IGF0IDE2OjAzICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K
PiBUaGVyZSBpcyBhIGN1dCBhbmQgcGFzdGUgYnVnIHNvIHdlIHJldHVybiB0aGUgd3JvbmcgZXJy
b3IgY29kZS4NCj4gDQo+IEZpeGVzOiBhNjAzZjViZDE2OTEgKCJkcm0vaTkxNS9kcDogTWFrZSBz
dXJlIGFsbCB0aWxlZCBjb25uZWN0b3JzIGdldA0KPiBhZGRlZCB0byB0aGUgc3RhdGUgd2l0aCBm
dWxsIG1vZGVzZXQiKQ0KDQpSZXZpZXdlZC1ieTogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9z
ZS5zb3V6YUBpbnRlbC5jb20+DQoNCj4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFu
LmNhcnBlbnRlckBvcmFjbGUuY29tPg0KPiAtLS0NCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp
c3BsYXkvaW50ZWxfZGlzcGxheS5jIHwgMiArLQ0KPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0
aW9uKCspLCAxIGRlbGV0aW9uKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMNCj4gYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k
aXNwbGF5L2ludGVsX2Rpc3BsYXkuYw0KPiBpbmRleCBkYTUyNjZlNzY3MzguLmE5NmJlZTY5OWE1
ZSAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNw
bGF5LmMNCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5
LmMNCj4gQEAgLTE0NDI0LDcgKzE0NDI0LDcgQEAgaW50ZWxfbW9kZXNldF9hbGxfdGlsZXMoc3Ry
dWN0DQo+IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsIGludCB0aWxlX2dycF9pZCkNCj4gIAkJ
Y3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoJnN0YXRlLT5iYXNlLA0KPiAg
CQkJCQkJICAgICAgIGNvbm5fc3RhdGUtDQo+ID5jcnRjKTsNCj4gIAkJaWYgKElTX0VSUihjcnRj
X3N0YXRlKSkgew0KPiAtCQkJcmV0ID0gUFRSX0VSUihjb25uX3N0YXRlKTsNCj4gKwkJCXJldCA9
IFBUUl9FUlIoY3J0Y19zdGF0ZSk7DQo+ICAJCQlicmVhazsNCj4gIAkJfQ0KPiAgCQljcnRjX3N0
YXRlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOw0K

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Souza, Jose]

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;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Chris Wilson]

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

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Chris Wilson]

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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: fix an error code in intel_modeset_all_tiles()

[Patchwork]

== Series Details ==

Series: drm/i915: fix an error code in intel_modeset_all_tiles()
URL   : https://patchwork.freedesktop.org/series/71694/
State : failure

== Summary ==

Applying: drm/i915: fix an error code in intel_modeset_all_tiles()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
No changes -- Patch already applied.

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Jani Nikula]

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.


-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Chris Wilson]

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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

[Jani Nikula]

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.


-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx