Commit e6411bf2 authored by Jason-JH.Lin's avatar Jason-JH.Lin Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Add blend_modes to mtk_plane_init() for different SoCs 



Since some SoCs support premultiplied pixel formats but some do not,
the blend_modes parameter is added to mtk_plane_init(), which is
obtained from the mtk_ddp_comp_get_blend_modes function implemented
in different blending supported components.

The blending supported components can use driver data to set the
blend mode capabilities for different SoCs.

Signed-off-by: default avatarJason-JH.Lin <jason-jh.lin@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20241009034646.13143-6-jason-jh.lin@mediatek.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 333ab436

drivers/gpu/drm/mediatek/mtk_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -913,6 +913,7 @@ static int mtk_crtc_init_comp_planes(struct drm_device *drm_dev, 
				BIT(pipe),

				mtk_crtc_plane_type(mtk_crtc->layer_nr, num_planes),

				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);

		if (ret)

drivers/gpu/drm/mediatek/mtk_ddp_comp.c

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ static const struct mtk_ddp_comp_funcs ddp_ovl = { 
	.layer_config = mtk_ovl_layer_config,

	.bgclr_in_on = mtk_ovl_bgclr_in_on,

	.bgclr_in_off = mtk_ovl_bgclr_in_off,

	.get_blend_modes = mtk_ovl_get_blend_modes,

	.get_formats = mtk_ovl_get_formats,

	.get_num_formats = mtk_ovl_get_num_formats,

};
@@ -416,6 +417,7 @@ static const struct mtk_ddp_comp_funcs ddp_ovl_adaptor = { 
	.disconnect = mtk_ovl_adaptor_disconnect,

	.add = mtk_ovl_adaptor_add_comp,

	.remove = mtk_ovl_adaptor_remove_comp,

	.get_blend_modes = mtk_ovl_adaptor_get_blend_modes,

	.get_formats = mtk_ovl_adaptor_get_formats,

	.get_num_formats = mtk_ovl_adaptor_get_num_formats,

	.mode_valid = mtk_ovl_adaptor_mode_valid,

drivers/gpu/drm/mediatek/mtk_ddp_comp.h

+10 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct mtk_ddp_comp_funcs { 
	void (*ctm_set)(struct device *dev,

			struct drm_crtc_state *state);

	struct device * (*dma_dev_get)(struct device *dev);

	u32 (*get_blend_modes)(struct device *dev);

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

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

	void (*connect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
@@ -266,6 +267,15 @@ static inline struct device *mtk_ddp_comp_dma_dev_get(struct mtk_ddp_comp *comp) 
	return comp->dev;

}



static inline

u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)

{

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

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



	return 0;

}



static inline

const u32 *mtk_ddp_comp_get_formats(struct mtk_ddp_comp *comp)

{

drivers/gpu/drm/mediatek/mtk_disp_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void mtk_ovl_register_vblank_cb(struct device *dev, 
void mtk_ovl_unregister_vblank_cb(struct device *dev);

void mtk_ovl_enable_vblank(struct device *dev);

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);
@@ -131,6 +132,7 @@ void mtk_ovl_adaptor_start(struct device *dev); 
void mtk_ovl_adaptor_stop(struct device *dev);

unsigned int mtk_ovl_adaptor_layer_nr(struct device *dev);

struct device *mtk_ovl_adaptor_dma_dev_get(struct device *dev);

u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);

const u32 *mtk_ovl_adaptor_get_formats(struct device *dev);

size_t mtk_ovl_adaptor_get_num_formats(struct device *dev);

enum drm_mode_status mtk_ovl_adaptor_mode_valid(struct device *dev,

drivers/gpu/drm/mediatek/mtk_disp_ovl.c

+7 −0
Original line number Diff line number Diff line
@@ -215,6 +215,13 @@ void mtk_ovl_disable_vblank(struct device *dev) 
	writel_relaxed(0x0, ovl->regs + DISP_REG_OVL_INTEN);

}



u32 mtk_ovl_get_blend_modes(struct device *dev)

{

	struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);



	return ovl->data->blend_modes;

}



const u32 *mtk_ovl_get_formats(struct device *dev)

{

	struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);