From patchwork Mon Dec 9 05:08:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 11278819 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C609B930 for ; Mon, 9 Dec 2019 09:46:41 +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 AE3B520726 for ; Mon, 9 Dec 2019 09:46:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE3B520726 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 D16F989ECD; Mon, 9 Dec 2019 09:46:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id C671D6E0D7 for ; Mon, 9 Dec 2019 05:09:04 +0000 (UTC) Received: by mail-pf1-x443.google.com with SMTP id d199so6570502pfd.11 for ; Sun, 08 Dec 2019 21:09:04 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=h2OHqcwVDr9+5ezRjBZJc/vTDH46fty81Rw45NE7AE8=; b=YAhFMY//Cfsm7pCdOBsmaMQZn+yojdDRmqBuFzEVFH/AaomwXT7S9CQ0OX0Kgdj2a+ 2gYapSH1PfNVrXqxoim8T0AvzWOIgOJSBRsSUvseVpD3zGMMzNW/ppqUxP2eFoJfw0sn voSqIyTm2fLdMT587Mun0UlKmzOyV7/M2fq9Jyh6oElaT3pt17grcHFLCjS/gha0TZ/P /VAX4nMGtuHXoXYhykWZGhGkwaiE6LeZIsHDPj/P4ibz9USL1+yzZ010OPebxppuhAdu Zl9Of6RqJ77rrpVqrT/1pWUlt8iaDMKrdOGaLT0omqTU9L6RNk6/MsxW+7cN3/MkuQG4 Tztw== X-Gm-Message-State: APjAAAW/FwJySfChbrLuvZCfXu7FeHyLS8m3bqcSiNor2ovUp9qlqros sKRGxC2vrCqEcHw5A0hAvmmkNzDGX0c= X-Google-Smtp-Source: APXvYqznSPSBRdPUtHXJID+lr6Go5PbSAOz5w3ewSHHSZGkKfkun066IEFBVJMejkW0Qwsh7paSIiw== X-Received: by 2002:a62:e208:: with SMTP id a8mr27642069pfi.258.1575868144048; Sun, 08 Dec 2019 21:09:04 -0800 (PST) Received: from localhost.localdomain (c-67-165-113-11.hsd1.wa.comcast.net. [67.165.113.11]) by smtp.gmail.com with ESMTPSA id k15sm25752119pfg.37.2019.12.08.21.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2019 21:09:03 -0800 (PST) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 1/2] drm/bridge: tc358767: Introduce __tc_bridge_enable/disable() Date: Sun, 8 Dec 2019 21:08:56 -0800 Message-Id: <20191209050857.31624-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191209050857.31624-1-andrew.smirnov@gmail.com> References: <20191209050857.31624-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 09 Dec 2019 09:46:36 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h2OHqcwVDr9+5ezRjBZJc/vTDH46fty81Rw45NE7AE8=; b=ZuFj1L/RTPD6b652FRkaqTT7gYm04h8zIBfLVNE8+FpZPgecaSyfVXv7nlYgtEMdUb aQ32CZ7r5xP/F8PJk2QBoamtwzMr5ObsKOvRuvugrY5OxcGMAq1LGGpgqYhYBdm1UNFA 2Q38oQHG9uRw1PGq51xSbBTlRru53smE82OV6S3VU3ZQZtsgJZmA61CX1OjDL7/KDhqV YlXMkL/IYYLqaKFnea2+hm6y0fCVX5XMPcK6xquKSfSWAt5aF+WoM/Rkr39MwoYj+HBE r0SCCRnjgfp+TWXa6BMsnATFVzNayztlB7ZBW3dxJ4Haj1E3mRUgC9fFa4qfyoKBbN7T mNPg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cory Tusar , Andrey Smirnov , linux-kernel@vger.kernel.org, Tomi Valkeinen , Laurent Pinchart , Chris Healy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Expose underlying implementation of bridge's enable/disable functions, so it would be possible to use them in other parts of the driver. Signed-off-by: Andrey Smirnov Cc: Andrzej Hajda Cc: Laurent Pinchart Cc: Tomi Valkeinen Cc: Cory Tusar Cc: Chris Healy Cc: Lucas Stach Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org --- drivers/gpu/drm/bridge/tc358767.c | 32 ++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 8a8d605021f0..3c252ae0ee6f 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1222,39 +1222,43 @@ static void tc_bridge_pre_enable(struct drm_bridge *bridge) drm_panel_prepare(tc->panel); } -static void tc_bridge_enable(struct drm_bridge *bridge) +static int __tc_bridge_enable(struct tc_data *tc) { - struct tc_data *tc = bridge_to_tc(bridge); int ret; ret = tc_get_display_props(tc); if (ret < 0) { dev_err(tc->dev, "failed to read display props: %d\n", ret); - return; + return ret; } ret = tc_main_link_enable(tc); if (ret < 0) { dev_err(tc->dev, "main link enable error: %d\n", ret); - return; + return ret; } ret = tc_stream_enable(tc); if (ret < 0) { dev_err(tc->dev, "main link stream start error: %d\n", ret); tc_main_link_disable(tc); - return; + return ret; } - drm_panel_enable(tc->panel); + return 0; } -static void tc_bridge_disable(struct drm_bridge *bridge) +static void tc_bridge_enable(struct drm_bridge *bridge) { struct tc_data *tc = bridge_to_tc(bridge); - int ret; - drm_panel_disable(tc->panel); + if (!__tc_bridge_enable(tc)) + drm_panel_enable(tc->panel); +} + +static int __tc_bridge_disable(struct tc_data *tc) +{ + int ret; ret = tc_stream_disable(tc); if (ret < 0) @@ -1263,6 +1267,16 @@ static void tc_bridge_disable(struct drm_bridge *bridge) ret = tc_main_link_disable(tc); if (ret < 0) dev_err(tc->dev, "main link disable error: %d\n", ret); + + return ret; +} + +static void tc_bridge_disable(struct drm_bridge *bridge) +{ + struct tc_data *tc = bridge_to_tc(bridge); + + drm_panel_disable(tc->panel); + __tc_bridge_disable(tc); } static void tc_bridge_post_disable(struct drm_bridge *bridge)