| Message ID | 1350666204-8101-10-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Ben Widawsky |
| Headers | show |
On Fri, 19 Oct 2012 18:03:16 +0100 Chris Wilson <chris@chris-wilson.co.uk> wrote: > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/i915_irq.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index d07c787..df3c10a 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -924,6 +924,14 @@ i915_error_object_create(struct drm_i915_private *dev_priv, > reloc_offset); > memcpy_fromio(d, s, PAGE_SIZE); > io_mapping_unmap_atomic(s); > + } else if (src->stolen) { > + unsigned long offset; > + > + offset = dev_priv->mm.stolen_base; > + offset += src->stolen->start; > + offset += i << PAGE_SHIFT; > + > + memcpy_fromio(d, (void *)offset, PAGE_SIZE); > } else { > struct page *page; > void *s; Everything up to and including this is so far: Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index d07c787..df3c10a 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -924,6 +924,14 @@ i915_error_object_create(struct drm_i915_private *dev_priv, reloc_offset); memcpy_fromio(d, s, PAGE_SIZE); io_mapping_unmap_atomic(s); + } else if (src->stolen) { + unsigned long offset; + + offset = dev_priv->mm.stolen_base; + offset += src->stolen->start; + offset += i << PAGE_SHIFT; + + memcpy_fromio(d, (void *)offset, PAGE_SIZE); } else { struct page *page; void *s;