OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/wayland: for prime, allocate linear_copy from display GPU VRAM

Browse Source 
Allocates VRAM in display GPU in case of prime. Then the dma_buf is imported
into prime GPU.

v4: add image tag to __DRIimage (Marek Olšák)
v3: move display fd opening to separate commit (Pierre-Eric)
    image_format_to_fourcc() non-static to seperate commit (Pierre-Eric)
v2: close query fds after linear_copy buffer import (Marek Olšák)
    use image_format_to_fourcc() from loader_dri3_helper.c (Marek Olšák)

Signed-off-by: Yogesh Mohanmarimuthu <yogesh.mohanmarimuthu@amd.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13422>
This commit is contained in:
Yogesh Mohanmarimuthu
2021-10-20 20:18:05 +05:30
committed by Marge Bot
parent 42a46f2c5f
commit 967b9ad084
1 changed files with 86 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/egl/drivers/dri2/platform_wayland.c
View File

@@ -885,26 +885,6 @@ dri2_wl_release_buffers(struct dri2_egl_surface *dri2_surf)
dri2_egl_surface_free_local_buffers(dri2_surf);
}
static void
create_dri_image_diff_gpu(struct dri2_egl_surface *dri2_surf,
unsigned int linear_dri_image_format, uint32_t use_flags)
{
struct dri2_egl_display *dri2_dpy =
dri2_egl_display(dri2_surf->base.Resource.Display);
uint64_t linear_mod;
/* The LINEAR modifier should be a perfect alias of the LINEAR use flag */
linear_mod = DRM_FORMAT_MOD_LINEAR;
dri2_surf->back->linear_copy =
loader_dri_create_image(dri2_dpy->dri_screen, dri2_dpy->image,
dri2_surf->base.Width,
dri2_surf->base.Height,
linear_dri_image_format,
use_flags | __DRI_IMAGE_USE_LINEAR,
&linear_mod, 1, NULL);
}
static void
create_dri_image_from_dmabuf_feedback(struct dri2_egl_surface *dri2_surf,
unsigned int dri_image_format, uint32_t use_flags)
@@ -1072,9 +1052,93 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
}
if (dri2_dpy->is_different_gpu && dri2_surf->back->linear_copy == NULL) {
create_dri_image_diff_gpu(dri2_surf, linear_dri_image_format, use_flags);
uint64_t linear_mod = DRM_FORMAT_MOD_LINEAR;
__DRIimage *linear_copy_display_gpu_image = NULL;
if (dri2_dpy->dri_screen_display_gpu) {
linear_copy_display_gpu_image =
loader_dri_create_image(dri2_dpy->dri_screen_display_gpu,
dri2_dpy->image,
dri2_surf->base.Width,
dri2_surf->base.Height,
linear_dri_image_format,
use_flags | __DRI_IMAGE_USE_LINEAR,
&linear_mod, 1, NULL);
if (linear_copy_display_gpu_image) {
int i, ret;
int num_planes = 0;
int buffer_fds[4];
int strides[4];
int offsets[4];
if (!dri2_dpy->image->queryImage(linear_copy_display_gpu_image,
__DRI_IMAGE_ATTRIB_NUM_PLANES, &num_planes))
num_planes = 1;
for (i = 0; i < num_planes; i++) {
__DRIimage *image = dri2_dpy->image->fromPlanar(
linear_copy_display_gpu_image, i, NULL);
if (!image) {
assert(i == 0);
image = linear_copy_display_gpu_image;
}
buffer_fds[i] = -1;
ret = dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_FD,
&buffer_fds[i]);
ret &= dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_STRIDE,
&strides[i]);
ret &= dri2_dpy->image->queryImage(image, __DRI_IMAGE_ATTRIB_OFFSET,
&offsets[i]);
if (image != linear_copy_display_gpu_image)
dri2_dpy->image->destroyImage(image);
if (!ret) {
do {
if (buffer_fds[i] != -1)
close(buffer_fds[i]);
} while (--i >= 0);
dri2_dpy->image->destroyImage(linear_copy_display_gpu_image);
return -1;
}
}
/* The linear buffer was created in the display GPU's vram, so we
* need to make it visible to render GPU
*/
dri2_surf->back->linear_copy =
dri2_dpy->image->createImageFromFds(dri2_dpy->dri_screen,
dri2_surf->base.Width,
dri2_surf->base.Height,
loader_image_format_to_fourcc(
linear_dri_image_format),
&buffer_fds[0], num_planes,
&strides[0],
&offsets[0],
dri2_surf->back);
do {
if (buffer_fds[i] != -1)
close(buffer_fds[i]);
} while (--i >= 0);
dri2_dpy->image->destroyImage(linear_copy_display_gpu_image);
}
}
if (!dri2_surf->back->linear_copy) {
dri2_surf->back->linear_copy =
loader_dri_create_image(dri2_dpy->dri_screen, dri2_dpy->image,
dri2_surf->base.Width,
dri2_surf->base.Height,
linear_dri_image_format,
use_flags | __DRI_IMAGE_USE_LINEAR,
&linear_mod, 1, NULL);
}
if (dri2_surf->back->linear_copy == NULL)
return -1;
return -1;
}
if (dri2_surf->back->dri_image == NULL) {