* [PATCH] drm/i915: Remove unneeded struct_mutex around rpm
@ 2017-02-18 15:00 Chris Wilson
2017-02-18 15:52 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-02-20 8:36 ` [PATCH] " Szwichtenberg, Radoslaw
0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2017-02-18 15:00 UTC (permalink / raw)
To: intel-gfx
We don't need struct_mutex for acquiring an rpm wakeref, and do not need
to serialise those register read (it's the wrong mutex for those
registers in any case). Begone!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_debugfs.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index c0bc922fe497..9f0d8abe1e99 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1107,7 +1107,6 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,
static int i915_frequency_info(struct seq_file *m, void *unused)
{
struct drm_i915_private *dev_priv = node_to_i915(m->private);
- struct drm_device *dev = &dev_priv->drm;
int ret = 0;
intel_runtime_pm_get(dev_priv);
@@ -1170,10 +1169,6 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
}
/* RPSTAT1 is in the GT power well */
- ret = mutex_lock_interruptible(&dev->struct_mutex);
- if (ret)
- goto out;
-
intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
reqf = I915_READ(GEN6_RPNSWREQ);
@@ -1208,7 +1203,6 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
cagf = intel_gpu_freq(dev_priv, cagf);
intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
- mutex_unlock(&dev->struct_mutex);
if (IS_GEN6(dev_priv) || IS_GEN7(dev_priv)) {
pm_ier = I915_READ(GEN6_PMIER);
@@ -1298,7 +1292,6 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
seq_printf(m, "Max CD clock frequency: %d kHz\n", dev_priv->max_cdclk_freq);
seq_printf(m, "Max pixel clock frequency: %d kHz\n", dev_priv->max_dotclk_freq);
-out:
intel_runtime_pm_put(dev_priv);
return ret;
}
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Remove unneeded struct_mutex around rpm
2017-02-18 15:00 [PATCH] drm/i915: Remove unneeded struct_mutex around rpm Chris Wilson
@ 2017-02-18 15:52 ` Patchwork
2017-02-20 8:36 ` [PATCH] " Szwichtenberg, Radoslaw
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2017-02-18 15:52 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Remove unneeded struct_mutex around rpm
URL : https://patchwork.freedesktop.org/series/19890/
State : success
== Summary ==
Series 19890v1 drm/i915: Remove unneeded struct_mutex around rpm
https://patchwork.freedesktop.org/api/1.0/series/19890/revisions/1/mbox/
fi-bdw-5557u total:252 pass:241 dwarn:0 dfail:0 fail:0 skip:11
fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39
fi-bxt-j4205 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19
fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12
fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27
fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31
fi-hsw-4770 total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-hsw-4770r total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-ilk-650 total:252 pass:202 dwarn:0 dfail:0 fail:0 skip:50
fi-ivb-3520m total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-ivb-3770 total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-kbl-7500u total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-skl-6260u total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
fi-skl-6700hq total:252 pass:235 dwarn:0 dfail:0 fail:0 skip:17
fi-skl-6700k total:252 pass:230 dwarn:4 dfail:0 fail:0 skip:18
fi-skl-6770hq total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
fi-snb-2520m total:252 pass:224 dwarn:0 dfail:0 fail:0 skip:28
fi-snb-2600 total:252 pass:223 dwarn:0 dfail:0 fail:0 skip:29
d13370a042e9d05329bcac34eb43c64e4f6704e0 drm-tip: 2017y-02m-17d-21h-23m-28s UTC integration manifest
5405783 drm/i915: Remove unneeded struct_mutex around rpm
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3894/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Remove unneeded struct_mutex around rpm
2017-02-18 15:00 [PATCH] drm/i915: Remove unneeded struct_mutex around rpm Chris Wilson
2017-02-18 15:52 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-02-20 8:36 ` Szwichtenberg, Radoslaw
2017-02-20 10:22 ` chris
1 sibling, 1 reply; 4+ messages in thread
From: Szwichtenberg, Radoslaw @ 2017-02-20 8:36 UTC (permalink / raw)
To: intel-gfx, chris
On Sat, 2017-02-18 at 15:00 +0000, Chris Wilson wrote:
> We don't need struct_mutex for acquiring an rpm wakeref, and do not need
> to serialise those register read (it's the wrong mutex for those
> registers in any case). Begone!
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Remove unneeded struct_mutex around rpm
2017-02-20 8:36 ` [PATCH] " Szwichtenberg, Radoslaw
@ 2017-02-20 10:22 ` chris
0 siblings, 0 replies; 4+ messages in thread
From: chris @ 2017-02-20 10:22 UTC (permalink / raw)
To: Szwichtenberg, Radoslaw; +Cc: intel-gfx
On Mon, Feb 20, 2017 at 08:36:31AM +0000, Szwichtenberg, Radoslaw wrote:
> On Sat, 2017-02-18 at 15:00 +0000, Chris Wilson wrote:
> > We don't need struct_mutex for acquiring an rpm wakeref, and do not need
> > to serialise those register read (it's the wrong mutex for those
> > registers in any case). Begone!
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Reviewed-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Applied, thanks.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-20 10:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-18 15:00 [PATCH] drm/i915: Remove unneeded struct_mutex around rpm Chris Wilson
2017-02-18 15:52 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-02-20 8:36 ` [PATCH] " Szwichtenberg, Radoslaw
2017-02-20 10:22 ` chris
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.