pipe_reference_init(&prsc->reference, 1);
prsc->screen = pscreen;
- rsc->bo = panfrost_drm_import_bo(screen, whandle);
- rsc->bo->slices[0].stride = whandle->stride;
- rsc->bo->slices[0].initialized = true;
+ rsc->bo = panfrost_drm_import_bo(screen, whandle->handle);
+ rsc->slices[0].stride = whandle->stride;
+ rsc->slices[0].initialized = true;
if (screen->ro) {
rsc->scanout =
return TRUE;
handle->handle = rsrc->bo->gem_handle;
- handle->stride = rsrc->bo->slices[0].stride;
+ handle->stride = rsrc->slices[0].stride;
return TRUE;
} else if (handle->type == WINSYS_HANDLE_TYPE_FD) {
if (scanout) {
handle->handle = args.fd;
return TRUE;
- } else
- return panfrost_drm_export_bo(screen, rsrc->bo->gem_handle,
- rsrc->bo->slices[0].stride,
- handle);
+ } else {
+ int fd = panfrost_drm_export_bo(screen, rsrc->bo);
+
+ if (fd < 0)
+ return FALSE;
+
+ handle->handle = fd;
+ handle->stride = rsrc->slices[0].stride;
+ return TRUE;
+ }
}
return FALSE;
ralloc_free(surf);
}
+static struct pipe_resource *
+panfrost_create_scanout_res(struct pipe_screen *screen,
+ const struct pipe_resource *template)
+{
+ struct panfrost_screen *pscreen = pan_screen(screen);
+ struct pipe_resource scanout_templat = *template;
+ struct renderonly_scanout *scanout;
+ struct winsys_handle handle;
+ struct pipe_resource *res;
+
+ scanout = renderonly_scanout_for_resource(&scanout_templat,
+ pscreen->ro, &handle);
+ if (!scanout)
+ return NULL;
+
+ assert(handle.type == WINSYS_HANDLE_TYPE_FD);
+ /* TODO: handle modifiers? */
+ res = screen->resource_from_handle(screen, template, &handle,
+ PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE);
+ close(handle.handle);
+ if (!res)
+ return NULL;
+
+ struct panfrost_resource *pres = pan_resource(res);
+
+ pres->scanout = scanout;
+ pscreen->display_target = pres;
+
+ return res;
+}
+
/* Computes sizes for checksumming, which is 8 bytes per 16x16 tile */
#define CHECKSUM_TILE_WIDTH 16
unsigned width,
unsigned height)
{
- unsigned aligned_width = ALIGN(width, CHECKSUM_TILE_WIDTH);
- unsigned aligned_height = ALIGN(height, CHECKSUM_TILE_HEIGHT);
+ unsigned aligned_width = ALIGN_POT(width, CHECKSUM_TILE_WIDTH);
+ unsigned aligned_height = ALIGN_POT(height, CHECKSUM_TILE_HEIGHT);
unsigned tile_count_x = aligned_width / CHECKSUM_TILE_WIDTH;
unsigned tile_count_y = aligned_height / CHECKSUM_TILE_HEIGHT;
/* Setup the mip tree given a particular layout, possibly with checksumming */
static void
-panfrost_setup_slices(const struct pipe_resource *tmpl, struct panfrost_bo *bo)
+panfrost_setup_slices(struct panfrost_resource *pres, size_t *bo_size)
{
- unsigned width = tmpl->width0;
- unsigned height = tmpl->height0;
- unsigned depth = tmpl->depth0;
- unsigned bytes_per_pixel = util_format_get_blocksize(tmpl->format);
+ struct pipe_resource *res = &pres->base;
+ unsigned width = res->width0;
+ unsigned height = res->height0;
+ unsigned depth = res->depth0;
+ unsigned bytes_per_pixel = util_format_get_blocksize(res->format);
assert(depth > 0);
* necessary, but we're not *that* pressed for memory and it
* makes code a lot simpler */
- bool renderable = tmpl->bind &
+ bool renderable = res->bind &
(PIPE_BIND_RENDER_TARGET | PIPE_BIND_DEPTH_STENCIL);
- bool afbc = bo->layout == PAN_AFBC;
- bool tiled = bo->layout == PAN_TILED;
+ bool afbc = pres->layout == PAN_AFBC;
+ bool tiled = pres->layout == PAN_TILED;
bool should_align = renderable || tiled;
/* We don't know how to specify a 2D stride for 3D textures */
bool can_align_stride =
- tmpl->target != PIPE_TEXTURE_3D;
+ res->target != PIPE_TEXTURE_3D;
should_align &= can_align_stride;
unsigned offset = 0;
unsigned size_2d = 0;
- for (unsigned l = 0; l <= tmpl->last_level; ++l) {
- struct panfrost_slice *slice = &bo->slices[l];
+ for (unsigned l = 0; l <= res->last_level; ++l) {
+ struct panfrost_slice *slice = &pres->slices[l];
unsigned effective_width = width;
unsigned effective_height = height;
unsigned effective_depth = depth;
if (should_align) {
- effective_width = ALIGN(effective_width, 16);
- effective_height = ALIGN(effective_height, 16);
+ effective_width = ALIGN_POT(effective_width, 16);
+ effective_height = ALIGN_POT(effective_height, 16);
/* We don't need to align depth */
}
unsigned stride = bytes_per_pixel * effective_width;
/* ..but cache-line align it for performance */
- if (can_align_stride && bo->layout == PAN_LINEAR)
- stride = ALIGN(stride, 64);
+ if (can_align_stride && pres->layout == PAN_LINEAR)
+ stride = ALIGN_POT(stride, 64);
slice->stride = stride;
offset += slice_full_size;
/* Add a checksum region if necessary */
- if (bo->checksummed) {
+ if (pres->checksummed) {
slice->checksum_offset = offset;
unsigned size = panfrost_compute_checksum_sizes(
depth = u_minify(depth, 1);
}
- assert(tmpl->array_size);
+ assert(res->array_size);
- if (tmpl->target != PIPE_TEXTURE_3D) {
+ if (res->target != PIPE_TEXTURE_3D) {
/* Arrays and cubemaps have the entire miptree duplicated */
- bo->cubemap_stride = ALIGN(offset, 64);
- bo->size = ALIGN(bo->cubemap_stride * tmpl->array_size, 4096);
+ pres->cubemap_stride = ALIGN_POT(offset, 64);
+ *bo_size = ALIGN_POT(pres->cubemap_stride * res->array_size, 4096);
} else {
/* 3D strides across the 2D layers */
- assert(tmpl->array_size == 1);
+ assert(res->array_size == 1);
- bo->cubemap_stride = size_2d;
- bo->size = ALIGN(offset, 4096);
+ pres->cubemap_stride = size_2d;
+ *bo_size = ALIGN_POT(offset, 4096);
}
}
-static struct panfrost_bo *
-panfrost_create_bo(struct panfrost_screen *screen, const struct pipe_resource *template)
+static void
+panfrost_resource_create_bo(struct panfrost_screen *screen, struct panfrost_resource *pres)
{
- struct panfrost_bo *bo = rzalloc(screen, struct panfrost_bo);
- pipe_reference_init(&bo->reference, 1);
+ struct pipe_resource *res = &pres->base;
/* Based on the usage, figure out what storing will be used. There are
* various tradeoffs:
/* Tiling textures is almost always faster, unless we only use it once */
- bool is_texture = (template->bind & PIPE_BIND_SAMPLER_VIEW);
- bool is_2d = template->depth0 == 1 && template->array_size == 1;
- bool is_streaming = (template->usage != PIPE_USAGE_STREAM);
+ bool is_texture = (res->bind & PIPE_BIND_SAMPLER_VIEW);
+ bool is_2d = res->depth0 == 1 && res->array_size == 1;
+ bool is_streaming = (res->usage != PIPE_USAGE_STREAM);
bool should_tile = is_streaming && is_texture && is_2d;
/* Depth/stencil can't be tiled, only linear or AFBC */
- should_tile &= !(template->bind & PIPE_BIND_DEPTH_STENCIL);
+ should_tile &= !(res->bind & PIPE_BIND_DEPTH_STENCIL);
/* FBOs we would like to checksum, if at all possible */
- bool can_checksum = !(template->bind & (PIPE_BIND_SCANOUT | PIPE_BIND_SHARED));
- bool should_checksum = template->bind & PIPE_BIND_RENDER_TARGET;
+ bool can_checksum = !(res->bind & (PIPE_BIND_SCANOUT | PIPE_BIND_SHARED));
+ bool should_checksum = res->bind & PIPE_BIND_RENDER_TARGET;
- bo->checksummed = can_checksum && should_checksum;
+ pres->checksummed = can_checksum && should_checksum;
/* Set the layout appropriately */
- bo->layout = should_tile ? PAN_TILED : PAN_LINEAR;
-
- panfrost_setup_slices(template, bo);
+ pres->layout = should_tile ? PAN_TILED : PAN_LINEAR;
- struct panfrost_memory mem;
+ size_t bo_size;
- panfrost_drm_allocate_slab(screen, &mem, bo->size / 4096, true, 0, 0, 0);
-
- bo->cpu = mem.cpu;
- bo->gpu = mem.gpu;
- bo->gem_handle = mem.gem_handle;
-
- return bo;
+ panfrost_setup_slices(pres, &bo_size);
+ pres->bo = panfrost_drm_create_bo(screen, bo_size, 0);
}
static struct pipe_resource *
panfrost_resource_create(struct pipe_screen *screen,
const struct pipe_resource *template)
{
- struct panfrost_resource *so = rzalloc(screen, struct panfrost_resource);
- struct panfrost_screen *pscreen = (struct panfrost_screen *) screen;
-
- so->base = *template;
- so->base.screen = screen;
-
- pipe_reference_init(&so->base.reference, 1);
-
/* Make sure we're familiar */
switch (template->target) {
case PIPE_BUFFER:
assert(0);
}
- util_range_init(&so->valid_buffer_range);
+ if (template->bind &
+ (PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED))
+ return panfrost_create_scanout_res(screen, template);
- if (template->bind & PIPE_BIND_DISPLAY_TARGET ||
- template->bind & PIPE_BIND_SCANOUT ||
- template->bind & PIPE_BIND_SHARED) {
- struct pipe_resource scanout_templat = *template;
- struct renderonly_scanout *scanout;
- struct winsys_handle handle;
+ struct panfrost_resource *so = rzalloc(screen, struct panfrost_resource);
+ struct panfrost_screen *pscreen = (struct panfrost_screen *) screen;
- scanout = renderonly_scanout_for_resource(&scanout_templat,
- pscreen->ro, &handle);
- if (!scanout)
- return NULL;
+ so->base = *template;
+ so->base.screen = screen;
- assert(handle.type == WINSYS_HANDLE_TYPE_FD);
- /* TODO: handle modifiers? */
- so = pan_resource(screen->resource_from_handle(screen, template,
- &handle,
- PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE));
- close(handle.handle);
- if (!so)
- return NULL;
+ pipe_reference_init(&so->base.reference, 1);
- so->scanout = scanout;
- pscreen->display_target = so;
- } else {
- so->bo = panfrost_create_bo(pscreen, template);
- }
+ util_range_init(&so->valid_buffer_range);
+ panfrost_resource_create_bo(pscreen, so);
return (struct pipe_resource *)so;
}
-static void
-panfrost_destroy_bo(struct panfrost_screen *screen, struct panfrost_bo *bo)
-{
- if (bo->imported) {
- panfrost_drm_free_imported_bo(screen, bo);
- } else {
- struct panfrost_memory mem = {
- .cpu = bo->cpu,
- .gpu = bo->gpu,
- .size = bo->size,
- .gem_handle = bo->gem_handle,
- };
-
- panfrost_drm_free_slab(screen, &mem);
- }
-
- ralloc_free(bo);
-}
-
void
panfrost_bo_reference(struct panfrost_bo *bo)
{
{
/* When the reference count goes to zero, we need to cleanup */
- if (pipe_reference(&bo->reference, NULL)) {
- panfrost_destroy_bo(pan_screen(screen), bo);
- }
+ if (pipe_reference(&bo->reference, NULL))
+ panfrost_drm_release_bo(pan_screen(screen), bo);
}
static void
}
}
- if (bo->layout != PAN_LINEAR) {
+ if (rsrc->layout != PAN_LINEAR) {
/* Non-linear resources need to be indirectly mapped */
if (usage & PIPE_TRANSFER_MAP_DIRECTLY)
transfer->map = rzalloc_size(transfer, transfer->base.layer_stride * box->depth);
assert(box->depth == 1);
- if ((usage & PIPE_TRANSFER_READ) && bo->slices[level].initialized) {
- if (bo->layout == PAN_AFBC) {
+ if ((usage & PIPE_TRANSFER_READ) && rsrc->slices[level].initialized) {
+ if (rsrc->layout == PAN_AFBC) {
DBG("Unimplemented: reads from AFBC");
- } else if (bo->layout == PAN_TILED) {
+ } else if (rsrc->layout == PAN_TILED) {
panfrost_load_tiled_image(
transfer->map,
- bo->cpu + bo->slices[level].offset,
+ bo->cpu + rsrc->slices[level].offset,
box,
transfer->base.stride,
- bo->slices[level].stride,
+ rsrc->slices[level].stride,
util_format_get_blocksize(resource->format));
}
}
return transfer->map;
} else {
- transfer->base.stride = bo->slices[level].stride;
- transfer->base.layer_stride = bo->cubemap_stride;
+ transfer->base.stride = rsrc->slices[level].stride;
+ transfer->base.layer_stride = rsrc->cubemap_stride;
/* By mapping direct-write, we're implicitly already
* initialized (maybe), so be conservative */
if ((usage & PIPE_TRANSFER_WRITE) && (usage & PIPE_TRANSFER_MAP_DIRECTLY))
- bo->slices[level].initialized = true;
+ rsrc->slices[level].initialized = true;
return bo->cpu
- + bo->slices[level].offset
- + transfer->base.box.z * bo->cubemap_stride
- + transfer->base.box.y * bo->slices[level].stride
+ + rsrc->slices[level].offset
+ + transfer->base.box.z * rsrc->cubemap_stride
+ + transfer->base.box.y * rsrc->slices[level].stride
+ transfer->base.box.x * bytes_per_pixel;
}
}
if (transfer->usage & PIPE_TRANSFER_WRITE) {
unsigned level = transfer->level;
- bo->slices[level].initialized = true;
+ prsrc->slices[level].initialized = true;
- if (bo->layout == PAN_AFBC) {
+ if (prsrc->layout == PAN_AFBC) {
DBG("Unimplemented: writes to AFBC\n");
- } else if (bo->layout == PAN_TILED) {
+ } else if (prsrc->layout == PAN_TILED) {
assert(transfer->box.depth == 1);
panfrost_store_tiled_image(
- bo->cpu + bo->slices[level].offset,
+ bo->cpu + prsrc->slices[level].offset,
trans->map,
&transfer->box,
- bo->slices[level].stride,
+ prsrc->slices[level].stride,
transfer->stride,
util_format_get_blocksize(prsrc->base.format));
}
assert(rsrc->bo);
for (unsigned l = base_level + 1; l <= last_level; ++l)
- rsrc->bo->slices[l].initialized = false;
+ rsrc->slices[l].initialized = false;
/* Beyond that, we just delegate the hard stuff. We're careful to
* include flushes on both ends to make sure the data is really valid.
struct panfrost_resource *rsrc,
unsigned level, unsigned face)
{
- unsigned level_offset = rsrc->bo->slices[level].offset;
- unsigned face_offset = face * rsrc->bo->cubemap_stride;
+ unsigned level_offset = rsrc->slices[level].offset;
+ unsigned face_offset = face * rsrc->cubemap_stride;
return rsrc->bo->gpu + level_offset + face_offset;
}
projects / mesa.git / blobdiff