From patchwork Fri Apr 23 09:26:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 12219983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 418EDC433B4 for ; Fri, 23 Apr 2021 09:42:35 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DDED261458 for ; Fri, 23 Apr 2021 09:42:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DDED261458 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51F016E0A2; Fri, 23 Apr 2021 09:42:34 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80040.outbound.protection.outlook.com [40.107.8.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 943B96E0A2 for ; Fri, 23 Apr 2021 09:42:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TgwfYdWsdJtDBjHBDlbMkCrbYl8M68pUj54mRp03/2jrk+R/CG5sp+u7rzde7C0CVX3XGyR1tMeFdqy6CUtO3p1cpOf6h2/piPky+nCReuQ7jWhNX5jOQVueh4jZbFPTU0VAXvOzCh9mCd4QgB9adlmzZy0sorEk+dDlAC3Acowb+fpUEAaNTsA3/Do+tkkG3V06ZVkrTZTT7fwkWE9l7QWrqtfaQMKpkN90fTOQNHt7YKKkR6cD5prcpO4jelH+dnZF9bL9tFr10G7vDKd46aK7/voYIF/R7bWNNljd+qBmU+j96oE34cyjLWcA2CX9XC4D6E+PvgFBkqCGDn4VVQ== 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-SenderADCheck; bh=cdu3u3yeBunLeUPDtKnG3pTLe15EG3f1+C2OXax/s1Q=; b=fREwRF+h+tW+KIeCcZAoN9xwmRaSKFJVXN6baQa2+4nFIYom4JoTYoLpDweg5J8R+/uUZuHhqNFNQi5aR5142u1/DyPIy911MDaSCPkEH+i2+xV+Odl/okwvoLKtN+8Sof+crBQ+pMAQrNK8tRlD1ztkR/2BqWMf3HNpEZIqk9OEEs+0dpQNL3Hrgq9RZgKfezIeXxfPPYMARIOVR9grtYjSPOKYP9jkuGMoreSAngr+vjBheMxMrx2pgKN2bFm5qnPttXiZd0lV4/Xk0tjASrJy2xRP8oR5zwzgMEZ/78C+G2d746XHH+X/nlZp93iUTMEYseEwDwt2cF/cIaFo6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cdu3u3yeBunLeUPDtKnG3pTLe15EG3f1+C2OXax/s1Q=; b=aJYOwcnYPrTO8Sze4HSwh3idhDO8CAljNiVL4v2YXIm0kr3xbyLUtMAD0giQQ6tIOGkOL40VQQHGEIkTC3fQcQXhpFe59B9DLxQV7Looj4ix3XiRo99lfH9KnUdM4mwHlLDEHlmJp/aQTYWWVGAqOrD/Ckz4qY/CTTMKfp1Q9Io= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB3983.eurprd04.prod.outlook.com (2603:10a6:803:4c::16) by VI1PR04MB5711.eurprd04.prod.outlook.com (2603:10a6:803:e7::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 23 Apr 2021 09:42:25 +0000 Received: from VI1PR04MB3983.eurprd04.prod.outlook.com ([fe80::a5f3:fde9:1d85:5f28]) by VI1PR04MB3983.eurprd04.prod.outlook.com ([fe80::a5f3:fde9:1d85:5f28%7]) with mapi id 15.20.4065.021; Fri, 23 Apr 2021 09:42:25 +0000 From: Liu Ying To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 1/3] drm/bridge: nwl-dsi: Force a full modeset when crtc_state->active is changed to be true Date: Fri, 23 Apr 2021 17:26:41 +0800 Message-Id: <1619170003-4817-2-git-send-email-victor.liu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1619170003-4817-1-git-send-email-victor.liu@nxp.com> References: <1619170003-4817-1-git-send-email-victor.liu@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK2PR02CA0181.apcprd02.prod.outlook.com (2603:1096:201:21::17) To VI1PR04MB3983.eurprd04.prod.outlook.com (2603:10a6:803:4c::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by HK2PR02CA0181.apcprd02.prod.outlook.com (2603:1096:201:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.20 via Frontend Transport; Fri, 23 Apr 2021 09:42:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd2e2aef-12f1-46db-6448-08d9063c19b0 X-MS-TrafficTypeDiagnostic: VI1PR04MB5711: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VB2LFm2AXsyO8J+e9hkzBd/sGK91U4g/YAQLqdZ+N5r0/WM+a/c0S3HTj6kPzVLhDqcNjRm7XMIyVf1HTcDVFPe056kGJ5SCl8aVh8V7jVa8gbnY+NixQ9EKiWMp+Owdku63Oknu40NbZ22bYqIKWpbIVJn63iKF4c90CVqJjzK61C5AmTz9pehMS9KMDcVrN0Nu0xUuseq2zY+RsTif+NtMOxA/lHWTCsCxO0nSWBzVMm1s/naw/lHRvY17XQ++gJzeGU3WME9SEgaT9fCIpukXg3+5/Cn3hAmYZPWAbAsJrDbQIKSzRgggKUANhHTvGEzd7PWcjrboDaGs8B2yX7d7fJMs6LP6LcCOtbGsDIAp92lZQ4LXIqg3KJAY8c7jx9wjHTDuBQiIoHfqoSd0l0ngFGQG73YE4kvOBFSDTLEBDijc1ERZqnQx11puXyQKEk5cr/ZyiRnjVLJLFSeR9yvrug0/WYLL4a/jJfIX1WXWcirlehwKEwzn/PFX2510Vm7S2N9I88Il1nd2MoC9r6GXbCNysob4HM7l8NXmQROCAQXLWAGHUcuWatYnnlrr4G9FUTCziZew34+3gWtV+cH8wPMvmVlBKwB7B9Aw0VD+IyAXw8uf5Lpx94r2AWd/NbP4XoIIrj9ERh2YSbGDGnO0/keTuORds4C0vSKxkDo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB3983.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(346002)(136003)(366004)(39860400002)(38100700002)(4326008)(8936002)(316002)(83380400001)(6916009)(52116002)(86362001)(6506007)(36756003)(6512007)(186003)(38350700002)(16526019)(66476007)(8676002)(26005)(7416002)(66556008)(66946007)(6486002)(2906002)(956004)(5660300002)(478600001)(6666004)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?3N2wxKNwm/2O9YHOn94Tz3dleFECNX?= =?utf-8?q?XS/ASZgN3YfHDOqJuY96U35xh7pRqmUGp7lhG+I0EoZtAGOxn0nfF7P9vzmaaVoU+?= =?utf-8?q?Q0xEeqM5YylJJ4Fn81iCY2yFHSB7hq+Jy8fmFEUA7gJ8LvnBOYVwP4eQ+fQlhMYHN?= =?utf-8?q?pum90fm1TeNV0D9yS3fyqrp4W4yrk4QtGp+BXfyR7jJ4EfA8v5wv7cSyf90sEdghD?= =?utf-8?q?Ys2KYZELBMxjisRwK73DmHvXe6x15pqSL6Qu1wopA8ECcsG0mHeBv9g7av/J0JYDz?= =?utf-8?q?aYm3FALaA/fFJecMs6gjEQTtYhf2VrzNS+L/YivJyfJu12p6eIT1syVUlNGIez1VP?= =?utf-8?q?xriDML/3tVEm/mUBfBxGQY5CRvDoL/dpEVBjgWwzO/rTJKl+e9roG55IirlzrdTve?= =?utf-8?q?elw9xRkBxjBIO+0oRS0CBm6ioWo2eReJtR10U50uiJwh5KFLM6ULD0S5vSurslSHq?= =?utf-8?q?Gz1l2kDyJQxRvkFfo5tcKVuv8lUX8ulX1wbkf+bXcDc0HjHLv/wCjqugyCavrSeBM?= =?utf-8?q?jamZwakpRkkJtuN6LwTuPsltGPJuN0pvmd8GsVfKde9bWU0U/r1neNqXt0QgiTDZk?= =?utf-8?q?BMc/H+jmKfvofTbU7V7pn9Eyl+3Rxpsu1oG38Catq46/qXe7U1bGfmfJgs94Padd3?= =?utf-8?q?COeH6qdPQN+wR79LbhA/EVDgRCAQOAeTWAX4AEFRUjEF7RSzevdpZ3MAnKF6o1AZp?= =?utf-8?q?GEfk4sOlOsyOHE/maQjrkQlNB16q/l5i8ewxS6/L7LgBgKxlvrjOoPADxdOO/ISPN?= =?utf-8?q?2nqC5zqqovRlQneZ6SBxgLxB//BPnKlouNxv2Cy+Gi//DC4PLd9IH3r1fDZvyaxgV?= =?utf-8?q?k67UK4mh6/SEdJATyXtdCoecECQtUj+exqACpknxWfwzVkA5whPNVoY++aHTsdx8k?= =?utf-8?q?osK5Bsa25Uhs7ysnnkQOpf7o9ouczJGPXy5ECsy0w5IIHDLAGLWOnFwRNvK8KyRb9?= =?utf-8?q?Cif9OqBdj/bWbSIX7NazdHtYEY9W2lcuyb0gXRKYMithgplS/y//FvfgYWK8s72Xu?= =?utf-8?q?rz6rjApqrQeUpznPNnAMQ2rJ6GrYRnKMwQ7Ro/ePtu/cfakX5sRRh3rxgdEUzotYN?= =?utf-8?q?TGzznOv0EmswX+C525KjRVQWJeh5QHiEOcrLcrAZHSHTCchFk9YdOjmRjY4wsHlQj?= =?utf-8?q?RG0VisK5o3LC7kre4XNbHGlY13OPEXlxzsIEiG4SGHGKBg9E/xcX+vGDE8ou3ZtWk?= =?utf-8?q?qnWpw7cr2++WSbIm+osTp3Wwe0QKk+sfEoFNNAR23/GyQAF4CjTcw8nnhcPskrciq?= =?utf-8?q?dcY+j3UdpjiL4W?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd2e2aef-12f1-46db-6448-08d9063c19b0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB3983.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2021 09:42:25.0169 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AUHd0BlroMRTJ/kTPXzHQ3T6TBEaOVtRSU++8FV/8bfCr7+U4b5lSRCVh2Q3uaBEo7Gpl3xFwFNYGXINZlcL6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5711 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: jernej.skrabec@siol.net, jonas@kwiboo.se, airlied@linux.ie, agx@sigxcpu.org, narmstrong@baylibre.com, linux-kernel@vger.kernel.org, robert.foss@linaro.org, a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com, robert.chiras@nxp.com, linux-imx@nxp.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This patch replaces ->mode_fixup() with ->atomic_check() so that a full modeset can be requested from there when crtc_state->active is changed to be true(which implies only connector's DPMS is brought out of "Off" status, though not necessarily). Bridge functions are added or changed to accommodate the ->atomic_check() callback. That full modeset is needed by the up-coming patch which gets MIPI DSI controller and PHY ready in ->mode_set(), because it makes sure ->mode_set() and ->atomic_disable() are called in pairs. Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Robert Foss Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec Cc: David Airlie Cc: Daniel Vetter Cc: Guido Günther Cc: Robert Chiras Cc: NXP Linux Team Signed-off-by: Liu Ying Reviewed-by: Neil Armstrong --- v2->v3: * Split from the single patch in v2 to clarify changes. (Neil) drivers/gpu/drm/bridge/nwl-dsi.c | 61 ++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c index 66b67402f1acd..c65ca860712d2 100644 --- a/drivers/gpu/drm/bridge/nwl-dsi.c +++ b/drivers/gpu/drm/bridge/nwl-dsi.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -742,7 +743,9 @@ static int nwl_dsi_disable(struct nwl_dsi *dsi) return 0; } -static void nwl_dsi_bridge_disable(struct drm_bridge *bridge) +static void +nwl_dsi_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { struct nwl_dsi *dsi = bridge_to_dsi(bridge); int ret; @@ -803,17 +806,6 @@ static int nwl_dsi_get_dphy_params(struct nwl_dsi *dsi, return 0; } -static bool nwl_dsi_bridge_mode_fixup(struct drm_bridge *bridge, - const struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode) -{ - /* At least LCDIF + NWL needs active high sync */ - adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); - adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); - - return true; -} - static enum drm_mode_status nwl_dsi_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info, @@ -831,6 +823,24 @@ nwl_dsi_bridge_mode_valid(struct drm_bridge *bridge, return MODE_OK; } +static int nwl_dsi_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 drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; + + /* At least LCDIF + NWL needs active high sync */ + adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); + adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); + + /* Do a full modeset if crtc_state->active is changed to be true. */ + if (crtc_state->active_changed && crtc_state->active) + crtc_state->mode_changed = true; + + return 0; +} + static void nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, const struct drm_display_mode *mode, @@ -862,7 +872,9 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, drm_mode_debug_printmodeline(adjusted_mode); } -static void nwl_dsi_bridge_pre_enable(struct drm_bridge *bridge) +static void +nwl_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { struct nwl_dsi *dsi = bridge_to_dsi(bridge); int ret; @@ -897,7 +909,9 @@ static void nwl_dsi_bridge_pre_enable(struct drm_bridge *bridge) } } -static void nwl_dsi_bridge_enable(struct drm_bridge *bridge) +static void +nwl_dsi_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { struct nwl_dsi *dsi = bridge_to_dsi(bridge); int ret; @@ -942,14 +956,17 @@ static void nwl_dsi_bridge_detach(struct drm_bridge *bridge) } static const struct drm_bridge_funcs nwl_dsi_bridge_funcs = { - .pre_enable = nwl_dsi_bridge_pre_enable, - .enable = nwl_dsi_bridge_enable, - .disable = nwl_dsi_bridge_disable, - .mode_fixup = nwl_dsi_bridge_mode_fixup, - .mode_set = nwl_dsi_bridge_mode_set, - .mode_valid = nwl_dsi_bridge_mode_valid, - .attach = nwl_dsi_bridge_attach, - .detach = nwl_dsi_bridge_detach, + .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, + .atomic_check = nwl_dsi_bridge_atomic_check, + .atomic_pre_enable = nwl_dsi_bridge_atomic_pre_enable, + .atomic_enable = nwl_dsi_bridge_atomic_enable, + .atomic_disable = nwl_dsi_bridge_atomic_disable, + .mode_set = nwl_dsi_bridge_mode_set, + .mode_valid = nwl_dsi_bridge_mode_valid, + .attach = nwl_dsi_bridge_attach, + .detach = nwl_dsi_bridge_detach, }; static int nwl_dsi_parse_dt(struct nwl_dsi *dsi) From patchwork Fri Apr 23 09:26:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 12219985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D267C43460 for ; Fri, 23 Apr 2021 09:42:37 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2EC9E6145A for ; Fri, 23 Apr 2021 09:42:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EC9E6145A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AF6C6EB57; Fri, 23 Apr 2021 09:42:36 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80040.outbound.protection.outlook.com [40.107.8.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id E6E406E0A2 for ; Fri, 23 Apr 2021 09:42:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E5qQQGotyW9SShMi8jJjb1uL55Wy4lLdMG07H7mNynX6lxadkBxfMpGtlyT0Sfm1dPg5Vlli4CsqFaO2iZF1uOvCQXerIJlo6sqXekfn9PCxXaIQMWUO5TDTGEtsvbMXbNx5Nthrtxg0O44eMVTqxy6aqQIX+n2CkP9bsMOM2BilCJVdMZzNj01ebt79B0EPl9CXtfL1QYtK3Eb57O/UolxRcfnIqQm7bCCqMGEP+xfgZnhXSw/tT2f9biBnHqp+DG7OLWSrazB17x7+knDCMeZHS7/J6UKi60kawKFQN/HzOJAUhGNDSnjL84Lh0n2TAEFQz3jJZmhbOw8f1gIfCg== 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-SenderADCheck; bh=zN7uTnoMdBca21/6HbuOht3QClt+UJ7xIuodMVidhCE=; b=hBSr7GDN02qfSiJXssXSNh0AeU5CrGS4t58YjMQnZ5ym++ekWKj7eMKma3uUtk0PV3Au0GxUprvKD0ZD9qSNIWVP41VJ8Bh+g0Mt/ag9rzQMStKHq+fjY5Eak6G2itGv4Vcj5y4IGXtvDOvnB4cXFwOL4wLrb6not9gMXxobrOmLNDWizPRJQ5cBq0M7otNlB6kE/NHMF+VVj8dVJezix468WehZ+4vpDYhOUtp2t5EvKzUhxbMlx3u/blcKSwC0htRqhrYgJUtl33B9jwkOVgxB3YAM7+O+LYQOVeKqNfqCTPtcczeJY5HZs0HNrFGo9fvWUyIKZt6iX7ypB9x0zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zN7uTnoMdBca21/6HbuOht3QClt+UJ7xIuodMVidhCE=; b=GT/K/MluNksPog0URq5N6hm9kIQOqHysD3IwC4+j1NyNKvDFUGFCUvr3WTOMsfdKfJLxHLnRFI9w5soXOQ/mH2vPMswMztMmecSTAEJqRVpzL68tReXXznKlZI1Ju2uUVeMqOi1+UPsdv0GPRGRBts3aHVEEH59wQ/CJOKfAWI0= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB3983.eurprd04.prod.outlook.com (2603:10a6:803:4c::16) by VI1PR04MB5711.eurprd04.prod.outlook.com (2603:10a6:803:e7::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 23 Apr 2021 09:42:29 +0000 Received: from VI1PR04MB3983.eurprd04.prod.outlook.com ([fe80::a5f3:fde9:1d85:5f28]) by VI1PR04MB3983.eurprd04.prod.outlook.com ([fe80::a5f3:fde9:1d85:5f28%7]) with mapi id 15.20.4065.021; Fri, 23 Apr 2021 09:42:29 +0000 From: Liu Ying To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 2/3] drm/bridge: nwl-dsi: Remove a check on unchanged HS clock rate from ->mode_set() Date: Fri, 23 Apr 2021 17:26:42 +0800 Message-Id: <1619170003-4817-3-git-send-email-victor.liu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1619170003-4817-1-git-send-email-victor.liu@nxp.com> References: <1619170003-4817-1-git-send-email-victor.liu@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK2PR02CA0181.apcprd02.prod.outlook.com (2603:1096:201:21::17) To VI1PR04MB3983.eurprd04.prod.outlook.com (2603:10a6:803:4c::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by HK2PR02CA0181.apcprd02.prod.outlook.com (2603:1096:201:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.20 via Frontend Transport; Fri, 23 Apr 2021 09:42:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04d43dd8-7448-4e5f-5771-08d9063c1c0f X-MS-TrafficTypeDiagnostic: VI1PR04MB5711: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rb6EeJ/rngKPZZzM29DuzGKbuTBZjmzX3c6lw4pEQKL2s6/Q49cqigWgmjZHzd0bAs3ixj8qer9wueJ9C9IzAbUMfnHxsnsbQq6wx5XgpfGbrTbFw/HQ9/5SUo2JVGrw+qaGPHdrOdrVtPV+bS3WHbO/0sHhotUhtOiT/P1UZGhXQTmqxEKxgFz54kJcF999VvbyGMOR+Puk3wtHOApQQ14qR79Y5tlscMwYfvyUiPcAE2/32gMLB5IluhYgMyRc88hm/SSz6d7TqA3KvGMNnqW7ioPfWFjV30T3VRMki3x+qpyIQSZaDK65lpmN3R/6WxHjktPD3J6Ko7NH5U2UNRUrAKUgHvxJtOcBmKC2VOIzyqh8eOYkXbcISV5i2DL5zXiuoJ7bldSDSjt+wylOuECgh6U3UaojzkaxYbIZ2MfaN6OmW0i5zU0sd9cpAph9TcN0ecyXUuvZ31ZbQl0e7UoMT3zRzGNJE4ByHMc6ZnQVmMxOPu0IDs7b8pnaxmNMYmE9NYmhheOg7wULDW+AY58WUiRU+MOo2RJi+3wNYkDCULB1uyuVMm1hniq/qDgwivJuFbtuiDicphe/BD3gXBz36KX+5a4n0+xmf0lVhZUXj4mcOG//lKaJpmuPwzXN6FHqlUZLshYdGxd+tPWRMPy8vG0PvGaQwPOzStOQAT0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB3983.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(346002)(136003)(366004)(39860400002)(38100700002)(4326008)(8936002)(316002)(83380400001)(6916009)(52116002)(86362001)(6506007)(36756003)(6512007)(186003)(38350700002)(16526019)(66476007)(8676002)(26005)(7416002)(66556008)(66946007)(6486002)(2906002)(956004)(5660300002)(478600001)(6666004)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?Lc+ZWfwum6vEswbCw0HmQrEhy41gTr?= =?utf-8?q?kxJEkCYuiOXBv7kvCF8HfI5K9t12Pblmef97EQBZuOYBeLw+C2rOqAs1wh+uUcVv/?= =?utf-8?q?iBNdn7K79MtE2nDOCTdn1E75SccBrEVJEauZYWlamVxKetquSyIG2SQgXN8AC7AMg?= =?utf-8?q?TFaWAeROZVxethRgTCyINOL8xVY+8ZUx2KRzQlAG/1gtZBx7dTO0P+PEBQUh/xkua?= =?utf-8?q?Bv8N+5MQERGzkbN4kKODh8kAuO772BsLLHFVn57qJa5W1Xq+baSz49K272QAc6Vdb?= =?utf-8?q?MpsB+46E9zu/9QlEGdBxQ6PDIKeBSH7Nhk02gnSoYpxQm69nWU9BaRiyZxzPXkJw+?= =?utf-8?q?8dkDDCo3O2m6F6QV4E9kKHT0tfiVztGueTQH8hR6kE2uttI4CLmYs++LzX0wwEBKL?= =?utf-8?q?8kO9fz9IAUVdNslZOYhnJHxrQty1t1dE5Je8fom5PV+NNO/PBgW6Zjw1SxTwL8On3?= =?utf-8?q?rFv9NWAYnNHEK9VoBZx4QfExaKlhP1gWkLsmoGKG6p9I7D0cPz3oQDyu9TdqKT4ZN?= =?utf-8?q?t1jNhHCAANxlAypEhdfVIxwE8CKkGjugEiBFtOnnEfZqPHPsLCKLzQAoSN3x3jXp0?= =?utf-8?q?5Yn9dfLPMUhsfnECirTVeImBtLAsG/K3j/61xLSbXeGa3Bu1lxSdxbO+izfN5ndK1?= =?utf-8?q?08jmQ1ANQLOjpOHOmlrBtyVQL0A0QTlBnkxCt3i6jEvHmSrE4VtOGtxvZ8Gk33hgQ?= =?utf-8?q?ulTv7rcc50gFbvF4c1pnpjNjjrH8TRJsm4oSVh2un898La4lXsZkB2Wma2Fj9t8FK?= =?utf-8?q?cM/61BQt8/uOLv7ycJNiMc9Ykgrv2oAmK8ylj9hVFqVMynB4Aa2m4gipowuhO/+cU?= =?utf-8?q?dWqSu/K4SYzTfLqInSBavuPlbC4JiyPjHq8GhZdZg/9V/MPYrSUiIAtptFhv1yaCa?= =?utf-8?q?whRlXyALM/d7sXVvEeWYPWg3dBKE90ta/ZMy9WHE9wxLhuiyvOsba+By1/oNWMDTO?= =?utf-8?q?syokTVknqBM18U5u2ykVogtFVRVn65x//W55x7+Jzz3YLO2LRmTlh+A/aT6hwjn9p?= =?utf-8?q?O/ZNrLdQ+/zK6ISJnoLiX1j1p74TR4UkYh3sYOrduFOzuYEnLeYCwyuMgCeu4LgtU?= =?utf-8?q?lxZ+WGJdolLDGINP/c6Whgln5nwll8hzKvsZUs/LRYPhEJrXZL2PAq5SYU4FQozkj?= =?utf-8?q?q5tUnzYsQFxj7p6p9i6HK19F0AbNW0e8djTpJPkrzFQKvCB24DtqMPFDMdaKRa9qM?= =?utf-8?q?TXVPNz7K6ZVNlMZmj8e8GhxJBbFJo77795UxMu/NJvWrNShlNSN3/lA6yis3aRBkt?= =?utf-8?q?h1sQ1YnprI3hbm?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04d43dd8-7448-4e5f-5771-08d9063c1c0f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB3983.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2021 09:42:29.1275 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SGrP5P29MzlRnZ87zcJjJLv809wR1WsNdfTXoDWQ/qwPbxFvucGIX+zYpnANESJfWz1WZ6YNXxU/TDTvlvg24g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5711 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: jernej.skrabec@siol.net, jonas@kwiboo.se, airlied@linux.ie, agx@sigxcpu.org, narmstrong@baylibre.com, linux-kernel@vger.kernel.org, robert.foss@linaro.org, a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com, robert.chiras@nxp.com, linux-imx@nxp.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The check on unchanged HS clock rate in ->mode_set() improves the callback's performance a bit by early return. However, the up-coming patch would get MIPI DSI controller and PHY ready in ->mode_set() after that check, thus likely skipped. So, this patch removes that check to make sure MIPI DSI controller and PHY will be brought up and taken down from ->mode_set() and ->atomic_disable() respectively in pairs. Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Robert Foss Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec Cc: David Airlie Cc: Daniel Vetter Cc: Guido Günther Cc: Robert Chiras Cc: NXP Linux Team Signed-off-by: Liu Ying Reviewed-by: Neil Armstrong --- v2->v3: * Split from the single patch in v2 to clarify changes. (Neil) drivers/gpu/drm/bridge/nwl-dsi.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c index c65ca860712d2..601ccc4a7cdc7 100644 --- a/drivers/gpu/drm/bridge/nwl-dsi.c +++ b/drivers/gpu/drm/bridge/nwl-dsi.c @@ -856,13 +856,6 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, if (ret < 0) return; - /* - * If hs clock is unchanged, we're all good - all parameters are - * derived from it atm. - */ - if (new_cfg.mipi_dphy.hs_clk_rate == dsi->phy_cfg.mipi_dphy.hs_clk_rate) - return; - phy_ref_rate = clk_get_rate(dsi->phy_ref_clk); DRM_DEV_DEBUG_DRIVER(dev, "PHY at ref rate: %lu\n", phy_ref_rate); /* Save the new desired phy config */ From patchwork Fri Apr 23 09:26:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 12219987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6BFDC433B4 for ; Fri, 23 Apr 2021 09:42:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 52CD86145A for ; Fri, 23 Apr 2021 09:42:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52CD86145A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9EF036EB5D; Fri, 23 Apr 2021 09:42:39 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140057.outbound.protection.outlook.com [40.107.14.57]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B3F16EB5C for ; Fri, 23 Apr 2021 09:42:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lAvpOGqDisacT3p3Pa9EZm/Zo0CoNth79CXsqDK2j61xbwDv4mabRipAMceh8j4m/HhTd8v6vVKbM95i7bbAmPuaOjEONeD3rWVP6enyqXdTMlxviU/KDw4uKNpBAMvjixjdpY4FTUciRm9JqLRByQzepHlgqUdIx+PVMKPF5KkiPy53XzlYst2fvHf2W5/U56c57fmeQQDe6PEsyB+T7WB2PzslSA0FPQ6FkTiZrWNSsSMNCdrXur+BKewMzcZQfwT7Nr36U6r1ry5axlD2zIlotCBV1a+U/DqaLIRTy0v7gE8SBa0FUjTme2hIKwXwiyJQl9BxnMZb2LXHZavzPg== 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-SenderADCheck; bh=RoMUdqA2OyqCBybPV0IXzjVbE71UnLKGZ0hGPNA0S5k=; b=cblAqmQsOwrsBANtI5IGJPCmQ8iHTSJmL2BcRPNqenS4owKEwpVBIEvkfB/RnHUR/7nKzy/DdS2T/TUcewwg1+mwBr0thYimviq3fB+FnLW0+glaBOedWf8JBhLwDkKQWfs0H240GrrhVwoSq8uH2EhQxoC/BgkOviCA0vy1/mnBRcxGkWXc3xVNC37nZM8Ym7pSuc9p0I6MKiYarxMzDOrgyhH6dHFEJN8ibGOXTLc2yPduSe//oD2t7Y7JFaLkOYY2jmIWiTsc8ge3Bk6ABHV3qJCnKfkJtficiENtiQcSQABjBTIEPglASo9UAFYFR12f8sEUrcmpd4nWgPX1cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RoMUdqA2OyqCBybPV0IXzjVbE71UnLKGZ0hGPNA0S5k=; b=LBCCW5WaK4ZYDCdYABhrR1Jf1N4hDQ13k3d6kcNSaz7qOHUWIARIW+nypFNcOvCOi3GPT4mTMHQcfQHBBMdjJrLIa9cd9ST/kG6xmx/BaNpYZtUFmDzmWRn3oxywbD792rkcuscM8J7Ao3lRdRVe8THtbldvbOTy25E1mLwJpgw= Authentication-Results: lists.freedesktop.org; dkim=none (message not signed) header.d=none; lists.freedesktop.org; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB3983.eurprd04.prod.outlook.com (2603:10a6:803:4c::16) by VI1PR04MB5711.eurprd04.prod.outlook.com (2603:10a6:803:e7::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Fri, 23 Apr 2021 09:42:33 +0000 Received: from VI1PR04MB3983.eurprd04.prod.outlook.com ([fe80::a5f3:fde9:1d85:5f28]) by VI1PR04MB3983.eurprd04.prod.outlook.com ([fe80::a5f3:fde9:1d85:5f28%7]) with mapi id 15.20.4065.021; Fri, 23 Apr 2021 09:42:33 +0000 From: Liu Ying To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 3/3] drm/bridge: nwl-dsi: Get MIPI DSI controller and PHY ready in ->mode_set() Date: Fri, 23 Apr 2021 17:26:43 +0800 Message-Id: <1619170003-4817-4-git-send-email-victor.liu@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1619170003-4817-1-git-send-email-victor.liu@nxp.com> References: <1619170003-4817-1-git-send-email-victor.liu@nxp.com> X-Originating-IP: [119.31.174.66] X-ClientProxiedBy: HK2PR02CA0181.apcprd02.prod.outlook.com (2603:1096:201:21::17) To VI1PR04MB3983.eurprd04.prod.outlook.com (2603:10a6:803:4c::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.66) by HK2PR02CA0181.apcprd02.prod.outlook.com (2603:1096:201:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4065.20 via Frontend Transport; Fri, 23 Apr 2021 09:42:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e10bee85-7b80-44f6-1ddc-08d9063c1e82 X-MS-TrafficTypeDiagnostic: VI1PR04MB5711: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:383; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vZXr0LK96cAE4OfcFwvwY538FulBcuNEiliQlTsB/CEYgae3VnkV+0W3ffQ9doq2QPuXQzNZP6pNEx2uJLnaSuA2tBsYvwl1WM6ztwlQg6ghX7o2NYCR+d9hOlKHLeZ7Rsw+kDu7rCNOtMC2wdp9Qxyl72j8Ygk7uFHUvkbqr0ba0sBa0w3P0AnoXRFWZejciQxITlZR5NV1lahvLyJSL8a6XLSiy0jMMN3amzmSGlOwuJ0rqwOlG7kucJnYtzfCenyWgywlecPge/Cv0WdzWr5J1BOOUXtRAHca377W+AK3tU7ctLvgZMaOHjyF8ZVvsN5oiLn4bwhm1krAEkbsYJuKEUTUay1jKPV7fE5I1bKs4An+HqyiqfJUG4/WIDCZsiSXspG8jYooSvoMEl7uoTJ7Cvj14eprL36i5aKKT04ODSDbyiwNa/uXjQeV+gPKA5J0jS006vapkjN634idVUkoM263PycnE9gAMil5p8f0gnqz62bZBKQLqNPj3EheLWsmBgGCkfjmHIrqODx9JWIpj5wODVDtfcz9YlfeJ1WuZsSddifMlGHXSVtvJ8sRDO3tSXNw1b2cVpY8uJJw6FPUZvTqMZ2XdqyPCfsRdiDpi7rWWmJL0IGvKJ/gpHBwm28RkkSpxyXWK1XaZOwprD4+W6220FGvG8VF62AOAtE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB3983.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(346002)(136003)(366004)(39860400002)(38100700002)(4326008)(8936002)(316002)(83380400001)(6916009)(52116002)(86362001)(6506007)(36756003)(6512007)(186003)(38350700002)(16526019)(66476007)(8676002)(26005)(7416002)(66556008)(66946007)(6486002)(2906002)(956004)(5660300002)(478600001)(6666004)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?XL7sLd0LRflKaYEaV+7IsCxpS3upKa?= =?utf-8?q?mJFpnV3ts6E1F6mI+oxRdyvriODvy8tJvPeQkgutBtqUhlQ577X4+5k29ZQtRq6z3?= =?utf-8?q?vD+HrnvjnT82kDjvgHos2sfK821Jj6eRdWB2C3Eb5gr621OemNMiHlim58NOFrlQL?= =?utf-8?q?gYHDsHj7KJzv5xrXLj3mwpSxcGxel/obZptipasK9IG3azZ+JCiWhsJu9dxfJeWbF?= =?utf-8?q?18dnl/GdCrqcIldiEjkx+7dbWqBGT9ArUtid4gh3wN//jtX0WCCy94nBi56DbeoXR?= =?utf-8?q?jRij0kh/11JdC0tPoB8xEElED1rtA+gT/KIKrJiaDntHZNlD147CIkmco5hzdo/QQ?= =?utf-8?q?h9M2OjKHlEDcpEhdiOJj2y08dHjFm2hWFjKtgwSvY1fNPdVbKA2b/ukL2wIoKVy/M?= =?utf-8?q?SBwOQEizVZHdPEbN1Rin0K290RqT8Lj5XMp1I8aij6dL13sXUyxQHHoUnq5lzy7//?= =?utf-8?q?KowsyP85oAZ/YeS7C3Rj6kne4HimE2m+ftXI5xI5mD7ety0N7mzN6U1SEOvY80LuB?= =?utf-8?q?tlBE2y2YFIYKqJCgQwAKYqe+h8adfxmiLLPuauNxYZyoFjyt64YzecEE73bagxlwv?= =?utf-8?q?tleoKeIMWhC3tLYkAVha5TW9LLBHWFODsvdFiDSd6JFfO1i9h853lGBaEzJQDvHy0?= =?utf-8?q?KdqPf2KooIqolHpAYdubO1687Yi6AFoSIVGbBzh74cnN8hhCynGSOfBJCo2jamxTQ?= =?utf-8?q?8AjPRGJASK8KGWlN2o+GYRyR4MOnz570jm7hcMbgdu/cBnoDYuVfAa2os/7Z8OAMa?= =?utf-8?q?JDwXk6ytg6o2wKmZ3VTVrInhymYLvTAfiqiHv2HyECeTyzzGJCvQR3pmeLtey5LQX?= =?utf-8?q?OwrIvhsfhFtQkoeYnNLsse41OnaBBtfaZDGFuOt3ZFX2/n2e2dJc0d77tpDCgTjbJ?= =?utf-8?q?mBlsd6lNyKuWdZuqyblc76RoMRzURDpyn+0wT40gZnV5ZmWYZAZzuQgSSuvBiz/2A?= =?utf-8?q?xeOkoVeYtwuP+hRvoBZVdSNkRswEwxWDTBp26qAUQEoCxAN+nVop1hWq9My+jLhRr?= =?utf-8?q?zrEfptmDYEjIdEYiZOKqcPR3aohYx4PeaZ4BHbf8Ni41r8EHjBuUHhgiyON2awYWh?= =?utf-8?q?pir6oJs9GnZ3Ot4jkZnrxKeORkPyjVaiwh6ehLHTlkUJ63vjdqe+nQqhLtcuoY9KA?= =?utf-8?q?aQwGjuVs4zPpDYgzmalLKwLiPdTyB2BaJoMQPRXEn6kI4ImtAuC4MBa+6gf8TTOYj?= =?utf-8?q?/el9WfCwdZ9GQ1UW9ixJLAd9Uazo0wJgFgStrbg/GiwOIuQdyWjqrlEK4fT8GHfQo?= =?utf-8?q?PfNdky9oTMv/Ha?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e10bee85-7b80-44f6-1ddc-08d9063c1e82 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB3983.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2021 09:42:33.0843 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RWpxbGv2EKDBVHuFvcwkeyzMFNs+0NoUt3RM7IfvWPuGP8p71nNgI0p80uazx9DpfcMqliqItOvhZ76dsYHaAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5711 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: jernej.skrabec@siol.net, jonas@kwiboo.se, airlied@linux.ie, agx@sigxcpu.org, narmstrong@baylibre.com, linux-kernel@vger.kernel.org, robert.foss@linaro.org, a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com, robert.chiras@nxp.com, linux-imx@nxp.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Some MIPI DSI panel drivers like 'raydium,rm68200' send MIPI_DCS_SET_DISPLAY_ON commands in panel_funcs->prepare(), which requires the MIPI DSI controller and PHY to be ready beforehand. Without this patch, the nwl-dsi driver gets the MIPI DSI controller and PHY ready in bridge_funcs->atomic_pre_enable(), which happens after the panel_funcs->prepare(). So, this patch shifts the bridge operation ealier from bridge_funcs->atomic_pre_enable() to bridge_funcs->mode_set(). This way, more MIPI DSI panels can connect to this nwl-dsi bridge. Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Robert Foss Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec Cc: David Airlie Cc: Daniel Vetter Cc: Guido Günther Cc: Robert Chiras Cc: NXP Linux Team Signed-off-by: Liu Ying Reviewed-by: Neil Armstrong --- v2->v3: * Split some changes to patch 1/3 and 2/3, to clarify changes. (Neil) v1->v2: * Fix a typo in commit message - s/unchange/unchanged/ drivers/gpu/drm/bridge/nwl-dsi.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/bridge/nwl-dsi.c b/drivers/gpu/drm/bridge/nwl-dsi.c index 601ccc4a7cdc7..873995f0a7416 100644 --- a/drivers/gpu/drm/bridge/nwl-dsi.c +++ b/drivers/gpu/drm/bridge/nwl-dsi.c @@ -662,7 +662,7 @@ static irqreturn_t nwl_dsi_irq_handler(int irq, void *data) return IRQ_HANDLED; } -static int nwl_dsi_enable(struct nwl_dsi *dsi) +static int nwl_dsi_mode_set(struct nwl_dsi *dsi) { struct device *dev = dsi->dev; union phy_configure_opts *phy_cfg = &dsi->phy_cfg; @@ -834,7 +834,12 @@ static int nwl_dsi_bridge_atomic_check(struct drm_bridge *bridge, adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC); adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC); - /* Do a full modeset if crtc_state->active is changed to be true. */ + /* + * Do a full modeset if crtc_state->active is changed to be true. + * This ensures our ->mode_set() is called to get the DSI controller + * and the PHY ready to send DCS commands, when only the connector's + * DPMS is brought out of "Off" status. + */ if (crtc_state->active_changed && crtc_state->active) crtc_state->mode_changed = true; @@ -863,16 +868,8 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, memcpy(&dsi->mode, adjusted_mode, sizeof(dsi->mode)); drm_mode_debug_printmodeline(adjusted_mode); -} - -static void -nwl_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, - struct drm_bridge_state *old_bridge_state) -{ - struct nwl_dsi *dsi = bridge_to_dsi(bridge); - int ret; - pm_runtime_get_sync(dsi->dev); + pm_runtime_get_sync(dev); if (clk_prepare_enable(dsi->lcdif_clk) < 0) return; @@ -882,22 +879,22 @@ nwl_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, /* Step 1 from DSI reset-out instructions */ ret = reset_control_deassert(dsi->rst_pclk); if (ret < 0) { - DRM_DEV_ERROR(dsi->dev, "Failed to deassert PCLK: %d\n", ret); + DRM_DEV_ERROR(dev, "Failed to deassert PCLK: %d\n", ret); return; } /* Step 2 from DSI reset-out instructions */ - nwl_dsi_enable(dsi); + nwl_dsi_mode_set(dsi); /* Step 3 from DSI reset-out instructions */ ret = reset_control_deassert(dsi->rst_esc); if (ret < 0) { - DRM_DEV_ERROR(dsi->dev, "Failed to deassert ESC: %d\n", ret); + DRM_DEV_ERROR(dev, "Failed to deassert ESC: %d\n", ret); return; } ret = reset_control_deassert(dsi->rst_byte); if (ret < 0) { - DRM_DEV_ERROR(dsi->dev, "Failed to deassert BYTE: %d\n", ret); + DRM_DEV_ERROR(dev, "Failed to deassert BYTE: %d\n", ret); return; } } @@ -953,7 +950,6 @@ static const struct drm_bridge_funcs nwl_dsi_bridge_funcs = { .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, .atomic_check = nwl_dsi_bridge_atomic_check, - .atomic_pre_enable = nwl_dsi_bridge_atomic_pre_enable, .atomic_enable = nwl_dsi_bridge_atomic_enable, .atomic_disable = nwl_dsi_bridge_atomic_disable, .mode_set = nwl_dsi_bridge_mode_set,