Commit 1648740b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-fixes-5.14' of... 

Merge tag 'mediatek-drm-fixes-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-fixes

Mediatek DRM Fixes for Linux 5.14

1. Fix dpi bridge bug.
2. Fix cursor plane no update.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210809150604.32426-1-chunkuang.hu@kernel.org
parents 36a21d51 1a64a7af

drivers/gpu/drm/mediatek/mtk_dpi.c

+5 −1
Original line number Diff line number Diff line
@@ -605,11 +605,15 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, 
				       struct drm_crtc_state *crtc_state,

				       struct drm_connector_state *conn_state)

{

	struct mtk_dpi *dpi = bridge->driver_private;

	struct mtk_dpi *dpi = bridge_to_dpi(bridge);

	unsigned int out_bus_format;



	out_bus_format = bridge_state->output_bus_cfg.format;



	if (out_bus_format == MEDIA_BUS_FMT_FIXED)

		if (dpi->conf->num_output_fmts)

			out_bus_format = dpi->conf->output_fmts[0];



	dev_dbg(dpi->dev, "input format 0x%04x, output format 0x%04x\n",

		bridge_state->input_bus_cfg.format,

		bridge_state->output_bus_cfg.format);

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+0 −3
Original line number Diff line number Diff line
@@ -532,13 +532,10 @@ void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane, 
			       struct drm_atomic_state *state)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	const struct drm_plane_helper_funcs *plane_helper_funcs =

			plane->helper_private;



	if (!mtk_crtc->enabled)

		return;



	plane_helper_funcs->atomic_update(plane, state);

	mtk_drm_crtc_update_config(mtk_crtc, false);

}

drivers/gpu/drm/mediatek/mtk_drm_plane.c

+34 −26
Original line number Diff line number Diff line
@@ -110,6 +110,35 @@ static int mtk_plane_atomic_async_check(struct drm_plane *plane, 
						   true, true);

}



static void mtk_plane_update_new_state(struct drm_plane_state *new_state,

				       struct mtk_plane_state *mtk_plane_state)

{

	struct drm_framebuffer *fb = new_state->fb;

	struct drm_gem_object *gem;

	struct mtk_drm_gem_obj *mtk_gem;

	unsigned int pitch, format;

	dma_addr_t addr;



	gem = fb->obj[0];

	mtk_gem = to_mtk_gem_obj(gem);

	addr = mtk_gem->dma_addr;

	pitch = fb->pitches[0];

	format = fb->format->format;



	addr += (new_state->src.x1 >> 16) * fb->format->cpp[0];

	addr += (new_state->src.y1 >> 16) * pitch;



	mtk_plane_state->pending.enable = true;

	mtk_plane_state->pending.pitch = pitch;

	mtk_plane_state->pending.format = format;

	mtk_plane_state->pending.addr = addr;

	mtk_plane_state->pending.x = new_state->dst.x1;

	mtk_plane_state->pending.y = new_state->dst.y1;

	mtk_plane_state->pending.width = drm_rect_width(&new_state->dst);

	mtk_plane_state->pending.height = drm_rect_height(&new_state->dst);

	mtk_plane_state->pending.rotation = new_state->rotation;

}



static void mtk_plane_atomic_async_update(struct drm_plane *plane,

					  struct drm_atomic_state *state)

{
@@ -126,8 +155,10 @@ static void mtk_plane_atomic_async_update(struct drm_plane *plane, 
	plane->state->src_h = new_state->src_h;

	plane->state->src_w = new_state->src_w;

	swap(plane->state->fb, new_state->fb);

	new_plane_state->pending.async_dirty = true;



	mtk_plane_update_new_state(new_state, new_plane_state);

	wmb(); /* Make sure the above parameters are set before update */

	new_plane_state->pending.async_dirty = true;

	mtk_drm_crtc_async_update(new_state->crtc, plane, state);

}
@@ -189,14 +220,8 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, 
	struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,

									   plane);

	struct mtk_plane_state *mtk_plane_state = to_mtk_plane_state(new_state);

	struct drm_crtc *crtc = new_state->crtc;

	struct drm_framebuffer *fb = new_state->fb;

	struct drm_gem_object *gem;

	struct mtk_drm_gem_obj *mtk_gem;

	unsigned int pitch, format;

	dma_addr_t addr;



	if (!crtc || WARN_ON(!fb))

	if (!new_state->crtc || WARN_ON(!new_state->fb))

		return;



	if (!new_state->visible) {
@@ -204,24 +229,7 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, 
		return;

	}



	gem = fb->obj[0];

	mtk_gem = to_mtk_gem_obj(gem);

	addr = mtk_gem->dma_addr;

	pitch = fb->pitches[0];

	format = fb->format->format;



	addr += (new_state->src.x1 >> 16) * fb->format->cpp[0];

	addr += (new_state->src.y1 >> 16) * pitch;



	mtk_plane_state->pending.enable = true;

	mtk_plane_state->pending.pitch = pitch;

	mtk_plane_state->pending.format = format;

	mtk_plane_state->pending.addr = addr;

	mtk_plane_state->pending.x = new_state->dst.x1;

	mtk_plane_state->pending.y = new_state->dst.y1;

	mtk_plane_state->pending.width = drm_rect_width(&new_state->dst);

	mtk_plane_state->pending.height = drm_rect_height(&new_state->dst);

	mtk_plane_state->pending.rotation = new_state->rotation;

	mtk_plane_update_new_state(new_state, mtk_plane_state);

	wmb(); /* Make sure the above parameters are set before update */

	mtk_plane_state->pending.dirty = true;

}