Commit e85d3006 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/tinydrm: Make fb_dirty into a lower level hook 



mipi_dbi_enable_flush() wants to call the fb->dirty() hook from the
bowels of the .atomic_enable() hook. That prevents us from taking the
plane mutex in fb->dirty() unless we also plumb down the acquire
context.

Instead it seems simpler to split the fb->dirty() into a tinydrm
specific lower level hook that can be called from
mipi_dbi_enable_flush() and from a generic higher level
tinydrm_fb_dirty() helper. As we don't have a tinydrm specific
vfuncs table we'll just stick it into tinydrm_device directly
for now.

v2: Deal with the fb->dirty() in tinydrm_display_pipe_update() as well (Noralf)

Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: David Lechner <david@lechnology.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180323153509.15287-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Tested-by: default avatarNoralf Trønnes <noralf@tronnes.org>
parent 0c9c7fd0

drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c

+30 −0
Original line number Diff line number Diff line
@@ -78,6 +78,36 @@ bool tinydrm_merge_clips(struct drm_clip_rect *dst, 
}

EXPORT_SYMBOL(tinydrm_merge_clips);



int tinydrm_fb_dirty(struct drm_framebuffer *fb,

		     struct drm_file *file_priv,

		     unsigned int flags, unsigned int color,

		     struct drm_clip_rect *clips,

		     unsigned int num_clips)

{

	struct tinydrm_device *tdev = fb->dev->dev_private;

	struct drm_plane *plane = &tdev->pipe.plane;

	int ret = 0;



	drm_modeset_lock(&plane->mutex, NULL);



	/* fbdev can flush even when we're not interested */

	if (plane->state->fb == fb) {

		mutex_lock(&tdev->dirty_lock);

		ret = tdev->fb_dirty(fb, file_priv, flags,

				     color, clips, num_clips);

		mutex_unlock(&tdev->dirty_lock);

	}



	drm_modeset_unlock(&plane->mutex);



	if (ret)

		dev_err_once(fb->dev->dev,

			     "Failed to update display %d\n", ret);



	return ret;

}

EXPORT_SYMBOL(tinydrm_fb_dirty);



/**

 * tinydrm_memcpy - Copy clip buffer

 * @dst: Destination buffer

drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c

+2 −3
Original line number Diff line number Diff line
@@ -125,9 +125,8 @@ void tinydrm_display_pipe_update(struct drm_simple_display_pipe *pipe, 
	struct drm_crtc *crtc = &tdev->pipe.crtc;



	if (fb && (fb != old_state->fb)) {

		pipe->plane.fb = fb;

		if (fb->funcs->dirty)

			fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);

		if (tdev->fb_dirty)

			tdev->fb_dirty(fb, NULL, 0, 0, NULL, 0);

	}



	if (crtc->state->event) {

drivers/gpu/drm/tinydrm/ili9225.c

+6 −17
Original line number Diff line number Diff line
@@ -88,14 +88,8 @@ static int ili9225_fb_dirty(struct drm_framebuffer *fb, 
	bool full;

	void *tr;



	mutex_lock(&tdev->dirty_lock);



	if (!mipi->enabled)

		goto out_unlock;



	/* fbdev can flush even when we're not interested */

	if (tdev->pipe.plane.fb != fb)

		goto out_unlock;

		return 0;



	full = tinydrm_merge_clips(&clip, clips, num_clips, flags,

				   fb->width, fb->height);
@@ -108,7 +102,7 @@ static int ili9225_fb_dirty(struct drm_framebuffer *fb, 
		tr = mipi->tx_buf;

		ret = mipi_dbi_buf_copy(mipi->tx_buf, fb, &clip, swap);

		if (ret)

			goto out_unlock;

			return ret;

	} else {

		tr = cma_obj->vaddr;

	}
@@ -159,20 +153,13 @@ static int ili9225_fb_dirty(struct drm_framebuffer *fb, 
	ret = mipi_dbi_command_buf(mipi, ILI9225_WRITE_DATA_TO_GRAM, tr,

				(clip.x2 - clip.x1) * (clip.y2 - clip.y1) * 2);



out_unlock:

	mutex_unlock(&tdev->dirty_lock);



	if (ret)

		dev_err_once(fb->dev->dev, "Failed to update display %d\n",

			     ret);



	return ret;

}



static const struct drm_framebuffer_funcs ili9225_fb_funcs = {

	.destroy	= drm_gem_fb_destroy,

	.create_handle	= drm_gem_fb_create_handle,

	.dirty		= ili9225_fb_dirty,

	.dirty		= tinydrm_fb_dirty,

};



static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,
@@ -269,7 +256,7 @@ static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe, 


	ili9225_command(mipi, ILI9225_DISPLAY_CONTROL_1, 0x1017);



	mipi_dbi_enable_flush(mipi);

	mipi_dbi_enable_flush(mipi, crtc_state, plane_state);

}



static void ili9225_pipe_disable(struct drm_simple_display_pipe *pipe)
@@ -342,6 +329,8 @@ static int ili9225_init(struct device *dev, struct mipi_dbi *mipi, 
	if (ret)

		return ret;



	tdev->fb_dirty = ili9225_fb_dirty;



	ret = tinydrm_display_pipe_init(tdev, pipe_funcs,

					DRM_MODE_CONNECTOR_VIRTUAL,

					ili9225_formats,

drivers/gpu/drm/tinydrm/mi0283qt.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void mi0283qt_enable(struct drm_simple_display_pipe *pipe, 
	msleep(100);



out_enable:

	mipi_dbi_enable_flush(mipi);

	mipi_dbi_enable_flush(mipi, crtc_state, plane_state);

}



static const struct drm_simple_display_pipe_funcs mi0283qt_pipe_funcs = {

drivers/gpu/drm/tinydrm/mipi-dbi.c

+11 −19
Original line number Diff line number Diff line
@@ -219,14 +219,8 @@ static int mipi_dbi_fb_dirty(struct drm_framebuffer *fb, 
	bool full;

	void *tr;



	mutex_lock(&tdev->dirty_lock);



	if (!mipi->enabled)

		goto out_unlock;



	/* fbdev can flush even when we're not interested */

	if (tdev->pipe.plane.fb != fb)

		goto out_unlock;

		return 0;



	full = tinydrm_merge_clips(&clip, clips, num_clips, flags,

				   fb->width, fb->height);
@@ -239,7 +233,7 @@ static int mipi_dbi_fb_dirty(struct drm_framebuffer *fb, 
		tr = mipi->tx_buf;

		ret = mipi_dbi_buf_copy(mipi->tx_buf, fb, &clip, swap);

		if (ret)

			goto out_unlock;

			return ret;

	} else {

		tr = cma_obj->vaddr;

	}
@@ -254,20 +248,13 @@ static int mipi_dbi_fb_dirty(struct drm_framebuffer *fb, 
	ret = mipi_dbi_command_buf(mipi, MIPI_DCS_WRITE_MEMORY_START, tr,

				(clip.x2 - clip.x1) * (clip.y2 - clip.y1) * 2);



out_unlock:

	mutex_unlock(&tdev->dirty_lock);



	if (ret)

		dev_err_once(fb->dev->dev, "Failed to update display %d\n",

			     ret);



	return ret;

}



static const struct drm_framebuffer_funcs mipi_dbi_fb_funcs = {

	.destroy	= drm_gem_fb_destroy,

	.create_handle	= drm_gem_fb_create_handle,

	.dirty		= mipi_dbi_fb_dirty,

	.dirty		= tinydrm_fb_dirty,

};



/**
@@ -278,13 +265,16 @@ static const struct drm_framebuffer_funcs mipi_dbi_fb_funcs = { 
 * 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)

void mipi_dbi_enable_flush(struct mipi_dbi *mipi,

			   struct drm_crtc_state *crtc_state,

			   struct drm_plane_state *plane_state)

{

	struct drm_framebuffer *fb = mipi->tinydrm.pipe.plane.fb;

	struct tinydrm_device *tdev = &mipi->tinydrm;

	struct drm_framebuffer *fb = plane_state->fb;



	mipi->enabled = true;

	if (fb)

		fb->funcs->dirty(fb, NULL, 0, 0, NULL, 0);

		tdev->fb_dirty(fb, NULL, 0, 0, NULL, 0);



	backlight_enable(mipi->backlight);

}
@@ -381,6 +371,8 @@ int mipi_dbi_init(struct device *dev, struct mipi_dbi *mipi, 
	if (ret)

		return ret;



	tdev->fb_dirty = mipi_dbi_fb_dirty;



	/* TODO: Maybe add DRM_MODE_CONNECTOR_SPI */

	ret = tinydrm_display_pipe_init(tdev, pipe_funcs,

					DRM_MODE_CONNECTOR_VIRTUAL,

CRA Git | Maintained and supported by SUSTech CRA and CCSE