From patchwork Thu Nov 9 07:37:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 163261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp274450vqs; Wed, 8 Nov 2023 23:39:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IGeCHMJuxY953ZF2vMy7qnralX4FFcgxm5CIbJVebJJm4SpVhlYI5/B/r8wZ3kDrbXof7OY X-Received: by 2002:a05:6358:590a:b0:168:e876:de46 with SMTP id g10-20020a056358590a00b00168e876de46mr3788007rwf.27.1699515541813; Wed, 08 Nov 2023 23:39:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699515541; cv=none; d=google.com; s=arc-20160816; b=vPFhu6AXUpszTchDFGtwB7HTPfDOZ08+hxdI0h5rwas5Hh0IxTQUj8XjN3f5HKltjI wRJ3pBAAb3FWdeDZpjVG8xGWoE2J+3fF+FnAgfLjgA0kKNvLwY703jeu3T9kPyv5h0/P ckg39YfdY9Pgc35SkRrHr73fkoPCBrEYlvBwlcH4OTnEPltda0gb6EWgdrr0RICCGhAc IH8GgjRSYtZ2xlkKvJYEX5zLgeSpn3FSb7szhvXThx0iNbz2aUmn6F1lRdskAYOONK8x t0cLpwvUge1SHIzSwPOlhg/hOS1w6tbdjRQIgV6khMEYFxv/qWoIVrzv4ffdF25nxvMi cMow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=fV+AkIaUInCV4fkcxdYbI/E22aw+wbiq+HG2RovpUUc=; fh=ar9Kuonru+6un71Fc3+cR+miWSr4t5vPPiuWh6IeKvI=; b=DPIjCBKI/QF3BcJ38cAm1jjZvgQSCSZeAGJGmigncK9MUdTJz5tdwpdfynHiT0VRCi bzzkccClj85OfMAyqGDVxRne1G3OcUqT6z149yHef9kwJOGbZ9LaW2Dzl5RUtZJUeQpn LI/41H+SWiG/NqOb27/5V9jm0tEhs2WnxN3NqBcIuhcuqzRMyxnnT+0Hd9MdcmtNgF0E mPl7sEFcSITRIUzHlCl0b4jnClj+BvGa0gH6eQWRDPbIjxEMRs70dpRTvSixIvDVqrBO JOGEtA3sr9fEG535QWS6S0c6W6pnpOo3xdOxzNoChNobL8pJ+zA/UQpATCVUdV1DWgaj 4tiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=lx6pfWLV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id k190-20020a636fc7000000b005b8ebaa2935si6553258pgc.164.2023.11.08.23.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 23:39:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=lx6pfWLV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 4BE87831ED9D; Wed, 8 Nov 2023 23:39:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233225AbjKIHi5 (ORCPT + 32 others); Thu, 9 Nov 2023 02:38:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232776AbjKIHiu (ORCPT ); Thu, 9 Nov 2023 02:38:50 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE77A173E for ; Wed, 8 Nov 2023 23:38:48 -0800 (PST) Received: from [127.0.1.1] (91-158-149-209.elisa-laajakaista.fi [91.158.149.209]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 73C6817E1; Thu, 9 Nov 2023 08:38:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1699515504; bh=1GEKCab8OHb1x6cabABKC9MQy0dJhOUkvWfwR9SFuWU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lx6pfWLVWCmmHaDeuOyAaaC57VoXbIEoLYr8BDw0U3KVHnD1/6LHIjN3OmgxMMDSC y8iBt0vYIfWg4drQZrTcC3RWuVpOtBqbktQzQn4jsd6KIdv7OfNVRXwdqCJdvJwgCC 6ZE7wRaJ2kbVaQos1sdat+2e81zFgtOS0JcgF+RY= From: Tomi Valkeinen Date: Thu, 09 Nov 2023 09:37:57 +0200 Subject: [PATCH v2 04/11] drm/tidss: Move reset to the end of dispc_init() MIME-Version: 1.0 Message-Id: <20231109-tidss-probe-v2-4-ac91b5ea35c0@ideasonboard.com> References: <20231109-tidss-probe-v2-0-ac91b5ea35c0@ideasonboard.com> In-Reply-To: <20231109-tidss-probe-v2-0-ac91b5ea35c0@ideasonboard.com> To: Aradhya Bhatia , Devarsh Thakkar , Jyri Sarha , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Laurent Pinchart , Francesco Dolcini , Tomi Valkeinen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1539; i=tomi.valkeinen@ideasonboard.com; h=from:subject:message-id; bh=1GEKCab8OHb1x6cabABKC9MQy0dJhOUkvWfwR9SFuWU=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBlTIx+bzzkLDQBAuaUOAtJiZaksLTxdF5B9rdMq LxobCQK80CJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZUyMfgAKCRD6PaqMvJYe 9Rc8EACWQUnArZGNglO1/TEwH5VQgmaOPDpDdNQFrSWbEXfHEH5Mhxdb/yzQJAryQqHswgWONS8 zv/voBbUvNC+gHdYUL8s2VywJMRhGhpkrcraLdTCuXb/Y1Zq3W3uAH5rRvUT3JR7tNqkTXbcLVq aYLwe/Vt2ADLLrAqRjOPlh8gx1zQdobVUTpJaRVOG0b5+gjSpbaPlyJYmK5uhigtRkHzRGpC8e1 3nAnCQV8nK0EHAWEIpe+k1MKvSiqPR2vayBxmgmZzodzdjX/QQ5VdjEA13dOflDg7+RS13TDGbG F0Cm0oEZtmZotu7pZvDPPFml7byp3c1jMaEBYMoxTS4IVSPnf9GyhC1vwxM2yKymnKJ4qLuJZvv k7oKCpe/vDSUnEfPzcet1AYNoqBgHQccBJtkKpIN3BErRBnlZKECPH5HL8Wac2ccYxjnObxupe0 1+/yYW5coIxn0sctpwoAX0PcX20xxo32ctL0CSB51sIhfmT7S6d4bzRNFE+b41pUnTA6n+Cih41 CVJEULzPTsVu5NdAdyA+9prHk7TrCK2Sg2ZwlsvO4qnH2doDpe5yYCZXIUxgwfU9HY5ZMRnoDOe Mi206BOCbn0vLkHOm1cRtOUlCYkmqtyihGi756/uR1CKq80fzIFYjNiPaiLYseHyu00ThJaOfFK 0Op0KFDTJ2N6p6A== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 08 Nov 2023 23:39:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782071208907086910 X-GMAIL-MSGID: 1782071208907086910 We do a DSS reset in the middle of the dispc_init(). While that happens to work now, we should really make sure that e..g the fclk, which is acquired only later in the function, is enabled when doing a reset. This will be handled in a later patch, but for now, let's move the dispc_softreset() call to the end of dispc_init(), which is a sensible place for it anyway. Reviewed-by: Laurent Pinchart Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/tidss/tidss_dispc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c index ad7999434299..deb665d0ede8 100644 --- a/drivers/gpu/drm/tidss/tidss_dispc.c +++ b/drivers/gpu/drm/tidss/tidss_dispc.c @@ -2777,10 +2777,6 @@ int dispc_init(struct tidss_device *tidss) return r; } - /* K2G display controller does not support soft reset */ - if (feat->subrev != DISPC_K2G) - dispc_softreset(dispc); - for (i = 0; i < dispc->feat->num_vps; i++) { u32 gamma_size = dispc->feat->vp_feat.color.gamma_size; u32 *gamma_table; @@ -2829,6 +2825,10 @@ int dispc_init(struct tidss_device *tidss) of_property_read_u32(dispc->dev->of_node, "max-memory-bandwidth", &dispc->memory_bandwidth_limit); + /* K2G display controller does not support soft reset */ + if (feat->subrev != DISPC_K2G) + dispc_softreset(dispc); + tidss->dispc = dispc; return 0;