Skip to content

Commit

Permalink
drm/i915/lvds: Ensure the HW is powered during HW state readout
Browse files Browse the repository at this point in the history
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-13-git-send-email-imre.deak@intel.com
  • Loading branch information
Imre Deak committed Feb 17, 2016
1 parent 5b09217 commit ecb2448
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions drivers/gpu/drm/i915/intel_lvds.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,30 @@ static bool intel_lvds_get_hw_state(struct intel_encoder *encoder,
struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base);
enum intel_display_power_domain power_domain;
u32 tmp;
bool ret;

power_domain = intel_display_port_power_domain(encoder);
if (!intel_display_power_is_enabled(dev_priv, power_domain))
if (!intel_display_power_get_if_enabled(dev_priv, power_domain))
return false;

ret = false;

tmp = I915_READ(lvds_encoder->reg);

if (!(tmp & LVDS_PORT_EN))
return false;
goto out;

if (HAS_PCH_CPT(dev))
*pipe = PORT_TO_PIPE_CPT(tmp);
else
*pipe = PORT_TO_PIPE(tmp);

return true;
ret = true;

out:
intel_display_power_put(dev_priv, power_domain);

return ret;
}

static void intel_lvds_get_config(struct intel_encoder *encoder,
Expand Down

0 comments on commit ecb2448

Please sign in to comment.