From patchwork Thu Sep 12 01:37:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 11142429 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 1BB1B13BD for ; Thu, 12 Sep 2019 07:07:58 +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 02BA220830 for ; Thu, 12 Sep 2019 07:07:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02BA220830 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 321146EB93; Thu, 12 Sep 2019 07:07:55 +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 682FA6E029 for ; Thu, 12 Sep 2019 01:37:49 +0000 (UTC) Received: by mail-pf1-x443.google.com with SMTP id y22so14877303pfr.3 for ; Wed, 11 Sep 2019 18:37:49 -0700 (PDT) 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=yKeAg+VF+an1CS4EAOX6mzh4xSkLDxRJGmMk96zvPtg=; b=M9V8/aOI+C0VJrzXjkVAd3g//iuVCxEyYrsZ7OciRqhK5szgblWNOF0nh/UoEAZ9vz PH/n4AMXRiWsXVRXml5AG2nfB0QWsWWrkNVzmMVNJMXSxTrVrmwKn73a0RNYym2WMftj l25ZpOJTDENvw+1sE+tFGbn/ok86eOwA/VRLKq0aGexTYRhpd2mJymfBDlfKI5B1bJxq yundHq3nJy20kn2CeHPrynUvhdQVEaztSJdo34wAu5Zz+BqPnV0X0GBEJKtxDDtflkBV zFh6z7k6O3kguW/LKwOZH4m9sgEB+Ej5vkWrWA7ZxP9hUPgPvpn5AV3uqRFQ88rlu7pD cuQw== X-Gm-Message-State: APjAAAXu6mU3kCx6wBHVm0g3u5pOaDHNy+oU4TyyuQ6+hlh1jDGBYYp4 MTvDO1ll43N3XxU6zV7FWezsMRh+yNY= X-Google-Smtp-Source: APXvYqxNosCn6ujN1bE5LevzZf60CVo34Xv1sZu8cGf+q+1adoxxMxF7CrQnTVSHjsX5cxvhEchZSA== X-Received: by 2002:a62:5ac1:: with SMTP id o184mr44954059pfb.67.1568252268670; Wed, 11 Sep 2019 18:37:48 -0700 (PDT) Received: from localhost.lan (c-67-185-54-80.hsd1.wa.comcast.net. [67.185.54.80]) by smtp.gmail.com with ESMTPSA id f22sm8682967pgb.4.2019.09.11.18.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2019 18:37:47 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/2] drm/bridge: tc358767: Introduce __tc_bridge_enable/disable() Date: Wed, 11 Sep 2019 18:37:39 -0700 Message-Id: <20190912013740.5638-2-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190912013740.5638-1-andrew.smirnov@gmail.com> References: <20190912013740.5638-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 12 Sep 2019 07:07:54 +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=yKeAg+VF+an1CS4EAOX6mzh4xSkLDxRJGmMk96zvPtg=; b=R8RkoSynna9fUZ82qTTBLWsp8mmGw0D1aNjBWsLQkMBGqjUZb1Gu7HthaRUwfFvWp9 B6iu7K3RNF0qXfz01/zG8Sg2nQknz/X/bWwi1XaOmRngYqgqWLQeZy4249AtaVDGVkKR nU3Ejjp7LBypukxflAzpJN3KrUzLN5HsO2wxXXnxLyBh80S9XG4wwYQjeH7Q20ikpxa3 NofseIH7W9lG3EKBQSgtVm9kbhQOGQEJQR6N48kcmBUvdDa1oECos0ZXZW13Z6r4g2Cc IjcLiEd/GCNMJmxsOYo2qsXiYLyj3wbvI8mIvt7RgIkBo55cStBqaJBkNLWWJ2gAkUzO HFCw== 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 6308d93ad91d..8532048e0550 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1220,39 +1220,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) @@ -1261,6 +1265,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)