From patchwork Fri May 3 12:29:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 163309 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp546628ill; Fri, 3 May 2019 05:31:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqydrAtN6ofsUwCJPqoLUkRIHA/Bdanl6teEJ15amLP/UTskcYaONr9Jbpr0dfFfoJNajLdV X-Received: by 2002:a17:902:a503:: with SMTP id s3mr9711908plq.16.1556886669875; Fri, 03 May 2019 05:31:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556886669; cv=none; d=google.com; s=arc-20160816; b=sWNCqcKmeHHfpdpuAbIANJW7rNB0lMEMVrq0Omc6FlggUjE8T6hNdawqg9sFiZuMHo WDbdD7f0arxd9rhaEI4AqWAs4pSr/vP24OOc1CuecSC3LOEGnOFSjo5vKRuQqbXQWYVP MdALFLiUPY4LgjvE6erQtDr0+P/y+ay9OggyTT12dyg+A9RT/429lgSK+cRa54EMBuOP EHhRy4QGsQGtQXKPVN/TWFjiQaK7bM2L4lRQmUD63rFFZg/ACxYtcgwbvkENGmAHJ4xX z7/5jfgaUh2bIc/k9/4KPHuuH6A8vICx6TOYhgChnUQ/3WGF5Kzvbo2ziFf+k8LCLmr6 5K3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=sZsVPYEeJgq2tPtltDjxEefD9lpxiXWxYt7PngtF4sE=; b=ViFaMttdIQuit38+e3NzL6DP49/QLj/qaaJefbrf5OnZvDVtqL1CFpd3yOgz1jtrak xcHH2mLY5kRsPeWlnyIlGekAFy0hvVFfRpREodhzc/KbkuQrAbVlVfcTIAy5jcqccHLl 6+zLo7WpFSvCmqydEAbxA1yyuFv41I2zpjY9Dpzrd08sSul7dJ2BprLVVBUJ/iGR7Cd5 q235+TSbrMaXTuej9H1bWyTFQjDSTOIeAqP5NIzY+n5d2+KR1M6vzgH6tqYWyGxQy68L VDFBTZ1p8DCgEQOThdoQaGLwk/IEfLHtNYTrPTsd1NYXJDZGNjQRJBR5mblXzVCMGRT/ chGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id p2si2030360pgi.372.2019.05.03.05.31.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2019 05:31:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 820D989EB4; Fri, 3 May 2019 12:31:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0152689EA6 for ; Fri, 3 May 2019 12:31:06 +0000 (UTC) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x43CV3HY032357; Fri, 3 May 2019 07:31:03 -0500 Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x43CV3kq128500 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 3 May 2019 07:31:03 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 3 May 2019 07:31:03 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Fri, 3 May 2019 07:31:03 -0500 Received: from deskari.lan (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x43CUYts002029; Fri, 3 May 2019 07:31:00 -0500 From: Tomi Valkeinen To: Andrzej Hajda , Laurent Pinchart , Lucas Stach , Andrey Gusakov , Philipp Zabel , Andrey Smirnov , Peter Ujfalusi , Jyri Sarha , Benoit Parrot , Subject: [PATCHv3 10/23] drm/bridge: tc358767: add link disable function Date: Fri, 3 May 2019 15:29:36 +0300 Message-ID: <20190503122949.12266-11-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190503122949.12266-1-tomi.valkeinen@ti.com> References: <20190503122949.12266-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1556886663; bh=bpMvvKbh0+HNnyPltp8TbnqepLsGZzA1yRVSYIfxqC0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=pghrWSqOovo80N5LQXAGSOirBhR1hZZM/Ua+UY6PaDRCJrFgQW+V697pOp580B+CL e0YppAXP+qPA9AHDTUdclHe3TyHz3ze/11JOxQLmmk7HHxRLX+CcFInp0keu6b6utt oVhODMKSMuq464er4iVHLJZMzViBLxs+1fwItRyw= 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: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Currently we have tc_main_link_setup(), which configures and enabled the link, but we have no counter-part for disabling the link. Add tc_main_link_disable, and rename tc_main_link_setup to tc_main_link_enable. Signed-off-by: Tomi Valkeinen Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/bridge/tc358767.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 887b78128f29..b22f5fe7ccfd 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -822,7 +822,7 @@ static int tc_link_training(struct tc_data *tc, int pattern) return ret; } -static int tc_main_link_setup(struct tc_data *tc) +static int tc_main_link_enable(struct tc_data *tc) { struct drm_dp_aux *aux = &tc->aux; struct device *dev = tc->dev; @@ -837,6 +837,8 @@ static int tc_main_link_setup(struct tc_data *tc) if (!tc->mode) return -EINVAL; + dev_dbg(tc->dev, "link enable\n"); + tc_write(DP0_SRCCTRL, tc_srcctrl(tc)); /* SSCG and BW27 on DP1 must be set to the same as on DP0 */ tc_write(DP1_SRCCTRL, @@ -1006,6 +1008,20 @@ static int tc_main_link_setup(struct tc_data *tc) return ret; } +static int tc_main_link_disable(struct tc_data *tc) +{ + int ret; + + dev_dbg(tc->dev, "link disable\n"); + + tc_write(DP0_SRCCTRL, 0); + tc_write(DP0CTL, 0); + + return 0; +err: + return ret; +} + static int tc_stream_enable(struct tc_data *tc) { int ret; @@ -1084,15 +1100,16 @@ static void tc_bridge_enable(struct drm_bridge *bridge) struct tc_data *tc = bridge_to_tc(bridge); int ret; - ret = tc_main_link_setup(tc); + ret = tc_main_link_enable(tc); if (ret < 0) { - dev_err(tc->dev, "main link setup error: %d\n", ret); + dev_err(tc->dev, "main link enable error: %d\n", ret); return; } 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; } @@ -1109,6 +1126,10 @@ static void tc_bridge_disable(struct drm_bridge *bridge) ret = tc_stream_disable(tc); if (ret < 0) dev_err(tc->dev, "main link stream stop error: %d\n", ret); + + ret = tc_main_link_disable(tc); + if (ret < 0) + dev_err(tc->dev, "main link disable error: %d\n", ret); } static void tc_bridge_post_disable(struct drm_bridge *bridge)