radeon/winsys: add offset support for BO import/export
Add offset support to handle NV12 offsets as well. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
parent
f1e78a48f2
commit
04bc082f6a
|
@ -981,8 +981,8 @@ boolean r300_resource_get_handle(struct pipe_screen* screen,
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return rws->buffer_get_handle(tex->buf,
|
return rws->buffer_get_handle(tex->buf, tex->tex.stride_in_bytes[0],
|
||||||
tex->tex.stride_in_bytes[0], whandle);
|
0, whandle);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct u_resource_vtbl r300_texture_vtbl =
|
static const struct u_resource_vtbl r300_texture_vtbl =
|
||||||
|
@ -1116,7 +1116,7 @@ struct pipe_resource *r300_texture_from_handle(struct pipe_screen *screen,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
buffer = rws->buffer_from_handle(rws, whandle, &stride);
|
buffer = rws->buffer_from_handle(rws, whandle, &stride, NULL);
|
||||||
if (!buffer)
|
if (!buffer)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -201,9 +201,11 @@ static int r600_init_surface(struct r600_common_screen *rscreen,
|
||||||
|
|
||||||
static int r600_setup_surface(struct pipe_screen *screen,
|
static int r600_setup_surface(struct pipe_screen *screen,
|
||||||
struct r600_texture *rtex,
|
struct r600_texture *rtex,
|
||||||
unsigned pitch_in_bytes_override)
|
unsigned pitch_in_bytes_override,
|
||||||
|
unsigned offset)
|
||||||
{
|
{
|
||||||
struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
|
struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
|
||||||
|
unsigned i;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
r = rscreen->ws->surface_init(rscreen->ws, &rtex->surface);
|
r = rscreen->ws->surface_init(rscreen->ws, &rtex->surface);
|
||||||
|
@ -225,6 +227,11 @@ static int r600_setup_surface(struct pipe_screen *screen,
|
||||||
rtex->surface.stencil_level[0].offset = rtex->surface.level[0].slice_size;
|
rtex->surface.stencil_level[0].offset = rtex->surface.level[0].slice_size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (offset) {
|
||||||
|
for (i = 0; i < Elements(rtex->surface.level); ++i)
|
||||||
|
rtex->surface.level[i].offset += offset;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -366,6 +373,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
|
||||||
|
|
||||||
return rscreen->ws->buffer_get_handle(res->buf,
|
return rscreen->ws->buffer_get_handle(res->buf,
|
||||||
rtex->surface.level[0].pitch_bytes,
|
rtex->surface.level[0].pitch_bytes,
|
||||||
|
rtex->surface.level[0].offset,
|
||||||
whandle);
|
whandle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -791,6 +799,7 @@ static struct r600_texture *
|
||||||
r600_texture_create_object(struct pipe_screen *screen,
|
r600_texture_create_object(struct pipe_screen *screen,
|
||||||
const struct pipe_resource *base,
|
const struct pipe_resource *base,
|
||||||
unsigned pitch_in_bytes_override,
|
unsigned pitch_in_bytes_override,
|
||||||
|
unsigned offset,
|
||||||
struct pb_buffer *buf,
|
struct pb_buffer *buf,
|
||||||
struct radeon_surf *surface)
|
struct radeon_surf *surface)
|
||||||
{
|
{
|
||||||
|
@ -812,7 +821,7 @@ r600_texture_create_object(struct pipe_screen *screen,
|
||||||
rtex->is_depth = util_format_has_depth(util_format_description(rtex->resource.b.b.format));
|
rtex->is_depth = util_format_has_depth(util_format_description(rtex->resource.b.b.format));
|
||||||
|
|
||||||
rtex->surface = *surface;
|
rtex->surface = *surface;
|
||||||
if (r600_setup_surface(screen, rtex, pitch_in_bytes_override)) {
|
if (r600_setup_surface(screen, rtex, pitch_in_bytes_override, offset)) {
|
||||||
FREE(rtex);
|
FREE(rtex);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -979,7 +988,7 @@ struct pipe_resource *r600_texture_create(struct pipe_screen *screen,
|
||||||
if (r) {
|
if (r) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return (struct pipe_resource *)r600_texture_create_object(screen, templ,
|
return (struct pipe_resource *)r600_texture_create_object(screen, templ, 0,
|
||||||
0, NULL, &surface);
|
0, NULL, &surface);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -990,7 +999,7 @@ static struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen
|
||||||
{
|
{
|
||||||
struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
|
struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
|
||||||
struct pb_buffer *buf = NULL;
|
struct pb_buffer *buf = NULL;
|
||||||
unsigned stride = 0;
|
unsigned stride = 0, offset = 0;
|
||||||
unsigned array_mode;
|
unsigned array_mode;
|
||||||
struct radeon_surf surface;
|
struct radeon_surf surface;
|
||||||
int r;
|
int r;
|
||||||
|
@ -1002,7 +1011,7 @@ static struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen
|
||||||
templ->depth0 != 1 || templ->last_level != 0)
|
templ->depth0 != 1 || templ->last_level != 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
buf = rscreen->ws->buffer_from_handle(rscreen->ws, whandle, &stride);
|
buf = rscreen->ws->buffer_from_handle(rscreen->ws, whandle, &stride, &offset);
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
@ -1029,8 +1038,8 @@ static struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen
|
||||||
if (metadata.scanout)
|
if (metadata.scanout)
|
||||||
surface.flags |= RADEON_SURF_SCANOUT;
|
surface.flags |= RADEON_SURF_SCANOUT;
|
||||||
|
|
||||||
rtex = r600_texture_create_object(screen, templ,
|
rtex = r600_texture_create_object(screen, templ, stride,
|
||||||
stride, buf, &surface);
|
offset, buf, &surface);
|
||||||
if (!rtex)
|
if (!rtex)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -515,7 +515,7 @@ struct radeon_winsys {
|
||||||
*/
|
*/
|
||||||
struct pb_buffer *(*buffer_from_handle)(struct radeon_winsys *ws,
|
struct pb_buffer *(*buffer_from_handle)(struct radeon_winsys *ws,
|
||||||
struct winsys_handle *whandle,
|
struct winsys_handle *whandle,
|
||||||
unsigned *stride);
|
unsigned *stride, unsigned *offset);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a winsys buffer from a user pointer. The resulting buffer can't
|
* Get a winsys buffer from a user pointer. The resulting buffer can't
|
||||||
|
@ -546,7 +546,7 @@ struct radeon_winsys {
|
||||||
* \return TRUE on success.
|
* \return TRUE on success.
|
||||||
*/
|
*/
|
||||||
boolean (*buffer_get_handle)(struct pb_buffer *buf,
|
boolean (*buffer_get_handle)(struct pb_buffer *buf,
|
||||||
unsigned stride,
|
unsigned stride, unsigned offset,
|
||||||
struct winsys_handle *whandle);
|
struct winsys_handle *whandle);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -519,7 +519,8 @@ amdgpu_bo_create(struct radeon_winsys *rws,
|
||||||
|
|
||||||
static struct pb_buffer *amdgpu_bo_from_handle(struct radeon_winsys *rws,
|
static struct pb_buffer *amdgpu_bo_from_handle(struct radeon_winsys *rws,
|
||||||
struct winsys_handle *whandle,
|
struct winsys_handle *whandle,
|
||||||
unsigned *stride)
|
unsigned *stride,
|
||||||
|
unsigned *offset)
|
||||||
{
|
{
|
||||||
struct amdgpu_winsys *ws = amdgpu_winsys(rws);
|
struct amdgpu_winsys *ws = amdgpu_winsys(rws);
|
||||||
struct amdgpu_winsys_bo *bo;
|
struct amdgpu_winsys_bo *bo;
|
||||||
|
@ -587,6 +588,8 @@ static struct pb_buffer *amdgpu_bo_from_handle(struct radeon_winsys *rws,
|
||||||
|
|
||||||
if (stride)
|
if (stride)
|
||||||
*stride = whandle->stride;
|
*stride = whandle->stride;
|
||||||
|
if (offset)
|
||||||
|
*offset = whandle->offset;
|
||||||
|
|
||||||
if (bo->initial_domain & RADEON_DOMAIN_VRAM)
|
if (bo->initial_domain & RADEON_DOMAIN_VRAM)
|
||||||
ws->allocated_vram += align(bo->base.size, ws->gart_page_size);
|
ws->allocated_vram += align(bo->base.size, ws->gart_page_size);
|
||||||
|
@ -609,7 +612,7 @@ error:
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean amdgpu_bo_get_handle(struct pb_buffer *buffer,
|
static boolean amdgpu_bo_get_handle(struct pb_buffer *buffer,
|
||||||
unsigned stride,
|
unsigned stride, unsigned offset,
|
||||||
struct winsys_handle *whandle)
|
struct winsys_handle *whandle)
|
||||||
{
|
{
|
||||||
struct amdgpu_winsys_bo *bo = amdgpu_winsys_bo(buffer);
|
struct amdgpu_winsys_bo *bo = amdgpu_winsys_bo(buffer);
|
||||||
|
@ -637,7 +640,7 @@ static boolean amdgpu_bo_get_handle(struct pb_buffer *buffer,
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
whandle->stride = stride;
|
whandle->stride = stride;
|
||||||
whandle->offset = 0;
|
whandle->offset = offset;
|
||||||
bo->is_shared = true;
|
bo->is_shared = true;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -851,7 +851,8 @@ static struct pb_buffer *radeon_winsys_bo_from_ptr(struct radeon_winsys *rws,
|
||||||
|
|
||||||
static struct pb_buffer *radeon_winsys_bo_from_handle(struct radeon_winsys *rws,
|
static struct pb_buffer *radeon_winsys_bo_from_handle(struct radeon_winsys *rws,
|
||||||
struct winsys_handle *whandle,
|
struct winsys_handle *whandle,
|
||||||
unsigned *stride)
|
unsigned *stride,
|
||||||
|
unsigned *offset)
|
||||||
{
|
{
|
||||||
struct radeon_drm_winsys *ws = radeon_drm_winsys(rws);
|
struct radeon_drm_winsys *ws = radeon_drm_winsys(rws);
|
||||||
struct radeon_bo *bo;
|
struct radeon_bo *bo;
|
||||||
|
@ -941,6 +942,8 @@ done:
|
||||||
|
|
||||||
if (stride)
|
if (stride)
|
||||||
*stride = whandle->stride;
|
*stride = whandle->stride;
|
||||||
|
if (offset)
|
||||||
|
*offset = whandle->offset;
|
||||||
|
|
||||||
if (ws->info.has_virtual_memory && !bo->va) {
|
if (ws->info.has_virtual_memory && !bo->va) {
|
||||||
struct drm_radeon_gem_va va;
|
struct drm_radeon_gem_va va;
|
||||||
|
@ -991,7 +994,7 @@ fail:
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean radeon_winsys_bo_get_handle(struct pb_buffer *buffer,
|
static boolean radeon_winsys_bo_get_handle(struct pb_buffer *buffer,
|
||||||
unsigned stride,
|
unsigned stride, unsigned offset,
|
||||||
struct winsys_handle *whandle)
|
struct winsys_handle *whandle)
|
||||||
{
|
{
|
||||||
struct drm_gem_flink flink;
|
struct drm_gem_flink flink;
|
||||||
|
@ -1025,7 +1028,7 @@ static boolean radeon_winsys_bo_get_handle(struct pb_buffer *buffer,
|
||||||
}
|
}
|
||||||
|
|
||||||
whandle->stride = stride;
|
whandle->stride = stride;
|
||||||
whandle->offset = 0;
|
whandle->offset = offset;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue