drm/i915/rkl: Don't try to access transcoder D
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): 20200504225227.464666-17-matthew.d.roper
PATCH v3 16/22 drm/i915/rkl: Don't try to access transcoder D
There are a couple places in our driver that loop over transcoders A..D for gen11+; since RKL only has three pipes/transcoders, this can lead to unclaimed register reads/writes. We should add checks for transcoder existence where appropriate.
v2: Move one transcoder check that wound up in the wrong function after
conflict resolution. It belongs in bdw_get_trans_port_sync_config rather than bxt_get_dsi_transcoder_state.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++ drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ 2 files changed, 9 insertions(+)
drivers/gpu/drm/i915/display/intel_ddi.c +3 -0
@@ -4131,6 +4131,9 @@ static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)enum intel_display_power_domain power_domain;intel_wakeref_t trans_wakeref; +if (!HAS_TRANSCODER (dev_priv, cpu_transcoder)) +continue ; + power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder); trans_wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain);
drivers/gpu/drm/i915/i915_irq.c +6 -0
@@ -2849,6 +2849,9 @@ static void gen11_display_irq_reset(struct drm_i915_private *dev_priv)for (trans =TRANSCODER_A ; trans <=TRANSCODER_D ; trans++) {enum intel_display_power_domain domain; +if (!HAS_TRANSCODER (dev_priv, trans)) +continue ; + domain =POWER_DOMAIN_TRANSCODER (trans);if (!intel_display_power_is_enabled (dev_priv, domain))continue ;
@@ -3397,6 +3400,9 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)for (trans =TRANSCODER_A ; trans <=TRANSCODER_D ; trans++) {enum intel_display_power_domain domain; +if (!HAS_TRANSCODER (dev_priv, trans)) +continue ; + domain =POWER_DOMAIN_TRANSCODER (trans);if (!intel_display_power_is_enabled (dev_priv, domain))continue ;
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Matt Roper
There are a couple places in our driver that loop over transcoders A..D for gen11+; since RKL only has three pipes/transcoders, this can lead to unclaimed register reads/writes. We should add checks for transcoder existence where appropriate.
v2: Move one transcoder check that wound up in the wrong function after
conflict resolution. It belongs inbdw_get_trans_port_sync_configrather thanbxt_get_dsi_transcoder_state.Cc Aditya Swarup <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++ drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ 2 files changed, 9 insertions(+)drivers/gpu/drm/i915/display/intel_ddi.c +0
-0
drivers/gpu/drm/i915/display/intel_ddi.c static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state) · line 4135
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_ddi.c +2
-0@@ -4131,6 +4131,9 @@ static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)enum intel_display_power_domain power_domain;intel_wakeref_t trans_wakeref; +if (!HAS_TRANSCODER (dev_priv, cpu_transcoder)) +continue ;
for_each_cpu_transcoder_masked() already handles this for us.
Perhaps should just convert the other places to use it as well.
Quoted 35 lines
drivers/gpu/drm/i915/display/intel_ddi.c +1
-0+ power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder); trans_wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain);drivers/gpu/drm/i915/i915_irq.c +6
-0@@ -2849,6 +2849,9 @@ static void gen11_display_irq_reset(struct drm_i915_private *dev_priv)for (trans =TRANSCODER_A ; trans <=TRANSCODER_D ; trans++) {enum intel_display_power_domain domain; +if (!HAS_TRANSCODER (dev_priv, trans)) +continue ; + domain =POWER_DOMAIN_TRANSCODER (trans);if (!intel_display_power_is_enabled (dev_priv, domain))continue ;@@ -3397,6 +3400,9 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)for (trans =TRANSCODER_A ; trans <=TRANSCODER_D ; trans++) {enum intel_display_power_domain domain; +if (!HAS_TRANSCODER (dev_priv, trans)) +continue ; + domain =POWER_DOMAIN_TRANSCODER (trans);if (!intel_display_power_is_enabled (dev_priv, domain))continue ;Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx