Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ac5eab8 authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 5f18c0782b99e26121efa93d20b76c19e17aa1dd ]

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>
parent c3b980a2

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

+9 −2
Original line number Diff line number Diff line
@@ -269,7 +269,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;
@@ -299,6 +299,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);
@@ -353,7 +360,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,

};