From patchwork Thu Jan 6 10:01:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Ji X-Patchwork-Id: 12705253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18A88C433F5 for ; Thu, 6 Jan 2022 10:02:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B57A10F02C; Thu, 6 Jan 2022 10:02:47 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2120.outbound.protection.outlook.com [40.107.223.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5CAB10F028 for ; Thu, 6 Jan 2022 10:02:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hf1c35HcObQhlQKFRE0k8C3EWyabPptVDBtbxUjFmlLn8VAl0nDUVpToh4jjxQEvcN6J2Fmc2O33GOyTY7uBUdPNndc6+8DpBgPrybvQ1tp06rLQDOox/bvNsM1hr8kwvxN6+3OvucVwCKq2B4LSOPj3fVF3mvSXAppLgCnf+Kj0O4/nRKi7I+B7u0FBrYSsv/+rVAZdluiW5yECR+KSyN1xOLs55tM7eQ0v5HgqxET5sLbd49c8wI/UEY48gNiwibRD0CVvgU1xFBi0hospwfjpGjHGV6wv/i7tIOXMVZqdONDxO81zACPcq6nX4hEKOiQ/f9xJbsh41GKUqULj3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=i1GAARlUuPkNx/DaETZaTWe9OF82JSrEHT4thKMWguY=; b=LfWzS6eNLfugZ9a/lHqwzI1aaYj3ZMBX3vV9O8t+Ix53Arh/gMnKeUddIgA94YKBQeEYWGfzUWim6Y8AgaGvE2nOJLg+/Jcdxxm5J5pcvrAF0ZmG7Twl6njF5rp9gDpBOZSW1x8upuncim3pk96tdOLs0HxK5LYOK3XgB0OBzrvr5guPL3ntyM6vH9oXbFytVSZKIKnrWECG26+/mwqNorIxv7w/xO0GjRsXtIdl9MGTtcMiRrxADiyuiFTqoVsFTO332C9Xfl4X6jCiHCKR03ONROi7LE0suRoS9SSVK20pv8tXCFgcLCuSolHyErc7swM+ufqxpQHcJA7a4w/hxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=analogixsemi.com; dmarc=pass action=none header.from=analogixsemi.com; dkim=pass header.d=analogixsemi.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Analogixsemi.onmicrosoft.com; s=selector2-Analogixsemi-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i1GAARlUuPkNx/DaETZaTWe9OF82JSrEHT4thKMWguY=; b=SJ32inKhZrMcZW5n25s/ZOA7vEf49BBFLVTEc+01I35v4JfBeYm+BeYdsn+kxvD59hRqcVoUIwMYO/UzbJbu7LA20ChXepf6PuUlg8RSQ0MfcW2GjVxj8zZXk+Jl3JmVHZj0mQKcaOdm6/kFX38d3uGGCdXFdol+2ZFcyZ1dla0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=analogixsemi.com; Received: from CH2PR04MB6741.namprd04.prod.outlook.com (2603:10b6:610:96::19) by CH2PR04MB6823.namprd04.prod.outlook.com (2603:10b6:610:90::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 10:02:43 +0000 Received: from CH2PR04MB6741.namprd04.prod.outlook.com ([fe80::c4d8:2407:431:aed1]) by CH2PR04MB6741.namprd04.prod.outlook.com ([fe80::c4d8:2407:431:aed1%6]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:02:43 +0000 From: Xin Ji To: andrzej.hajda@intel.com, Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter Subject: [PATCH v3 1/3] drm/bridge: anx7625: Add bridge helper atomic conversion Date: Thu, 6 Jan 2022 18:01:24 +0800 Message-Id: <20220106100127.1862702-1-xji@analogixsemi.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: HKAPR04CA0004.apcprd04.prod.outlook.com (2603:1096:203:d0::14) To CH2PR04MB6741.namprd04.prod.outlook.com (2603:10b6:610:96::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5d3f40d-a50e-49eb-dba5-08d9d0fbae6a X-MS-TrafficTypeDiagnostic: CH2PR04MB6823:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:989; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mP5c8+ZOBOfel+l6XHsdmKWl1AUIAOZ/bCjJa+33IYE24ZzNpx0ROf9hxkPTbyo0nqt5aBkp15DwL8g2KIvFY57e7hxzZVm/tIRL70mx+iRTS7KYHmTmzt0h+CGu02aSdA8vlTqDIZyfaGrNxKtXZIDBdDktgfnirYuSQIirdIt+jyG5W+NC3t9tGZxFBaldmMwMhS8lGHEYy3tr2xBjzqBkzsFm4MqYfyPiGJuSIfXCahjqtOD2pw6t3Gzlzh0nJhRlO3bwGpw16rbwZ1dVv/s1WMiACzjVLBlv9q55hVPE7la5dpF1rRSLQDLuUOLiYMnIls85x3WtUo3QT7H+y7w+nLxCVxL53NVp4wONiy3Z+fjH3n2cUmcNN8rAzqpkycKTARW4YhFKosB12c8ORZ8308ojj9aMRZsQIA3w/vSIeZfdP/+zjPMdLLcL0YeANFqZvRPrqDLYZEc7moOrCRU7G2ULm1xQV8kdEZF8p9iryzBOqaVXnw62m8ttDqfxSdP3PZdRc0OFLnOIywuSxfh6T8OSPTit1zEWXk3OSen0sUcgrjwMz1Sh9DIT7rtKc13SRJ6yY1S9IDg5UGeu77OyZW3/Ku37gs1Y/29ceMSXMQmjAO8g+937+6BCPSXJIHdq6o1ft2qFWxRJvMwWf911KZ0huw7sbceNn/bI+acGfFJhK2FE8NvRWR9lgVr7wS4+D7tBPykJiPpuKfzHRg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH2PR04MB6741.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(83380400001)(4326008)(110136005)(316002)(52116002)(508600001)(2616005)(38100700002)(8676002)(6666004)(8936002)(1076003)(6512007)(66946007)(55236004)(36756003)(66476007)(26005)(7416002)(66556008)(38350700002)(186003)(86362001)(5660300002)(2906002)(6506007)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k51Qbj2uFiKIMVCtbciJvGdISWAG01g9lY8Jjd1siK3n+fwisNQCkjZLzziWfLKtLC3PS/BJTCqnzxjYDlfO1eS3lpg5ibfPqYk+DtzV5lruxFZmKZMXEZCHW4YVPeggPD/Uz9fW65SxJH+zIS/ys27K1g7yJ5psLV7a3x0IDp4rI9BZDX/bh2DZbmI8XuqOd1ffTe1f6IRMAhBF5LBpQFwJ6CFKffLm1ap5jUU0eFcUSGI9m0Vp+wlcEyQ4BRCY2zRHbHLoPB7ZyKXPIvfE5t9B3rurdlECNtqhaVzmMcJOG+cEAEAGlC6q8BRJkwHELtc9QfVSddAnwHZH+ssB45Aix1LYaPdCm11iTLT6+AWVixUuXevxctSXXngiz/Tz0Tpx8BgJzbIkLZ3JbBzULNnc7EHibDyO9fILEiIocHs/ObYSwpdlja6wHXGELoB9x62hu4ls+XC9g0OAM29IkRP83Fhy0uTsVyuEhQxMHuStTI8XS5lFX4zhcV/iyRM7cfd0qkoVnsDvh9DYRKcuEVUZZZyW8V/c9BFLRTt7B6or5JumDx2TIAJK0uHoTfD7gHLngbzgXQ+0wrXYIy0YM8/k1ZV4w3vxklp8/thExA71D/loo8qpfdIKmu2282LtVORnWxOfKfxK6llzw3LVGzyl3ymf7Ji107IK+sxfRf1w8kOEmGEgRSYjsC8eDUjhJl0DyNDyGMHFjYc/oZbe5ZQfqmXnfx76PaaF6BapDpBRJmg1fotg1e2ZD0/PwX2kVHHTywnUyd/sY9k3PrPmK5GQauAzo2fHDLq6lmEDVzat8HiInGUu9gHjhcc0gCt75fz79312bWKqlK9d8AiqDk5ZzajJfppjSd3uPthUbDCHgFEddyp5kRi3wRewD8YAO6CoM9YnTx0kNQ1mYfges5VnO0Jlv8ctngu8cQ8vNrKkSv+cbljGDZSNCBYVxC9NK6DShX1M88l63M9iEglI04RyiebdtQvbT7i9BwP5io6L/5HHtP00JAUTBCzTzdIJHXO5HZx3wBHGo5Mr9lszGcF/rvBlD5lkeM39TPUGYoe2ckH+Ypgr/au75CvatB1sVA1J35ZgbOEBhKNjcqQS6rjw8aZ1gZ4d/L1zXHxehERUlTbr5BXuerDF4XliCDC6F3V80FdyyfwE3U0rTDq/z1by6ZCzItXjTKi9RX1dT7H19qWPTG9HaFWwnNpcSAWM2kkwM8XJ2wZfMSDsNgu52GQwcxxuwe0B7MfWWSBwcE03XOHbPCTH8ggmiwsR37hZ2wE+MsQxdS/aXHLB94KluekzBvQZBVYZuz1iT3er6/Ms071IMXGX8u6YaTRTg2CyBmKI3Cs14h7W62vbOX2eXT3j8dtEwSCijuh8meUVpeSbHsH9s9vkixNsknZ3EDvSlWWYx/F1SHJJYfhsC6TI1IJTyNFhlFEi9PmY+tnkE7eVMZ+irWjOwhl8mwQwdCJVfcZR59NKdpzwLWFU//rpFxNZ3zIT+3VYZICY5CTZczyHCjdLG0vLpU8xNWiBf/fYbP1jJxWqHoYjyJJh1iIDN66gc0CJw+MUEVcfy2joOmEJl2Vajeb5CNxYF9hmBfsstqvj+n4mnNkERrkKumNYbk+HQ020YIKOwm4cNAQgWK0= X-OriginatorOrg: analogixsemi.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5d3f40d-a50e-49eb-dba5-08d9d0fbae6a X-MS-Exchange-CrossTenant-AuthSource: CH2PR04MB6741.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:02:43.5785 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b099b0b4-f26c-4cf5-9a0f-d5be9acab205 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1H882d+sFIeHkQseSEbe2TigBeQWLOYaXFxMDRXQ3Qvd80NskKKSGZHeDH1L3Ij4YfFRN8pDTLZ3pvwCk1XJ4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR04MB6823 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qwen@analogixsemi.com, bliang@analogixsemi.com, Xin Ji , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add bridge helper atomic conversion. Reviewed-by: Robert Foss Signed-off-by: Xin Ji --- drivers/gpu/drm/bridge/analogix/anx7625.c | 46 +++++++++++++++++++---- drivers/gpu/drm/bridge/analogix/anx7625.h | 1 + 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 7b24213f7b13..6d5ae52f4142 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1911,25 +1911,54 @@ static bool anx7625_bridge_mode_fixup(struct drm_bridge *bridge, return true; } -static void anx7625_bridge_enable(struct drm_bridge *bridge) +static int anx7625_bridge_atomic_check(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) { struct anx7625_data *ctx = bridge_to_anx7625(bridge); struct device *dev = &ctx->client->dev; - DRM_DEV_DEBUG_DRIVER(dev, "drm enable\n"); + dev_dbg(dev, "drm bridge atomic check\n"); + return anx7625_bridge_mode_fixup(bridge, &crtc_state->mode, + &crtc_state->adjusted_mode); +} + +static void anx7625_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *state) +{ + struct anx7625_data *ctx = bridge_to_anx7625(bridge); + struct device *dev = &ctx->client->dev; + struct drm_connector *connector; + + dev_dbg(dev, "drm atomic enable\n"); + + if (!bridge->encoder) { + dev_err(dev, "Parent encoder object not found"); + return; + } + + connector = drm_atomic_get_new_connector_for_encoder(state->base.state, + bridge->encoder); + if (!connector) + return; + + ctx->connector = connector; pm_runtime_get_sync(dev); anx7625_dp_start(ctx); } -static void anx7625_bridge_disable(struct drm_bridge *bridge) +static void anx7625_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old) { struct anx7625_data *ctx = bridge_to_anx7625(bridge); struct device *dev = &ctx->client->dev; - DRM_DEV_DEBUG_DRIVER(dev, "drm disable\n"); + dev_dbg(dev, "drm atomic disable\n"); + ctx->connector = NULL; anx7625_dp_stop(ctx); pm_runtime_put_sync(dev); @@ -1959,11 +1988,14 @@ static struct edid *anx7625_bridge_get_edid(struct drm_bridge *bridge, static const struct drm_bridge_funcs anx7625_bridge_funcs = { .attach = anx7625_bridge_attach, - .disable = anx7625_bridge_disable, .mode_valid = anx7625_bridge_mode_valid, .mode_set = anx7625_bridge_mode_set, - .mode_fixup = anx7625_bridge_mode_fixup, - .enable = anx7625_bridge_enable, + .atomic_check = anx7625_bridge_atomic_check, + .atomic_enable = anx7625_bridge_atomic_enable, + .atomic_disable = anx7625_bridge_atomic_disable, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, .detect = anx7625_bridge_detect, .get_edid = anx7625_bridge_get_edid, }; diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.h b/drivers/gpu/drm/bridge/analogix/anx7625.h index 3d79b6fb13c8..6f9d5f0e377c 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.h +++ b/drivers/gpu/drm/bridge/analogix/anx7625.h @@ -407,6 +407,7 @@ struct anx7625_data { u8 display_timing_valid; struct drm_bridge bridge; u8 bridge_attached; + struct drm_connector *connector; struct mipi_dsi_device *dsi; }; From patchwork Thu Jan 6 10:01:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Ji X-Patchwork-Id: 12705254 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4CC93C433F5 for ; Thu, 6 Jan 2022 10:03:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 53E3310F036; Thu, 6 Jan 2022 10:03:00 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2128.outbound.protection.outlook.com [40.107.237.128]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71C3110F036 for ; Thu, 6 Jan 2022 10:02:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iVy2mvnnVpKm29slk0kcF1rU4nchV7ZMsNpT34FlTu9FstMtu8Y/rGL164Cf/honzp4/n17Q/0rElvgVKkU5NemiBPx32hmnJmUjk/zOIAr2tPFStdYcylk3XT6bv9KID8Uyt4aIWkrHKlsFbTZRgVu6i/tkZxNHH6gSHdNG7WNkns8yjMAUs1D0HunUFRo6TV20dBIEMcoTgtIGZfhwN8TQ5bBtuTHrCxuLkO8/gDpt44dXAUduh+nR2aIvUgeuegcgX/QseHStsqmYku9aQBOdlHDw4Ttk4/fbxNtsl6Rwa357WgViuMHlgo1ZBWzqpCG2b1a7Cbco+vhop2YYaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QtmiS7bGGEyRh4HpLcchCh9KLFXXN43E1f1C3RbS1qo=; b=HSDwQFzemF05WH/6tVoNntOxgWLmnQXIEWTbsM4ImHlbGROvAR1deOCdHGn0PTwjvOgjye9nz81vHuyEg+G91BoECeh/ekuaUuApxCjPwuUWUmReVv9HCgjjfeKFRK49qomn9muStbx2++cTMzm2QqL/zeozy+hE5mUSmyAZXfhkzREqON7nZUUP7e1c0skjk4fHAlMClZbQyz9iJFo/9fMjJRNL8tRrKMNJroJe+ebFEISCuCLqExquW1CyW3sTuuZhFqIsN4LCIU5KzrsXpfcOQIjviPI8MR4RZ8PcJgEAqGI92IGwlvsh769w8CDXhTZAL0NZnXwpDZEeQc3UYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=analogixsemi.com; dmarc=pass action=none header.from=analogixsemi.com; dkim=pass header.d=analogixsemi.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Analogixsemi.onmicrosoft.com; s=selector2-Analogixsemi-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QtmiS7bGGEyRh4HpLcchCh9KLFXXN43E1f1C3RbS1qo=; b=XTjXvIz4JbuTIAdlAtiFnil1UAfsdirkdi8PAqSItOdQNXTEmc06gI9deDqVZb0ZNVcIyNgbB4U1yIe0nWXa957ruKUX+IAcYxaw+TWu+YBflczH3NvMnTDSpo3Qt1OKDCkxJ5so/q2u753yDYampFZ6ENjLK/QliafZ4XSQOis= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=analogixsemi.com; Received: from CH2PR04MB6741.namprd04.prod.outlook.com (2603:10b6:610:96::19) by CH2PR04MB6823.namprd04.prod.outlook.com (2603:10b6:610:90::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 10:02:57 +0000 Received: from CH2PR04MB6741.namprd04.prod.outlook.com ([fe80::c4d8:2407:431:aed1]) by CH2PR04MB6741.namprd04.prod.outlook.com ([fe80::c4d8:2407:431:aed1%6]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:02:57 +0000 From: Xin Ji To: andrzej.hajda@intel.com, Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter Subject: [PATCH v3 2/3] drm/bridge: anx7625: add HDCP support Date: Thu, 6 Jan 2022 18:01:25 +0800 Message-Id: <20220106100127.1862702-2-xji@analogixsemi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220106100127.1862702-1-xji@analogixsemi.com> References: <20220106100127.1862702-1-xji@analogixsemi.com> X-ClientProxiedBy: HK2PR02CA0209.apcprd02.prod.outlook.com (2603:1096:201:20::21) To CH2PR04MB6741.namprd04.prod.outlook.com (2603:10b6:610:96::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0159c5f6-f628-4993-2416-08d9d0fbb6ae X-MS-TrafficTypeDiagnostic: CH2PR04MB6823:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rzxfwb2NHO9Ajx7285UeSl025g2YnlQVky5WHC3EiLS7+5B0MgU1KAZq+0UXvqkeWE8/dWY73G4KImVvuPKIkW8GbegBfp9PpIP/7AYZtOKP9+6Z9OfQjt8q/lGNJDQKQqxnC2D8PdXUuyfDLmB711BjzpJszHoEzCi0sJbRYiOu6obc4k0TP43JVJVqFJG35OupdH31iF997XxyGOcpmqw39HzMJIdMPLjJYp8N8k1JQwger60HEJ4/Wz+bhV7uAkSogVzQ1weZspRtHRk5UjVTOodLj2nDc7aX3WTjshhzC4UcpL1+jzQ+It363iMn1mTCoUhvFSAKmEWX7qyjialQCG/OGCqOEC1n683rY011gazfiENNW22+nqUDcMQwfqR6iBrNYKRziBZfyxHEoebv0ZssY+VfQQPCaSPM/glVOx8YeORUNv2k7AkHIHrG1p+B5B24BSV0C4DTpT6m8cBQX/FMeatZKvVkFK5XSfc+WB4Wj36PCplR8gWZOvNdtpDSFrznF9fy1fD0lAsmBSzRTPKSCSdkJLFvn4rXp8uU+WyBeawuFar3d8oZg3JWF9YiCE9kfZKTsDb/mY5fW4ZXrKZXoqrZPZMx/NK+uth7XkS8byFULWypFByBHemK2mLQRbQ5mnrXoQUjytFGRN5LHTzKpauadzUfuQnP8W69s0B6PvfVHMmZuZYm9U1yUqjqIYXxfcv1OujVqtDfoQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH2PR04MB6741.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(83380400001)(54906003)(4326008)(110136005)(316002)(52116002)(508600001)(2616005)(38100700002)(8676002)(6666004)(8936002)(1076003)(6512007)(66946007)(55236004)(36756003)(66476007)(26005)(7416002)(66556008)(38350700002)(186003)(86362001)(5660300002)(30864003)(2906002)(6506007)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QH94hofrkAyCysrT8F/NZsuNlxV2CZBRUbXwjMfpplgYgUHOiH7qSHkF8YajqHmnPNn9BgKpL1lktnfF3Wd17YaQ63Xq9oHkUZapJ6gP0348HUN/MUQP2NVnSKNzhgrM/lCFeMf8dfodzQRyRPNcT9eLRipOLiMaDN5rUpNPjQBVuNFaJ7viDp1Vex7mdxjHdTpJldLBpy+FifzPc5oTv7g/0W07c0hbySiOJPwj2N0OrMPqYzWs06Si5UmeOgpWKijD5vhSZulynpLiFEG5Qd5rQHTXrMwZ784m5eO2Fqn0+iUc0G8ppvzS7etDlC4aa7HcVdeAw6RFf4/qoT+4VdDO2C0IDBqKgLwvqvC13Rz5mPcHaI9cAmpEdpkXpzTaRGiPNuI+Mbuuy5OXu6FEK3tYxvyZaa6HT6L0SWXL7lmgud4QUawe5wf//dSK1TO+r1CBDy7JGN/39RQnH1d8Y+xz1vZfoYxlPUtOaub8sGic+hYmAIc/CDd3Bsn07c3fU9EVQluaATbVvPkfQGEUgPTSLvTm87ryI9+qWwo9YkUef9HZ7SocnPL/O8yDZAZUe5ib00T7gv8bOIQ2C+q14DXraJx9SnqgFEpbuCgXp/6/9b4lMhKhOCAAAF163B3WrauDnsw2vSn9alCpllMW78q7V2oy9PjiZaLVXclNy5qrbcOxN39l7A6W8cQIc9WUEgjzbdLENBD4ynGwx3FTf87L8g2Cv1RMi7uEn+QqLJ7IPfRhkoukY0+K1pYYBAKFCJksL2bZwlTtvYR0FylriP9vlgWI4RCu1JUo8N9u4DU8O/PChXMoOMDAgbPpG4DtBfAW/3rR5QKitqrDM/4NPyeMftPfgF6XxlpHNGzHajYuFKO4jdkjCXo0BqOC/Z9/gXWcbJG3l5D42/6hh3EIXYf1sP8C7oZHevrj7IQHFYZHjhcawYxIGev5Ljp6oFdUjQyxF8HY7XmCZiStRpUtfUlPRkY0A/rZ0yTFFWkgM1525nkPT2rOE+zIpUUnyKFpQwGMupHH2TJg+ZhTGAhfN4g/8G8XWTdfYqOz9e/kmFInGGWg++y2riCtf2JUWXNHCeBn6HAcfxINos/CS0j9EZk5pF4di3yxP6oG67Au98L+CNxT/cIRrvxmRZOhP/88sJcucGTUaqQRRNPgiCeSytWpddfe/1Adf0/N3rD89BFrsGxt9ME9UsuC8LcwZO6yvO8j6ndv+EqDuD0W4IEputnSA+ybPs5UuKx0KqMz8ppVwJY2xcy9yAdeOeXsRPCU7Sy9v+ITccWNlGyybmQXicNTxJ0KxpSeae2EJ8Uhho5x5CaxzF5cWJhUIsVnakcrQf2QYfZr840ryoqlgkWFj8MId98kJnq39beLw7kP6aaUnfKR0Ee+NoHVnrKAO1W/AEAd89RFIl/0RpMiBz//Mt0taeINWgLsoqzOKFGb6nyL313qkFCJ4+6i2yQs3W4TignMQYl3fqsLASU/BmDREt0z4eOHyN7qWNAg4m9+WUdK7qGQoYtgLzVxBuJXdQRHH0st4UJnN6XMGOd4hu+HlfDxQ57wiXNh8MhKmkO/pwUYFmC/82fMenYNWr9RPlLqb+kv1tgWReoaLMn4kkgT8CC8zKFgvqGXF+tQY/w961c= X-OriginatorOrg: analogixsemi.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0159c5f6-f628-4993-2416-08d9d0fbb6ae X-MS-Exchange-CrossTenant-AuthSource: CH2PR04MB6741.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:02:57.4412 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b099b0b4-f26c-4cf5-9a0f-d5be9acab205 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aDGL2gENzMDxrtoxqTnSYhVMT5agJM8C9VAPw57/Yl/t7H//3FkBI3spysAwu7vzRPXmf2LJirgahWcjdAQyCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR04MB6823 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel test robot , qwen@analogixsemi.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, bliang@analogixsemi.com, Xin Ji Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This patch provides HDCP setting interface for userspace to dynamic enable/disable HDCP function. Reported-by: kernel test robot Reviewed-by: Robert Foss Signed-off-by: Xin Ji --- drivers/gpu/drm/bridge/analogix/anx7625.c | 335 +++++++++++++++++++++- drivers/gpu/drm/bridge/analogix/anx7625.h | 79 ++++- 2 files changed, 404 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 6d5ae52f4142..001460f62b0c 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -213,6 +214,65 @@ static int wait_aux_op_finish(struct anx7625_data *ctx) return 0; } +static int anx7625_aux_dpcd_read(struct anx7625_data *ctx, + u32 address, u8 len, u8 *buf) +{ + struct device *dev = &ctx->client->dev; + int ret; + u8 addrh, addrm, addrl; + u8 cmd; + + if (len > MAX_DPCD_BUFFER_SIZE) { + dev_err(dev, "exceed aux buffer len.\n"); + return -EINVAL; + } + + addrl = address & 0xFF; + addrm = (address >> 8) & 0xFF; + addrh = (address >> 16) & 0xFF; + + cmd = DPCD_CMD(len, DPCD_READ); + cmd = ((len - 1) << 4) | 0x09; + + /* Set command and length */ + ret = anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + AP_AUX_COMMAND, cmd); + + /* Set aux access address */ + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + AP_AUX_ADDR_7_0, addrl); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + AP_AUX_ADDR_15_8, addrm); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + AP_AUX_ADDR_19_16, addrh); + + /* Enable aux access */ + ret |= anx7625_write_or(ctx, ctx->i2c.rx_p0_client, + AP_AUX_CTRL_STATUS, AP_AUX_CTRL_OP_EN); + + if (ret < 0) { + dev_err(dev, "cannot access aux related register.\n"); + return -EIO; + } + + usleep_range(2000, 2100); + + ret = wait_aux_op_finish(ctx); + if (ret) { + dev_err(dev, "aux IO error: wait aux op finish.\n"); + return ret; + } + + ret = anx7625_reg_block_read(ctx, ctx->i2c.rx_p0_client, + AP_AUX_BUFF_START, len, buf); + if (ret < 0) { + dev_err(dev, "read dpcd register failed\n"); + return -EIO; + } + + return 0; +} + static int anx7625_video_mute_control(struct anx7625_data *ctx, u8 status) { @@ -669,6 +729,165 @@ static int anx7625_dpi_config(struct anx7625_data *ctx) return ret; } +static int anx7625_read_flash_status(struct anx7625_data *ctx) +{ + return anx7625_reg_read(ctx, ctx->i2c.rx_p0_client, R_RAM_CTRL); +} + +static int anx7625_hdcp_key_probe(struct anx7625_data *ctx) +{ + int ret, val; + struct device *dev = &ctx->client->dev; + u8 ident[FLASH_BUF_LEN]; + + ret = anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + FLASH_ADDR_HIGH, 0x91); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + FLASH_ADDR_LOW, 0xA0); + if (ret < 0) { + dev_err(dev, "IO error : set key flash address.\n"); + return ret; + } + + ret = anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + FLASH_LEN_HIGH, (FLASH_BUF_LEN - 1) >> 8); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + FLASH_LEN_LOW, (FLASH_BUF_LEN - 1) & 0xFF); + if (ret < 0) { + dev_err(dev, "IO error : set key flash len.\n"); + return ret; + } + + ret = anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + R_FLASH_RW_CTRL, FLASH_READ); + ret |= readx_poll_timeout(anx7625_read_flash_status, + ctx, val, + ((val & FLASH_DONE) || (val < 0)), + 2000, + 2000 * 150); + if (ret) { + dev_err(dev, "flash read access fail!\n"); + return -EIO; + } + + ret = anx7625_reg_block_read(ctx, ctx->i2c.rx_p0_client, + FLASH_BUF_BASE_ADDR, + FLASH_BUF_LEN, ident); + if (ret < 0) { + dev_err(dev, "read flash data fail!\n"); + return -EIO; + } + + if (ident[29] == 0xFF && ident[30] == 0xFF && ident[31] == 0xFF) + return -EINVAL; + + return 0; +} + +static int anx7625_hdcp_key_load(struct anx7625_data *ctx) +{ + int ret; + struct device *dev = &ctx->client->dev; + + /* Select HDCP 1.4 KEY */ + ret = anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + R_BOOT_RETRY, 0x12); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + FLASH_ADDR_HIGH, HDCP14KEY_START_ADDR >> 8); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + FLASH_ADDR_LOW, HDCP14KEY_START_ADDR & 0xFF); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + R_RAM_LEN_H, HDCP14KEY_SIZE >> 12); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + R_RAM_LEN_L, HDCP14KEY_SIZE >> 4); + + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + R_RAM_ADDR_H, 0); + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + R_RAM_ADDR_L, 0); + /* Enable HDCP 1.4 KEY load */ + ret |= anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, + R_RAM_CTRL, DECRYPT_EN | LOAD_START); + dev_dbg(dev, "load HDCP 1.4 key done\n"); + return ret; +} + +static int anx7625_hdcp_disable(struct anx7625_data *ctx) +{ + int ret; + struct device *dev = &ctx->client->dev; + + dev_dbg(dev, "disable HDCP 1.4\n"); + + /* Disable HDCP */ + ret = anx7625_write_and(ctx, ctx->i2c.rx_p1_client, 0xee, 0x9f); + /* Try auth flag */ + ret |= anx7625_write_or(ctx, ctx->i2c.rx_p1_client, 0xec, 0x10); + /* Interrupt for DRM */ + ret |= anx7625_write_or(ctx, ctx->i2c.rx_p1_client, 0xff, 0x01); + if (ret < 0) + dev_err(dev, "fail to disable HDCP\n"); + + return anx7625_write_and(ctx, ctx->i2c.tx_p0_client, + TX_HDCP_CTRL0, ~HARD_AUTH_EN & 0xFF); +} + +static int anx7625_hdcp_enable(struct anx7625_data *ctx) +{ + u8 bcap; + int ret; + struct device *dev = &ctx->client->dev; + + ret = anx7625_hdcp_key_probe(ctx); + if (ret) { + dev_dbg(dev, "no key found, not to do hdcp\n"); + return ret; + } + + /* Read downstream capability */ + anx7625_aux_dpcd_read(ctx, 0x68028, 1, &bcap); + if (!(bcap & 0x01)) { + pr_warn("downstream not support HDCP 1.4, cap(%x).\n", bcap); + return 0; + } + + dev_dbg(dev, "enable HDCP 1.4\n"); + + /* First clear HDCP state */ + ret = anx7625_reg_write(ctx, ctx->i2c.tx_p0_client, + TX_HDCP_CTRL0, + KSVLIST_VLD | BKSV_SRM_PASS | RE_AUTHEN); + usleep_range(1000, 1100); + /* Second clear HDCP state */ + ret |= anx7625_reg_write(ctx, ctx->i2c.tx_p0_client, + TX_HDCP_CTRL0, + KSVLIST_VLD | BKSV_SRM_PASS | RE_AUTHEN); + + /* Set time for waiting KSVR */ + ret |= anx7625_reg_write(ctx, ctx->i2c.tx_p0_client, + SP_TX_WAIT_KSVR_TIME, 0xc8); + /* Set time for waiting R0 */ + ret |= anx7625_reg_write(ctx, ctx->i2c.tx_p0_client, + SP_TX_WAIT_R0_TIME, 0xb0); + ret |= anx7625_hdcp_key_load(ctx); + if (ret) { + pr_warn("prepare HDCP key failed.\n"); + return ret; + } + + ret = anx7625_write_or(ctx, ctx->i2c.rx_p1_client, 0xee, 0x20); + + /* Try auth flag */ + ret |= anx7625_write_or(ctx, ctx->i2c.rx_p1_client, 0xec, 0x10); + /* Interrupt for DRM */ + ret |= anx7625_write_or(ctx, ctx->i2c.rx_p1_client, 0xff, 0x01); + if (ret < 0) + dev_err(dev, "fail to enable HDCP\n"); + + return anx7625_write_or(ctx, ctx->i2c.tx_p0_client, + TX_HDCP_CTRL0, HARD_AUTH_EN); +} + static void anx7625_dp_start(struct anx7625_data *ctx) { int ret; @@ -679,6 +898,9 @@ static void anx7625_dp_start(struct anx7625_data *ctx) return; } + /* Disable HDCP */ + anx7625_write_and(ctx, ctx->i2c.rx_p1_client, 0xee, 0x9f); + if (ctx->pdata.is_dpi) ret = anx7625_dpi_config(ctx); else @@ -686,6 +908,10 @@ static void anx7625_dp_start(struct anx7625_data *ctx) if (ret < 0) DRM_DEV_ERROR(dev, "MIPI phy setup error.\n"); + + ctx->hdcp_cp = DRM_MODE_CONTENT_PROTECTION_UNDESIRED; + + ctx->dp_en = 1; } static void anx7625_dp_stop(struct anx7625_data *ctx) @@ -705,6 +931,10 @@ static void anx7625_dp_stop(struct anx7625_data *ctx) ret |= anx7625_video_mute_control(ctx, 1); if (ret < 0) DRM_DEV_ERROR(dev, "IO error : mute video fail\n"); + + ctx->hdcp_cp = DRM_MODE_CONTENT_PROTECTION_UNDESIRED; + + ctx->dp_en = 0; } static int sp_tx_rst_aux(struct anx7625_data *ctx) @@ -1697,6 +1927,83 @@ static int anx7625_attach_dsi(struct anx7625_data *ctx) return 0; } +static void hdcp_check_work_func(struct work_struct *work) +{ + u8 status; + struct delayed_work *dwork; + struct anx7625_data *ctx; + struct device *dev; + struct drm_device *drm_dev; + + dwork = to_delayed_work(work); + ctx = container_of(dwork, struct anx7625_data, hdcp_work); + dev = &ctx->client->dev; + + if (!ctx->connector) { + dev_err(dev, "HDCP connector is null!"); + return; + } + + drm_dev = ctx->connector->dev; + drm_modeset_lock(&drm_dev->mode_config.connection_mutex, NULL); + mutex_lock(&ctx->hdcp_wq_lock); + + status = anx7625_reg_read(ctx, ctx->i2c.tx_p0_client, 0); + dev_dbg(dev, "sink HDCP status check: %.02x\n", status); + if (status & BIT(1)) { + ctx->hdcp_cp = DRM_MODE_CONTENT_PROTECTION_ENABLED; + drm_hdcp_update_content_protection(ctx->connector, + ctx->hdcp_cp); + dev_dbg(dev, "update CP to ENABLE\n"); + } + + mutex_unlock(&ctx->hdcp_wq_lock); + drm_modeset_unlock(&drm_dev->mode_config.connection_mutex); +} + +static int anx7625_connector_atomic_check(struct anx7625_data *ctx, + struct drm_connector_state *state) +{ + struct device *dev = &ctx->client->dev; + int cp; + + dev_dbg(dev, "hdcp state check\n"); + cp = state->content_protection; + + if (cp == ctx->hdcp_cp) + return 0; + + if (cp == DRM_MODE_CONTENT_PROTECTION_DESIRED) { + if (ctx->dp_en) { + dev_dbg(dev, "enable HDCP\n"); + anx7625_hdcp_enable(ctx); + + queue_delayed_work(ctx->hdcp_workqueue, + &ctx->hdcp_work, + msecs_to_jiffies(2000)); + } + } + + if (cp == DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { + if (ctx->hdcp_cp != DRM_MODE_CONTENT_PROTECTION_ENABLED) { + dev_err(dev, "current CP is not ENABLED\n"); + return -EINVAL; + } + anx7625_hdcp_disable(ctx); + ctx->hdcp_cp = DRM_MODE_CONTENT_PROTECTION_UNDESIRED; + drm_hdcp_update_content_protection(ctx->connector, + ctx->hdcp_cp); + dev_dbg(dev, "update CP to UNDESIRE\n"); + } + + if (cp == DRM_MODE_CONTENT_PROTECTION_ENABLED) { + dev_err(dev, "Userspace illegal set to PROTECTION ENABLE\n"); + return -EINVAL; + } + + return 0; +} + static int anx7625_bridge_attach(struct drm_bridge *bridge, enum drm_bridge_attach_flags flags) { @@ -1920,8 +2227,11 @@ static int anx7625_bridge_atomic_check(struct drm_bridge *bridge, struct device *dev = &ctx->client->dev; dev_dbg(dev, "drm bridge atomic check\n"); - return anx7625_bridge_mode_fixup(bridge, &crtc_state->mode, - &crtc_state->adjusted_mode); + + anx7625_bridge_mode_fixup(bridge, &crtc_state->mode, + &crtc_state->adjusted_mode); + + return anx7625_connector_atomic_check(ctx, conn_state); } static void anx7625_bridge_atomic_enable(struct drm_bridge *bridge, @@ -2189,6 +2499,15 @@ static int anx7625_i2c_probe(struct i2c_client *client, anx7625_init_gpio(platform); mutex_init(&platform->lock); + mutex_init(&platform->hdcp_wq_lock); + + INIT_DELAYED_WORK(&platform->hdcp_work, hdcp_check_work_func); + platform->hdcp_workqueue = create_workqueue("hdcp workqueue"); + if (!platform->hdcp_workqueue) { + dev_err(dev, "fail to create work queue\n"); + ret = -ENOMEM; + goto free_platform; + } platform->pdata.intp_irq = client->irq; if (platform->pdata.intp_irq) { @@ -2198,7 +2517,7 @@ static int anx7625_i2c_probe(struct i2c_client *client, if (!platform->workqueue) { DRM_DEV_ERROR(dev, "fail to create work queue\n"); ret = -ENOMEM; - goto free_platform; + goto free_hdcp_wq; } ret = devm_request_threaded_irq(dev, platform->pdata.intp_irq, @@ -2268,6 +2587,10 @@ static int anx7625_i2c_probe(struct i2c_client *client, if (platform->workqueue) destroy_workqueue(platform->workqueue); +free_hdcp_wq: + if (platform->hdcp_workqueue) + destroy_workqueue(platform->hdcp_workqueue); + free_platform: kfree(platform); @@ -2283,6 +2606,12 @@ static int anx7625_i2c_remove(struct i2c_client *client) if (platform->pdata.intp_irq) destroy_workqueue(platform->workqueue); + if (platform->hdcp_workqueue) { + cancel_delayed_work(&platform->hdcp_work); + flush_workqueue(platform->workqueue); + destroy_workqueue(platform->workqueue); + } + if (!platform->pdata.low_power_mode) pm_runtime_put_sync_suspend(&client->dev); diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.h b/drivers/gpu/drm/bridge/analogix/anx7625.h index 6f9d5f0e377c..56165f5b254c 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.h +++ b/drivers/gpu/drm/bridge/analogix/anx7625.h @@ -59,10 +59,23 @@ /***************************************************************/ /* Register definition of device address 0x70 */ -#define I2C_ADDR_70_DPTX 0x70 - -#define SP_TX_LINK_BW_SET_REG 0xA0 -#define SP_TX_LANE_COUNT_SET_REG 0xA1 +#define TX_HDCP_CTRL0 0x01 +#define STORE_AN BIT(7) +#define RX_REPEATER BIT(6) +#define RE_AUTHEN BIT(5) +#define SW_AUTH_OK BIT(4) +#define HARD_AUTH_EN BIT(3) +#define ENC_EN BIT(2) +#define BKSV_SRM_PASS BIT(1) +#define KSVLIST_VLD BIT(0) + +#define SP_TX_WAIT_R0_TIME 0x40 +#define SP_TX_WAIT_KSVR_TIME 0x42 +#define SP_TX_SYS_CTRL1_REG 0x80 +#define HDCP2TX_FW_EN BIT(4) + +#define SP_TX_LINK_BW_SET_REG 0xA0 +#define SP_TX_LANE_COUNT_SET_REG 0xA1 #define M_VID_0 0xC0 #define M_VID_1 0xC1 @@ -71,6 +84,12 @@ #define N_VID_1 0xC4 #define N_VID_2 0xC5 +#define KEY_START_ADDR 0x9000 +#define KEY_RESERVED 416 + +#define HDCP14KEY_START_ADDR (KEY_START_ADDR + KEY_RESERVED) +#define HDCP14KEY_SIZE 624 + /***************************************************************/ /* Register definition of device address 0x72 */ #define AUX_RST 0x04 @@ -155,9 +174,43 @@ #define I2C_ADDR_7E_FLASH_CONTROLLER 0x7E +#define R_BOOT_RETRY 0x00 +#define R_RAM_ADDR_H 0x01 +#define R_RAM_ADDR_L 0x02 +#define R_RAM_LEN_H 0x03 +#define R_RAM_LEN_L 0x04 #define FLASH_LOAD_STA 0x05 #define FLASH_LOAD_STA_CHK BIT(7) +#define R_RAM_CTRL 0x05 +/* bit positions */ +#define FLASH_DONE BIT(7) +#define BOOT_LOAD_DONE BIT(6) +#define CRC_OK BIT(5) +#define LOAD_DONE BIT(4) +#define O_RW_DONE BIT(3) +#define FUSE_BUSY BIT(2) +#define DECRYPT_EN BIT(1) +#define LOAD_START BIT(0) + +#define FLASH_ADDR_HIGH 0x0F +#define FLASH_ADDR_LOW 0x10 +#define FLASH_LEN_HIGH 0x31 +#define FLASH_LEN_LOW 0x32 +#define R_FLASH_RW_CTRL 0x33 +/* bit positions */ +#define READ_DELAY_SELECT BIT(7) +#define GENERAL_INSTRUCTION_EN BIT(6) +#define FLASH_ERASE_EN BIT(5) +#define RDID_READ_EN BIT(4) +#define REMS_READ_EN BIT(3) +#define WRITE_STATUS_EN BIT(2) +#define FLASH_READ BIT(1) +#define FLASH_WRITE BIT(0) + +#define FLASH_BUF_BASE_ADDR 0x60 +#define FLASH_BUF_LEN 0x20 + #define XTAL_FRQ_SEL 0x3F /* bit field positions */ #define XTAL_FRQ_SEL_POS 5 @@ -184,10 +237,15 @@ #define AP_AUX_CTRL_ADDRONLY 0x20 #define AP_AUX_BUFF_START 0x15 -#define PIXEL_CLOCK_L 0x25 -#define PIXEL_CLOCK_H 0x26 +#define PIXEL_CLOCK_L 0x25 +#define PIXEL_CLOCK_H 0x26 + +#define AP_AUX_COMMAND 0x27 /* com+len */ +#define LENGTH_SHIFT 4 +#define DPCD_READ 0x09 +#define DPCD_WRITE 0x08 +#define DPCD_CMD(len, cmd) ((((len) - 1) << LENGTH_SHIFT) | (cmd)) -#define AP_AUX_COMMAND 0x27 /* com+len */ /* Bit 0&1: 3D video structure */ /* 0x01: frame packing, 0x02:Line alternative, 0x03:Side-by-side(full) */ #define AP_AV_STATUS 0x28 @@ -392,16 +450,23 @@ struct anx7625_data { struct platform_device *audio_pdev; int hpd_status; int hpd_high_cnt; + int dp_en; + int hdcp_cp; /* Lock for work queue */ struct mutex lock; struct i2c_client *client; struct anx7625_i2c_client i2c; struct i2c_client *last_client; + struct timer_list hdcp_timer; struct s_edid_data slimport_edid_p; struct device *codec_dev; hdmi_codec_plugged_cb plugged_cb; struct work_struct work; struct workqueue_struct *workqueue; + struct delayed_work hdcp_work; + struct workqueue_struct *hdcp_workqueue; + /* Lock for hdcp work queue */ + struct mutex hdcp_wq_lock; char edid_block; struct display_timing dt; u8 display_timing_valid; From patchwork Thu Jan 6 10:01:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Ji X-Patchwork-Id: 12705255 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B8878C433EF for ; Thu, 6 Jan 2022 10:03:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F26E410F039; Thu, 6 Jan 2022 10:03:07 +0000 (UTC) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2137.outbound.protection.outlook.com [40.107.223.137]) by gabe.freedesktop.org (Postfix) with ESMTPS id E972D10F039 for ; Thu, 6 Jan 2022 10:03:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P7oAhLBfzq24k0neSCKNu5rQ1duISKAaHppLcQUKYE4xfU9p6R/8p8SnOS6qmlk2T7uOg2n7XhODDDWweNJpynSFdQBg27tPE314n8fA9eUtALy3lKMhs+FabB2x7euWSwXj1rNWsYdxb6wCRqUS9KEhW5Wvg2acCRRoReeoc40WG0FbOAGqb5Nwk72A13X+8J8bqhZtXRzzNdFiW1Yp9bu1ojWOG9mN9TFbnuQVilywptOF98GXrF+G76JA58Nfuh7EByzEBtMRHwpMdFhvoM8kLNHDEm4aDCOuaZuHQxkVRcGqf0EaUmiR24pAd93RCrE7BbGOm0osOePkgnpk8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gAVLymIL1MOYd0sTSZsnWdojtld8XnFrUHbXsttEFEQ=; b=LYeEBAKYF43kCd2PBhuCR7qSRtnzOmhIIt65MvbD9FMqI2rAXf6VMeT1HS+PgsS0mSbUTfMqTD1xnScPDA5Q0SQaS4v1MCIy1hTwp0nOMZFxQM4pxO6yqrbjMomEYsyborc4gDJg9KZIZ+Wgk4UYuwlo7sEO8adg9vkCNipZ1k1KPT7s7BzWezqO0+UzmMiCRs8oYWuU3MJbgzoaVQg+HHFY5eOm2pB33Urcr0gmvUQ46C8U+hlpp2vK3WCMnOGaMMkOiz1rzwWTW6GWZHgWjvzJR0t4KZvOeokU+zU3O2FJhiBgIOC5DN10ktheDpmmMZDh6I7YF1yciXtr4Le71Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=analogixsemi.com; dmarc=pass action=none header.from=analogixsemi.com; dkim=pass header.d=analogixsemi.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Analogixsemi.onmicrosoft.com; s=selector2-Analogixsemi-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gAVLymIL1MOYd0sTSZsnWdojtld8XnFrUHbXsttEFEQ=; b=LeDPkmwD7msHTrQjAfj3H/z7QqeogcNp8CnCumcoOdqo72LDIa996aytYZl8WFPldofJzQJlfGC0iWD+15cqwuUq3QEnQCwBWb3akvxlLzDTQvptqGxz/gjhtDKMT+5owR1jzOP/z26HDo35TCipLQwjPdOX7iLspl0Vfh0VvEY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=analogixsemi.com; Received: from CH2PR04MB6741.namprd04.prod.outlook.com (2603:10b6:610:96::19) by CH2PR04MB6823.namprd04.prod.outlook.com (2603:10b6:610:90::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Thu, 6 Jan 2022 10:03:05 +0000 Received: from CH2PR04MB6741.namprd04.prod.outlook.com ([fe80::c4d8:2407:431:aed1]) by CH2PR04MB6741.namprd04.prod.outlook.com ([fe80::c4d8:2407:431:aed1%6]) with mapi id 15.20.4867.009; Thu, 6 Jan 2022 10:03:05 +0000 From: Xin Ji To: andrzej.hajda@intel.com, Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter Subject: [PATCH v3 3/3] drm/bridge: anx7625: add audio codec .get_eld support Date: Thu, 6 Jan 2022 18:01:26 +0800 Message-Id: <20220106100127.1862702-3-xji@analogixsemi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220106100127.1862702-1-xji@analogixsemi.com> References: <20220106100127.1862702-1-xji@analogixsemi.com> X-ClientProxiedBy: HK2PR0302CA0011.apcprd03.prod.outlook.com (2603:1096:202::21) To CH2PR04MB6741.namprd04.prod.outlook.com (2603:10b6:610:96::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5538948-a970-43bd-116d-08d9d0fbbbb1 X-MS-TrafficTypeDiagnostic: CH2PR04MB6823:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tK+zOri4cxGVSRktuU/LUkkhlpjX8wCAh8bvU6O7d9eRIAYT78nRYJIxSns1tYQIw66nCLqFnA3nOxVY1d8bn32l9EoBv4pw9E5d8JzpGbXCUURPSK79OlJNn/qVpVtidVETLl2vItOzy+JAPwEnrTvKx4XNRNGJvplOLKnnZhRAr4XE6fQYRxtSOTmMLYfJe7kDv9uuxOdj+O5ZaWCq/phvvhhIaSBAxH9tIU4idfGqrmkR8yFsteCa0XMEXuQPWoXWwOGvlOvpxC6KxoYtHGuOhjRQtoi/EWbjOS5pttBHJKzxvC3kDftYJSIcEExlpS2fCuaV4gAxkO4bQtajC+7rRZJih6cDjxrRmlFw3oR10qiEHTGBg8E/+IWDj61A0lOy9hboxg7OuS62REBDjIO87fX9RF25X31kvMVJfE0sX7y7d1z0eWstcuTkJbMHkNe0wYIDZXpCSUKLMbd1fFS12p6DZKHbb5lbKfdMps4412t7CtfruZOr4mJIpsvAZoggl4eVMuCvK7uKtOSgMxAtHe/6FWyEVFqMrfb2qBck0CfByqCFodZg/ok4EwiUl3LqQhKFkVi6CSv8JazqZ0DX4ur2a3V0poh/O0BSVQxW8kSikUYUSwYL7OGm5lOi+LI78ZOrYUH+EKQQoxWLyItxuRnPALXHd1RSQlXv+wgmv72w37JWDnxeaOjxT5phk9JrtEjffwZGo2ADd6i3YuMMt2FSRHmC82wQj81Gzf8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH2PR04MB6741.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(4326008)(110136005)(316002)(52116002)(508600001)(2616005)(38100700002)(8676002)(6666004)(8936002)(1076003)(6512007)(66946007)(55236004)(36756003)(66476007)(26005)(7416002)(66556008)(38350700002)(186003)(86362001)(5660300002)(2906002)(6506007)(6486002)(142923001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0uoBhvMYT1sVdSIwancqVEsT6pKeWqyDuvoCkAMfhDYAjkt2FUJ2lKg6PAYEhE1bUgAeBv3F6HppPTNl3EuE/MLBHgww+pBBDww/69vA2XZ6Ch13IcJgLbJcwJFRANn49HaGZg4IH3vmxy5TNxibu4faD511wuJny5rLWOFuRBS/i3VbUPr4MjnbZGP0KK8lQmy8QvDuTN8BdEsA5s9I4RsvZg+3Bzl/vWig+BO/VjgyOIw++5ZJ/d2p2a9B+3xAnFFqOayK22LIuIB45PyY5Un23FoNRZ+WV/F+mA7ZoHYx9b+iG06tPgafwHIF9GSKx396g03lC6fZyz63hFblNQXMP5aA7oA57IIJljKR5LHBjfp6RbDnvC+IvzozELhvO0RNcp8FfVaMPEz9vFKL4NqM+jmbhwIiEzA6qPoyCaXwCyQoy+OLFS3UEXmfCMT5/3/v1vtbHILG1RcQJ1Qukv2vvDskhWm+/41BwpDaVXeza2g8w7rdt3ICAEQgMx/Nfkp27nilrSZTkOHJ1wwOOddgCkvNSKCIQL6R6zqYMZ+X5TFSo1wEOqiRSVP71ZmbFyH91kMM5S+eYZjqfeZC6m+9xoJq0c9CTymlef8/yOVSbhweXAMwLEUTfllQ/TNfXX5TbCDwQXNsr2PIzDKrxUEyY4MHvdxRthExiBrAbdf+eKV1eDRX41UtXhoj69PnflzFmAWu1OBWsuutx35BBOWrgsZCbaOrhSB1NJuykPVvye7TBBIi7OhDvYayl38OORVoejzhnubKnScUgGKZqPyG3IrPaDnPBqyAbPROORP/uTGjI0YpJ+6N6aD4H86ZF3/9Bi1b9AFJDX0CcLQ6SFHG+5B+/60rj0uLSn9yX4abaPNMTrsOjQTzjvx/HE+9uUmC28QF+0A7g0G7eSIjTZxcgSQPSrC0JLgYLHuxHe2Wf95Unp6bmUVGT3VkbG/4U0B4zHHHxj+T8BqUBEGakLNA9K5/acQhtYHb3hr9LIbthekOcfnLHozYoFbNKWCv3qWFULOcjxto3/ixDocRsFECJKxNjyolqM4kcbck9VcxvtRenT6LF/prAI90j7y8c85HW3l3NUHCRCTlkzWBqCL2UE328StJ3NdlI9Zt8t9edM/S4RrYwe0Hjjczxm8eDDhGwhKnEhnSz85fcpt41F81AOI8RL5Hzf+7ov4PZpAlwo97WDLx2w2Fl43E46oXkX1yqcqT2jXzOJvYoOjqcS928ELJGZzAy0ZyCkt+MJ6HUCxOOF9TpVRPCzcmKt4odTEH83JXsq3rx3Jcoh9ZzKfCvGVW9bBhVYUHJkUU7eGFPNBsfIfcBpKalRd9zaQmNWQMSYFlPI4T8MfwD8zAi0uq6O29JCNcnZf7nMfT9KQgy3SH1isY1T2+/oLSf76IFzXIQP/+jN6D2JskbgxNHeJZLrQHAqEvVjWsBE6hWvUb3+VzbK34xc1qMC8opMe7GAeYrz+2tH+Sx8b6Q2jcrdMOkElbFCVrYIqFdE6SNuhI7n88W1isJ8VUa2VqzBGmS9PCm7t+SKNUcOnipm47wFVIDMu6Xp9Dx+QNi1bRZy1mC3P6yrj8BtdnTTIndSV8pNVxd/dMWDdKpR+XsnOmY/Z0ljX8om0CtDflCCeaJgE= X-OriginatorOrg: analogixsemi.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5538948-a970-43bd-116d-08d9d0fbbbb1 X-MS-Exchange-CrossTenant-AuthSource: CH2PR04MB6741.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 10:03:05.6916 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b099b0b4-f26c-4cf5-9a0f-d5be9acab205 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GivgqIWTQZO8PKbYhS6jCSEphB3Y7bv4cJOdMYLgy/WaHWntrehrWUud4ZJD4jte7u5S0YwdT0Lr911nFXs73Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR04MB6823 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qwen@analogixsemi.com, bliang@analogixsemi.com, Xin Ji , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Provide .get_eld interface in hdmi_codec_ops for hdmi-codec driver. Reviewed-by: Robert Foss Signed-off-by: Xin Ji --- drivers/gpu/drm/bridge/analogix/anx7625.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 001460f62b0c..33383f83255d 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1840,9 +1840,27 @@ static int anx7625_audio_hook_plugged_cb(struct device *dev, void *data, return 0; } +static int anx7625_audio_get_eld(struct device *dev, void *data, + u8 *buf, size_t len) +{ + struct anx7625_data *ctx = dev_get_drvdata(dev); + + if (!ctx->connector) { + dev_err(dev, "connector not initial\n"); + return -EINVAL; + } + + dev_dbg(dev, "audio copy eld\n"); + memcpy(buf, ctx->connector->eld, + min(sizeof(ctx->connector->eld), len)); + + return 0; +} + static const struct hdmi_codec_ops anx7625_codec_ops = { .hw_params = anx7625_audio_hw_params, .audio_shutdown = anx7625_audio_shutdown, + .get_eld = anx7625_audio_get_eld, .get_dai_id = anx7625_hdmi_i2s_get_dai_id, .hook_plugged_cb = anx7625_audio_hook_plugged_cb, };