drm/i915: checking IS_ERR() instead of NULL

Commit Message

Dan Carpenter April 30, 2015, 2:30 p.m. UTC

We switched from calling i915_gem_alloc_context_obj() to calling
i915_gem_alloc_object() so the error handling needs to be updated to
check for NULL instead of IS_ERR().

Fixes: 149c86e74fe4 ('drm/i915: Allocate context objects from stolen')
Signed-off-by: Dan Carpenter <[e-mail]>

Comments

Chris Wilson April 30, 2015, 2:43 p.m. UTC | #1

On Thu, Apr 30, 2015 at 05:30:50PM +0300, Dan Carpenter wrote:
> We switched from calling i915_gem_alloc_context_obj() to calling
> i915_gem_alloc_object() so the error handling needs to be updated to
> check for NULL instead of IS_ERR().

I had a patch to change i915_gem_alloc_object() to report the correct
error rather than NULL - which can come in surprisingly handy at
times...
-Chris

Dan Carpenter April 30, 2015, 2:47 p.m. UTC | #2

On Thu, Apr 30, 2015 at 03:43:02PM +0100, Chris Wilson wrote:
> On Thu, Apr 30, 2015 at 05:30:50PM +0300, Dan Carpenter wrote:
> > We switched from calling i915_gem_alloc_context_obj() to calling
> > i915_gem_alloc_object() so the error handling needs to be updated to
> > check for NULL instead of IS_ERR().
> 
> I had a patch to change i915_gem_alloc_object() to report the correct
> error rather than NULL - which can come in surprisingly handy at
> times...

That also works, of course.  Send it.  :)

regards,
dan carpenter

Daniel Vetter May 5, 2015, 7:30 a.m. UTC | #3

On Thu, Apr 30, 2015 at 05:47:13PM +0300, Dan Carpenter wrote:
> On Thu, Apr 30, 2015 at 03:43:02PM +0100, Chris Wilson wrote:
> > On Thu, Apr 30, 2015 at 05:30:50PM +0300, Dan Carpenter wrote:
> > > We switched from calling i915_gem_alloc_context_obj() to calling
> > > i915_gem_alloc_object() so the error handling needs to be updated to
> > > check for NULL instead of IS_ERR().
> > 
> > I had a patch to change i915_gem_alloc_object() to report the correct
> > error rather than NULL - which can come in surprisingly handy at
> > times...
> 
> That also works, of course.  Send it.  :)

Doesn't seem to have shown up yet, I applied your patch meanwhile.

Thanks, Daniel

Patch

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 732fd63..0fa9209 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1895,10 +1895,9 @@  int intel_lr_context_deferred_create(struct intel_context *ctx,
 	context_size = round_up(get_lr_context_size(ring), 4096);
 
 	ctx_obj = i915_gem_alloc_object(dev, context_size);
-	if (IS_ERR(ctx_obj)) {
-		ret = PTR_ERR(ctx_obj);
-		DRM_DEBUG_DRIVER("Alloc LRC backing obj failed: %d\n", ret);
-		return ret;
+	if (!ctx_obj) {
+		DRM_DEBUG_DRIVER("Alloc LRC backing obj failed.\n");
+		return -ENOMEM;
 	}
 
 	if (is_global_default_ctx) {