fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 00:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gallium/dri2: Report correct YUYV and UYVY plane count

Browse source 
Return the actual number of planes in these formats (one) instead of the
number of planes used for lowering (two).

Fixes: d5c857837a ("gallium/dri2: Fix creation of multi-planar modifier images")
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6449>
(cherry picked from commit 36bd3e9868)
This commit is contained in:
Nanley Chery 2020-07-24 18:20:52 -07:00 • committed by Eric Engestrom
parent 2b58168de0
commit a8be210170
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2560,7 +2560,7 @@
"description": "gallium/dri2: Report correct YUYV and UYVY plane count",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "d5c857837aae205c0e1fddee30300b4419e2bb3f"
},

18
src/gallium/state_trackers/dri/dri2.c
View file

@ -868,7 +868,7 @@ dri2_get_modifier_num_planes(uint64_t modifier, int fourcc)
case I915_FORMAT_MOD_X_TILED:
case I915_FORMAT_MOD_Y_TILED:
case DRM_FORMAT_MOD_INVALID:
return map->nplanes;
return util_format_get_num_planes(map->pipe_format);
default:
return 0;
}
@ -885,24 +885,14 @@ dri2_create_image_from_fd(__DRIscreen *_screen,
const struct dri2_format_mapping *map = dri2_get_mapping_by_fourcc(fourcc);
__DRIimage *img = NULL;
unsigned err = __DRI_IMAGE_ERROR_SUCCESS;
int i, expected_num_fds;
int num_handles = dri2_get_modifier_num_planes(modifier, fourcc);
int i;
const int expected_num_fds = dri2_get_modifier_num_planes(modifier, fourcc);
if (!map || num_handles == 0) {
if (!map || expected_num_fds == 0) {
err = __DRI_IMAGE_ERROR_BAD_MATCH;
goto exit;
}
switch (fourcc) {
case DRM_FORMAT_YUYV:
case DRM_FORMAT_UYVY:
expected_num_fds = 1;
break;
default:
expected_num_fds = num_handles;
break;
}
if (num_fds != expected_num_fds) {
err = __DRI_IMAGE_ERROR_BAD_MATCH;
goto exit;