From nobody Tue Dec 16 07:08:40 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00FEAC0018C for ; Thu, 9 Nov 2023 07:39:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233038AbjKIHjC (ORCPT ); Thu, 9 Nov 2023 02:39:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232829AbjKIHiw (ORCPT ); Thu, 9 Nov 2023 02:38:52 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EEA12D4F for ; Wed, 8 Nov 2023 23:38:50 -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 546FA192B; Thu, 9 Nov 2023 08:38:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1699515505; bh=VZv+V3IKNcMeqSjrqpYywcyKWHFI9nt7knJQOXJX0vM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qjxCD+ceAFZq3LYouJotO30GncXvPdnTefzEuEgBDOqHtKVVB+RZgA//m9RKzs2HY FOeWZfBz1kEhwD+5j3z/E49QGoId+fmqGJNWo1OY4V7Ck9VpkACnAQz2NyI6S1wOVR OaX/XlB6S7XUBtX1WDV5/VY+zJ3iuTE4uKB2KCns= From: Tomi Valkeinen Date: Thu, 09 Nov 2023 09:37:58 +0200 Subject: [PATCH v2 05/11] drm/tidss: Return error value from from softreset MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231109-tidss-probe-v2-5-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=VZv+V3IKNcMeqSjrqpYywcyKWHFI9nt7knJQOXJX0vM=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBlTIx/FF6QxSHj8qkvS1orhbruRNq/l+uSonfZ4 /D5S5+WMyuJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZUyMfwAKCRD6PaqMvJYe 9VKrEACnZABVQDSXZM2HMY8KEoDduklNACb3sB5wbNqXx6yhXF6Bfz8V0vXm/3WbnM/uj6Tf0is SkrFyj3F2oNfDrPUOcfRHyfKXg+4j8CDyvT4/ZEzkGeqTT6ZGGlix1sfmTaeWExckRGkaeDXmDc EtA1RTzyMdvaDZlf+iNff4B/tM4BhaE/QnL3zTPpmZhH0A8Vfim/ujER+PkSCQ9tYBMmL4Gz94R i2n0ZaJRIJsqTgKEPH8GQ7mHauo/bZfFyO2akOGfqhPi/e8mzkLSfTOEImKyuDHYNDgBhUCjsX+ /ZuY57fGqk9F5F5WQtGGXiAS6CsD0rhCHzGdoA3rbgF0wXsFKFm/drOPiimrgUsuZxfixi6RQHP cNn+RqTm2R9vJCYESteB95Lv1634KsLUs5jmcMUgscfTBSXezRTfqHA8fkzmRPPdkyjpBH4qhjh 3wEj0eHCFJbxd1vgUZNEcKZvNfYChkRJaft6PQeN1rI7yzdn4/ng4PWUfF/UIhjfCgLJd10Ac0n Muwt47+7rRL/ZaJVXICXQFha3/+O0DWfmlwahE8aKlhvDC0x2CFEHH3aTr7m9FjAAKuqgsi2tsT d1YCwr1a+Hj5cZR+/hiuLJk1MbSnx+go7uGYXIUaTqA5wiy0Xx+Y1ezj82iic7ERIAqm6I/LgVS 2uvjhCVpj1JzUNQ== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return an error value from dispc_softreset() so that the caller can handle the errors. Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/tidss/tidss_dispc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/ti= dss_dispc.c index deb665d0ede8..50b475b285d9 100644 --- a/drivers/gpu/drm/tidss/tidss_dispc.c +++ b/drivers/gpu/drm/tidss/tidss_dispc.c @@ -2702,7 +2702,7 @@ static void dispc_init_errata(struct dispc_device *di= spc) } } =20 -static void dispc_softreset(struct dispc_device *dispc) +static int dispc_softreset(struct dispc_device *dispc) { u32 val; int ret; @@ -2712,8 +2712,12 @@ static void dispc_softreset(struct dispc_device *dis= pc) /* Wait for reset to complete */ ret =3D readl_poll_timeout(dispc->base_common + DSS_SYSSTATUS, val, val & 1, 100, 5000); - if (ret) - dev_warn(dispc->dev, "failed to reset dispc\n"); + if (ret) { + dev_err(dispc->dev, "failed to reset dispc\n"); + return ret; + } + + return 0; } =20 int dispc_init(struct tidss_device *tidss) @@ -2826,8 +2830,11 @@ int dispc_init(struct tidss_device *tidss) &dispc->memory_bandwidth_limit); =20 /* K2G display controller does not support soft reset */ - if (feat->subrev !=3D DISPC_K2G) - dispc_softreset(dispc); + if (feat->subrev !=3D DISPC_K2G) { + r =3D dispc_softreset(dispc); + if (r) + return r; + } =20 tidss->dispc =3D dispc; =20 --=20 2.34.1