From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA0376312A; Tue, 23 Jan 2024 00:51:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971083; cv=none; b=lE3fb4LkEztymYL7XJ1IW6OvctKsVCKldTU4Oh3lnvztAs66EY0eaBaG5Lsy08esLaeh3CS7HYYuvzrYjoL2CPQsR+QBjo16+57WXf8Rm1dvrccE+P9HeaUS7o3UhHni83vd4Qe2pcE5paOAXBLuhzRiQbrJB18wkIZ6yNQVi2g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971083; c=relaxed/simple; bh=HZYyiNi5L5UF7uhJW+Zits+TCcSK/J6bSHdwpG2mU64=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=taZOYAxuQlbzw5yEk2m4oZdzamFR6xfn+/Y1zneA5XAWoDdBKgHKjHa/glOswOJMTscGnrUytQXrAozLCyCH6sUTQ8REz9DXQAGI1wDskpr1VsWN1L9b/glYmTH/KIlpAcr5eG2+MKhGs5ZuarQXeryhgQo6FTsAyDAPx1WI0u8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=F7V4Aenp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="F7V4Aenp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62BF4C43390; Tue, 23 Jan 2024 00:51:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971083; bh=HZYyiNi5L5UF7uhJW+Zits+TCcSK/J6bSHdwpG2mU64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F7V4AenpDEOhb4rdro6gIb2gGjtfhlmGiPbnqviKpAu8HP9zNqRUXE43q5/WqzZNo ECUjbILmutfxsHXOV3zpN/ndQJu4h/X2mP3MYSa7nZ99NeSVLYkSNqx50EgfW2MAKS 2goGb5RJivhxW6cLW3OIbwcAXwqxg430nBH/rvwg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Laurent Pinchart , Aradhya Bhatia , Tomi Valkeinen , Sasha Levin Subject: [PATCH 6.1 177/417] drm/tidss: Check for K2G in in dispc_softreset() Date: Mon, 22 Jan 2024 15:55:45 -0800 Message-ID: <20240122235757.997622296@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tomi Valkeinen [ Upstream commit 151825150cf9c2e9fb90763d35b9dff3783628ac ] K2G doesn't have softreset feature. Instead of having every caller of dispc_softreset() check for K2G, move the check into dispc_softreset(), and make dispc_softreset() return 0 in case of K2G. Reviewed-by: Laurent Pinchart Reviewed-by: Aradhya Bhatia Link: https://lore.kernel.org/r/20231109-tidss-probe-v2-6-ac91b5ea35c0@ideasonboard.com Signed-off-by: Tomi Valkeinen Stable-dep-of: bc288a927815 ("drm/tidss: Fix dss reset") Signed-off-by: Sasha Levin --- drivers/gpu/drm/tidss/tidss_dispc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c index 591f0606f7f8..4bdd4c7b4991 100644 --- a/drivers/gpu/drm/tidss/tidss_dispc.c +++ b/drivers/gpu/drm/tidss/tidss_dispc.c @@ -2658,6 +2658,10 @@ static int dispc_softreset(struct dispc_device *dispc) u32 val; int ret = 0; + /* K2G display controller does not support soft reset */ + if (dispc->feat->subrev == DISPC_K2G) + return 0; + /* Soft reset */ REG_FLD_MOD(dispc, DSS_SYSCONFIG, 1, 1, 1); /* Wait for reset to complete */ @@ -2778,12 +2782,9 @@ 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) { - r = dispc_softreset(dispc); - if (r) - return r; - } + r = dispc_softreset(dispc); + if (r) + return r; tidss->dispc = dispc; -- 2.43.0