All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 09/26] drm/i915: add power context allocation and setup on VLV
Date: Thu, 7 Mar 2013 14:56:16 -0800	[thread overview]
Message-ID: <20130307145616.4f5fcd6f@jbarnes-desktop> (raw)
In-Reply-To: <87boaxyj9f.fsf@intel.com>

On Tue, 05 Mar 2013 17:10:52 +0200
Jani Nikula <jani.nikula@linux.intel.com> wrote:

> On Sat, 02 Mar 2013, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > The Gunit has a separate reg for this, so allocate some stolen space for
> > the power context and initialize the reg.
> >
> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> > ---
> >  drivers/gpu/drm/i915/i915_drv.h        |    2 ++
> >  drivers/gpu/drm/i915/i915_gem_stolen.c |   41 ++++++++++++++++++++++++++++++++
> >  drivers/gpu/drm/i915/i915_reg.h        |    1 +
> >  3 files changed, 44 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 48426e1..871d7c8 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1024,6 +1024,8 @@ typedef struct drm_i915_private {
> >  
> >  	struct i915_gpu_error gpu_error;
> >  
> > +	struct drm_mm_node *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 69d97cb..0d137de 100644
> > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c
> > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
> > @@ -171,11 +171,49 @@ void i915_gem_stolen_cleanup_compression(struct drm_device *dev)
> >  	dev_priv->cfb_size = 0;
> >  }
> >  
> > +static void i915_setup_pctx(struct drm_device *dev)
> > +{
> > +	struct drm_i915_private *dev_priv = dev->dev_private;
> > +	struct drm_mm_node *pctx;
> > +	unsigned long pctx_paddr;
> > +	int pctx_size = 24*1024;
> > +
> > +	pctx = drm_mm_search_free(&dev_priv->mm.stolen, pctx_size, 4096, 0);
> > +	if (pctx)
> > +		pctx = drm_mm_get_block(pctx, pctx_size, 4096);
> > +	if (!pctx)
> > +		goto err;
> > +
> > +	pctx_paddr = dev_priv->mm.stolen_base + pctx->start;
> > +	if (!pctx_paddr)
> > +		goto err_free_pctx;
> > +
> > +	dev_priv->vlv_pctx = pctx;
> > +	I915_WRITE(VLV_PCBR, pctx_paddr);
> > +
> > +	return;
> > +
> > +err_free_pctx:
> > +	drm_mm_put_block(pctx);
> > +err:
> > +	DRM_DEBUG("not enough stolen space for PCTX, disabling\n");
> > +}
> > +
> > +static void i915_cleanup_pctx(struct drm_device *dev)
> > +{
> > +	struct drm_i915_private *dev_priv = dev->dev_private;
> > +
> > +	I915_WRITE(VLV_PCBR, 0);
> > +	drm_mm_put_block(dev_priv->vlv_pctx);
> > +}
> > +
> >  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) && i915_powersave)
> > +		i915_cleanup_pctx(dev);
> >  	drm_mm_takedown(&dev_priv->mm.stolen);
> >  }
> >  
> > @@ -193,6 +231,9 @@ int i915_gem_init_stolen(struct drm_device *dev)
> >  	/* Basic memrange allocator for stolen space */
> >  	drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->gtt.stolen_size);
> >  
> > +	if (IS_VALLEYVIEW(dev) && i915_powersave)
> > +		i915_setup_pctx(dev);
> 
> If the setup failed or someone toggled powersave on after module
> loading, this oopses. Not likely I guess.

