Commit b080a607 authored by Tejas Vipin's avatar Tejas Vipin Committed by Douglas Anderson

drm/panel: startek-kd070fhfid015: transition to mipi_dsi wrapped functions

Use multi style wrapped functions for mipi_dsi in the
startek-kd070fhfid015 panel.
Signed-off-by: default avatarTejas Vipin <tejasvipin76@gmail.com>
Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240806135949.468636-3-tejasvipin76@gmail.com
parent 5ddb0a8a
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <drm/drm_modes.h> #include <drm/drm_modes.h>
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#define DSI_REG_MCAP 0xB0 #define DSI_REG_MCAP 0xb0
#define DSI_REG_IS 0xB3 /* Interface Setting */ #define DSI_REG_IS 0xb3 /* Interface Setting */
#define DSI_REG_IIS 0xB4 /* Interface ID Setting */ #define DSI_REG_IIS 0xb4 /* Interface ID Setting */
#define DSI_REG_CTRL 0xB6 #define DSI_REG_CTRL 0xb6
enum { enum {
IOVCC = 0, IOVCC = 0,
...@@ -52,92 +52,55 @@ static inline struct stk_panel *to_stk_panel(struct drm_panel *panel) ...@@ -52,92 +52,55 @@ static inline struct stk_panel *to_stk_panel(struct drm_panel *panel)
static int stk_panel_init(struct stk_panel *stk) static int stk_panel_init(struct stk_panel *stk)
{ {
struct mipi_dsi_device *dsi = stk->dsi; struct mipi_dsi_device *dsi = stk->dsi;
struct device *dev = &stk->dsi->dev; struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
int ret;
ret = mipi_dsi_dcs_soft_reset(dsi);
if (ret < 0) {
dev_err(dev, "failed to mipi_dsi_dcs_soft_reset: %d\n", ret);
return ret;
}
mdelay(5);
ret = mipi_dsi_dcs_exit_sleep_mode(dsi); mipi_dsi_dcs_soft_reset_multi(&dsi_ctx);
if (ret < 0) { mipi_dsi_msleep(&dsi_ctx, 5);
dev_err(dev, "failed to set exit sleep mode: %d\n", ret); mipi_dsi_dcs_exit_sleep_mode_multi(&dsi_ctx);
return ret; mipi_dsi_msleep(&dsi_ctx, 120);
}
msleep(120);
mipi_dsi_generic_write_seq(dsi, DSI_REG_MCAP, 0x04); mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_MCAP, 0x04);
/* Interface setting, video mode */ /* Interface setting, video mode */
mipi_dsi_generic_write_seq(dsi, DSI_REG_IS, 0x14, 0x08, 0x00, 0x22, 0x00); mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_IS, 0x14, 0x08, 0x00, 0x22, 0x00);
mipi_dsi_generic_write_seq(dsi, DSI_REG_IIS, 0x0C, 0x00); mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_IIS, 0x0c, 0x00);
mipi_dsi_generic_write_seq(dsi, DSI_REG_CTRL, 0x3A, 0xD3); mipi_dsi_generic_write_seq_multi(&dsi_ctx, DSI_REG_CTRL, 0x3a, 0xd3);
ret = mipi_dsi_dcs_set_display_brightness(dsi, 0x77); mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, 0x77);
if (ret < 0) {
dev_err(dev, "failed to write display brightness: %d\n", ret);
return ret;
}
mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, mipi_dsi_dcs_write_seq_multi(&dsi_ctx, MIPI_DCS_WRITE_CONTROL_DISPLAY,
MIPI_DCS_WRITE_MEMORY_START); MIPI_DCS_WRITE_MEMORY_START);
ret = mipi_dsi_dcs_set_pixel_format(dsi, 0x77); mipi_dsi_dcs_set_pixel_format_multi(&dsi_ctx, 0x77);
if (ret < 0) { mipi_dsi_dcs_set_column_address_multi(&dsi_ctx, 0, stk->mode->hdisplay - 1);
dev_err(dev, "failed to set pixel format: %d\n", ret); mipi_dsi_dcs_set_page_address_multi(&dsi_ctx, 0, stk->mode->vdisplay - 1);
return ret;
}
ret = mipi_dsi_dcs_set_column_address(dsi, 0, stk->mode->hdisplay - 1); return dsi_ctx.accum_err;
if (ret < 0) {
dev_err(dev, "failed to set column address: %d\n", ret);
return ret;
}
ret = mipi_dsi_dcs_set_page_address(dsi, 0, stk->mode->vdisplay - 1);
if (ret < 0) {
dev_err(dev, "failed to set page address: %d\n", ret);
return ret;
}
return 0;
} }
static int stk_panel_on(struct stk_panel *stk) static int stk_panel_on(struct stk_panel *stk)
{ {
struct mipi_dsi_device *dsi = stk->dsi; struct mipi_dsi_device *dsi = stk->dsi;
struct device *dev = &stk->dsi->dev; struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
int ret;
ret = mipi_dsi_dcs_set_display_on(dsi); mipi_dsi_dcs_set_display_on_multi(&dsi_ctx);
if (ret < 0)
dev_err(dev, "failed to set display on: %d\n", ret);
mdelay(20); mipi_dsi_msleep(&dsi_ctx, 20);
return ret; return dsi_ctx.accum_err;
} }
static void stk_panel_off(struct stk_panel *stk) static void stk_panel_off(struct stk_panel *stk)
{ {
struct mipi_dsi_device *dsi = stk->dsi; struct mipi_dsi_device *dsi = stk->dsi;
struct device *dev = &stk->dsi->dev; struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
int ret;
dsi->mode_flags &= ~MIPI_DSI_MODE_LPM; dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
ret = mipi_dsi_dcs_set_display_off(dsi); mipi_dsi_dcs_set_display_off_multi(&dsi_ctx);
if (ret < 0) mipi_dsi_dcs_enter_sleep_mode_multi(&dsi_ctx);
dev_err(dev, "failed to set display off: %d\n", ret);
ret = mipi_dsi_dcs_enter_sleep_mode(dsi); mipi_dsi_msleep(&dsi_ctx, 100);
if (ret < 0)
dev_err(dev, "failed to enter sleep mode: %d\n", ret);
msleep(100);
} }
static int stk_panel_unprepare(struct drm_panel *panel) static int stk_panel_unprepare(struct drm_panel *panel)
...@@ -155,7 +118,6 @@ static int stk_panel_unprepare(struct drm_panel *panel) ...@@ -155,7 +118,6 @@ static int stk_panel_unprepare(struct drm_panel *panel)
static int stk_panel_prepare(struct drm_panel *panel) static int stk_panel_prepare(struct drm_panel *panel)
{ {
struct stk_panel *stk = to_stk_panel(panel); struct stk_panel *stk = to_stk_panel(panel);
struct device *dev = &stk->dsi->dev;
int ret; int ret;
gpiod_set_value(stk->reset_gpio, 0); gpiod_set_value(stk->reset_gpio, 0);
...@@ -175,16 +137,12 @@ static int stk_panel_prepare(struct drm_panel *panel) ...@@ -175,16 +137,12 @@ static int stk_panel_prepare(struct drm_panel *panel)
gpiod_set_value(stk->reset_gpio, 1); gpiod_set_value(stk->reset_gpio, 1);
mdelay(10); mdelay(10);
ret = stk_panel_init(stk); ret = stk_panel_init(stk);
if (ret < 0) { if (ret < 0)
dev_err(dev, "failed to init panel: %d\n", ret);
goto poweroff; goto poweroff;
}
ret = stk_panel_on(stk); ret = stk_panel_on(stk);
if (ret < 0) { if (ret < 0)
dev_err(dev, "failed to set panel on: %d\n", ret);
goto poweroff; goto poweroff;
}
return 0; return 0;
...@@ -250,18 +208,15 @@ static int dsi_dcs_bl_get_brightness(struct backlight_device *bl) ...@@ -250,18 +208,15 @@ static int dsi_dcs_bl_get_brightness(struct backlight_device *bl)
static int dsi_dcs_bl_update_status(struct backlight_device *bl) static int dsi_dcs_bl_update_status(struct backlight_device *bl)
{ {
struct mipi_dsi_device *dsi = bl_get_data(bl); struct mipi_dsi_device *dsi = bl_get_data(bl);
struct device *dev = &dsi->dev; struct mipi_dsi_multi_context dsi_ctx = {.dsi = dsi};
int ret;
dsi->mode_flags &= ~MIPI_DSI_MODE_LPM; dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
ret = mipi_dsi_dcs_set_display_brightness(dsi, bl->props.brightness); mipi_dsi_dcs_set_display_brightness_multi(&dsi_ctx, bl->props.brightness);
if (ret < 0) { if (dsi_ctx.accum_err)
dev_err(dev, "failed to set DSI control: %d\n", ret); return dsi_ctx.accum_err;
return ret;
}
dsi->mode_flags |= MIPI_DSI_MODE_LPM; dsi->mode_flags |= MIPI_DSI_MODE_LPM;
return 0; return dsi_ctx.accum_err;
} }
static const struct backlight_ops dsi_bl_ops = { static const struct backlight_ops dsi_bl_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment