diff options
| author | Chris Wilson | 2016-12-24 20:31:46 +0100 |
|---|---|---|
| committer | Chris Wilson | 2016-12-28 12:15:48 +0100 |
| commit | 4741da925fa3e5acdd4da154f4803dad383e882f (patch) | |
| tree | 75127e590f6d486a90415b911077a9b2cf67ee4f /drivers/gpu/drm/i915/intel_uc.h | |
| parent | drm/i915: Update DRIVER_DATE to 20161226 (diff) | |
| download | kernel-qcow2-linux-4741da925fa3e5acdd4da154f4803dad383e882f.tar.gz kernel-qcow2-linux-4741da925fa3e5acdd4da154f4803dad383e882f.tar.xz kernel-qcow2-linux-4741da925fa3e5acdd4da154f4803dad383e882f.zip | |
drm/i915/guc: Assert that all GGTT offsets used by the GuC are mappable
Add an assertion to the plain i915_ggtt_offset() to double check that
any offset we hand to the GuC is outside of its unmappable ranges.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161224193146.4402-1-chris@chris-wilson.co.uk
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index 11f56082b363..d556215e691f 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -28,6 +28,8 @@ #include "i915_guc_reg.h" #include "intel_ringbuffer.h" +#include "i915_vma.h" + struct drm_i915_gem_request; /* @@ -198,4 +200,11 @@ void i915_guc_register(struct drm_i915_private *dev_priv); void i915_guc_unregister(struct drm_i915_private *dev_priv); int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val); +static inline u32 guc_ggtt_offset(struct i915_vma *vma) +{ + u32 offset = i915_ggtt_offset(vma); + GEM_BUG_ON(offset < GUC_WOPCM_TOP); + return offset; +} + #endif |