From: Suraj Kandpal <suraj.kandpal@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: uma.shankar@intel.com, ankit.k.nautiyal@intel.com,
Suraj Kandpal <suraj.kandpal@intel.com>
Subject: [PATCH 1/2] drm/i915/hdcp: Move aux assignment after connector type check
Date: Tue, 30 Apr 2024 12:10:28 +0530 [thread overview]
Message-ID: <20240430064030.887080-2-suraj.kandpal@intel.com> (raw)
In-Reply-To: <20240430064030.887080-1-suraj.kandpal@intel.com>
Move assignment of aux after connector type check as port may not
exist if connector is not DPMST.
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 92b03073acdd..92be53d7c81f 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -687,15 +687,16 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,
bool *hdcp2_capable)
{
struct drm_i915_private *i915 = to_i915(connector->base.dev);
- struct drm_dp_aux *aux = &connector->port->aux;
+ struct drm_dp_aux *aux;
u8 bcaps;
int ret;
*hdcp_capable = false;
*hdcp2_capable = false;
- if (!intel_encoder_is_mst(connector->encoder))
+ if (intel_encoder_is_mst(connector->encoder))
return -EINVAL;
+ aux = &connector->port->aux;
ret = _intel_dp_hdcp2_get_capability(aux, hdcp2_capable);
if (ret)
drm_dbg_kms(&i915->drm,
--
2.43.2
next prev parent reply other threads:[~2024-04-30 6:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 6:40 [PATCH 0/2] Fixes in hdcp remote capability Suraj Kandpal
2024-04-30 6:40 ` Suraj Kandpal [this message]
2024-05-02 10:43 ` [PATCH 1/2] drm/i915/hdcp: Move aux assignment after connector type check Jani Nikula
2024-05-02 12:13 ` Kandpal, Suraj
2024-04-30 6:40 ` [PATCH 2/2] drm/i915/hdcp: Check mst_port to determine connector type Suraj Kandpal
2024-04-30 7:17 ` ✗ Fi.CI.SPARSE: warning for Fixes in hdcp remote capability Patchwork
2024-04-30 7:26 ` ✓ Fi.CI.BAT: success " Patchwork
2024-04-30 8:40 ` ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2024-05-07 3:50 [PATCH 0/2] " Suraj Kandpal
2024-05-07 3:50 ` [PATCH 1/2] drm/i915/hdcp: Move aux assignment after connector type check Suraj Kandpal
2024-05-21 8:14 [PATCH 0/2] Fixes in hdcp remote capability Suraj Kandpal
2024-05-21 8:14 ` [PATCH 1/2] drm/i915/hdcp: Move aux assignment after connector type check Suraj Kandpal
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=20240430064030.887080-2-suraj.kandpal@intel.com \
--to=suraj.kandpal@intel.com \
--cc=ankit.k.nautiyal@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=uma.shankar@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