Re: [PATCH v3 1/4] dp/dp_mst: Add support for sink event notify messages
From: Hans Verkuil
Date: Thu Feb 04 2021 - 05:44:51 EST
Hi Sam,
I replied to several of the patches: it looks like the drm code has changed since
some of this patches were written, and I think it can be simplified quite a bit.
Regards,
Hans
On 04/02/2021 10:54, Sam McNally wrote:
> I can for this patch; I'm not really sure of the right approach for the other two though.
>
> On Wed, 3 Feb 2021 at 20:57, Hans Verkuil <hverkuil@xxxxxxxxx <mailto:hverkuil@xxxxxxxxx>> wrote:
>
> Hi Sam,
>
> Are you able to work on a v4?
>
> I haven't heard from you for some time now. I would be willing to take over
> this series if it wasn't for the fact that I do not have any hardware to test
> this with.
>
> Regards,
>
> Hans
>
> On 01/02/2021 22:56, Lyude Paul wrote:
> > On Wed, 2020-09-23 at 12:13 +1000, Sam McNally wrote:
> >> Sink event notify messages are used for MST CEC IRQs. Add parsing
> >> support for sink event notify messages in preparation for handling MST
> >> CEC IRQs.
> >>
> >> Signed-off-by: Sam McNally <sammc@xxxxxxxxxxxx <mailto:sammc@xxxxxxxxxxxx>>
> >> ---
> >>
> >> (no changes since v1)
> >>
> >> drivers/gpu/drm/drm_dp_mst_topology.c | 37 ++++++++++++++++++++++++++-
> >> include/drm/drm_dp_mst_helper.h | 14 ++++++++++
> >> 2 files changed, 50 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> >> b/drivers/gpu/drm/drm_dp_mst_topology.c
> >> index 17dbed0a9800..15b6cc39a754 100644
> >> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> >> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> >> @@ -1027,6 +1027,30 @@ static bool
> >> drm_dp_sideband_parse_resource_status_notify(struct drm_dp_sideband_
> >> return false;
> >> }
> >>
> >> +static bool drm_dp_sideband_parse_sink_event_notify(
> >> + struct drm_dp_sideband_msg_rx *raw,
> >> + struct drm_dp_sideband_msg_req_body *msg)
> >> +{
> >> + int idx = 1;
> >> +
> >> + msg->u.sink_event.port_number = (raw->msg[idx] & 0xf0) >> 4;
> >> + idx++;
> >> + if (idx > raw->curlen)
> >> + goto fail_len;
> >> +
> >> + memcpy(msg->u.sink_event.guid, &raw->msg[idx], 16);
> >> + idx += 16;
> >> + if (idx > raw->curlen)
> >> + goto fail_len;
> >> +
> >> + msg->u.sink_event.event_id = (raw->msg[idx] << 8) | (raw->msg[idx +
> >> 1]);
> >> + idx++;
> >> + return true;
> >> +fail_len:
> >> + DRM_DEBUG_KMS("sink event notify parse length fail %d %d\n", idx, raw-
> >>> curlen);
> >
> > Is it possible for us to use drm_dbg_kms() here?
> >
> > Also-there is an MST selftest you should update for this
> >
> >> + return false;
> >> +}
> >> +
> >> static bool drm_dp_sideband_parse_req(struct drm_dp_sideband_msg_rx *raw,
> >> struct drm_dp_sideband_msg_req_body
> >> *msg)
> >> {
> >> @@ -1038,6 +1062,8 @@ static bool drm_dp_sideband_parse_req(struct
> >> drm_dp_sideband_msg_rx *raw,
> >> return drm_dp_sideband_parse_connection_status_notify(raw,
> >> msg);
> >> case DP_RESOURCE_STATUS_NOTIFY:
> >> return drm_dp_sideband_parse_resource_status_notify(raw, msg);
> >> + case DP_SINK_EVENT_NOTIFY:
> >> + return drm_dp_sideband_parse_sink_event_notify(raw, msg);
> >> default:
> >> DRM_ERROR("Got unknown request 0x%02x (%s)\n", msg->req_type,
> >> drm_dp_mst_req_type_str(msg->req_type));
> >> @@ -3875,6 +3901,8 @@ drm_dp_mst_process_up_req(struct drm_dp_mst_topology_mgr
> >> *mgr,
> >> guid = msg->u.conn_stat.guid;
> >> else if (msg->req_type == DP_RESOURCE_STATUS_NOTIFY)
> >> guid = msg->u.resource_stat.guid;
> >> + else if (msg->req_type == DP_SINK_EVENT_NOTIFY)
> >> + guid = msg->u.sink_event.guid;
> >>
> >> if (guid)
> >> mstb = drm_dp_get_mst_branch_device_by_guid(mgr,
> >> guid);
> >> @@ -3948,7 +3976,8 @@ static int drm_dp_mst_handle_up_req(struct
> >> drm_dp_mst_topology_mgr *mgr)
> >> drm_dp_sideband_parse_req(&mgr->up_req_recv, &up_req->msg);
> >>
> >> if (up_req->msg.req_type != DP_CONNECTION_STATUS_NOTIFY &&
> >> - up_req->msg.req_type != DP_RESOURCE_STATUS_NOTIFY) {
> >> + up_req->msg.req_type != DP_RESOURCE_STATUS_NOTIFY &&
> >> + up_req->msg.req_type != DP_SINK_EVENT_NOTIFY) {
> >> DRM_DEBUG_KMS("Received unknown up req type, ignoring: %x\n",
> >> up_req->msg.req_type);
> >> kfree(up_req);
> >> @@ -3976,6 +4005,12 @@ static int drm_dp_mst_handle_up_req(struct
> >> drm_dp_mst_topology_mgr *mgr)
> >> DRM_DEBUG_KMS("Got RSN: pn: %d avail_pbn %d\n",
> >> res_stat->port_number,
> >> res_stat->available_pbn);
> >> + } else if (up_req->msg.req_type == DP_SINK_EVENT_NOTIFY) {
> >> + const struct drm_dp_sink_event_notify *sink_event =
> >> + &up_req->msg.u.sink_event;
> >> +
> >> + DRM_DEBUG_KMS("Got SEN: pn: %d event_id %d\n",
> >> + sink_event->port_number, sink_event->event_id);
> >> }
> >>
> >> up_req->hdr = mgr->up_req_recv.initial_hdr;
> >> diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
> >> index 6ae5860d8644..c7c79e0ced18 100644
> >> --- a/include/drm/drm_dp_mst_helper.h
> >> +++ b/include/drm/drm_dp_mst_helper.h
> >> @@ -402,6 +402,19 @@ struct drm_dp_resource_status_notify {
> >> u16 available_pbn;
> >> };
> >>
> >> +#define DP_SINK_EVENT_PANEL_REPLAY_ACTIVE_FRAME_CRC_ERROR BIT(0)
> >> +#define DP_SINK_EVENT_PANEL_REPLAY_RFB_STORAGE_ERROR BIT(1)
> >> +#define DP_SINK_EVENT_DSC_RC_BUFFER_UNDER_RUN BIT(2)
> >> +#define DP_SINK_EVENT_DSC_RC_BUFFER_OVERFLOW BIT(3)
> >> +#define DP_SINK_EVENT_DSC_CHUNK_LENGTH_ERROR BIT(4)
> >> +#define DP_SINK_EVENT_CEC_IRQ_EVENT BIT(5)
> >> +
> >> +struct drm_dp_sink_event_notify {
> >> + u8 port_number;
> >> + u8 guid[16];
> >> + u16 event_id;
> >> +};
> >> +
> >> struct drm_dp_query_payload_ack_reply {
> >> u8 port_number;
> >> u16 allocated_pbn;
> >> @@ -413,6 +426,7 @@ struct drm_dp_sideband_msg_req_body {
> >> struct drm_dp_connection_status_notify conn_stat;
> >> struct drm_dp_port_number_req port_num;
> >> struct drm_dp_resource_status_notify resource_stat;
> >> + struct drm_dp_sink_event_notify sink_event;
> >>
> >> struct drm_dp_query_payload query_payload;
> >> struct drm_dp_allocate_payload allocate_payload;
> >
>