Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Decode] Add ddi implement for vaEndPicture2 #1803

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[Decode] Add ddi implement for vaEndPicture2 #1803

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b124488
[Decode] Add ddi implement for vaEndPicture2
Jexu May 21, 2024
13ec454
[Decode] Add sync fence mutex for vaEndPicure2
Jexu May 22, 2024
f93d2b8
[Decode] Add media common function to set and get fences
Jexu May 22, 2024
3962c18
[Decode] Add mos bufmgr api to set and get fences
Jexu May 22, 2024
d1e964a
[Decode] Add set fences and get fence implement in i915 drm
Jexu May 27, 2024
1487558
[Decode] add fence array into execbuffer in i915 drm
Jexu May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 81 additions & 3 deletions media_softlet/linux/common/os/i915/mos_bufmgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2461,9 +2461,10 @@ mos_bufmgr_gem_destroy(struct mos_bufmgr *bufmgr)
struct drm_gem_close close_bo;
int ret;

free(bufmgr_gem->exec2_objects);
free(bufmgr_gem->exec_objects);
free(bufmgr_gem->exec_bos);
mos_safe_free(bufmgr_gem->exec2_objects);
mos_safe_free(bufmgr_gem->exec_objects);
mos_safe_free(bufmgr_gem->exec_bos);
mos_safe_free(bufmgr_gem->exec_fences.fences);
pthread_mutex_destroy(&bufmgr_gem->lock);

/* Free any cached buffer objects we were going to reuse */
Expand Down Expand Up @@ -2964,6 +2965,79 @@ mos_update_buffer_offsets2 (struct mos_bufmgr_gem *bufmgr_gem, mos_linux_context
}
}

//todo: to move synchronization_xe.h to os common instead of xe specific
#include "mos_synchronization_xe.h"

int
__add_eb_fence_array(struct mos_bufmgr_gem *bufmgr_gem,
struct drm_i915_gem_execbuffer2 *eb,
unsigned int flags)
{
#define SCALABILITY_ON (I915_EXEC_FENCE_OUT | I915_EXEC_FENCE_IN | I915_EXEC_FENCE_SUBMIT)

//Ignore multi batch submission for scalability to simplify logic
//todo: check has_fence_array from params
if (!(flags & SCALABILITY_ON)
&& bufmgr_gem->exec_fences.fences)
{
int32_t fence_count = bufmgr_gem->exec_fences.count;
int32_t *exec_fences = bufmgr_gem->exec_fences.fences;

if (fence_count > 0)
{
struct drm_i915_gem_exec_fence *fences
= (struct drm_i915_gem_exec_fence *)malloc(fence_count * sizeof(struct drm_i915_gem_exec_fence));
if (fences == nullptr)
{
return -ENOMEM;
}
for (int32_t i = 0; i < fence_count; i++)
{
fences[i].handle = mos_sync_syncfile_fd_to_syncobj_handle(bufmgr_gem->fd, exec_fences[i + 1]);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to check if exec_fences[i + 1] is valid and imported status; Ignore invalid one.

fences[i].flags = I915_EXEC_FENCE_WAIT;
}

eb->num_cliprects = fence_count;
eb->cliprects_ptr = (uintptr_t)fences;
eb->flags |= I915_EXEC_FENCE_ARRAY;
}

eb->rsvd2 = -1;
eb->flags |= I915_EXEC_FENCE_OUT; //todo: to verify rsvd2 >> 32 still has fence out
return 0;
}
else
{
return 0;
}
}

void
__clear_eb_fence_array(struct mos_bufmgr_gem *bufmgr_gem,
struct drm_i915_gem_execbuffer2 *eb)
{
if (eb->cliprects_ptr
&& eb->flags & I915_EXEC_FENCE_ARRAY)
{
struct drm_i915_gem_exec_fence *fences = (drm_i915_gem_exec_fence *)eb->cliprects_ptr;

for (int32_t i = 0; i < eb->num_cliprects; i++)
{
mos_sync_syncobj_destroy(bufmgr_gem->fd, fences[i].handle);
}

mos_safe_free(fences);
eb->cliprects_ptr = (uintptr_t)nullptr;
}

if (bufmgr_gem->exec_fences.fences
&& eb->flags & I915_EXEC_FENCE_OUT)
{
bufmgr_gem->exec_fences.fences[0] = eb->rsvd2 >> 32;
}

}

drm_export int
do_exec2(struct mos_linux_bo *bo, int used, struct mos_linux_context *ctx,
drm_clip_rect_t *cliprects, int num_cliprects, int DR4,
Expand Down Expand Up @@ -3035,6 +3109,8 @@ do_exec2(struct mos_linux_bo *bo, int used, struct mos_linux_context *ctx,
if (bufmgr_gem->no_exec)
goto skip_execution;

__add_eb_fence_array(bufmgr_gem, &execbuf, flags);

ret = drmIoctl(bufmgr_gem->fd,
DRM_IOCTL_I915_GEM_EXECBUFFER2_WR,
&execbuf);
Expand All @@ -3061,6 +3137,8 @@ do_exec2(struct mos_linux_bo *bo, int used, struct mos_linux_context *ctx,
*fence = execbuf.rsvd2 >> 32;
}

__clear_eb_fence_array(bufmgr_gem, &execbuf);

skip_execution:
if (bufmgr_gem->bufmgr.debug)
mos_gem_dump_validation_list(bufmgr_gem);
Expand Down
1 change: 1 addition & 0 deletions media_softlet/linux/common/os/xe/include/mos_synchronization_xe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ int mos_sync_syncobj_timeline_wait(int fd, uint32_t *handles, uint64_t *points,
uint32_t *first_signaled);

int mos_sync_syncobj_handle_to_syncfile_fd(int fd, int syncobj_handle);
int mos_sync_syncfile_fd_to_syncobj_handle(int fd, int syncfile_fd);
int mos_sync_import_syncfile_to_external_bo(int fd, int prime_fd, int syncfile_fd);
int mos_sync_syncobj_timeline_to_binary(int fd, uint32_t binary_handle,
uint32_t timeline_handle,
Expand Down
Loading