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)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 3 Oct 2016 19:59:55 +0000 (20:59 +0100)
commit5f12b80a0b42da253691ca03828033014bb786eb
tree1901f99205efbcaafd9c4712036db4b1c39004aa
parentdda960335e020835f7f1c12760e7f0b525b451e2
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
drivers/gpu/drm/i915/i915_drv.h