Commit 4399e3d8 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-fixes

Mediatek DRM Fixes - 20250718

1. Add wait_event_timeout when disabling plane
2. only announce AFBC if really supported
3. mtk_dpi: Reorder output formats on MT8195/88

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://lore.kernel.org/r/20250717232916.12372-1-chunkuang.hu@kernel.org
parents 8d2ad056 5ceed7a6

drivers/gpu/drm/mediatek/mtk_crtc.c

+35 −1
Original line number Diff line number Diff line
@@ -719,6 +719,39 @@ int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane, 
	return 0;

}



void mtk_crtc_plane_disable(struct drm_crtc *crtc, struct drm_plane *plane)

{

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_plane_state *plane_state = to_mtk_plane_state(plane->state);

	int i;



	/* no need to wait for disabling the plane by CPU */

	if (!mtk_crtc->cmdq_client.chan)

		return;



	if (!mtk_crtc->enabled)

		return;



	/* set pending plane state to disabled */

	for (i = 0; i < mtk_crtc->layer_nr; i++) {

		struct drm_plane *mtk_plane = &mtk_crtc->planes[i];

		struct mtk_plane_state *mtk_plane_state = to_mtk_plane_state(mtk_plane->state);



		if (mtk_plane->index == plane->index) {

			memcpy(mtk_plane_state, plane_state, sizeof(*plane_state));

			break;

		}

	}

	mtk_crtc_update_config(mtk_crtc, false);



	/* wait for planes to be disabled by CMDQ */

	wait_event_timeout(mtk_crtc->cb_blocking_queue,

			   mtk_crtc->cmdq_vblank_cnt == 0,

			   msecs_to_jiffies(500));

#endif

}



void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,

			   struct drm_atomic_state *state)

{
@@ -930,7 +963,8 @@ static int mtk_crtc_init_comp_planes(struct drm_device *drm_dev, 
				mtk_ddp_comp_supported_rotations(comp),

				mtk_ddp_comp_get_blend_modes(comp),

				mtk_ddp_comp_get_formats(comp),

				mtk_ddp_comp_get_num_formats(comp), i);

				mtk_ddp_comp_get_num_formats(comp),

				mtk_ddp_comp_is_afbc_supported(comp), i);

		if (ret)

			return ret;

drivers/gpu/drm/mediatek/mtk_crtc.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ int mtk_crtc_create(struct drm_device *drm_dev, const unsigned int *path, 
		    unsigned int num_conn_routes);

int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,

			 struct mtk_plane_state *state);

void mtk_crtc_plane_disable(struct drm_crtc *crtc, struct drm_plane *plane);

void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,

			   struct drm_atomic_state *plane_state);

struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc);

drivers/gpu/drm/mediatek/mtk_ddp_comp.c

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static const struct mtk_ddp_comp_funcs ddp_ovl = { 
	.get_blend_modes = mtk_ovl_get_blend_modes,

	.get_formats = mtk_ovl_get_formats,

	.get_num_formats = mtk_ovl_get_num_formats,

	.is_afbc_supported = mtk_ovl_is_afbc_supported,

};



static const struct mtk_ddp_comp_funcs ddp_postmask = {

drivers/gpu/drm/mediatek/mtk_ddp_comp.h

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ struct mtk_ddp_comp_funcs { 
	u32 (*get_blend_modes)(struct device *dev);

	const u32 *(*get_formats)(struct device *dev);

	size_t (*get_num_formats)(struct device *dev);

	bool (*is_afbc_supported)(struct device *dev);

	void (*connect)(struct device *dev, struct device *mmsys_dev, unsigned int next);

	void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);

	void (*add)(struct device *dev, struct mtk_mutex *mutex);
@@ -294,6 +295,14 @@ size_t mtk_ddp_comp_get_num_formats(struct mtk_ddp_comp *comp) 
	return 0;

}



static inline bool mtk_ddp_comp_is_afbc_supported(struct mtk_ddp_comp *comp)

{

	if (comp->funcs && comp->funcs->is_afbc_supported)

		return comp->funcs->is_afbc_supported(comp->dev);



	return false;

}



static inline bool mtk_ddp_comp_add(struct mtk_ddp_comp *comp, struct mtk_mutex *mutex)

{

	if (comp->funcs && comp->funcs->add) {

drivers/gpu/drm/mediatek/mtk_disp_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ void mtk_ovl_disable_vblank(struct device *dev); 
u32 mtk_ovl_get_blend_modes(struct device *dev);

const u32 *mtk_ovl_get_formats(struct device *dev);

size_t mtk_ovl_get_num_formats(struct device *dev);

bool mtk_ovl_is_afbc_supported(struct device *dev);



void mtk_ovl_adaptor_add_comp(struct device *dev, struct mtk_mutex *mutex);

void mtk_ovl_adaptor_remove_comp(struct device *dev, struct mtk_mutex *mutex);