Fixed it by checking the allocation before freeing.  Thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center

  reply	other threads:[~2013-03-07 22:55 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-01 22:08 [PATCH 01/26] drm/i915: sprite support for ValleyView Jesse Barnes
2013-03-01 22:08 ` [PATCH 02/26] drm/i915: add sprite assertion function for VLV Jesse Barnes
2013-03-01 22:08 ` [PATCH 03/26] drm/i915: add constant alpha support to sprite ioctl Jesse Barnes
2013-03-01 22:08 ` [PATCH 04/26] drm/i915: update VLV PLL and DPIO code Jesse Barnes
2013-03-01 22:19   ` Jesse Barnes
2013-03-01 22:19   ` Jesse Barnes
2013-03-03 16:21   ` Daniel Vetter
2013-03-05 15:05   ` Jani Nikula
2013-03-08 13:33   ` Jani Nikula
2013-03-08 16:52     ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 05/26] drm/i915: panel power sequencing for VLV eDP Jesse Barnes
2013-03-08 13:51   ` Jani Nikula
2013-03-08 16:53     ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 06/26] drm/i915: add more VLV IDs Jesse Barnes
2013-03-01 22:08 ` [PATCH 07/26] drm/i915: implement WaDisablePSDDualDispatchEnable on VLV Jesse Barnes
2013-03-06 18:20   ` Ville Syrjälä
2013-03-06 18:28     ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 08/26] drm/i915: VLV has force wake Jesse Barnes
2013-03-01 22:08 ` [PATCH 09/26] drm/i915: add power context allocation and setup on VLV Jesse Barnes
2013-03-05 15:10   ` Jani Nikula
2013-03-07 22:56     ` Jesse Barnes [this message]
2013-03-01 22:08 ` [PATCH 10/26] drm/i915: add more clock gating for VLV, allow force wake at init Jesse Barnes
2013-03-08 13:39   ` Jani Nikula
2013-03-08 16:52     ` Jesse Barnes
2013-03-08 17:06       ` Ville Syrjälä
2013-03-08 17:08         ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 11/26] drm/i915: fix VLV limits and m/n/p calculations Jesse Barnes
2013-03-05 12:56   ` Daniel Vetter
2013-03-07 21:41     ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 12/26] drm/i915: disable watermarks on VLV, pondicherry takes care of this Jesse Barnes
2013-03-01 22:08 ` [PATCH 13/26] drm/i915: use gen6 stolen check on VLV Jesse Barnes
2013-03-06 18:45   ` Ville Syrjälä
2013-03-06 19:07     ` Daniel Vetter
2013-03-01 22:08 ` [PATCH 14/26] drm/i915: add Punit read/write routines for VLV Jesse Barnes
2013-03-01 22:08 ` [PATCH 15/26] drm/i915: add media well to VLV force wake routines Jesse Barnes
2013-03-06 18:28   ` Ville Syrjälä
2013-03-06 18:33     ` Jesse Barnes
2013-03-06 18:52       ` Ville Syrjälä
2013-03-06 19:10       ` Daniel Vetter
2013-03-06 20:53         ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 16/26] drm/i915: turbo & RC6 support for VLV Jesse Barnes
2013-03-06 10:51   ` Rohit Jain
2013-03-07 22:27     ` Jesse Barnes
2013-03-11  6:21       ` Jain, Rohit
2013-03-01 22:08 ` [PATCH 17/26] drm/i915: remove VLV MSI IRQ hack Jesse Barnes
2013-04-26 21:40   ` Daniel Vetter
2013-03-01 22:08 ` [PATCH 18/26] drm/i915: don't enumerate VGA on VLV Jesse Barnes
2013-03-01 22:08 ` [PATCH 19/26] drm/i915: DSPFW and BLC regs are in the display offset range Jesse Barnes
2013-03-08 13:57   ` Jani Nikula
2013-03-08 16:54     ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 20/26] drm/i915: don't use plane pipe select on VLV Jesse Barnes
2013-03-01 22:08 ` [PATCH 21/26] drm/i915: use VLV DIP routines " Jesse Barnes
2013-03-01 22:08 ` [PATCH 22/26] drm/i915: export intel_dpio_write for use in intel_dp.c Jesse Barnes
2013-03-01 22:08 ` [PATCH 23/26] drm/i915/dp: program VSwing and Preemphasis control settings on VLV Jesse Barnes
2013-03-01 22:08 ` [PATCH 24/26] drm/i915: VLV doesn't have HDMI on port C Jesse Barnes
2013-03-19 13:00   ` Ville Syrjälä
2013-03-19 15:27     ` Jesse Barnes
2013-03-01 22:08 ` [PATCH 25/26] drm/i915/dp: don't use ILK paths on VLV Jesse Barnes
2013-03-08 14:12   ` Jani Nikula
2013-03-08 14:57     ` Ville Syrjälä
2013-03-01 22:08 ` [PATCH 26/26] drm/i915/dp: add pre-PCH eDP checking to DP detect for VLV Jesse Barnes
2013-03-08 14:16 ` [PATCH 01/26] drm/i915: sprite support for ValleyView Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130307145616.4f5fcd6f@jbarnes-desktop \
    --to=jbarnes@virtuousgeek.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.