]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
committerJani Nikula <jani.nikula@intel.com>
Mon, 10 Oct 2016 13:06:41 +0000 (16:06 +0300)
commitca5732c53bf66ad755284786897e0dd10330de87
tree8dde1aa9606b05edb7df1bbebffb8bf508629bd0
parentf856f847b22c52be82f712ea6ada946c6db884d7
drm/i915: Unalias obj->phys_handle and obj->userptr

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>
Cc: stable@vger.kernel.org
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>
drivers/gpu/drm/i915/i915_drv.h