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 OVL components.
The OVL component can use driver data to set the blend mode
capabilities for different SoCs.
Fixes: 4225d5d5e779 ("drm/mediatek: Support alpha blending in display driver")
Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_crtc.c | 1 +
drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 2 ++
drivers/gpu/drm/mediatek/mtk_ddp_comp.h | 10 ++++++++
drivers/gpu/drm/mediatek/mtk_disp_drv.h | 3 +++
drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 25 +++++++++++++++++++
.../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 7 ++++++
drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 8 ++++++
drivers/gpu/drm/mediatek/mtk_plane.c | 9 +++----
drivers/gpu/drm/mediatek/mtk_plane.h | 4 +--
9 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c
index 175b00e5a253..b65f196f2015 100644
--- a/drivers/gpu/drm/mediatek/mtk_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_crtc.c
@@ -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)
diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
index be66d94be361..edc6417639e6 100644
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
@@ -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,
diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
index ecf6dc283cd7..79562af1180f 100644
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
@@ -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);
+ const 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
+const 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)
{
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index 082ac18fe04a..ea07b3b55b1c 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -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);
+const 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);
+const 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,
@@ -165,6 +167,7 @@ void mtk_mdp_rdma_start(struct device *dev, struct cmdq_pkt *cmdq_pkt);
void mtk_mdp_rdma_stop(struct device *dev, struct cmdq_pkt *cmdq_pkt);
void mtk_mdp_rdma_config(struct device *dev, struct mtk_mdp_rdma_cfg *cfg,
struct cmdq_pkt *cmdq_pkt);
+const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
const u32 *mtk_mdp_rdma_get_formats(struct device *dev);
size_t mtk_mdp_rdma_get_num_formats(struct device *dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
index 8f7b7e07aeb1..864dc96aad01 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
@@ -147,6 +147,7 @@ struct mtk_disp_ovl_data {
bool fmt_rgb565_is_0;
bool smi_id_en;
bool supports_afbc;
+ const u32 blend_modes;
const u32 *formats;
size_t num_formats;
bool supports_clrfmt_ext;
@@ -215,6 +216,13 @@ void mtk_ovl_disable_vblank(struct device *dev)
writel_relaxed(0x0, ovl->regs + DISP_REG_OVL_INTEN);
}
+const 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);
@@ -674,6 +682,8 @@ static const struct mtk_disp_ovl_data mt2701_ovl_driver_data = {
.layer_nr = 4,
.fmt_convert = mtk_ovl_fmt_convert,
.fmt_rgb565_is_0 = false,
+ .blend_modes = BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE),
.formats = mt8173_formats,
.num_formats = ARRAY_SIZE(mt8173_formats),
};
@@ -684,6 +694,8 @@ static const struct mtk_disp_ovl_data mt8173_ovl_driver_data = {
.layer_nr = 4,
.fmt_convert = mtk_ovl_fmt_convert,
.fmt_rgb565_is_0 = true,
+ .blend_modes = BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE),
.formats = mt8173_formats,
.num_formats = ARRAY_SIZE(mt8173_formats),
};
@@ -694,6 +706,8 @@ static const struct mtk_disp_ovl_data mt8183_ovl_driver_data = {
.layer_nr = 4,
.fmt_convert = mtk_ovl_fmt_convert,
.fmt_rgb565_is_0 = true,
+ .blend_modes = BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE),
.formats = mt8173_formats,
.num_formats = ARRAY_SIZE(mt8173_formats),
};
@@ -704,6 +718,8 @@ static const struct mtk_disp_ovl_data mt8183_ovl_2l_driver_data = {
.layer_nr = 2,
.fmt_convert = mtk_ovl_fmt_convert,
.fmt_rgb565_is_0 = true,
+ .blend_modes = BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE),
.formats = mt8173_formats,
.num_formats = ARRAY_SIZE(mt8173_formats),
};
@@ -715,6 +731,9 @@ static const struct mtk_disp_ovl_data mt8192_ovl_driver_data = {
.fmt_convert = mtk_ovl_fmt_convert_with_blend,
.fmt_rgb565_is_0 = true,
.smi_id_en = true,
+ .blend_modes = BIT(DRM_MODE_BLEND_PREMULTI) |
+ BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE),
.formats = mt8173_formats,
.num_formats = ARRAY_SIZE(mt8173_formats),
};
@@ -726,6 +745,9 @@ static const struct mtk_disp_ovl_data mt8192_ovl_2l_driver_data = {
.fmt_convert = mtk_ovl_fmt_convert_with_blend,
.fmt_rgb565_is_0 = true,
.smi_id_en = true,
+ .blend_modes = BIT(DRM_MODE_BLEND_PREMULTI) |
+ BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE),
.formats = mt8173_formats,
.num_formats = ARRAY_SIZE(mt8173_formats),
};
@@ -738,6 +760,9 @@ static const struct mtk_disp_ovl_data mt8195_ovl_driver_data = {
.fmt_rgb565_is_0 = true,
.smi_id_en = true,
.supports_afbc = true,
+ .blend_modes = BIT(DRM_MODE_BLEND_PREMULTI) |
+ BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE),
.formats = mt8195_formats,
.num_formats = ARRAY_SIZE(mt8195_formats),
.supports_clrfmt_ext = true,
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
index c6768210b08b..2d47b6eb4c19 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
@@ -400,6 +400,13 @@ void mtk_ovl_adaptor_disable_vblank(struct device *dev)
mtk_ethdr_disable_vblank(ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_ETHDR0]);
}
+const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev)
+{
+ struct mtk_disp_ovl_adaptor *ovl_adaptor = dev_get_drvdata(dev);
+
+ return mtk_mdp_rdma_get_blend_modes(ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_MDP_RDMA0]);
+}
+
const u32 *mtk_ovl_adaptor_get_formats(struct device *dev)
{
struct mtk_disp_ovl_adaptor *ovl_adaptor = dev_get_drvdata(dev);
diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
index 7c1a8c796833..a011d2e664f4 100644
--- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
@@ -3,6 +3,7 @@
* Copyright (c) 2021 MediaTek Inc.
*/
+#include <drm/drm_blend.h>
#include <drm/drm_fourcc.h>
#include <linux/clk.h>
#include <linux/component.h>
@@ -232,6 +233,13 @@ void mtk_mdp_rdma_config(struct device *dev, struct mtk_mdp_rdma_cfg *cfg,
MDP_RDMA_MF_CLIP_SIZE, FLD_MF_CLIP_H);
}
+const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev)
+{
+ return BIT(DRM_MODE_BLEND_PREMULTI) |
+ BIT(DRM_MODE_BLEND_COVERAGE) |
+ BIT(DRM_MODE_BLEND_PIXEL_NONE);
+}
+
const u32 *mtk_mdp_rdma_get_formats(struct device *dev)
{
return formats;
diff --git a/drivers/gpu/drm/mediatek/mtk_plane.c b/drivers/gpu/drm/mediatek/mtk_plane.c
index 7d2cb4e0fafa..eb545b81bf2f 100644
--- a/drivers/gpu/drm/mediatek/mtk_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_plane.c
@@ -320,8 +320,8 @@ static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {
int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
unsigned long possible_crtcs, enum drm_plane_type type,
- unsigned int supported_rotations, const u32 *formats,
- size_t num_formats, unsigned int plane_idx)
+ unsigned int supported_rotations, const u32 blend_modes,
+ const u32 *formats, size_t num_formats, unsigned int plane_idx)
{
int err;
@@ -366,10 +366,7 @@ int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
if (err)
DRM_ERROR("failed to create property: alpha\n");
- err = drm_plane_create_blend_mode_property(plane,
- BIT(DRM_MODE_BLEND_PREMULTI) |
- BIT(DRM_MODE_BLEND_COVERAGE) |
- BIT(DRM_MODE_BLEND_PIXEL_NONE));
+ err = drm_plane_create_blend_mode_property(plane, blend_modes);
if (err)
DRM_ERROR("failed to create property: blend_mode\n");
diff --git a/drivers/gpu/drm/mediatek/mtk_plane.h b/drivers/gpu/drm/mediatek/mtk_plane.h
index 5b177eac67b7..3b13b89989c7 100644
--- a/drivers/gpu/drm/mediatek/mtk_plane.h
+++ b/drivers/gpu/drm/mediatek/mtk_plane.h
@@ -48,6 +48,6 @@ to_mtk_plane_state(struct drm_plane_state *state)
int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
unsigned long possible_crtcs, enum drm_plane_type type,
- unsigned int supported_rotations, const u32 *formats,
- size_t num_formats, unsigned int plane_idx);
+ unsigned int supported_rotations, const u32 blend_modes,
+ const u32 *formats, size_t num_formats, unsigned int plane_idx);
#endif
--
2.43.0Hi Jason-JH.Lin,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on linus/master v6.12-rc1 next-20241001]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jason-JH-Lin/drm-mediatek-ovl-Add-fmt_convert-function-pointer-to-driver-data/20240925-182056
base: git://anongit.freedesktop.org/drm/drm drm-next
patch link: https://lore.kernel.org/r/20240925101927.17042-3-jason-jh.lin%40mediatek.com
patch subject: [PATCH v5 2/2] drm/mediatek: Add blend_modes to mtk_plane_init() for different SoCs
config: arm64-randconfig-002-20241002 (https://download.01.org/0day-ci/archive/20241002/202410021332.VIWq2mtZ-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project fef3566a25ff0e34fb87339ba5e13eca17cec00f)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241002/202410021332.VIWq2mtZ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202410021332.VIWq2mtZ-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/mediatek/mtk_disp_gamma.c:14:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:9:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:517:36: error: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Werror,-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_gamma.c:14:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_gamma.c:16:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
6 errors generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_ethdr.c:18:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:9:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:517:36: error: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Werror,-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
In file included from drivers/gpu/drm/mediatek/mtk_ethdr.c:18:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
3 errors generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:7:
In file included from include/drm/drm_of.h:8:
In file included from include/drm/drm_bridge.h:30:
In file included from include/drm/drm_atomic.h:31:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:517:36: error: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Werror,-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:20:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:21:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:403:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
403 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev)
| ^~~~~
7 errors generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:15:
In file included from drivers/gpu/drm/mediatek/mtk_disp_drv.h:13:
In file included from drivers/gpu/drm/mediatek/mtk_plane.h:10:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:517:36: error: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Werror,-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
In file included from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:15:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:16:
In file included from drivers/gpu/drm/mediatek/mtk_drm_drv.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:236:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
236 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev)
| ^~~~~
7 errors generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:18:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:9:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:517:36: error: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Werror,-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:18:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:20:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_disp_ovl.c:219:1: error: 'const' type qualifier on return type has no effect [-Werror,-Wignored-qualifiers]
219 | const u32 mtk_ovl_get_blend_modes(struct device *dev)
| ^~~~~
7 errors generated.
vim +/const +83 drivers/gpu/drm/mediatek/mtk_ddp_comp.h
48
49 struct mtk_ddp_comp;
50 struct cmdq_pkt;
51 struct mtk_ddp_comp_funcs {
52 int (*power_on)(struct device *dev);
53 void (*power_off)(struct device *dev);
54 int (*clk_enable)(struct device *dev);
55 void (*clk_disable)(struct device *dev);
56 void (*config)(struct device *dev, unsigned int w,
57 unsigned int h, unsigned int vrefresh,
58 unsigned int bpc, struct cmdq_pkt *cmdq_pkt);
59 void (*start)(struct device *dev);
60 void (*stop)(struct device *dev);
61 void (*register_vblank_cb)(struct device *dev,
62 void (*vblank_cb)(void *),
63 void *vblank_cb_data);
64 void (*unregister_vblank_cb)(struct device *dev);
65 void (*enable_vblank)(struct device *dev);
66 void (*disable_vblank)(struct device *dev);
67 unsigned int (*supported_rotations)(struct device *dev);
68 unsigned int (*layer_nr)(struct device *dev);
69 int (*layer_check)(struct device *dev,
70 unsigned int idx,
71 struct mtk_plane_state *state);
72 void (*layer_config)(struct device *dev, unsigned int idx,
73 struct mtk_plane_state *state,
74 struct cmdq_pkt *cmdq_pkt);
75 unsigned int (*gamma_get_lut_size)(struct device *dev);
76 void (*gamma_set)(struct device *dev,
77 struct drm_crtc_state *state);
78 void (*bgclr_in_on)(struct device *dev);
79 void (*bgclr_in_off)(struct device *dev);
80 void (*ctm_set)(struct device *dev,
81 struct drm_crtc_state *state);
82 struct device * (*dma_dev_get)(struct device *dev);
> 83 const u32 (*get_blend_modes)(struct device *dev);
84 const u32 *(*get_formats)(struct device *dev);
85 size_t (*get_num_formats)(struct device *dev);
86 void (*connect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
87 void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
88 void (*add)(struct device *dev, struct mtk_mutex *mutex);
89 void (*remove)(struct device *dev, struct mtk_mutex *mutex);
90 unsigned int (*encoder_index)(struct device *dev);
91 enum drm_mode_status (*mode_valid)(struct device *dev, const struct drm_display_mode *mode);
92 };
93
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Jason-JH.Lin,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm/drm-next]
[also build test ERROR on linus/master next-20240927]
[cannot apply to v6.11]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jason-JH-Lin/drm-mediatek-ovl-Add-fmt_convert-function-pointer-to-driver-data/20240925-182056
base: git://anongit.freedesktop.org/drm/drm drm-next
patch link: https://lore.kernel.org/r/20240925101927.17042-3-jason-jh.lin%40mediatek.com
patch subject: [PATCH v5 2/2] drm/mediatek: Add blend_modes to mtk_plane_init() for different SoCs
config: arm-randconfig-002-20240929 (https://download.01.org/0day-ci/archive/20240929/202409290726.oaatx2OR-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 14.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240929/202409290726.oaatx2OR-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409290726.oaatx2OR-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10,
from drivers/gpu/drm/mediatek/mtk_crtc.c:22:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:9: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
cc1: all warnings being treated as errors
--
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10,
from drivers/gpu/drm/mediatek/mtk_disp_color.c:13:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:9: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_color.c:15:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
cc1: all warnings being treated as errors
--
In file included from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:15:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_drm_drv.h:10,
from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:16:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:9: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:236:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
236 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev)
| ^~~~~
cc1: all warnings being treated as errors
--
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10,
from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:18:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:9: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:20:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_disp_ovl.c:219:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
219 | const u32 mtk_ovl_get_blend_modes(struct device *dev)
| ^~~~~
cc1: all warnings being treated as errors
--
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:20:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:9: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:21:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:403:1: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers]
403 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev)
| ^~~~~
cc1: all warnings being treated as errors
vim +83 drivers/gpu/drm/mediatek/mtk_ddp_comp.h
48
49 struct mtk_ddp_comp;
50 struct cmdq_pkt;
51 struct mtk_ddp_comp_funcs {
52 int (*power_on)(struct device *dev);
53 void (*power_off)(struct device *dev);
54 int (*clk_enable)(struct device *dev);
55 void (*clk_disable)(struct device *dev);
56 void (*config)(struct device *dev, unsigned int w,
57 unsigned int h, unsigned int vrefresh,
58 unsigned int bpc, struct cmdq_pkt *cmdq_pkt);
59 void (*start)(struct device *dev);
60 void (*stop)(struct device *dev);
61 void (*register_vblank_cb)(struct device *dev,
62 void (*vblank_cb)(void *),
63 void *vblank_cb_data);
64 void (*unregister_vblank_cb)(struct device *dev);
65 void (*enable_vblank)(struct device *dev);
66 void (*disable_vblank)(struct device *dev);
67 unsigned int (*supported_rotations)(struct device *dev);
68 unsigned int (*layer_nr)(struct device *dev);
69 int (*layer_check)(struct device *dev,
70 unsigned int idx,
71 struct mtk_plane_state *state);
72 void (*layer_config)(struct device *dev, unsigned int idx,
73 struct mtk_plane_state *state,
74 struct cmdq_pkt *cmdq_pkt);
75 unsigned int (*gamma_get_lut_size)(struct device *dev);
76 void (*gamma_set)(struct device *dev,
77 struct drm_crtc_state *state);
78 void (*bgclr_in_on)(struct device *dev);
79 void (*bgclr_in_off)(struct device *dev);
80 void (*ctm_set)(struct device *dev,
81 struct drm_crtc_state *state);
82 struct device * (*dma_dev_get)(struct device *dev);
> 83 const u32 (*get_blend_modes)(struct device *dev);
84 const u32 *(*get_formats)(struct device *dev);
85 size_t (*get_num_formats)(struct device *dev);
86 void (*connect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
87 void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
88 void (*add)(struct device *dev, struct mtk_mutex *mutex);
89 void (*remove)(struct device *dev, struct mtk_mutex *mutex);
90 unsigned int (*encoder_index)(struct device *dev);
91 enum drm_mode_status (*mode_valid)(struct device *dev, const struct drm_display_mode *mode);
92 };
93
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Jason-JH.Lin,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm/drm-next]
[also build test WARNING on linus/master next-20240926]
[cannot apply to v6.11]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jason-JH-Lin/drm-mediatek-ovl-Add-fmt_convert-function-pointer-to-driver-data/20240925-182056
base: git://anongit.freedesktop.org/drm/drm drm-next
patch link: https://lore.kernel.org/r/20240925101927.17042-3-jason-jh.lin%40mediatek.com
patch subject: [PATCH v5 2/2] drm/mediatek: Add blend_modes to mtk_plane_init() for different SoCs
config: arm64-allmodconfig (https://download.01.org/0day-ci/archive/20240926/202409261653.FyqBL1w8-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 7773243d9916f98ba0ffce0c3a960e4aa9f03e81)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240926/202409261653.FyqBL1w8-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409261653.FyqBL1w8-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/gpu/drm/mediatek/mtk_crtc.c:7:
In file included from include/linux/dma-mapping.h:11:
In file included from include/linux/scatterlist.h:8:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:503:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
503 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
504 | item];
| ~~~~
include/linux/vmstat.h:510:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
510 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
511 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:523:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
523 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
524 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/mediatek/mtk_crtc.c:22:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
6 warnings generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_ddp_comp.c:17:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:9:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:503:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
503 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
504 | item];
| ~~~~
include/linux/vmstat.h:510:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
510 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
511 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:523:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
523 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
524 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/mediatek/mtk_ddp_comp.c:17:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_ddp_comp.c:19:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
9 warnings generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:18:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:9:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:503:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
503 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
504 | item];
| ~~~~
include/linux/vmstat.h:510:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
510 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
511 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:523:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
523 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
524 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:18:
In file included from drivers/gpu/drm/mediatek/mtk_crtc.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl.c:20:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_disp_ovl.c:219:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
219 | const u32 mtk_ovl_get_blend_modes(struct device *dev)
| ^~~~~
10 warnings generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:7:
In file included from include/drm/drm_of.h:8:
In file included from include/drm/drm_bridge.h:30:
In file included from include/drm/drm_atomic.h:31:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:503:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
503 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
504 | item];
| ~~~~
include/linux/vmstat.h:510:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
510 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
511 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:523:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
523 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
524 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:20:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:21:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:403:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
403 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev)
| ^~~~~
10 warnings generated.
--
In file included from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:15:
In file included from drivers/gpu/drm/mediatek/mtk_disp_drv.h:13:
In file included from drivers/gpu/drm/mediatek/mtk_plane.h:10:
In file included from include/drm/drm_crtc.h:32:
In file included from include/drm/drm_modes.h:33:
In file included from include/drm/drm_connector.h:32:
In file included from include/drm/drm_util.h:36:
In file included from include/linux/kgdb.h:19:
In file included from include/linux/kprobes.h:28:
In file included from include/linux/ftrace.h:13:
In file included from include/linux/kallsyms.h:13:
In file included from include/linux/mm.h:2232:
include/linux/vmstat.h:503:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
503 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
504 | item];
| ~~~~
include/linux/vmstat.h:510:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
510 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
511 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
include/linux/vmstat.h:517:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
517 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
include/linux/vmstat.h:523:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
523 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
524 | NR_VM_NUMA_EVENT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:15:
>> drivers/gpu/drm/mediatek/mtk_disp_drv.h:106:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
106 | const u32 mtk_ovl_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:135:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
135 | const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_disp_drv.h:170:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
170 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev);
| ^~~~~
In file included from drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:16:
In file included from drivers/gpu/drm/mediatek/mtk_drm_drv.h:10:
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.h:83:2: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
83 | const u32 (*get_blend_modes)(struct device *dev);
| ^~~~~
drivers/gpu/drm/mediatek/mtk_ddp_comp.h:271:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
271 | const u32 mtk_ddp_comp_get_blend_modes(struct mtk_ddp_comp *comp)
| ^~~~~
>> drivers/gpu/drm/mediatek/mtk_mdp_rdma.c:236:1: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers]
236 | const u32 mtk_mdp_rdma_get_blend_modes(struct device *dev)
| ^~~~~
10 warnings generated.
vim +/const +83 drivers/gpu/drm/mediatek/mtk_ddp_comp.h
48
49 struct mtk_ddp_comp;
50 struct cmdq_pkt;
51 struct mtk_ddp_comp_funcs {
52 int (*power_on)(struct device *dev);
53 void (*power_off)(struct device *dev);
54 int (*clk_enable)(struct device *dev);
55 void (*clk_disable)(struct device *dev);
56 void (*config)(struct device *dev, unsigned int w,
57 unsigned int h, unsigned int vrefresh,
58 unsigned int bpc, struct cmdq_pkt *cmdq_pkt);
59 void (*start)(struct device *dev);
60 void (*stop)(struct device *dev);
61 void (*register_vblank_cb)(struct device *dev,
62 void (*vblank_cb)(void *),
63 void *vblank_cb_data);
64 void (*unregister_vblank_cb)(struct device *dev);
65 void (*enable_vblank)(struct device *dev);
66 void (*disable_vblank)(struct device *dev);
67 unsigned int (*supported_rotations)(struct device *dev);
68 unsigned int (*layer_nr)(struct device *dev);
69 int (*layer_check)(struct device *dev,
70 unsigned int idx,
71 struct mtk_plane_state *state);
72 void (*layer_config)(struct device *dev, unsigned int idx,
73 struct mtk_plane_state *state,
74 struct cmdq_pkt *cmdq_pkt);
75 unsigned int (*gamma_get_lut_size)(struct device *dev);
76 void (*gamma_set)(struct device *dev,
77 struct drm_crtc_state *state);
78 void (*bgclr_in_on)(struct device *dev);
79 void (*bgclr_in_off)(struct device *dev);
80 void (*ctm_set)(struct device *dev,
81 struct drm_crtc_state *state);
82 struct device * (*dma_dev_get)(struct device *dev);
> 83 const u32 (*get_blend_modes)(struct device *dev);
84 const u32 *(*get_formats)(struct device *dev);
85 size_t (*get_num_formats)(struct device *dev);
86 void (*connect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
87 void (*disconnect)(struct device *dev, struct device *mmsys_dev, unsigned int next);
88 void (*add)(struct device *dev, struct mtk_mutex *mutex);
89 void (*remove)(struct device *dev, struct mtk_mutex *mutex);
90 unsigned int (*encoder_index)(struct device *dev);
91 enum drm_mode_status (*mode_valid)(struct device *dev, const struct drm_display_mode *mode);
92 };
93
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Il 25/09/24 12:19, Jason-JH.Lin ha scritto:
> 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 OVL components.
>
> The OVL component can use driver data to set the blend mode
> capabilities for different SoCs.
>
> Fixes: 4225d5d5e779 ("drm/mediatek: Support alpha blending in display driver")
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
Just perfect.
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
On Thu, 2024-09-26 at 10:37 +0200, AngeloGioacchino Del Regno wrote:
> Il 25/09/24 12:19, Jason-JH.Lin ha scritto:
> > 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 OVL components.
> >
> > The OVL component can use driver data to set the blend mode
> > capabilities for different SoCs.
> >
> > Fixes: 4225d5d5e779 ("drm/mediatek: Support alpha blending in
> > display driver")
> > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
>
> Just perfect.
>
> Signed-off-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@collabora.com>
>
Just to confirm. Do you mean reviewed-by? :)
Regards,
Jason-JH.Lin
Il 26/09/24 11:42, Jason-JH Lin (林睿祥) ha scritto:
> On Thu, 2024-09-26 at 10:37 +0200, AngeloGioacchino Del Regno wrote:
>> Il 25/09/24 12:19, Jason-JH.Lin ha scritto:
>>> 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 OVL components.
>>>
>>> The OVL component can use driver data to set the blend mode
>>> capabilities for different SoCs.
>>>
>>> Fixes: 4225d5d5e779 ("drm/mediatek: Support alpha blending in
>>> display driver")
>>> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
>>
>> Just perfect.
>>
>> Signed-off-by: AngeloGioacchino Del Regno <
>> angelogioacchino.delregno@collabora.com>
>>
>
> Just to confirm. Do you mean reviewed-by? :)
>
Oh, my brain needs coffee. Sorry about that, yes, I was meaning R-b.
Anyway, gave you the right tag on v6, so ignore that.... :-)
Cheers,
Angelo
Hi, Jason:
On Wed, 2024-09-25 at 18:19 +0800, Jason-JH.Lin wrote:
> 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 OVL components.
>
> The OVL component can use driver data to set the blend mode
> capabilities for different SoCs.
>
> Fixes: 4225d5d5e779 ("drm/mediatek: Support alpha blending in display driver")
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> ---
[snip]
> +
> const u32 *mtk_ovl_get_formats(struct device *dev)
> {
> struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
> @@ -674,6 +682,8 @@ static const struct mtk_disp_ovl_data mt2701_ovl_driver_data = {
> .layer_nr = 4,
> .fmt_convert = mtk_ovl_fmt_convert,
> .fmt_rgb565_is_0 = false,
> + .blend_modes = BIT(DRM_MODE_BLEND_COVERAGE) |
> + BIT(DRM_MODE_BLEND_PIXEL_NONE),
When blend_modes has no pre-multiplied, fmt_convert is mtk_ovl_fmt_convert().
When blend_modes pre-multiplied, fmt_convert is mtk_ovl_fmt_convert_with_blend().
I think we could keep blend_modes and drop fmt_convert.
if (data->blend_modes & BIT(DRM_MODE_BLEND_PREMULTI))
mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
else
mtk_ovl_fmt_convert(fmt);
In current patch, when SoC does not support pre-multiplied but user space set pre-multiplied buffer,
driver would keep going and treat it as coverage buffer.
I think the result is wrong but it's error handling.
If we accept this error, why not keep only mtk_ovl_fmt_convert_with_blend() and drop mtk_ovl_fmt_convert().
if (data->blend_modes & BIT(DRM_MODE_BLEND_PREMULTI))
mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
else
mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
and this would result in:
mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
> .formats = mt8173_formats,
> .num_formats = ARRAY_SIZE(mt8173_formats),
> };
[snip]
> @@ -715,6 +731,9 @@ static const struct mtk_disp_ovl_data mt8192_ovl_driver_data = {
> .fmt_convert = mtk_ovl_fmt_convert_with_blend,
> .fmt_rgb565_is_0 = true,
> .smi_id_en = true,
> + .blend_modes = BIT(DRM_MODE_BLEND_PREMULTI) |
> + BIT(DRM_MODE_BLEND_COVERAGE) |
> + BIT(DRM_MODE_BLEND_PIXEL_NONE),
> .formats = mt8173_formats,
> .num_formats = ARRAY_SIZE(mt8173_formats),
> };
[snip]
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> index c6768210b08b..2d47b6eb4c19 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> @@ -400,6 +400,13 @@ void mtk_ovl_adaptor_disable_vblank(struct device *dev)
> mtk_ethdr_disable_vblank(ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_ETHDR0]);
> }
>
> +const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev)
> +{
> + struct mtk_disp_ovl_adaptor *ovl_adaptor = dev_get_drvdata(dev);
> +
> + return mtk_mdp_rdma_get_blend_modes(ovl_adaptor->ovl_adaptor_comp[OVL_ADAPTOR_MDP_RDMA0]);
RDMA has no alpha blending function.
Get blend mode from ethdr.
> +}
> +
>
[snip]
>
> @@ -366,10 +366,7 @@ int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
> if (err)
> DRM_ERROR("failed to create property: alpha\n");
>
> - err = drm_plane_create_blend_mode_property(plane,
> - BIT(DRM_MODE_BLEND_PREMULTI) |
> - BIT(DRM_MODE_BLEND_COVERAGE) |
> - BIT(DRM_MODE_BLEND_PIXEL_NONE));
> + err = drm_plane_create_blend_mode_property(plane, blend_modes);
For disp_rdma, blend_modes is 0, I this is not necessary to create blend mode property.
Regards,
CK
> if (err)
> DRM_ERROR("failed to create property: blend_mode\n");
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_plane.h b/drivers/gpu/drm/mediatek/mtk_plane.h
> index 5b177eac67b7..3b13b89989c7 100644
> --- a/drivers/gpu/drm/mediatek/mtk_plane.h
> +++ b/drivers/gpu/drm/mediatek/mtk_plane.h
> @@ -48,6 +48,6 @@ to_mtk_plane_state(struct drm_plane_state *state)
>
> int mtk_plane_init(struct drm_device *dev, struct drm_plane *plane,
> unsigned long possible_crtcs, enum drm_plane_type type,
> - unsigned int supported_rotations, const u32 *formats,
> - size_t num_formats, unsigned int plane_idx);
> + unsigned int supported_rotations, const u32 blend_modes,
> + const u32 *formats, size_t num_formats, unsigned int plane_idx);
> #endif
On Thu, 2024-09-26 at 02:34 +0000, CK Hu (胡俊光) wrote:
> Hi, Jason:
>
> On Wed, 2024-09-25 at 18:19 +0800, Jason-JH.Lin wrote:
> > 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 OVL components.
> >
> > The OVL component can use driver data to set the blend mode
> > capabilities for different SoCs.
> >
> > Fixes: 4225d5d5e779 ("drm/mediatek: Support alpha blending in
> > display driver")
> > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
> > ---
>
> [snip]
>
> > +
> > const u32 *mtk_ovl_get_formats(struct device *dev)
> > {
> > struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
> > @@ -674,6 +682,8 @@ static const struct mtk_disp_ovl_data
> > mt2701_ovl_driver_data = {
> > .layer_nr = 4,
> > .fmt_convert = mtk_ovl_fmt_convert,
> > .fmt_rgb565_is_0 = false,
> > + .blend_modes = BIT(DRM_MODE_BLEND_COVERAGE) |
> > + BIT(DRM_MODE_BLEND_PIXEL_NONE),
>
> When blend_modes has no pre-multiplied, fmt_convert is
> mtk_ovl_fmt_convert().
> When blend_modes pre-multiplied, fmt_convert is
> mtk_ovl_fmt_convert_with_blend().
>
> I think we could keep blend_modes and drop fmt_convert.
>
> if (data->blend_modes & BIT(DRM_MODE_BLEND_PREMULTI))
> mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
> else
> mtk_ovl_fmt_convert(fmt);
>
> In current patch, when SoC does not support pre-multiplied but user
> space set pre-multiplied buffer,
> driver would keep going and treat it as coverage buffer.
>
> I think the result is wrong but it's error handling.
Yes, OVL in previous SoCs only support the color format with coverage
mode, even if user space set pre-multiplied buffer.
I'll write the comment in this part of code.
> If we accept this error, why not keep only
> mtk_ovl_fmt_convert_with_blend() and drop mtk_ovl_fmt_convert().
>
> if (data->blend_modes & BIT(DRM_MODE_BLEND_PREMULTI))
> mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
> else
> mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
>
> and this would result in:
>
> mtk_ovl_fmt_convert_with_blend(fmt, blend_modes);
OK I'll drop the function pointer and use blend_modes to cope with
this.
> [snip]
>
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> > b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> > index c6768210b08b..2d47b6eb4c19 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> > @@ -400,6 +400,13 @@ void mtk_ovl_adaptor_disable_vblank(struct
> > device *dev)
> > mtk_ethdr_disable_vblank(ovl_adaptor-
> > >ovl_adaptor_comp[OVL_ADAPTOR_ETHDR0]);
> > }
> >
> > +const u32 mtk_ovl_adaptor_get_blend_modes(struct device *dev)
> > +{
> > + struct mtk_disp_ovl_adaptor *ovl_adaptor =
> > dev_get_drvdata(dev);
> > +
> > + return mtk_mdp_rdma_get_blend_modes(ovl_adaptor-
> > >ovl_adaptor_comp[OVL_ADAPTOR_MDP_RDMA0]);
>
> RDMA has no alpha blending function.
> Get blend mode from ethdr.
OK, I'll change it to ethdr.
>
> > +}
> > +
> >
>
> [snip]
>
> >
> > @@ -366,10 +366,7 @@ int mtk_plane_init(struct drm_device *dev,
> > struct drm_plane *plane,
> > if (err)
> > DRM_ERROR("failed to create property: alpha\n");
> >
> > - err = drm_plane_create_blend_mode_property(plane,
> > - BIT(DRM_MODE_BLEND_P
> > REMULTI) |
> > - BIT(DRM_MODE_BLEND_C
> > OVERAGE) |
> > - BIT(DRM_MODE_BLEND_P
> > IXEL_NONE));
> > + err = drm_plane_create_blend_mode_property(plane, blend_modes);
>
> For disp_rdma, blend_modes is 0, I this is not necessary to create
> blend mode property.
OK, I'll add the 0 checking for this.
Regards,
Jason-JH.Lin
>
> Regards,
> CK
© 2016 - 2024 Red Hat, Inc.