| Message ID | 1467720019-31876-1-git-send-email-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 05, 2016 at 01:00:19PM +0100, Matthew Auld wrote: > This should already be handled by drm_gem_object_release, which is > called later on. > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Signed-off-by: Matthew Auld <matthew.auld@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On 5 July 2016 at 14:21, Patchwork <patchwork@emeril.freedesktop.org> wrote: > == Series Details == > > Series: drm/i915: remove superfluous i915_gem_object_free_mmap_offset call > URL : https://patchwork.freedesktop.org/series/9516/ > State : failure > > == Summary == > > Series 9516v1 drm/i915: remove superfluous i915_gem_object_free_mmap_offset call > http://patchwork.freedesktop.org/api/1.0/series/9516/revisions/1/mbox > > Test gem_exec_flush: > Subgroup basic-batch-kernel-default-cmd: > pass -> FAIL (ro-byt-n2820) https://bugs.freedesktop.org/show_bug.cgi?id=95372 > Subgroup basic-batch-kernel-default-wb: > pass -> DMESG-FAIL (ro-bdw-i7-5557U) Created bug report https://bugs.freedesktop.org/show_bug.cgi?id=96927 > Test kms_pipe_crc_basic: > Subgroup suspend-read-crc-pipe-a: > skip -> DMESG-WARN (ro-bdw-i7-5557U) Created bug report https://bugs.freedesktop.org/show_bug.cgi?id=96913
Merged, thanks for the patch and review. Regards, Joonas On to, 2016-07-14 at 13:14 +0100, Matthew Auld wrote: > On 5 July 2016 at 14:21, Patchwork <patchwork@emeril.freedesktop.org> wrote: > > > > == Series Details == > > > > Series: drm/i915: remove superfluous i915_gem_object_free_mmap_offset call > > URL : https://patchwork.freedesktop.org/series/9516/ > > State : failure > > > > == Summary == > > > > Series 9516v1 drm/i915: remove superfluous i915_gem_object_free_mmap_offset call > > http://patchwork.freedesktop.org/api/1.0/series/9516/revisions/1/mbox > > > > Test gem_exec_flush: > > Subgroup basic-batch-kernel-default-cmd: > > pass -> FAIL (ro-byt-n2820) > https://bugs.freedesktop.org/show_bug.cgi?id=95372 > > > > > Subgroup basic-batch-kernel-default-wb: > > pass -> DMESG-FAIL (ro-bdw-i7-5557U) > Created bug report https://bugs.freedesktop.org/show_bug.cgi?id=96927 > > > > > Test kms_pipe_crc_basic: > > Subgroup suspend-read-crc-pipe-a: > > skip -> DMESG-WARN (ro-bdw-i7-5557U) > Created bug report https://bugs.freedesktop.org/show_bug.cgi?id=96913
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 20123c0..9dc274c 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4908,7 +4908,6 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj) if (discard_backing_storage(obj)) obj->madv = I915_MADV_DONTNEED; i915_gem_object_put_pages(obj); - i915_gem_object_free_mmap_offset(obj); BUG_ON(obj->pages);
This should already be handled by drm_gem_object_release, which is called later on. Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Matthew Auld <matthew.auld@intel.com> --- drivers/gpu/drm/i915/i915_gem.c | 1 - 1 file changed, 1 deletion(-)