drm/i915: check pipe power domain when reading its hw state (b5482bd0) · Commits · 戴 / test

We can read out the pipe HW state only if the required power domain is on. If not we consider the pipe to be off. v2: - no change v3: - push down the power domain checks into the specific crtc get_pipe_config handlers (Daniel) Signed-off-by:

Imre Deak <imre.deak@intel.com> Reviewed-by:

Jesse Barnes <jbarnes@virtuousgeek.org> [danvet: Appease checkpatch.] Signed-off-by:

Daniel Vetter <daniel.vetter@ffwll.ch>

drivers/gpu/drm/i915/intel_display.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -5611,6 +5611,10 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,
		struct drm_i915_private *dev_priv = dev->dev_private;
		uint32_t tmp;

		if (!intel_display_power_enabled(dev_priv,
		POWER_DOMAIN_PIPE(crtc->pipe)))
		return false;

		pipe_config->cpu_transcoder = (enum transcoder) crtc->pipe;
		pipe_config->shared_dpll = DPLL_ID_PRIVATE;

		@@ -6981,6 +6985,10 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
		enum intel_display_power_domain pfit_domain;
		uint32_t tmp;

		if (!intel_display_power_enabled(dev_priv,
		POWER_DOMAIN_PIPE(crtc->pipe)))
		return false;

		pipe_config->cpu_transcoder = (enum transcoder) crtc->pipe;
		pipe_config->shared_dpll = DPLL_ID_PRIVATE;

Admin message