geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No fence_class argument on drmBOSetStatus since it's not 

associated with a particular command submission.
main
Thomas Hellstrom 2007-10-19 16:28:47 +02:00
parent cf2d1bba55
commit 733ff56834
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdrm/xf86drm.c
View File

@ -2695,7 +2695,7 @@ int drmBOUnmap(int fd, drmBO *buf)
return 0; return 0;
} }
int drmBOSetStatus(int fd, drmBO *buf, uint32_t fence_class, int drmBOSetStatus(int fd, drmBO *buf,
uint64_t flags, uint64_t mask, uint64_t flags, uint64_t mask,
unsigned int hint, unsigned int hint,
unsigned int desired_tile_stride, unsigned int desired_tile_stride,
@ -2711,7 +2711,6 @@ int drmBOSetStatus(int fd, drmBO *buf, uint32_t fence_class,
req->flags = flags; req->flags = flags;
req->handle = buf->handle; req->handle = buf->handle;
req->hint = hint; req->hint = hint;
req->fence_class = fence_class;
req->desired_tile_stride = desired_tile_stride; req->desired_tile_stride = desired_tile_stride;
req->tile_info = tile_info; req->tile_info = tile_info;

11
linux-core/drm_bo.c
View File

@ -1524,7 +1524,9 @@ EXPORT_SYMBOL(drm_bo_do_validate);
int drm_bo_handle_validate(struct drm_file * file_priv, uint32_t handle, int drm_bo_handle_validate(struct drm_file * file_priv, uint32_t handle,
uint32_t fence_class, uint32_t fence_class,
uint64_t flags, uint64_t mask, uint32_t hint, uint64_t flags, uint64_t mask,
uint32_t hint,
int use_old_fence_class,
struct drm_bo_info_rep * rep, struct drm_bo_info_rep * rep,
struct drm_buffer_object **bo_rep) struct drm_buffer_object **bo_rep)
{ {
@ -1537,9 +1539,11 @@ int drm_bo_handle_validate(struct drm_file * file_priv, uint32_t handle,
bo = drm_lookup_buffer_object(file_priv, handle, 1); bo = drm_lookup_buffer_object(file_priv, handle, 1);
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
if (!bo) { if (!bo)
return -EINVAL; return -EINVAL;
}
if (use_old_fence_class)
fence_class = bo->fence_class;
/* /*
* Only allow creator to change shared buffer mask. * Only allow creator to change shared buffer mask.
@ -1780,6 +1784,7 @@ int drm_bo_setstatus_ioctl(struct drm_device *dev,
req->flags, req->flags,
req->mask, req->mask,
req->hint | DRM_BO_HINT_DONT_FENCE, req->hint | DRM_BO_HINT_DONT_FENCE,
1,
rep, NULL); rep, NULL);
if (ret) if (ret)

1
linux-core/drm_objects.h
View File

@ -510,6 +510,7 @@ extern int drm_bo_init_mm(struct drm_device * dev, unsigned type,
extern int drm_bo_handle_validate(struct drm_file * file_priv, uint32_t handle, extern int drm_bo_handle_validate(struct drm_file * file_priv, uint32_t handle,
uint32_t fence_class, uint64_t flags, uint32_t fence_class, uint64_t flags,
uint64_t mask, uint32_t hint, uint64_t mask, uint32_t hint,
int use_old_fence_class,
struct drm_bo_info_rep * rep, struct drm_bo_info_rep * rep,
struct drm_buffer_object **bo_rep); struct drm_buffer_object **bo_rep);
extern struct drm_buffer_object *drm_lookup_buffer_object(struct drm_file * file_priv, extern struct drm_buffer_object *drm_lookup_buffer_object(struct drm_file * file_priv,