diff options
| author | Ben Widawsky | 2013-04-24 08:15:30 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-05-06 11:40:47 +0200 |
| commit | 0a73287060cdd8fc2b50ecd216c918c2d097de59 (patch) | |
| tree | 6d2c42f8396e76eab86a0d6fa7162b35e91189b8 /drivers/gpu/drm/i915/i915_gem_gtt.c | |
| parent | drm/i915: Assert mutex_is_locked on context lookup (diff) | |
| download | kernel-qcow2-linux-0a73287060cdd8fc2b50ecd216c918c2d097de59.tar.gz kernel-qcow2-linux-0a73287060cdd8fc2b50ecd216c918c2d097de59.tar.xz kernel-qcow2-linux-0a73287060cdd8fc2b50ecd216c918c2d097de59.zip | |
drm/i915: BUG_ON bad PPGTT offset
Because PPGTT PDEs within the GTT are calculated in cachelines
(HW guys consistency ftw) we do a divide which will wreak havoc if this
is wrong, and I know that from experience).
If/when we move to multiple PPGTTs this will have to become a WARN, and
return an error. For now however it should always be considered fatal,
and only a developer could hit it.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[danvet: s/BUG/WARN]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_gtt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index ce024bd18eac..a4f0f9519503 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -110,6 +110,8 @@ static int gen6_ppgtt_enable(struct drm_device *dev) uint32_t pd_entry; int i; + WARN_ON(ppgtt->pd_offset & 0x3f); + pd_addr = (gen6_gtt_pte_t __iomem*)dev_priv->gtt.gsm + ppgtt->pd_offset / sizeof(gen6_gtt_pte_t); for (i = 0; i < ppgtt->num_pd_entries; i++) { |