android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/tidss: Check for K2G in in dispc_softreset()

Browse Source 
[ 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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Aradhya Bhatia <a-bhatia1@ti.com>
Link: https://lore.kernel.org/r/20231109-tidss-probe-v2-6-ac91b5ea35c0@ideasonboard.com
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Stable-dep-of: bc288a927815 ("drm/tidss: Fix dss reset")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tomi Valkeinen 2023-11-09 09:37:59 +02:00 committed by Greg Kroah-Hartman
parent f099c742ca
commit 553574c023
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/tidss/tidss_dispc.c
View File

@ -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;