drm/komeda: Added AFBC support for komeda driver
For supporting AFBC: 1. Check if the user requested modifier can be supported by display HW. 2. Check the obj->size with AFBC's requirement. 3. Configure HW according to the modifier (afbc features) This patch depends on: - https://patchwork.freedesktop.org/series/59915/ - https://patchwork.freedesktop.org/series/59000/ v2: Rebase and addressed Ayan's comments Signed-off-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>alistair/sunxi64-5.4-dsi
parent
5d51f6c0da
commit
65ad2392dd
|
@ -134,6 +134,27 @@ static u32 to_rot_ctrl(u32 rot)
|
|||
return lr_ctrl;
|
||||
}
|
||||
|
||||
static u32 to_ad_ctrl(u64 modifier)
|
||||
{
|
||||
u32 afbc_ctrl = AD_AEN;
|
||||
|
||||
if (!modifier)
|
||||
return 0;
|
||||
|
||||
if ((modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) ==
|
||||
AFBC_FORMAT_MOD_BLOCK_SIZE_32x8)
|
||||
afbc_ctrl |= AD_WB;
|
||||
|
||||
if (modifier & AFBC_FORMAT_MOD_YTR)
|
||||
afbc_ctrl |= AD_YT;
|
||||
if (modifier & AFBC_FORMAT_MOD_SPLIT)
|
||||
afbc_ctrl |= AD_BS;
|
||||
if (modifier & AFBC_FORMAT_MOD_TILED)
|
||||
afbc_ctrl |= AD_TH;
|
||||
|
||||
return afbc_ctrl;
|
||||
}
|
||||
|
||||
static inline u32 to_d71_input_id(struct komeda_component_output *output)
|
||||
{
|
||||
struct komeda_component *comp = output->component;
|
||||
|
@ -173,6 +194,24 @@ static void d71_layer_update(struct komeda_component *c,
|
|||
fb->pitches[i] & 0xFFFF);
|
||||
}
|
||||
|
||||
malidp_write32(reg, AD_CONTROL, to_ad_ctrl(fb->modifier));
|
||||
if (fb->modifier) {
|
||||
u64 addr;
|
||||
|
||||
malidp_write32(reg, LAYER_AD_H_CROP, HV_CROP(st->afbc_crop_l,
|
||||
st->afbc_crop_r));
|
||||
malidp_write32(reg, LAYER_AD_V_CROP, HV_CROP(st->afbc_crop_t,
|
||||
st->afbc_crop_b));
|
||||
/* afbc 1.2 wants payload, afbc 1.0/1.1 wants end_addr */
|
||||
if (fb->modifier & AFBC_FORMAT_MOD_TILED)
|
||||
addr = st->addr[0] + kfb->offset_payload;
|
||||
else
|
||||
addr = st->addr[0] + kfb->afbc_size - 1;
|
||||
|
||||
malidp_write32(reg, BLK_P1_PTR_LOW, lower_32_bits(addr));
|
||||
malidp_write32(reg, BLK_P1_PTR_HIGH, upper_32_bits(addr));
|
||||
}
|
||||
|
||||
malidp_write32(reg, LAYER_FMT, kfb->format_caps->hw_id);
|
||||
malidp_write32(reg, BLK_IN_SIZE, HV_SIZE(st->hsize, st->vsize));
|
||||
|
||||
|
|
|
@ -35,6 +35,59 @@ komeda_get_format_caps(struct komeda_format_caps_table *table,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
/* Two assumptions
|
||||
* 1. RGB always has YTR
|
||||
* 2. Tiled RGB always has SC
|
||||
*/
|
||||
u64 komeda_supported_modifiers[] = {
|
||||
/* AFBC_16x16 + features: YUV+RGB both */
|
||||
AFBC_16x16(0),
|
||||
/* SPARSE */
|
||||
AFBC_16x16(_SPARSE),
|
||||
/* YTR + (SPARSE) */
|
||||
AFBC_16x16(_YTR | _SPARSE),
|
||||
AFBC_16x16(_YTR),
|
||||
/* SPLIT + SPARSE + YTR RGB only */
|
||||
/* split mode is only allowed for sparse mode */
|
||||
AFBC_16x16(_SPLIT | _SPARSE | _YTR),
|
||||
/* TILED + (SPARSE) */
|
||||
/* TILED YUV format only */
|
||||
AFBC_16x16(_TILED | _SPARSE),
|
||||
AFBC_16x16(_TILED),
|
||||
/* TILED + SC + (SPLIT+SPARSE | SPARSE) + (YTR) */
|
||||
AFBC_16x16(_TILED | _SC | _SPLIT | _SPARSE | _YTR),
|
||||
AFBC_16x16(_TILED | _SC | _SPARSE | _YTR),
|
||||
AFBC_16x16(_TILED | _SC | _YTR),
|
||||
/* AFBC_32x8 + features: which are RGB formats only */
|
||||
/* YTR + (SPARSE) */
|
||||
AFBC_32x8(_YTR | _SPARSE),
|
||||
AFBC_32x8(_YTR),
|
||||
/* SPLIT + SPARSE + (YTR) */
|
||||
/* split mode is only allowed for sparse mode */
|
||||
AFBC_32x8(_SPLIT | _SPARSE | _YTR),
|
||||
/* TILED + SC + (SPLIT+SPARSE | SPARSE) + YTR */
|
||||
AFBC_32x8(_TILED | _SC | _SPLIT | _SPARSE | _YTR),
|
||||
AFBC_32x8(_TILED | _SC | _SPARSE | _YTR),
|
||||
AFBC_32x8(_TILED | _SC | _YTR),
|
||||
DRM_FORMAT_MOD_LINEAR,
|
||||
DRM_FORMAT_MOD_INVALID
|
||||
};
|
||||
|
||||
bool komeda_format_mod_supported(struct komeda_format_caps_table *table,
|
||||
u32 layer_type, u32 fourcc, u64 modifier)
|
||||
{
|
||||
const struct komeda_format_caps *caps;
|
||||
|
||||
caps = komeda_get_format_caps(table, fourcc, modifier);
|
||||
if (!caps)
|
||||
return false;
|
||||
|
||||
if (!(caps->supported_layer_types & layer_type))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
u32 *komeda_get_layer_fourcc_list(struct komeda_format_caps_table *table,
|
||||
u32 layer_type, u32 *n_fmts)
|
||||
{
|
||||
|
|
|
@ -77,6 +77,8 @@ struct komeda_format_caps_table {
|
|||
const struct komeda_format_caps *format_caps;
|
||||
};
|
||||
|
||||
extern u64 komeda_supported_modifiers[];
|
||||
|
||||
const struct komeda_format_caps *
|
||||
komeda_get_format_caps(struct komeda_format_caps_table *table,
|
||||
u32 fourcc, u64 modifier);
|
||||
|
@ -86,4 +88,7 @@ u32 *komeda_get_layer_fourcc_list(struct komeda_format_caps_table *table,
|
|||
|
||||
void komeda_put_fourcc_list(u32 *fourcc_list);
|
||||
|
||||
bool komeda_format_mod_supported(struct komeda_format_caps_table *table,
|
||||
u32 layer_type, u32 fourcc, u64 modifier);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -36,6 +36,76 @@ static const struct drm_framebuffer_funcs komeda_fb_funcs = {
|
|||
.create_handle = komeda_fb_create_handle,
|
||||
};
|
||||
|
||||
static int
|
||||
komeda_fb_afbc_size_check(struct komeda_fb *kfb, struct drm_file *file,
|
||||
const struct drm_mode_fb_cmd2 *mode_cmd)
|
||||
{
|
||||
struct drm_framebuffer *fb = &kfb->base;
|
||||
const struct drm_format_info *info = fb->format;
|
||||
struct drm_gem_object *obj;
|
||||
u32 alignment_w = 0, alignment_h = 0, alignment_header;
|
||||
u32 n_blocks = 0, min_size = 0;
|
||||
|
||||
obj = drm_gem_object_lookup(file, mode_cmd->handles[0]);
|
||||
if (!obj) {
|
||||
DRM_DEBUG_KMS("Failed to lookup GEM object\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
switch (fb->modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK) {
|
||||
case AFBC_FORMAT_MOD_BLOCK_SIZE_32x8:
|
||||
alignment_w = 32;
|
||||
alignment_h = 8;
|
||||
break;
|
||||
case AFBC_FORMAT_MOD_BLOCK_SIZE_16x16:
|
||||
alignment_w = 16;
|
||||
alignment_h = 16;
|
||||
break;
|
||||
default:
|
||||
WARN(1, "Invalid AFBC_FORMAT_MOD_BLOCK_SIZE: %lld.\n",
|
||||
fb->modifier & AFBC_FORMAT_MOD_BLOCK_SIZE_MASK);
|
||||
break;
|
||||
}
|
||||
|
||||
/* tiled header afbc */
|
||||
if (fb->modifier & AFBC_FORMAT_MOD_TILED) {
|
||||
alignment_w *= AFBC_TH_LAYOUT_ALIGNMENT;
|
||||
alignment_h *= AFBC_TH_LAYOUT_ALIGNMENT;
|
||||
alignment_header = AFBC_TH_BODY_START_ALIGNMENT;
|
||||
} else {
|
||||
alignment_header = AFBC_BODY_START_ALIGNMENT;
|
||||
}
|
||||
|
||||
kfb->aligned_w = ALIGN(fb->width, alignment_w);
|
||||
kfb->aligned_h = ALIGN(fb->height, alignment_h);
|
||||
|
||||
if (fb->offsets[0] % alignment_header) {
|
||||
DRM_DEBUG_KMS("afbc offset alignment check failed.\n");
|
||||
goto check_failed;
|
||||
}
|
||||
|
||||
n_blocks = (kfb->aligned_w * kfb->aligned_h) / AFBC_SUPERBLK_PIXELS;
|
||||
kfb->offset_payload = ALIGN(n_blocks * AFBC_HEADER_SIZE,
|
||||
alignment_header);
|
||||
|
||||
kfb->afbc_size = kfb->offset_payload + n_blocks *
|
||||
ALIGN(info->cpp[0] * AFBC_SUPERBLK_PIXELS,
|
||||
AFBC_SUPERBLK_ALIGNMENT);
|
||||
min_size = kfb->afbc_size + fb->offsets[0];
|
||||
if (min_size > obj->size) {
|
||||
DRM_DEBUG_KMS("afbc size check failed, obj_size: 0x%lx. min_size 0x%x.\n",
|
||||
obj->size, min_size);
|
||||
goto check_failed;
|
||||
}
|
||||
|
||||
fb->obj[0] = obj;
|
||||
return 0;
|
||||
|
||||
check_failed:
|
||||
drm_gem_object_put_unlocked(obj);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int
|
||||
komeda_fb_none_afbc_size_check(struct komeda_dev *mdev, struct komeda_fb *kfb,
|
||||
struct drm_file *file,
|
||||
|
@ -118,7 +188,10 @@ komeda_fb_create(struct drm_device *dev, struct drm_file *file,
|
|||
|
||||
drm_helper_mode_fill_fb_struct(dev, &kfb->base, mode_cmd);
|
||||
|
||||
ret = komeda_fb_none_afbc_size_check(mdev, kfb, file, mode_cmd);
|
||||
if (kfb->base.modifier)
|
||||
ret = komeda_fb_afbc_size_check(kfb, file, mode_cmd);
|
||||
else
|
||||
ret = komeda_fb_none_afbc_size_check(mdev, kfb, file, mode_cmd);
|
||||
if (ret < 0)
|
||||
goto err_cleanup;
|
||||
|
||||
|
|
|
@ -25,6 +25,10 @@ struct komeda_fb {
|
|||
u32 aligned_w;
|
||||
/** @aligned_h: aligned frame buffer height */
|
||||
u32 aligned_h;
|
||||
/** @afbc_size: minimum size of afbc */
|
||||
u32 afbc_size;
|
||||
/** @offset_payload: start of afbc body buffer */
|
||||
u32 offset_payload;
|
||||
};
|
||||
|
||||
#define to_kfb(dfb) container_of(dfb, struct komeda_fb, base)
|
||||
|
|
|
@ -148,7 +148,7 @@ static void komeda_kms_mode_config_init(struct komeda_kms_dev *kms,
|
|||
config->min_height = 0;
|
||||
config->max_width = 4096;
|
||||
config->max_height = 4096;
|
||||
config->allow_fb_modifiers = false;
|
||||
config->allow_fb_modifiers = true;
|
||||
|
||||
config->funcs = &komeda_mode_config_funcs;
|
||||
config->helper_private = &komeda_mode_config_helpers;
|
||||
|
|
|
@ -235,6 +235,10 @@ struct komeda_layer_state {
|
|||
/* layer specific configuration state */
|
||||
u16 hsize, vsize;
|
||||
u32 rot;
|
||||
u16 afbc_crop_l;
|
||||
u16 afbc_crop_r;
|
||||
u16 afbc_crop_t;
|
||||
u16 afbc_crop_b;
|
||||
dma_addr_t addr[3];
|
||||
};
|
||||
|
||||
|
|
|
@ -291,8 +291,22 @@ komeda_layer_validate(struct komeda_layer *layer,
|
|||
st = to_layer_st(c_st);
|
||||
|
||||
st->rot = dflow->rot;
|
||||
st->hsize = kfb->aligned_w;
|
||||
st->vsize = kfb->aligned_h;
|
||||
|
||||
if (fb->modifier) {
|
||||
st->hsize = kfb->aligned_w;
|
||||
st->vsize = kfb->aligned_h;
|
||||
st->afbc_crop_l = dflow->in_x;
|
||||
st->afbc_crop_r = kfb->aligned_w - dflow->in_x - dflow->in_w;
|
||||
st->afbc_crop_t = dflow->in_y;
|
||||
st->afbc_crop_b = kfb->aligned_h - dflow->in_y - dflow->in_h;
|
||||
} else {
|
||||
st->hsize = dflow->in_w;
|
||||
st->vsize = dflow->in_h;
|
||||
st->afbc_crop_l = 0;
|
||||
st->afbc_crop_r = 0;
|
||||
st->afbc_crop_t = 0;
|
||||
st->afbc_crop_b = 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < fb->format->num_planes; i++)
|
||||
st->addr[i] = komeda_fb_get_pixel_addr(kfb, dflow->in_x,
|
||||
|
|
|
@ -151,6 +151,18 @@ komeda_plane_atomic_destroy_state(struct drm_plane *plane,
|
|||
kfree(to_kplane_st(state));
|
||||
}
|
||||
|
||||
static bool
|
||||
komeda_plane_format_mod_supported(struct drm_plane *plane,
|
||||
u32 format, u64 modifier)
|
||||
{
|
||||
struct komeda_dev *mdev = plane->dev->dev_private;
|
||||
struct komeda_plane *kplane = to_kplane(plane);
|
||||
u32 layer_type = kplane->layer->layer_type;
|
||||
|
||||
return komeda_format_mod_supported(&mdev->fmt_tbl, layer_type,
|
||||
format, modifier);
|
||||
}
|
||||
|
||||
static const struct drm_plane_funcs komeda_plane_funcs = {
|
||||
.update_plane = drm_atomic_helper_update_plane,
|
||||
.disable_plane = drm_atomic_helper_disable_plane,
|
||||
|
@ -158,6 +170,7 @@ static const struct drm_plane_funcs komeda_plane_funcs = {
|
|||
.reset = komeda_plane_reset,
|
||||
.atomic_duplicate_state = komeda_plane_atomic_duplicate_state,
|
||||
.atomic_destroy_state = komeda_plane_atomic_destroy_state,
|
||||
.format_mod_supported = komeda_plane_format_mod_supported,
|
||||
};
|
||||
|
||||
/* for komeda, which is pipeline can be share between crtcs */
|
||||
|
@ -210,7 +223,7 @@ static int komeda_plane_add(struct komeda_kms_dev *kms,
|
|||
err = drm_universal_plane_init(&kms->base, plane,
|
||||
get_possible_crtcs(kms, c->pipeline),
|
||||
&komeda_plane_funcs,
|
||||
formats, n_formats, NULL,
|
||||
formats, n_formats, komeda_supported_modifiers,
|
||||
get_plane_type(kms, c),
|
||||
"%s", c->name);
|
||||
|
||||
|
|
Loading…
Reference in New Issue