shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop2: add support for ARGB1555 alpha map config from userspace

Browse Source 
The alpha value is mapped as follows:
    bit[7, 0]: alpha 0 mapping value;
    bit[15,8]: alpha 1 mapping value;
    bit[31]  : alpha map enable.

for example:
    modetest -w 57:alpha_map:2147548928 #0x8000ff00

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ib38ee9b578e265cdb7beee66860e21a6dc8598cf
This commit is contained in:
Sandy Huang
2025-05-25 11:28:54 +08:00
parent 49d4637556
commit 7c2dbdf4cd
1 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@@ -365,6 +365,7 @@ struct vop2_plane_state {
int global_alpha;
int blend_mode;
uint32_t background;
uint32_t alpha_map;
uint64_t color_key;
unsigned long offset;
int pdaf_data_type;
@@ -486,6 +487,7 @@ struct vop2_win {
struct drm_property *color_key_prop;
struct drm_property *scale_prop;
struct drm_property *name_prop;
struct drm_property *alpha_map_prop;
/**
* @dci_data_prop: dci data interaction with userspace
*/
@@ -2764,6 +2766,20 @@ static inline bool vop2_has_feature(struct vop2 *vop2, uint64_t feature)
return (vop2->data->feature & feature);
}
static bool vop2_supported_argb1555(struct vop2 *vop2, struct vop2_win *win)
{
const struct vop2_data *vop2_data = vop2->data;
const struct vop2_win_data *win_data = &vop2_data->win[win->win_id];
const u32 *format = win_data->formats;
int i;
for (i = 0; i < win_data->nformats; i++) {
if ((format[i] == DRM_FORMAT_ARGB1555) || (format[i] == DRM_FORMAT_ABGR1555))
return true;
}
return false;
}
/*
* rk356x/rk3588/rk3528:
* 0: Full mode, 16 lines for one tail
@@ -7095,8 +7111,11 @@ static void vop2_win_atomic_update(struct vop2_win *win, struct drm_rect *src, s
/* rk3588 should set half_blocK_en to 1 in line and tile mode */
VOP_AFBC_SET(vop2, win, half_block_en, afbc_half_block_en);
if (!win->parent && win->feature & WIN_FEATURE_MULTI_AREA)
VOP_CTRL_SET(vop2, win_alpha_map[win->phys_id], 0x8000ff00);
if (win->alpha_map_prop) {
u32 alpha_map = vpstate->alpha_map ? vpstate->alpha_map : 0x8000ff00;
VOP_CTRL_SET(vop2, win_alpha_map[win->phys_id], alpha_map);
}
VOP_WIN_SET(vop2, win, yrgb_mst, yrgb_mst);
@@ -7413,6 +7432,7 @@ static void vop2_atomic_plane_reset(struct drm_plane *plane)
__drm_atomic_helper_plane_reset(plane, &vpstate->base);
vpstate->base.zpos = win->zpos;
vpstate->alpha_map = 0x8000ff00;
}
static struct drm_plane_state *vop2_atomic_plane_duplicate_state(struct drm_plane *plane)
@@ -7515,6 +7535,11 @@ static int vop2_atomic_plane_set_property(struct drm_plane *plane,
return 0;
}
if (property == win->alpha_map_prop) {
vpstate->alpha_map = val;
return 0;
}
if (property == win->dci_data_prop) {
ret = vop2_atomic_replace_property_blob_from_id(drm_dev,
&vpstate->dci_data,
@@ -7576,6 +7601,11 @@ static int vop2_atomic_plane_get_property(struct drm_plane *plane,
return 0;
}
if (property == win->alpha_map_prop) {
*val = vpstate->alpha_map;
return 0;
}
if (property == win->dci_data_prop) {
*val = vpstate->dci_data ? vpstate->dci_data->base.id : 0;
return 0;
@@ -14928,6 +14958,23 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win, unsigned lon
if (win->regs->color_key.mask)
drm_object_attach_property(&win->base.base, win->color_key_prop, 0);
/*
* argb1555 support alpha map config from userspace:
* bit[7, 0]: alpha 0 mapping value;
* bit[15,8]: alpha 1 mapping value;
* bit[31] : alpha map enable.
*/
if (vop2_supported_argb1555(vop2, win) && !win->parent) {
win->alpha_map_prop = drm_property_create_range(vop2->drm_dev, 0, "alpha_map", 0,
0x8fffffff);
if (!win->alpha_map_prop) {
DRM_ERROR("failed to create alpha_map property\n");
return -ENOMEM;
}
drm_object_attach_property(&win->base.base, win->alpha_map_prop, 0x8000ff00);
}
return 0;
}