Commit ef80c1a1 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Rodrigo Vivi

drm/i915: Fix state checker hw.active/hw.enable readout

Previously intel_dump_pipe_config() used to dump the full crtc state
whether or not the crtc was logically enabled or not. As that meant
occasionally dumping confusing stale garbage I changed it to
check whether the crtc is logically enabled or not. However I did
not realize that the state checker readout code does not
populate crtc_state.hw.{active,enabled}. Hence the state checker
dump would only give us a full dump of the sw state but not the hw
state. Fix that by populating those bits of the hw state as well.
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Fixes: 10d75f54 ("drm/i915: Fix plane state dumps")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200925131656.10022-2-ville.syrjala@linux.intel.com
(cherry picked from commit 504c7bd8)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 32e4d9df
...@@ -14304,7 +14304,6 @@ verify_crtc_state(struct intel_crtc *crtc, ...@@ -14304,7 +14304,6 @@ verify_crtc_state(struct intel_crtc *crtc,
struct intel_encoder *encoder; struct intel_encoder *encoder;
struct intel_crtc_state *pipe_config = old_crtc_state; struct intel_crtc_state *pipe_config = old_crtc_state;
struct drm_atomic_state *state = old_crtc_state->uapi.state; struct drm_atomic_state *state = old_crtc_state->uapi.state;
bool active;
__drm_atomic_helper_crtc_destroy_state(&old_crtc_state->uapi); __drm_atomic_helper_crtc_destroy_state(&old_crtc_state->uapi);
intel_crtc_free_hw_state(old_crtc_state); intel_crtc_free_hw_state(old_crtc_state);
...@@ -14314,16 +14313,19 @@ verify_crtc_state(struct intel_crtc *crtc, ...@@ -14314,16 +14313,19 @@ verify_crtc_state(struct intel_crtc *crtc,
drm_dbg_kms(&dev_priv->drm, "[CRTC:%d:%s]\n", crtc->base.base.id, drm_dbg_kms(&dev_priv->drm, "[CRTC:%d:%s]\n", crtc->base.base.id,
crtc->base.name); crtc->base.name);
active = dev_priv->display.get_pipe_config(crtc, pipe_config); pipe_config->hw.enable = new_crtc_state->hw.enable;
pipe_config->hw.active =
dev_priv->display.get_pipe_config(crtc, pipe_config);
/* we keep both pipes enabled on 830 */ /* we keep both pipes enabled on 830 */
if (IS_I830(dev_priv)) if (IS_I830(dev_priv) && pipe_config->hw.active)
active = new_crtc_state->hw.active; pipe_config->hw.active = new_crtc_state->hw.active;
I915_STATE_WARN(new_crtc_state->hw.active != active, I915_STATE_WARN(new_crtc_state->hw.active != pipe_config->hw.active,
"crtc active state doesn't match with hw state " "crtc active state doesn't match with hw state "
"(expected %i, found %i)\n", "(expected %i, found %i)\n",
new_crtc_state->hw.active, active); new_crtc_state->hw.active, pipe_config->hw.active);
I915_STATE_WARN(crtc->active != new_crtc_state->hw.active, I915_STATE_WARN(crtc->active != new_crtc_state->hw.active,
"transitional active state does not match atomic hw state " "transitional active state does not match atomic hw state "
...@@ -14332,6 +14334,7 @@ verify_crtc_state(struct intel_crtc *crtc, ...@@ -14332,6 +14334,7 @@ verify_crtc_state(struct intel_crtc *crtc,
for_each_encoder_on_crtc(dev, &crtc->base, encoder) { for_each_encoder_on_crtc(dev, &crtc->base, encoder) {
enum pipe pipe; enum pipe pipe;
bool active;
active = encoder->get_hw_state(encoder, &pipe); active = encoder->get_hw_state(encoder, &pipe);
I915_STATE_WARN(active != new_crtc_state->hw.active, I915_STATE_WARN(active != new_crtc_state->hw.active,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment