From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 6/6] drm/i915: get runtime PM at intel_set_mode
Date: Fri, 7 Mar 2014 20:05:24 -0300 [thread overview]
Message-ID: <1394233524-3522-7-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1394233524-3522-1-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Otherwise, when we run intel_modeset_check_state we may already be
runtime suspended, and our state checking code will read registers
while the device is suspended. This can only happen if your
autosuspend_delay_ms is low (not the default 10s) and i915.pc8_timeout
is set to zero.
NOTE: The correct way to fix this problem would be to properly get/put
runtime PM at the get_config/state functions. I still didn't do this,
so I'll keep this patch on the series because it fixes the remaining
WARNs we get while running the pm_pc8 test suite. It's fine if we
don't merge this. The problem
v2: - Add the note above.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0868afb..dc2b377 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9785,13 +9785,18 @@ static int intel_set_mode(struct drm_crtc *crtc,
struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *fb)
{
+ struct drm_device *dev = crtc->dev;
+ struct drm_i915_private *dev_priv = dev->dev_private;
int ret;
+ intel_runtime_pm_get(dev_priv);
+
ret = __intel_set_mode(crtc, mode, x, y, fb);
if (ret == 0)
intel_modeset_check_state(crtc->dev);
+ intel_runtime_pm_put(dev_priv);
return ret;
}
--
1.8.5.3
next prev parent reply other threads:[~2014-03-07 23:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-07 23:05 [PATCH 0/6] More runtime PM fixes Paulo Zanoni
2014-03-07 23:05 ` [PATCH 1/6] drm/i915: don't schedule force_wake_timer at gen6_read Paulo Zanoni
2014-03-08 9:36 ` Chris Wilson
2014-03-08 10:27 ` Daniel Vetter
2014-03-07 23:05 ` [PATCH 2/6] drm/i915: properly disable the VDD when disabling the panel Paulo Zanoni
2014-03-14 12:07 ` Jani Nikula
2014-03-14 13:57 ` Daniel Vetter
2014-03-14 19:00 ` Patrik Jakobsson
2014-03-18 11:27 ` Jani Nikula
2014-03-07 23:05 ` [PATCH 3/6] drm/i915: get runtime PM at i915_reg_read_ioctl Paulo Zanoni
2014-03-07 23:05 ` [PATCH 4/6] drm/i915: don't get/put runtime PM at the debugfs forcewake file Paulo Zanoni
2014-03-07 23:05 ` [PATCH 5/6] drm/i915: don't read pp_ctrl_reg if we're suspended Paulo Zanoni
2014-03-07 23:05 ` Paulo Zanoni [this message]
2014-03-08 10:04 ` [PATCH 6/6] drm/i915: get runtime PM at intel_set_mode Daniel Vetter
2014-03-10 16:17 ` Imre Deak
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=1394233524-3522-7-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@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.