Skip to content

Commit 1155de9

Browse files
committed
drm/i915/hdcp: Move aux assignment after connector type check
Move assignment of aux after connector type check as port may not exist if connector is not DPMST. --v2 -Fix unwanted change in intel_encoder check [Jani] Signed-off-by: Suraj Kandpal <[email protected]> Reviewed-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 3c7bbd4 commit 1155de9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/i915/display/intel_dp_hdcp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,
687687
bool *hdcp2_capable)
688688
{
689689
struct drm_i915_private *i915 = to_i915(connector->base.dev);
690-
struct drm_dp_aux *aux = &connector->port->aux;
690+
struct drm_dp_aux *aux;
691691
u8 bcaps;
692692
int ret;
693693

@@ -696,6 +696,7 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,
696696
if (!intel_encoder_is_mst(connector->encoder))
697697
return -EINVAL;
698698

699+
aux = &connector->port->aux;
699700
ret = _intel_dp_hdcp2_get_capability(aux, hdcp2_capable);
700701
if (ret)
701702
drm_dbg_kms(&i915->drm,

0 commit comments

Comments
 (0)