Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: fix locking around punit access in cur_delayinfo for VLV
Date: Tue, 23 Apr 2013 10:51:28 +0300	[thread overview]
Message-ID: <8761zdznun.fsf@intel.com> (raw)
In-Reply-To: <1366671570-11524-1-git-send-email-jbarnes@virtuousgeek.org>

On Tue, 23 Apr 2013, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> We need to hold the rps lock around punit access.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

And a semi-related question while at it... we will need punit access
also for non-rps stuff. Shall we just bundle them under the semantically
wrong rps lock? It would also feel a bit awkward to add another level of
locking for punit when we already have a "hw_lock" in rps.

BR,
Jani.

> Reported-by: Kenneth Graunke <kenneth@whitecape.org>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/i915_debugfs.c |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 367b534..d195d09 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1012,6 +1012,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
>  	} else if (IS_VALLEYVIEW(dev)) {
>  		u32 freq_sts, val;
>  
> +		mutex_lock(&dev_priv->rps.hw_lock);
>  		valleyview_punit_read(dev_priv, PUNIT_REG_GPU_FREQ_STS,
>  				      &freq_sts);
>  		seq_printf(m, "PUNIT_REG_GPU_FREQ_STS: 0x%08x\n", freq_sts);
> @@ -1028,6 +1029,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused)
>  		seq_printf(m, "current GPU freq: %d MHz\n",
>  			   vlv_gpu_freq(dev_priv->mem_freq,
>  					(freq_sts >> 8) & 0xff));
> +		mutex_unlock(&dev_priv->rps.hw_lock);
>  	} else {
>  		seq_printf(m, "no P-state info available\n");
>  	}
> -- 
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2013-04-23  7:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-22 22:59 [PATCH] drm/i915: fix locking around punit access in cur_delayinfo for VLV Jesse Barnes
2013-04-23  7:51 ` Jani Nikula [this message]
2013-04-23 16:39   ` Jesse Barnes

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=8761zdznun.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jbarnes@virtuousgeek.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox