Re: [PATCH 05/11] drm/tinydrm/mipi-dbi: Add drm_to_mipi_dbi()

[Sam Ravnborg]

On Sun, Jan 20, 2019 at 12:43:12PM +0100, Noralf Trønnes wrote:
> Add a function to derive mipi_dbi from drm_device now that tinydrm_device
> is going away.
> 
> Signed-off-by: Noralf Trønnes 
Reviewed-by: Sam Ravnborg 
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 05/11] drm/tinydrm/mipi-dbi: Add drm_to_mipi_dbi()

[Noralf Trønnes]

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

Signed-off-by: Noralf Trønnes 
---
 drivers/gpu/drm/tinydrm/hx8357d.c  |  3 +--
 drivers/gpu/drm/tinydrm/ili9225.c  | 11 ---
 drivers/gpu/drm/tinydrm/ili9341.c  |  3 +--
 drivers/gpu/drm/tinydrm/mi0283qt.c |  3 +--
 drivers/gpu/drm/tinydrm/mipi-dbi.c |  9 +++--
 drivers/gpu/drm/tinydrm/st7586.c   |  9 +++--
 drivers/gpu/drm/tinydrm/st7735r.c  |  3 +--
 include/drm/tinydrm/mipi-dbi.h |  5 +++--
 8 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/tinydrm/hx8357d.c 
b/drivers/gpu/drm/tinydrm/hx8357d.c
index 5a1ec0451c19..ab604513b865 100644
--- a/drivers/gpu/drm/tinydrm/hx8357d.c
+++ b/drivers/gpu/drm/tinydrm/hx8357d.c
@@ -46,8 +46,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 d40814d370e2..40e1f98ca393 100644
--- a/drivers/gpu/drm/tinydrm/ili9225.c
+++ b/drivers/gpu/drm/tinydrm/ili9225.c
@@ -81,8 +81,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;
@@ -181,10 +180,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,
@@ -284,8 +282,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 063f4f07f811..86f8884036b2 100644
--- a/drivers/gpu/drm/tinydrm/ili9341.c
+++ b/drivers/gpu/drm/tinydrm/ili9341.c
@@ -52,8 +52,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 3d067c2ba1bc..ea14f89cf9af 100644
--- a/drivers/gpu/drm/tinydrm/mi0283qt.c
+++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
@@ -54,8 +54,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 d1d546f3a664..3c66a844fe56 100644
--- 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;