]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/i915: Do not use ggtt_view with (aliasing) PPGTT
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Mon, 16 Mar 2015 12:11:13 +0000 (14:11 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 20 Mar 2015 10:48:03 +0000 (11:48 +0100)
commitec7adb6ee79c8c9fe64d63ad638a31cd62e55515
tree9af18c1e023146304feacf5dd5006ae07498d267
parentaca5e361e84d20ac68eedb37b7c4561a33f56198
drm/i915: Do not use ggtt_view with (aliasing) PPGTT

GGTT views are only applicable when dealing with GGTT. Change the code to
reject ggtt_view where it should not be used and require it when it should
be.

v2:
- Dropped _ppgtt_ infixes, allow both types to be passed
- Disregard other but normal views when no view is specified
- More checks that valid parameters are passed
- More readable error checking

v3:
- Prefer WARN_ONCE over BUG_ON when there is code path for failure

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
[danvet: Drop unecessary forward decl from earlier patch iterations.]
[danvet: Remove unused variable spotted by Tvrtko.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_gtt.c