Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Ensure the HW is powered during HW access in assert_pipe

Browse Source 
The assumption when adding the intel_display_power_is_enabled() checks
was that if it returns success the power can't be turned off afterwards
during the HW access, which is guaranteed by modeset locks. This isn't
always true, so make sure we hold a dedicated reference for the time of
the access.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1455296121-4742-6-git-send-email-imre.deak@intel.com
This commit is contained in:
Imre Deak 2016-02-12 18:55:14 +02:00
parent 6392f8478e
commit 4feed0ebfa
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/intel_display.c
View File

@ -1343,18 +1343,21 @@ void assert_pipe(struct drm_i915_private *dev_priv,
bool cur_state; bool cur_state;
enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv,
pipe); pipe);
enum intel_display_power_domain power_domain;
/* if we need the pipe quirk it must be always on */ /* if we need the pipe quirk it must be always on */
if ((pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE) || if ((pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE) ||
(pipe == PIPE_B && dev_priv->quirks & QUIRK_PIPEB_FORCE)) (pipe == PIPE_B && dev_priv->quirks & QUIRK_PIPEB_FORCE))
state = true; state = true;
if (!intel_display_power_is_enabled(dev_priv, power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
POWER_DOMAIN_TRANSCODER(cpu_transcoder))) { if (intel_display_power_get_if_enabled(dev_priv, power_domain)) {
cur_state = false;
} else {
u32 val = I915_READ(PIPECONF(cpu_transcoder)); u32 val = I915_READ(PIPECONF(cpu_transcoder));
cur_state = !!(val & PIPECONF_ENABLE); cur_state = !!(val & PIPECONF_ENABLE);
intel_display_power_put(dev_priv, power_domain);
} else {
cur_state = false;
} }
I915_STATE_WARN(cur_state != state, I915_STATE_WARN(cur_state != state,