Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ramalingam C <ramalingam.c@intel.com>
To: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org,
	dri-devel@lists.freedesktop.org, seanpaul@chromium.org
Subject: Re: [Intel-gfx] [PATCH v7 04/18] drm/i915/hdcp: No HDCP when encoder is't initialized
Date: Fri, 11 Dec 2020 11:55:34 +0530	[thread overview]
Message-ID: <20201211062534.GA1297@intel.com> (raw)
In-Reply-To: <20201210062640.11783-5-anshuman.gupta@intel.com>

On 2020-12-10 at 11:56:26 +0530, Anshuman Gupta wrote:
> There can be situation when DP MST connector is created without
> mst modeset being done, in those cases connector->encoder will be
> NULL. MST connector->encoder initializes after modeset.
> Don't enable HDCP in such cases to prevent any crash.

LGTM..
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
> 
> Cc: Ramalingam C <ramalingam.c@intel.com>
> Cc: Juston Li <juston.li@intel.com>
> Tested-by: Karthik B S <karthik.b.s@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_hdcp.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index b9d8825e2bb1..7d63e9495956 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -2106,6 +2106,12 @@ int intel_hdcp_enable(struct intel_connector *connector,
>  	if (!hdcp->shim)
>  		return -ENOENT;
>  
> +	if (!connector->encoder) {
> +		drm_err(&dev_priv->drm, "[%s:%d] encoder is not initialized\n",
> +			connector->base.name, connector->base.base.id);
> +		return -ENODEV;
> +	}
> +
>  	mutex_lock(&hdcp->mutex);
>  	mutex_lock(&dig_port->hdcp_mutex);
>  	drm_WARN_ON(&dev_priv->drm,
> -- 
> 2.26.2
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2020-12-11  6:25 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-10  6:26 [Intel-gfx] [PATCH v7 00/18] HDCP 2.2 and HDCP 1.4 Gen12 DP MST support Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 01/18] drm/i915/hdcp: Update CP property in update_pipe Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 02/18] drm/i915/hdcp: Get conn while content_type changed Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 03/18] drm/i915/hotplug: Handle CP_IRQ for DP-MST Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 04/18] drm/i915/hdcp: No HDCP when encoder is't initialized Anshuman Gupta
2020-12-11  6:25   ` Ramalingam C [this message]
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 05/18] drm/i915/hdcp: DP MST transcoder for link and stream Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 06/18] drm/i915/hdcp: Move HDCP enc status timeout to header Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 07/18] drm/i915/hdcp: HDCP stream encryption support Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 08/18] drm/i915/hdcp: Enable HDCP 1.4 stream encryption Anshuman Gupta
2020-12-11  6:32   ` Ramalingam C
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 09/18] drm/i915/hdcp: Enable Gen12 HDCP 1.4 DP MST support Anshuman Gupta
2020-12-11  6:37   ` Ramalingam C
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 10/18] drm/i915/hdcp: Pass dig_port to intel_hdcp_init Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 11/18] drm/i915/hdcp: Encapsulate hdcp_port_data to dig_port Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 12/18] misc/mei/hdcp: Fix AUTH_STREAM_REQ cmd buffer len Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 13/18] drm/hdcp: Max MST content streams Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 14/18] drm/i915/hdcp: MST streams support in hdcp port_data Anshuman Gupta
2020-12-11  6:58   ` Ramalingam C
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 15/18] drm/i915/hdcp: Pass connector to check_2_2_link Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 16/18] drm/i915/hdcp: Add HDCP 2.2 stream register Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 17/18] drm/i915/hdcp: Support for HDCP 2.2 MST shim callbacks Anshuman Gupta
2020-12-11  7:19   ` Ramalingam C
2020-12-11  9:16     ` Anshuman Gupta
2020-12-11 10:43     ` Anshuman Gupta
2020-12-10  6:26 ` [Intel-gfx] [PATCH v7 18/18] drm/i915/hdcp: Enable HDCP 2.2 MST support Anshuman Gupta
2020-12-11  7:24   ` Ramalingam C
2020-12-10  7:00 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for HDCP 2.2 and HDCP 1.4 Gen12 DP MST support (rev6) Patchwork
2020-12-10  7:03 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork

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=20201211062534.GA1297@intel.com \
    --to=ramalingam.c@intel.com \
    --cc=anshuman.gupta@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=seanpaul@chromium.org \
    /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