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

Add a function to derive mipi_dbi from drm_device now that tinydrm_device
is going away.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190210131039.52664-8-noralf@tronnes.org

diff --git a/drivers/gpu/drm/tinydrm/hx8357d.c b/drivers/gpu/drm/tinydrm/hx8357d.c
index cb0ea98..84dda62 100644 (file)
--- a/drivers/gpu/drm/tinydrm/hx8357d.c
+++ b/drivers/gpu/drm/tinydrm/hx8357d.c
@@ -47,8 +47,7 @@ static void yx240qv29_enable(struct drm_simple_display_pipe *pipe,
                             struct drm_crtc_state *crtc_state,
                             struct drm_plane_state *plane_state)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
        u8 addr_mode;
        int ret;
 

diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c
index 7837b78..3f59cfb 100644 (file)
--- a/drivers/gpu/drm/tinydrm/ili9225.c
+++ b/drivers/gpu/drm/tinydrm/ili9225.c
@@ -82,8 +82,7 @@ static inline int ili9225_command(struct mipi_dbi *mipi, u8 cmd, u16 data)
 static void ili9225_fb_dirty(struct drm_framebuffer *fb, struct drm_rect *rect)
 {
        struct drm_gem_cma_object *cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
-       struct tinydrm_device *tdev = fb->dev->dev_private;
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(fb->dev);
        unsigned int height = rect->y2 - rect->y1;
        unsigned int width = rect->x2 - rect->x1;
        bool swap = mipi->swap_bytes;
@@ -182,10 +181,9 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
                                struct drm_crtc_state *crtc_state,
                                struct drm_plane_state *plane_state)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
        struct drm_framebuffer *fb = plane_state->fb;
-       struct device *dev = tdev->drm->dev;
+       struct device *dev = pipe->crtc.dev->dev;
        struct drm_rect rect = {
                .x1 = 0,
                .x2 = fb->width,
@@ -285,8 +283,7 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
 
 static void ili9225_pipe_disable(struct drm_simple_display_pipe *pipe)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
 
        DRM_DEBUG_KMS("\n");
 

diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c
index 87400a9..3b7565a 100644 (file)
--- a/drivers/gpu/drm/tinydrm/ili9341.c
+++ b/drivers/gpu/drm/tinydrm/ili9341.c
@@ -53,8 +53,7 @@ static void yx240qv29_enable(struct drm_simple_display_pipe *pipe,
                             struct drm_crtc_state *crtc_state,
                             struct drm_plane_state *plane_state)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
        u8 addr_mode;
        int ret;
 

diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
index 1fa0cda..da326fd 100644 (file)
--- a/drivers/gpu/drm/tinydrm/mi0283qt.c
+++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
@@ -55,8 +55,7 @@ static void mi0283qt_enable(struct drm_simple_display_pipe *pipe,
                            struct drm_crtc_state *crtc_state,
                            struct drm_plane_state *plane_state)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
        u8 addr_mode;
        int ret;
 

diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
index 6ce7c01..045b840 100644 (file)
--- a/drivers/gpu/drm/tinydrm/mipi-dbi.c
+++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
@@ -216,8 +216,7 @@ EXPORT_SYMBOL(mipi_dbi_buf_copy);
 static void mipi_dbi_fb_dirty(struct drm_framebuffer *fb, struct drm_rect *rect)
 {
        struct drm_gem_cma_object *cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
-       struct tinydrm_device *tdev = fb->dev->dev_private;
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(fb->dev);
        unsigned int height = rect->y2 - rect->y1;
        unsigned int width = rect->x2 - rect->x1;
        bool swap = mipi->swap_bytes;
@@ -342,8 +341,7 @@ static void mipi_dbi_blank(struct mipi_dbi *mipi)
  */
 void mipi_dbi_pipe_disable(struct drm_simple_display_pipe *pipe)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
 
        DRM_DEBUG_KMS("\n");
 
@@ -1088,8 +1086,7 @@ static const struct file_operations mipi_dbi_debugfs_command_fops = {
  */
 int mipi_dbi_debugfs_init(struct drm_minor *minor)
 {
-       struct tinydrm_device *tdev = minor->dev->dev_private;
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(minor->dev);
        umode_t mode = S_IFREG | S_IWUSR;
 
        if (mipi->read_commands)

diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c
index 20d79a1..6097585 100644 (file)
--- a/drivers/gpu/drm/tinydrm/st7586.c
+++ b/drivers/gpu/drm/tinydrm/st7586.c
@@ -117,8 +117,7 @@ static int st7586_buf_copy(void *dst, struct drm_framebuffer *fb,
 
 static void st7586_fb_dirty(struct drm_framebuffer *fb, struct drm_rect *rect)
 {
-       struct tinydrm_device *tdev = fb->dev->dev_private;
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(fb->dev);
        int start, end;
        int ret = 0;
 
@@ -176,8 +175,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
                               struct drm_crtc_state *crtc_state,
                               struct drm_plane_state *plane_state)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
        struct drm_framebuffer *fb = plane_state->fb;
        struct drm_rect rect = {
                .x1 = 0,
@@ -249,8 +247,7 @@ static void st7586_pipe_enable(struct drm_simple_display_pipe *pipe,
 
 static void st7586_pipe_disable(struct drm_simple_display_pipe *pipe)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
 
        DRM_DEBUG_KMS("\n");
 

diff --git a/drivers/gpu/drm/tinydrm/st7735r.c b/drivers/gpu/drm/tinydrm/st7735r.c
index 9b47d86..bfa7e22 100644 (file)
--- a/drivers/gpu/drm/tinydrm/st7735r.c
+++ b/drivers/gpu/drm/tinydrm/st7735r.c
@@ -42,8 +42,7 @@ static void jd_t18003_t01_pipe_enable(struct drm_simple_display_pipe *pipe,
                                      struct drm_crtc_state *crtc_state,
                                      struct drm_plane_state *plane_state)
 {
-       struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);
-       struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);
+       struct mipi_dbi *mipi = drm_to_mipi_dbi(pipe->crtc.dev);
        int ret;
        u8 addr_mode;
 

diff --git a/include/drm/tinydrm/mipi-dbi.h b/include/drm/tinydrm/mipi-dbi.h
index f4ec283..ad7e6be 100644 (file)
--- a/include/drm/tinydrm/mipi-dbi.h
+++ b/include/drm/tinydrm/mipi-dbi.h
@@ -56,9 +56,10 @@ struct mipi_dbi {
        struct regulator *regulator;
 };
 
-static inline struct mipi_dbi *
-mipi_dbi_from_tinydrm(struct tinydrm_device *tdev)
+static inline struct mipi_dbi *drm_to_mipi_dbi(struct drm_device *drm)
 {
+       struct tinydrm_device *tdev = drm->dev_private;
+
        return container_of(tdev, struct mipi_dbi, tinydrm);
 }