OSDN Git Service

drm/amd/display: fix a minor HDCP logging error
authorWenjing Liu <Wenjing.Liu@amd.com>
Tue, 25 Feb 2020 19:23:01 +0000 (14:23 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 9 Mar 2020 17:49:54 +0000 (13:49 -0400)
[why]
In HDCP Uninitialzed State, a CPIRQ event would cause log output
internal policy error because the CPIRQ event is not recognized as
unexpected event.

[how]
CPIRQ is issued in HDCP uninitialized state is unexpected.  We should
set unexpected event flag in event ctx.

Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: Ashley Thomas <Ashley.Thomas2@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c

index 7a571b3..cc1d3f4 100644 (file)
@@ -114,6 +114,9 @@ static enum mod_hdcp_status execution(struct mod_hdcp *hdcp,
        } else if (is_in_hdcp2_dp_states(hdcp)) {
                status = mod_hdcp_hdcp2_dp_execution(hdcp,
                                event_ctx, &input->hdcp2);
+       } else {
+               event_ctx->unexpected_event = 1;
+               goto out;
        }
 out:
        return status;