Commit 22edc8d3 authored by Noralf Trønnes's avatar Noralf Trønnes

drm/tinydrm/mipi-dbi: Add mipi_dbi_enable_flush()

Add and use a function for enabling, flushing and turning on backlight.
Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180110185940.53841-4-noralf@tronnes.org
parent 24e05e7a
...@@ -180,7 +180,6 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe, ...@@ -180,7 +180,6 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
{ {
struct tinydrm_device *tdev = pipe_to_tinydrm(pipe); struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev); struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
struct drm_framebuffer *fb = pipe->plane.fb;
struct device *dev = tdev->drm->dev; struct device *dev = tdev->drm->dev;
int ret; int ret;
u8 am_id; u8 am_id;
...@@ -269,10 +268,7 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe, ...@@ -269,10 +268,7 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
ili9225_command(mipi, ILI9225_DISPLAY_CONTROL_1, 0x1017); ili9225_command(mipi, ILI9225_DISPLAY_CONTROL_1, 0x1017);
mipi->enabled = true; mipi_dbi_enable_flush(mipi);
if (fb)
fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);
} }
static void ili9225_pipe_disable(struct drm_simple_display_pipe *pipe) static void ili9225_pipe_disable(struct drm_simple_display_pipe *pipe)
......
...@@ -270,6 +270,26 @@ static const struct drm_framebuffer_funcs mipi_dbi_fb_funcs = { ...@@ -270,6 +270,26 @@ static const struct drm_framebuffer_funcs mipi_dbi_fb_funcs = {
.dirty = mipi_dbi_fb_dirty, .dirty = mipi_dbi_fb_dirty,
}; };
/**
* mipi_dbi_enable_flush - MIPI DBI enable helper
* @mipi: MIPI DBI structure
*
* This function sets &mipi_dbi->enabled, flushes the whole framebuffer and
* enables the backlight. Drivers can use this in their
* &drm_simple_display_pipe_funcs->enable callback.
*/
void mipi_dbi_enable_flush(struct mipi_dbi *mipi)
{
struct drm_framebuffer *fb = mipi->tinydrm.pipe.plane.fb;
mipi->enabled = true;
if (fb)
fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);
tinydrm_enable_backlight(mipi->backlight);
}
EXPORT_SYMBOL(mipi_dbi_enable_flush);
/** /**
* mipi_dbi_pipe_enable - MIPI DBI pipe enable helper * mipi_dbi_pipe_enable - MIPI DBI pipe enable helper
* @pipe: Display pipe * @pipe: Display pipe
......
...@@ -179,7 +179,6 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe, ...@@ -179,7 +179,6 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
{ {
struct tinydrm_device *tdev = pipe_to_tinydrm(pipe); struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev); struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
struct drm_framebuffer *fb = pipe->plane.fb;
struct device *dev = tdev->drm->dev; struct device *dev = tdev->drm->dev;
int ret; int ret;
u8 addr_mode; u8 addr_mode;
...@@ -241,10 +240,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe, ...@@ -241,10 +240,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_ON); mipi_dbi_command(mipi, MIPI_DCS_SET_DISPLAY_ON);
mipi->enabled = true; mipi_dbi_enable_flush(mipi);
if (fb)
fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);
} }
static void st7586_pipe_disable(struct drm_simple_display_pipe *pipe) static void st7586_pipe_disable(struct drm_simple_display_pipe *pipe)
......
...@@ -102,7 +102,7 @@ static void jd_t18003_t01_pipe_enable(struct drm_simple_display_pipe *pipe, ...@@ -102,7 +102,7 @@ static void jd_t18003_t01_pipe_enable(struct drm_simple_display_pipe *pipe,
msleep(20); msleep(20);
mipi_dbi_pipe_enable(pipe, crtc_state); mipi_dbi_enable_flush(mipi);
} }
static const struct drm_simple_display_pipe_funcs jd_t18003_t01_pipe_funcs = { static const struct drm_simple_display_pipe_funcs jd_t18003_t01_pipe_funcs = {
......
...@@ -67,6 +67,7 @@ int mipi_dbi_init(struct device *dev, struct mipi_dbi *mipi, ...@@ -67,6 +67,7 @@ int mipi_dbi_init(struct device *dev, struct mipi_dbi *mipi,
const struct drm_simple_display_pipe_funcs *pipe_funcs, const struct drm_simple_display_pipe_funcs *pipe_funcs,
struct drm_driver *driver, struct drm_driver *driver,
const struct drm_display_mode *mode, unsigned int rotation); const struct drm_display_mode *mode, unsigned int rotation);
void mipi_dbi_enable_flush(struct mipi_dbi *mipi);
void mipi_dbi_pipe_enable(struct drm_simple_display_pipe *pipe, void mipi_dbi_pipe_enable(struct drm_simple_display_pipe *pipe,
struct drm_crtc_state *crtc_state); struct drm_crtc_state *crtc_state);
void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe); void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe);
......
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