mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-04-04 19:00:45 +02:00
modesetting: Parse the IN_FORMATS_ASYNC blob
The kernel has gained another format/modifier blob to indicate which formats/modifiers support async flips. Parse it. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä
parent
a5f0b973d2
commit
b563eb7c60
3 changed files with 40 additions and 13 deletions
|
|
@ -111,8 +111,18 @@ get_opaque_format(uint32_t format)
|
|||
}
|
||||
}
|
||||
|
||||
static drmmode_format_ptr get_format(drmmode_crtc_private_ptr drmmode_crtc,
|
||||
Bool async_flip, int i)
|
||||
{
|
||||
if (async_flip && drmmode_crtc->formats_async)
|
||||
return &drmmode_crtc->formats_async[i];
|
||||
else
|
||||
return &drmmode_crtc->formats[i];
|
||||
}
|
||||
|
||||
Bool
|
||||
drmmode_is_format_supported(ScrnInfoPtr scrn, uint32_t format, uint64_t modifier)
|
||||
drmmode_is_format_supported(ScrnInfoPtr scrn, uint32_t format,
|
||||
uint64_t modifier, Bool async_flip)
|
||||
{
|
||||
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
|
||||
int c, i, j;
|
||||
|
|
@ -132,7 +142,7 @@ drmmode_is_format_supported(ScrnInfoPtr scrn, uint32_t format, uint64_t modifier
|
|||
continue;
|
||||
|
||||
for (i = 0; i < drmmode_crtc->num_formats; i++) {
|
||||
drmmode_format_ptr iter = &drmmode_crtc->formats[i];
|
||||
drmmode_format_ptr iter = get_format(drmmode_crtc, async_flip, i);
|
||||
|
||||
if (iter->format != format)
|
||||
continue;
|
||||
|
|
@ -163,7 +173,7 @@ drmmode_is_format_supported(ScrnInfoPtr scrn, uint32_t format, uint64_t modifier
|
|||
#ifdef GBM_BO_WITH_MODIFIERS
|
||||
static uint32_t
|
||||
get_modifiers_set(ScrnInfoPtr scrn, uint32_t format, uint64_t **modifiers,
|
||||
Bool enabled_crtc_only, Bool exclude_multiplane)
|
||||
Bool enabled_crtc_only, Bool exclude_multiplane, Bool async_flip)
|
||||
{
|
||||
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
|
||||
modesettingPtr ms = modesettingPTR(scrn);
|
||||
|
|
@ -183,7 +193,7 @@ get_modifiers_set(ScrnInfoPtr scrn, uint32_t format, uint64_t **modifiers,
|
|||
continue;
|
||||
|
||||
for (i = 0; i < drmmode_crtc->num_formats; i++) {
|
||||
drmmode_format_ptr iter = &drmmode_crtc->formats[i];
|
||||
drmmode_format_ptr iter = get_format(drmmode_crtc, async_flip, i);
|
||||
|
||||
if (iter->format != format)
|
||||
continue;
|
||||
|
|
@ -238,7 +248,8 @@ get_drawable_modifiers(DrawablePtr draw, uint32_t format,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
*num_modifiers = get_modifiers_set(scrn, format, modifiers, TRUE, FALSE);
|
||||
*num_modifiers = get_modifiers_set(scrn, format, modifiers,
|
||||
TRUE, FALSE, FALSE);
|
||||
return TRUE;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -2287,7 +2298,7 @@ is_plane_assigned(ScrnInfoPtr scrn, int plane_id)
|
|||
*/
|
||||
static Bool
|
||||
populate_format_modifiers(xf86CrtcPtr crtc, const drmModePlane *kplane,
|
||||
uint32_t blob_id)
|
||||
drmmode_format_rec *formats, uint32_t blob_id)
|
||||
{
|
||||
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
|
||||
drmmode_ptr drmmode = drmmode_crtc->drmmode;
|
||||
|
|
@ -2333,9 +2344,9 @@ populate_format_modifiers(xf86CrtcPtr crtc, const drmModePlane *kplane,
|
|||
modifiers[num_modifiers - 1] = mod->modifier;
|
||||
}
|
||||
|
||||
drmmode_crtc->formats[i].format = blob_formats[i];
|
||||
drmmode_crtc->formats[i].modifiers = modifiers;
|
||||
drmmode_crtc->formats[i].num_modifiers = num_modifiers;
|
||||
formats[i].format = blob_formats[i];
|
||||
formats[i].modifiers = modifiers;
|
||||
formats[i].num_modifiers = num_modifiers;
|
||||
}
|
||||
|
||||
drmModeFreePropertyBlob(blob);
|
||||
|
|
@ -2351,7 +2362,7 @@ drmmode_crtc_create_planes(xf86CrtcPtr crtc, int num)
|
|||
drmModePlaneRes *kplane_res;
|
||||
drmModePlane *kplane, *best_kplane = NULL;
|
||||
drmModeObjectProperties *props;
|
||||
uint32_t i, type, blob_id;
|
||||
uint32_t i, type, blob_id, async_blob_id;
|
||||
int current_crtc, best_plane = 0;
|
||||
|
||||
static drmmode_prop_enum_info_rec plane_type_enums[] = {
|
||||
|
|
@ -2374,6 +2385,7 @@ drmmode_crtc_create_planes(xf86CrtcPtr crtc, int num)
|
|||
[DRMMODE_PLANE_FB_ID] = { .name = "FB_ID", },
|
||||
[DRMMODE_PLANE_CRTC_ID] = { .name = "CRTC_ID", },
|
||||
[DRMMODE_PLANE_IN_FORMATS] = { .name = "IN_FORMATS", },
|
||||
[DRMMODE_PLANE_IN_FORMATS_ASYNC] = { .name = "IN_FORMATS_ASYNC", },
|
||||
[DRMMODE_PLANE_SRC_X] = { .name = "SRC_X", },
|
||||
[DRMMODE_PLANE_SRC_Y] = { .name = "SRC_Y", },
|
||||
[DRMMODE_PLANE_SRC_W] = { .name = "SRC_W", },
|
||||
|
|
@ -2448,6 +2460,8 @@ drmmode_crtc_create_planes(xf86CrtcPtr crtc, int num)
|
|||
best_kplane = kplane;
|
||||
blob_id = drmmode_prop_get_value(&tmp_props[DRMMODE_PLANE_IN_FORMATS],
|
||||
props, 0);
|
||||
async_blob_id = drmmode_prop_get_value(&tmp_props[DRMMODE_PLANE_IN_FORMATS_ASYNC],
|
||||
props, 0);
|
||||
drmmode_prop_info_copy(drmmode_crtc->props_plane, tmp_props,
|
||||
DRMMODE_PLANE__COUNT, 1);
|
||||
drmModeFreeObjectProperties(props);
|
||||
|
|
@ -2459,6 +2473,8 @@ drmmode_crtc_create_planes(xf86CrtcPtr crtc, int num)
|
|||
best_kplane = kplane;
|
||||
blob_id = drmmode_prop_get_value(&tmp_props[DRMMODE_PLANE_IN_FORMATS],
|
||||
props, 0);
|
||||
async_blob_id = drmmode_prop_get_value(&tmp_props[DRMMODE_PLANE_IN_FORMATS_ASYNC],
|
||||
props, 0);
|
||||
drmmode_prop_info_copy(drmmode_crtc->props_plane, tmp_props,
|
||||
DRMMODE_PLANE__COUNT, 1);
|
||||
} else {
|
||||
|
|
@ -2473,9 +2489,18 @@ drmmode_crtc_create_planes(xf86CrtcPtr crtc, int num)
|
|||
drmmode_crtc->num_formats = best_kplane->count_formats;
|
||||
drmmode_crtc->formats = calloc(best_kplane->count_formats,
|
||||
sizeof(drmmode_format_rec));
|
||||
if (!populate_format_modifiers(crtc, best_kplane, blob_id)) {
|
||||
if (!populate_format_modifiers(crtc, best_kplane,
|
||||
drmmode_crtc->formats, blob_id)) {
|
||||
for (i = 0; i < best_kplane->count_formats; i++)
|
||||
drmmode_crtc->formats[i].format = best_kplane->formats[i];
|
||||
} else {
|
||||
drmmode_crtc->formats_async = calloc(best_kplane->count_formats,
|
||||
sizeof(drmmode_format_rec));
|
||||
if (!populate_format_modifiers(crtc, best_kplane,
|
||||
drmmode_crtc->formats_async, async_blob_id)) {
|
||||
free(drmmode_crtc->formats_async);
|
||||
drmmode_crtc->formats_async = NULL;
|
||||
}
|
||||
}
|
||||
drmModeFreePlane(best_kplane);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ enum drmmode_plane_property {
|
|||
DRMMODE_PLANE_TYPE = 0,
|
||||
DRMMODE_PLANE_FB_ID,
|
||||
DRMMODE_PLANE_IN_FORMATS,
|
||||
DRMMODE_PLANE_IN_FORMATS_ASYNC,
|
||||
DRMMODE_PLANE_CRTC_ID,
|
||||
DRMMODE_PLANE_SRC_X,
|
||||
DRMMODE_PLANE_SRC_Y,
|
||||
|
|
@ -198,6 +199,7 @@ typedef struct {
|
|||
drmmode_mode_ptr current_mode;
|
||||
uint32_t num_formats;
|
||||
drmmode_format_rec *formats;
|
||||
drmmode_format_rec *formats_async;
|
||||
|
||||
drmmode_bo rotate_bo;
|
||||
unsigned rotate_fb_id;
|
||||
|
|
@ -293,7 +295,7 @@ typedef struct _msSpritePriv {
|
|||
extern miPointerSpriteFuncRec drmmode_sprite_funcs;
|
||||
|
||||
Bool drmmode_is_format_supported(ScrnInfoPtr scrn, uint32_t format,
|
||||
uint64_t modifier);
|
||||
uint64_t modifier, Bool async_flip);
|
||||
int drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo,
|
||||
uint32_t *fb_id);
|
||||
int drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo);
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@ ms_present_check_unflip(RRCrtcPtr crtc,
|
|||
modifier = gbm_bo_get_modifier(gbm);
|
||||
gbm_bo_destroy(gbm);
|
||||
|
||||
if (!drmmode_is_format_supported(scrn, format, modifier)) {
|
||||
if (!drmmode_is_format_supported(scrn, format, modifier, FALSE)) {
|
||||
if (reason)
|
||||
*reason = PRESENT_FLIP_REASON_BUFFER_FORMAT;
|
||||
return FALSE;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue