mirror of
https://github.com/torvalds/linux.git
synced 2026-05-22 06:01:53 +02:00
drm/panel: samsung-s6d7aa0: transition to mipi_dsi wrapped functions
Changes the samsung-s6d7aa0 panel to use multi style functions for improved error handling. Signed-off-by: Tejas Vipin <tejasvipin76@gmail.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> [dianders: fixed whitespace errors] Signed-off-by: Douglas Anderson <dianders@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20250319183106.12613-1-tejasvipin76@gmail.com
This commit is contained in:
Tejas Vipin
Douglas Anderson
parent
d69362f55f
commit
837f9b917c
|
|
@ -34,8 +34,8 @@ struct s6d7aa0 {
|
|||
|
||||
struct s6d7aa0_panel_desc {
|
||||
unsigned int panel_type;
|
||||
int (*init_func)(struct s6d7aa0 *ctx);
|
||||
int (*off_func)(struct s6d7aa0 *ctx);
|
||||
void (*init_func)(struct s6d7aa0 *ctx, struct mipi_dsi_multi_context *dsi_ctx);
|
||||
void (*off_func)(struct mipi_dsi_multi_context *dsi_ctx);
|
||||
const struct drm_display_mode *drm_mode;
|
||||
unsigned long mode_flags;
|
||||
u32 bus_flags;
|
||||
|
|
@ -62,93 +62,61 @@ static void s6d7aa0_reset(struct s6d7aa0 *ctx)
|
|||
msleep(50);
|
||||
}
|
||||
|
||||
static int s6d7aa0_lock(struct s6d7aa0 *ctx, bool lock)
|
||||
static void s6d7aa0_lock(struct s6d7aa0 *ctx, struct mipi_dsi_multi_context *dsi_ctx, bool lock)
|
||||
{
|
||||
struct mipi_dsi_device *dsi = ctx->dsi;
|
||||
|
||||
if (lock) {
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_PASSWD1, 0xa5, 0xa5);
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_PASSWD2, 0xa5, 0xa5);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_PASSWD1, 0xa5, 0xa5);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_PASSWD2, 0xa5, 0xa5);
|
||||
if (ctx->desc->use_passwd3)
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_PASSWD3, 0x5a, 0x5a);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_PASSWD3, 0x5a, 0x5a);
|
||||
} else {
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_PASSWD1, 0x5a, 0x5a);
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_PASSWD2, 0x5a, 0x5a);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_PASSWD1, 0x5a, 0x5a);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_PASSWD2, 0x5a, 0x5a);
|
||||
if (ctx->desc->use_passwd3)
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_PASSWD3, 0xa5, 0xa5);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_PASSWD3, 0xa5, 0xa5);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int s6d7aa0_on(struct s6d7aa0 *ctx)
|
||||
{
|
||||
struct mipi_dsi_device *dsi = ctx->dsi;
|
||||
struct device *dev = &dsi->dev;
|
||||
int ret;
|
||||
struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };
|
||||
|
||||
ret = ctx->desc->init_func(ctx);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to initialize panel: %d\n", ret);
|
||||
gpiod_set_value_cansleep(ctx->reset_gpio, 1);
|
||||
return ret;
|
||||
}
|
||||
ctx->desc->init_func(ctx, &dsi_ctx);
|
||||
|
||||
ret = mipi_dsi_dcs_set_display_on(dsi);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to set display on: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
mipi_dsi_dcs_set_display_on_multi(&dsi_ctx);
|
||||
|
||||
return 0;
|
||||
return dsi_ctx.accum_err;
|
||||
}
|
||||
|
||||
static int s6d7aa0_off(struct s6d7aa0 *ctx)
|
||||
static void s6d7aa0_off(struct s6d7aa0 *ctx)
|
||||
{
|
||||
struct mipi_dsi_device *dsi = ctx->dsi;
|
||||
struct device *dev = &dsi->dev;
|
||||
int ret;
|
||||
struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };
|
||||
|
||||
ret = ctx->desc->off_func(ctx);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Panel-specific off function failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
ctx->desc->off_func(&dsi_ctx);
|
||||
|
||||
ret = mipi_dsi_dcs_set_display_off(dsi);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to set display off: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
msleep(64);
|
||||
mipi_dsi_dcs_set_display_off_multi(&dsi_ctx);
|
||||
mipi_dsi_msleep(&dsi_ctx, 64);
|
||||
|
||||
ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to enter sleep mode: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
msleep(120);
|
||||
mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx);
|
||||
|
||||
return 0;
|
||||
mipi_dsi_msleep(&dsi_ctx, 120);
|
||||
}
|
||||
|
||||
static int s6d7aa0_prepare(struct drm_panel *panel)
|
||||
{
|
||||
struct s6d7aa0 *ctx = panel_to_s6d7aa0(panel);
|
||||
struct device *dev = &ctx->dsi->dev;
|
||||
int ret;
|
||||
|
||||
ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to enable regulators: %d\n", ret);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
s6d7aa0_reset(ctx);
|
||||
|
||||
ret = s6d7aa0_on(ctx);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to initialize panel: %d\n", ret);
|
||||
gpiod_set_value_cansleep(ctx->reset_gpio, 1);
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -159,12 +127,8 @@ static int s6d7aa0_prepare(struct drm_panel *panel)
|
|||
static int s6d7aa0_disable(struct drm_panel *panel)
|
||||
{
|
||||
struct s6d7aa0 *ctx = panel_to_s6d7aa0(panel);
|
||||
struct device *dev = &ctx->dsi->dev;
|
||||
int ret;
|
||||
|
||||
ret = s6d7aa0_off(ctx);
|
||||
if (ret < 0)
|
||||
dev_err(dev, "Failed to un-initialize panel: %d\n", ret);
|
||||
s6d7aa0_off(ctx);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -185,13 +149,11 @@ static int s6d7aa0_bl_update_status(struct backlight_device *bl)
|
|||
{
|
||||
struct mipi_dsi_device *dsi = bl_get_data(bl);
|
||||
u16 brightness = backlight_get_brightness(bl);
|
||||
int ret;
|
||||
struct mipi_dsi_multi_context dsi_ctx = { .dsi = dsi };
|
||||
|
||||
ret = mipi_dsi_dcs_set_display_brightness(dsi, brightness);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, brightness);
|
||||
|
||||
return 0;
|
||||
return dsi_ctx.accum_err;
|
||||
}
|
||||
|
||||
static int s6d7aa0_bl_get_brightness(struct backlight_device *bl)
|
||||
|
|
@ -228,65 +190,39 @@ s6d7aa0_create_backlight(struct mipi_dsi_device *dsi)
|
|||
|
||||
/* Initialization code and structures for LSL080AL02 panel */
|
||||
|
||||
static int s6d7aa0_lsl080al02_init(struct s6d7aa0 *ctx)
|
||||
static void s6d7aa0_lsl080al02_init(struct s6d7aa0 *ctx, struct mipi_dsi_multi_context *dsi_ctx)
|
||||
{
|
||||
struct mipi_dsi_device *dsi = ctx->dsi;
|
||||
struct device *dev = &dsi->dev;
|
||||
int ret;
|
||||
mipi_dsi_usleep_range(dsi_ctx, 20000, 25000);
|
||||
|
||||
usleep_range(20000, 25000);
|
||||
s6d7aa0_lock(ctx, dsi_ctx, false);
|
||||
|
||||
ret = s6d7aa0_lock(ctx, false);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to unlock registers: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_OTP_RELOAD, 0x00, 0x10);
|
||||
usleep_range(1000, 1500);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_OTP_RELOAD, 0x00, 0x10);
|
||||
mipi_dsi_usleep_range(dsi_ctx, 1000, 1500);
|
||||
|
||||
/* SEQ_B6_PARAM_8_R01 */
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xb6, 0x10);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xb6, 0x10);
|
||||
|
||||
/* BL_CTL_ON */
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_BL_CTL, 0x40, 0x00, 0x28);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_BL_CTL, 0x40, 0x00, 0x28);
|
||||
|
||||
usleep_range(5000, 6000);
|
||||
mipi_dsi_usleep_range(dsi_ctx, 5000, 6000);
|
||||
|
||||
mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_SET_ADDRESS_MODE, 0x04);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MIPI_DCS_SET_ADDRESS_MODE, 0x04);
|
||||
|
||||
ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to exit sleep mode: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
mipi_dsi_dcs_exit_sleep_mode_multi(dsi_ctx);
|
||||
|
||||
msleep(120);
|
||||
mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_SET_ADDRESS_MODE, 0x00);
|
||||
mipi_dsi_msleep(dsi_ctx, 120);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MIPI_DCS_SET_ADDRESS_MODE, 0x00);
|
||||
|
||||
ret = s6d7aa0_lock(ctx, true);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to lock registers: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
s6d7aa0_lock(ctx, dsi_ctx, true);
|
||||
|
||||
ret = mipi_dsi_dcs_set_display_on(dsi);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to set display on: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
mipi_dsi_dcs_set_display_on_multi(dsi_ctx);
|
||||
}
|
||||
|
||||
static int s6d7aa0_lsl080al02_off(struct s6d7aa0 *ctx)
|
||||
static void s6d7aa0_lsl080al02_off(struct mipi_dsi_multi_context *dsi_ctx)
|
||||
{
|
||||
struct mipi_dsi_device *dsi = ctx->dsi;
|
||||
|
||||
/* BL_CTL_OFF */
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_BL_CTL, 0x40, 0x00, 0x20);
|
||||
|
||||
return 0;
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_BL_CTL, 0x40, 0x00, 0x20);
|
||||
}
|
||||
|
||||
static const struct drm_display_mode s6d7aa0_lsl080al02_mode = {
|
||||
|
|
@ -317,79 +253,51 @@ static const struct s6d7aa0_panel_desc s6d7aa0_lsl080al02_desc = {
|
|||
|
||||
/* Initialization code and structures for LSL080AL03 panel */
|
||||
|
||||
static int s6d7aa0_lsl080al03_init(struct s6d7aa0 *ctx)
|
||||
static void s6d7aa0_lsl080al03_init(struct s6d7aa0 *ctx, struct mipi_dsi_multi_context *dsi_ctx)
|
||||
{
|
||||
struct mipi_dsi_device *dsi = ctx->dsi;
|
||||
struct device *dev = &dsi->dev;
|
||||
int ret;
|
||||
mipi_dsi_usleep_range(dsi_ctx, 20000, 25000);
|
||||
|
||||
usleep_range(20000, 25000);
|
||||
|
||||
ret = s6d7aa0_lock(ctx, false);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to unlock registers: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
s6d7aa0_lock(ctx, dsi_ctx, false);
|
||||
|
||||
if (ctx->desc->panel_type == S6D7AA0_PANEL_LSL080AL03) {
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_BL_CTL, 0xc7, 0x00, 0x29);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xbc, 0x01, 0x4e, 0xa0);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xfd, 0x16, 0x10, 0x11, 0x23,
|
||||
0x09);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x00, 0x02, 0x03, 0x21,
|
||||
0x80, 0x78);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_BL_CTL, 0xc7, 0x00, 0x29);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xbc, 0x01, 0x4e, 0xa0);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xfd, 0x16, 0x10, 0x11, 0x23,
|
||||
0x09);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xfe, 0x00, 0x02, 0x03, 0x21,
|
||||
0x80, 0x78);
|
||||
} else if (ctx->desc->panel_type == S6D7AA0_PANEL_LTL101AT01) {
|
||||
mipi_dsi_dcs_write_seq(dsi, MCS_BL_CTL, 0x40, 0x00, 0x08);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xbc, 0x01, 0x4e, 0x0b);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xfd, 0x16, 0x10, 0x11, 0x23,
|
||||
0x09);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xfe, 0x00, 0x02, 0x03, 0x21,
|
||||
0x80, 0x68);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MCS_BL_CTL, 0x40, 0x00, 0x08);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xbc, 0x01, 0x4e, 0x0b);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xfd, 0x16, 0x10, 0x11, 0x23,
|
||||
0x09);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xfe, 0x00, 0x02, 0x03, 0x21,
|
||||
0x80, 0x68);
|
||||
}
|
||||
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xb3, 0x51);
|
||||
mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x24);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xf2, 0x02, 0x08, 0x08);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xb3, 0x51);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x24);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xf2, 0x02, 0x08, 0x08);
|
||||
|
||||
usleep_range(10000, 11000);
|
||||
mipi_dsi_usleep_range(dsi_ctx, 10000, 11000);
|
||||
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xc0, 0x80, 0x80, 0x30);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xcd,
|
||||
0x2e, 0x2e, 0x2e, 0x2e, 0x2e, 0x2e, 0x2e, 0x2e,
|
||||
0x2e, 0x2e, 0x2e, 0x2e, 0x2e);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xce,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00);
|
||||
mipi_dsi_dcs_write_seq(dsi, 0xc1, 0x03);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xc0, 0x80, 0x80, 0x30);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xcd,
|
||||
0x2e, 0x2e, 0x2e, 0x2e, 0x2e, 0x2e, 0x2e, 0x2e,
|
||||
0x2e, 0x2e, 0x2e, 0x2e, 0x2e);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xce,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00);
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0xc1, 0x03);
|
||||
|
||||
ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to exit sleep mode: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = s6d7aa0_lock(ctx, true);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to lock registers: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = mipi_dsi_dcs_set_display_on(dsi);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Failed to set display on: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
mipi_dsi_dcs_exit_sleep_mode_multi(dsi_ctx);
|
||||
s6d7aa0_lock(ctx, dsi_ctx, true);
|
||||
mipi_dsi_dcs_set_display_on_multi(dsi_ctx);
|
||||
}
|
||||
|
||||
static int s6d7aa0_lsl080al03_off(struct s6d7aa0 *ctx)
|
||||
static void s6d7aa0_lsl080al03_off(struct mipi_dsi_multi_context *dsi_ctx)
|
||||
{
|
||||
struct mipi_dsi_device *dsi = ctx->dsi;
|
||||
|
||||
mipi_dsi_dcs_write_seq(dsi, 0x22, 0x00);
|
||||
|
||||
return 0;
|
||||
mipi_dsi_dcs_write_seq_multi(dsi_ctx, 0x22, 0x00);
|
||||
}
|
||||
|
||||
static const struct drm_display_mode s6d7aa0_lsl080al03_mode = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user