Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/hdcp: Move dig_port assignment lower in the sequence
@ 2024-10-09  6:24 Suraj Kandpal
  2024-10-09  6:51 ` ✓ CI.Patch_applied: success for " Patchwork
                   ` (8 more replies)
  0 siblings, 9 replies; 11+ messages in thread
From: Suraj Kandpal @ 2024-10-09  6:24 UTC (permalink / raw)
  To: intel-xe, intel-gfx; +Cc: ankit.k.nautiyal, Suraj Kandpal

Move dig_port assignment much lower in the sequence to avoid NULL
pointer deference in case encoder is not present.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index ed6aa87403e2..ea8d56b25f6e 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2404,7 +2404,7 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state,
 	struct drm_i915_private *i915 = to_i915(display->drm);
 	struct intel_connector *connector =
 		to_intel_connector(conn_state->connector);
-	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
+	struct intel_digital_port *dig_port;
 	struct intel_hdcp *hdcp = &connector->hdcp;
 	unsigned long check_link_interval = DRM_HDCP_CHECK_PERIOD_MS;
 	int ret = -EINVAL;
@@ -2418,6 +2418,8 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state,
 		return -ENODEV;
 	}
 
+	dig_port = intel_attached_dig_port(connector);
+
 	mutex_lock(&hdcp->mutex);
 	mutex_lock(&dig_port->hdcp_mutex);
 	drm_WARN_ON(display->drm,
-- 
2.43.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2024-10-10  4:30 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-09  6:24 [PATCH] drm/i915/hdcp: Move dig_port assignment lower in the sequence Suraj Kandpal
2024-10-09  6:51 ` ✓ CI.Patch_applied: success for " Patchwork
2024-10-09  6:51 ` ✓ CI.checkpatch: " Patchwork
2024-10-09  6:52 ` ✓ CI.KUnit: " Patchwork
2024-10-09  7:04 ` ✓ CI.Build: " Patchwork
2024-10-09  7:06 ` ✓ CI.Hooks: " Patchwork
2024-10-09  7:08 ` ✗ CI.checksparse: warning " Patchwork
2024-10-09  7:32 ` ✓ CI.BAT: success " Patchwork
2024-10-09  9:49 ` [PATCH] " Jani Nikula
2024-10-10  4:30   ` Kandpal, Suraj
2024-10-09 12:08 ` ✗ CI.FULL: failure for " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox