| Message ID | 1344696088-24760-17-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Aug 11, 2012 at 03:41:15PM +0100, Chris Wilson wrote: > A few of the earlier registers where enlarged and so the Base Data of > Stolem Memory Register (BDSM) was pushed to 0xb0. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/i915_gem_stolen.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c > index a01ff74..a528e4a 100644 > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c > @@ -63,7 +63,11 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) > * its value of TOLUD. > */ > base = 0; > - if (INTEL_INFO(dev)->gen > 3 || IS_G33(dev)) { > + if (INTEL_INFO(dev)->gen >= 6) { > + /* Read Base Data of Stolen Memory Register (BDSM) directly */ > + pci_read_config_dword(pdev, 0xB0, &base); Wishlist (i.e. feel free to ignore): Can we have #defines instead of magic numbers here, please? -Daniel > + base &= ~4095; /* lower bits used for locking register */ > + } else if (INTEL_INFO(dev)->gen > 3 || IS_G33(dev)) { > /* Read Graphics Base of Stolen Memory directly */ > pci_read_config_dword(pdev, 0xA4, &base); > #if 0 > @@ -172,6 +176,9 @@ int i915_gem_init_stolen(struct drm_device *dev) > if (dev_priv->mm.stolen_base == 0) > return 0; > > + DRM_DEBUG_KMS("found %d bytes of stolen memory at %08lx\n", > + dev_priv->mm.gtt->stolen_size, dev_priv->mm.stolen_base); > + > /* Basic memrange allocator for stolen space */ > drm_mm_init(&dev_priv->mm.stolen, 0, prealloc_size); > > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, 20 Aug 2012 21:38:04 +0200, Daniel Vetter <daniel@ffwll.ch> wrote: > On Sat, Aug 11, 2012 at 03:41:15PM +0100, Chris Wilson wrote: > > A few of the earlier registers where enlarged and so the Base Data of > > Stolem Memory Register (BDSM) was pushed to 0xb0. > > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > --- > > drivers/gpu/drm/i915/i915_gem_stolen.c | 9 ++++++++- > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c > > index a01ff74..a528e4a 100644 > > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c > > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c > > @@ -63,7 +63,11 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) > > * its value of TOLUD. > > */ > > base = 0; > > - if (INTEL_INFO(dev)->gen > 3 || IS_G33(dev)) { > > + if (INTEL_INFO(dev)->gen >= 6) { > > + /* Read Base Data of Stolen Memory Register (BDSM) directly */ > > + pci_read_config_dword(pdev, 0xB0, &base); > > Wishlist (i.e. feel free to ignore): Can we have #defines instead of magic > numbers here, please? Shrug, I'm not sure in this instance. Each chipset generation seems to move it about and give it a different name and rationale, so sticking with a verbose comment made sense. -Chris
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index a01ff74..a528e4a 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -63,7 +63,11 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) * its value of TOLUD. */ base = 0; - if (INTEL_INFO(dev)->gen > 3 || IS_G33(dev)) { + if (INTEL_INFO(dev)->gen >= 6) { + /* Read Base Data of Stolen Memory Register (BDSM) directly */ + pci_read_config_dword(pdev, 0xB0, &base); + base &= ~4095; /* lower bits used for locking register */ + } else if (INTEL_INFO(dev)->gen > 3 || IS_G33(dev)) { /* Read Graphics Base of Stolen Memory directly */ pci_read_config_dword(pdev, 0xA4, &base); #if 0 @@ -172,6 +176,9 @@ int i915_gem_init_stolen(struct drm_device *dev) if (dev_priv->mm.stolen_base == 0) return 0; + DRM_DEBUG_KMS("found %d bytes of stolen memory at %08lx\n", + dev_priv->mm.gtt->stolen_size, dev_priv->mm.stolen_base); + /* Basic memrange allocator for stolen space */ drm_mm_init(&dev_priv->mm.stolen, 0, prealloc_size);
A few of the earlier registers where enlarged and so the Base Data of Stolem Memory Register (BDSM) was pushed to 0xb0. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gem_stolen.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)