From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Matt Roper <matthew.d.roper@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v3 16/22] drm/i915/rkl: Don't try to access transcoder D
Date: Thu, 7 May 2020 10:57:48 +0300 [thread overview]
Message-ID: <20200507075748.GA6112@intel.com> (raw)
In-Reply-To: <20200506211405.816125-1-matthew.d.roper@intel.com>
On Wed, May 06, 2020 at 02:14:05PM -0700, Matt Roper wrote:
> 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.
>
> Cc: Aditya Swarup <aditya.swarup@intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++
> drivers/gpu/drm/i915/i915_irq.c | 6 ++++++
> 2 files changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 0ab03282c397..f93bc0661d00 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -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.
> +
> power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
> trans_wakeref = intel_display_power_get_if_enabled(dev_priv,
> power_domain);
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 3c3fb9d9df62..297d4cacfb6a 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -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;
> --
> 2.24.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-05-07 7:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200504225227.464666-17-matthew.d.roper>
2020-05-06 21:14 ` [Intel-gfx] [PATCH v3 16/22] drm/i915/rkl: Don't try to access transcoder D Matt Roper
2020-05-07 7:57 ` Ville Syrjälä [this message]
2020-05-04 22:52 [Intel-gfx] [PATCH v2 " Matt Roper
2020-05-06 21:21 ` [Intel-gfx] [PATCH v3 " Matt Roper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200507075748.GA6112@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.d.roper@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).