On Tue, May 07, 2013 at 12:34:00PM -0700, Jesse Barnes wrote:
> But we need to get the right stolen base and make pre-allocated objects
> for BIOS stuff so we don't clobber it. If the BIOS hasn't allocated a
> power context, we allocate one here too, from stolen space as required
> by the docs.
>
> v2: fix stolen to phys if ladder (Ben)
> keep BIOS reserved space out of allocator altogether (Ben)
> v3: fix mask of stolen base (Ben)
> v4: clean up preallocated object on unload (Ben)
> don't zero reg on unload (Jesse)
> fix mask harder (Jesse)
>
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 +
> drivers/gpu/drm/i915/i915_gem_stolen.c | 69 +++++++++++++++++++++++++++++++-
> drivers/gpu/drm/i915/i915_reg.h | 1 +
> 3 files changed, 70 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index c81100c..2fe5fd4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1073,6 +1073,8 @@ typedef struct drm_i915_private {
>
> struct i915_gpu_error gpu_error;
>
> + struct drm_i915_gem_object *vlv_pctx;
> +
> /* list of fbdev register on this device */
> struct intel_fbdev *fbdev;
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
> index 67d3510..02950bb 100644
> --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> @@ -62,7 +62,10 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)
> * its value of TOLUD.
> */
> base = 0;
> - if (INTEL_INFO(dev)->gen >= 6) {
> + if (IS_VALLEYVIEW(dev)) {
> + pci_read_config_dword(pdev, 0x5c, &base);
> + base &= ~((1<<20) - 1);
> + } else if (INTEL_INFO(dev)->gen >= 6) {
> /* Read Base Data of Stolen Memory Register (BDSM) directly.
> * Note that there is also a MCHBAR miror at 0x1080c0 or
> * we could use device 2:0x5c instead.
> @@ -172,17 +175,72 @@ void i915_gem_stolen_cleanup_compression(struct drm_device *dev)
> dev_priv->cfb_size = 0;
> }
>
> +static void valleyview_setup_pctx(struct drm_device *dev)
> +{
This doesn't belong in i915_gem_stolen.c. It has nothing to do with the
management of stolen memory, it is just a user. It should be closer to
the other power contexts.
> +static void valleyview_cleanup_pctx(struct drm_device *dev)
> +{
> + struct drm_i915_private *dev_priv = dev->dev_private;
> +
> + if (!dev_priv->vlv_pctx)
> + return;
> +
> + i915_gem_object_release_stolen(dev_priv->vlv_pctx);
Cleanup should just be drm_gem_object_unreference();
> +}
> +
> void i915_gem_cleanup_stolen(struct drm_device *dev)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> i915_gem_stolen_cleanup_compression(dev);
> + if (IS_VALLEYVIEW(dev))
> + valleyview_cleanup_pctx(dev);
Not here, not like this.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
