]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
drm/i915: Unalias obj->phys_handle and obj->userptr
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 3 Oct 2016 12:45:15 +0000 (13:45 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 8 Nov 2016 16:46:12 +0000 (16:46 +0000)
commit814e76b60f54599e5d7da18573c566b61de5df22
treedc35f0c7562cb9468fe62777022cd5494cadb275
parent6d18ef5d97f16e9a03d2cc109570dca5becd78b9
drm/i915: Unalias obj->phys_handle and obj->userptr

BugLink: http://bugs.launchpad.net/bugs/1638267
commit ca5732c53bf66ad755284786897e0dd10330de87 upstream.

We use obj->phys_handle to choose the pread/pwrite path, but as
obj->phys_handle is a union with obj->userptr, we then mistakenly use
the phys_handle path for userptr objects within pread/pwrite.

Testcase: igt/gem_userptr_blits/forbidden-operations
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97519
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161003124516.12388-2-chris@chris-wilson.co.uk
(cherry picked from commit 5f12b80a0b42da253691ca03828033014bb786eb)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/gpu/drm/i915/i915_drv.h