| Message ID | 1487779266-25956-2-git-send-email-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Feb 22, 2017 at 04:01:06PM +0000, Matthew Auld wrote: > Always use i915_gem_object_put over i915_gem_object_free if we can. > > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c > index f3abdc27c5dd..9ad8c7dddd04 100644 > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c > @@ -599,7 +599,7 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, > return obj; > > cleanup: > - i915_gem_object_free(obj); > + i915_gem_object_put(obj); Which you can't here. Put(stolen) assumes we have pinned the pages. -Chris
On 22 February 2017 at 16:12, Chris Wilson <chris@chris-wilson.co.uk> wrote: > On Wed, Feb 22, 2017 at 04:01:06PM +0000, Matthew Auld wrote: >> Always use i915_gem_object_put over i915_gem_object_free if we can. >> >> Signed-off-by: Matthew Auld <matthew.auld@intel.com> >> Cc: Chris Wilson <chris@chris-wilson.co.uk> >> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >> --- >> drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c >> index f3abdc27c5dd..9ad8c7dddd04 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c >> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c >> @@ -599,7 +599,7 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, >> return obj; >> >> cleanup: >> - i915_gem_object_free(obj); >> + i915_gem_object_put(obj); > > Which you can't here. Put(stolen) assumes we have pinned the pages. Ah, missed that :|
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index f3abdc27c5dd..9ad8c7dddd04 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -599,7 +599,7 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, return obj; cleanup: - i915_gem_object_free(obj); + i915_gem_object_put(obj); return NULL; }
Always use i915_gem_object_put over i915_gem_object_free if we can. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> --- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)