Commit 27f402d6 authored by Dave Stevenson's avatar Dave Stevenson Committed by Zheng Zengkai
Browse files

drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare 

stable inclusion
from stable-v5.10.113
commit 405d98427416849cf37c84c0c70bd5008b686a1e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ISAH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=405d98427416849cf37c84c0c70bd5008b686a1e



--------------------------------

[ Upstream commit 5f18c078 ]

The panel has a prepare call which is before video starts, and an
enable call which is after.
The Toshiba bridge should be configured before video, so move
the relevant power and initialisation calls to prepare.

Fixes: 2f733d61 ("drm/panel: Add support for the Raspberry Pi 7" Touchscreen.")
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220415162513.42190-3-stefan.wahren@i2se.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent 5f70f8f0

drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c

+9 −2
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int rpi_touchscreen_noop(struct drm_panel *panel) 
	return 0;

}



static int rpi_touchscreen_enable(struct drm_panel *panel)

static int rpi_touchscreen_prepare(struct drm_panel *panel)

{

	struct rpi_touchscreen *ts = panel_to_ts(panel);

	int i;
@@ -295,6 +295,13 @@ static int rpi_touchscreen_enable(struct drm_panel *panel) 
	rpi_touchscreen_write(ts, DSI_STARTDSI, 0x01);

	msleep(100);



	return 0;

}



static int rpi_touchscreen_enable(struct drm_panel *panel)

{

	struct rpi_touchscreen *ts = panel_to_ts(panel);



	/* Turn on the backlight. */

	rpi_touchscreen_i2c_write(ts, REG_PWM, 255);
@@ -349,7 +356,7 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel, 
static const struct drm_panel_funcs rpi_touchscreen_funcs = {

	.disable = rpi_touchscreen_disable,

	.unprepare = rpi_touchscreen_noop,

	.prepare = rpi_touchscreen_noop,

	.prepare = rpi_touchscreen_prepare,

	.enable = rpi_touchscreen_enable,

	.get_modes = rpi_touchscreen_get_modes,

};