Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp124675pxk; Wed, 9 Sep 2020 00:24:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgsEqi8JJE1mnN0n+Yyf/PwO/1ZzdXhqfNljzlUjWnCaO03SOufgqXXEUmKcjCOENiu3Eg X-Received: by 2002:a17:906:3f89:: with SMTP id b9mr2356963ejj.463.1599636262406; Wed, 09 Sep 2020 00:24:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599636262; cv=none; d=google.com; s=arc-20160816; b=iVEoJJ0Hcdj9iS3ehmCP7135lKnZoFd47DCSDj9naSeKWR6lU/loAzPkxYxHJIASbu C4eLFci5a8CnLWF7vY/5ouVJ+CC/aLlPqkVv0986EiEDhCsEONY8BTIHtbLm0NBiGWVh KxQSzJ8GY138+G8y3HilVY2yjzIYtX8F23B6lycbVcYsCjgM7CqrT/dxp3ZCGaVuFP/8 BltGzX76RT1gsKe8urKEIzBvsRMVc+RNdo2ZNljrdHOXFWtVzPZKaFAT88NARG9diM/x BLaVyRdNcn7ls/0KHopsoNy0f7NJ+Rc9hAu5Yi35J5Y7o20ojGJumKE/fFGFx+W2qiGN ZvoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=W2VhfbOKCbP6xOWgijAOnPOO6KfSFoAdclkx3aMqBRo=; b=VNMb9cHy5SJtmGhv74C6vvQgBw+vG9/WpvnYihWqQ2smPWvhxDaI9TgQxGaUjnNmR6 IrWfzPO1KitUrrVqJHpvp24xMQotnOIGCewXnfBgH6Sl+9t0ZaNDmxN2glnGjVnIMVtw QILeIgbOMys2J5CjQVz7qojWLLMCjIjGwANMAv+OKFAgdeWlKQsOeVa4uVt1Jo9+4K2q QOcJ7oPiE6CaBPPiNfcPskFd0y/ERwge73hwPM4Koa22vQ6CQzCjDw/2/CGcqSky7ODg bqxkXuLB2TvOov6UYQczBu6P45nAI5xqwSMMSeKzP/sisOYa6+vt4DYgXoIaGkkJnO4x qiTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="L/4ezaJD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ox9si937903ejb.97.2020.09.09.00.23.59; Wed, 09 Sep 2020 00:24:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="L/4ezaJD"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727899AbgIIHVS (ORCPT + 99 others); Wed, 9 Sep 2020 03:21:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbgIIHVQ (ORCPT ); Wed, 9 Sep 2020 03:21:16 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CBDFC061573 for ; Wed, 9 Sep 2020 00:21:16 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id 34so1397351pgo.13 for ; Wed, 09 Sep 2020 00:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W2VhfbOKCbP6xOWgijAOnPOO6KfSFoAdclkx3aMqBRo=; b=L/4ezaJDF1N2ep+9GnJ84KZi95IRpEZ4ZWgfuDP2LU+gUtpo+nIYEL+HmfBIVEyoCq nE/1MviSNKQlysBhOqzUgNyGOVNLvrnr5yOKeG5C1nfZO4uBi0rYZrX5Zn0rQM7OKlKG YrjN6qW1SSp7AFtpH1HyQQqgt/NdCSI4YtjnU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=W2VhfbOKCbP6xOWgijAOnPOO6KfSFoAdclkx3aMqBRo=; b=H9/FTLwBOXZd0OWVB5HQ+xryWu0lOlEsdF6O8YUowTNfKHGR0yYmQdCBt7lz0X5ZKm zfa1/axPnf533xUVvdkdmlJerfScnUVhKp0yNNaWw545vVidZvZmKnm14Qyu8CyrYnWq n1zj5m7PpXXov19r1QBJwHgJNlNWwQrEZU7fZUuN0CF0HC+vFX9msnA+JJdX1uAt/XjO 6l+7jOnQjQb08SAX9MiY4nYWq8jMWxJoWMe/EWjFc+Kq+jJhf8yFr0AKn3DFKEJ0aM/b Vyd5THaPlWgkoIsxH5IZzNd2p8mSFv72j4W+zHR57Mt0X9GWjNCFh/zGeEQx9uXOs1r0 OizA== X-Gm-Message-State: AOAM530HcLTiMlgtN0FbUi97iZ2PwxyhP0gFBu5Iiex3NWnoXiklbcLS 9oMXPgyRWz1XEDIngZrArkKcevawO/7/Kw== X-Received: by 2002:a17:902:b494:: with SMTP id y20mr2494781plr.111.1599636075513; Wed, 09 Sep 2020 00:21:15 -0700 (PDT) Received: from localhost ([2401:fa00:9:15:7220:84ff:fe09:cabc]) by smtp.gmail.com with ESMTPSA id g1sm1595387pfm.124.2020.09.09.00.21.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Sep 2020 00:21:14 -0700 (PDT) From: Sam McNally To: LKML Cc: Hans Verkuil , Sam McNally , Daniel Vetter , David Airlie , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/4] dp/dp_mst: Add support for sink event notify messages Date: Wed, 9 Sep 2020 17:20:49 +1000 Message-Id: <20200909172023.v2.1.I8693156f555875e5c8342e86ab37ce968dfdd277@changeid> X-Mailer: git-send-email 2.28.0.526.ge36021eeef-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- (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); + 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; -- 2.28.0.526.ge36021eeef-goog