#include "pan_util.h"
#include "pandecode/decode.h"
-struct panfrost_drm {
- struct panfrost_driver base;
- int fd;
-};
-
-static void
+void
panfrost_drm_allocate_slab(struct panfrost_screen *screen,
struct panfrost_memory *mem,
size_t pages,
int commit_count,
int extent)
{
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct drm_panfrost_create_bo create_bo = {
.size = pages * 4096,
.flags = 0, // TODO figure out proper flags..
// TODO properly handle errors
// TODO take into account extra_flags
- ret = drmIoctl(drm->fd, DRM_IOCTL_PANFROST_CREATE_BO, &create_bo);
+ ret = drmIoctl(screen->fd, DRM_IOCTL_PANFROST_CREATE_BO, &create_bo);
if (ret) {
fprintf(stderr, "DRM_IOCTL_PANFROST_CREATE_BO failed: %d\n", ret);
assert(0);
// TODO map and unmap on demand?
mmap_bo.handle = create_bo.handle;
- ret = drmIoctl(drm->fd, DRM_IOCTL_PANFROST_MMAP_BO, &mmap_bo);
+ ret = drmIoctl(screen->fd, DRM_IOCTL_PANFROST_MMAP_BO, &mmap_bo);
if (ret) {
fprintf(stderr, "DRM_IOCTL_PANFROST_MMAP_BO failed: %d\n", ret);
assert(0);
}
mem->cpu = os_mmap(NULL, mem->size, PROT_READ | PROT_WRITE, MAP_SHARED,
- drm->fd, mmap_bo.offset);
+ screen->fd, mmap_bo.offset);
if (mem->cpu == MAP_FAILED) {
fprintf(stderr, "mmap failed: %p\n", mem->cpu);
assert(0);
pandecode_inject_mmap(mem->gpu, mem->cpu, mem->size, NULL);
}
-static void
+void
panfrost_drm_free_slab(struct panfrost_screen *screen, struct panfrost_memory *mem)
{
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct drm_gem_close gem_close = {
.handle = mem->gem_handle,
};
mem->cpu = NULL;
- ret = drmIoctl(drm->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
+ ret = drmIoctl(screen->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
if (ret) {
fprintf(stderr, "DRM_IOCTL_GEM_CLOSE failed: %d\n", ret);
assert(0);
mem->gem_handle = -1;
}
-static struct panfrost_bo *
+struct panfrost_bo *
panfrost_drm_import_bo(struct panfrost_screen *screen, struct winsys_handle *whandle)
{
struct panfrost_bo *bo = rzalloc(screen, struct panfrost_bo);
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct drm_panfrost_get_bo_offset get_bo_offset = {0,};
struct drm_panfrost_mmap_bo mmap_bo = {0,};
int ret;
unsigned gem_handle;
- ret = drmPrimeFDToHandle(drm->fd, whandle->handle, &gem_handle);
+ ret = drmPrimeFDToHandle(screen->fd, whandle->handle, &gem_handle);
assert(!ret);
get_bo_offset.handle = gem_handle;
- ret = drmIoctl(drm->fd, DRM_IOCTL_PANFROST_GET_BO_OFFSET, &get_bo_offset);
+ ret = drmIoctl(screen->fd, DRM_IOCTL_PANFROST_GET_BO_OFFSET, &get_bo_offset);
assert(!ret);
bo->gem_handle = gem_handle;
// TODO map and unmap on demand?
mmap_bo.handle = gem_handle;
- ret = drmIoctl(drm->fd, DRM_IOCTL_PANFROST_MMAP_BO, &mmap_bo);
+ ret = drmIoctl(screen->fd, DRM_IOCTL_PANFROST_MMAP_BO, &mmap_bo);
if (ret) {
fprintf(stderr, "DRM_IOCTL_PANFROST_MMAP_BO failed: %d\n", ret);
assert(0);
bo->size = lseek(whandle->handle, 0, SEEK_END);
assert(bo->size > 0);
bo->cpu = os_mmap(NULL, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
- drm->fd, mmap_bo.offset);
+ screen->fd, mmap_bo.offset);
if (bo->cpu == MAP_FAILED) {
fprintf(stderr, "mmap failed: %p\n", bo->cpu);
assert(0);
return bo;
}
-static int
+int
panfrost_drm_export_bo(struct panfrost_screen *screen, int gem_handle, unsigned int stride, struct winsys_handle *whandle)
{
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct drm_prime_handle args = {
.handle = gem_handle,
.flags = DRM_CLOEXEC,
};
- int ret = drmIoctl(drm->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args);
+ int ret = drmIoctl(screen->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args);
if (ret == -1)
return FALSE;
return TRUE;
}
-static void
+void
panfrost_drm_free_imported_bo(struct panfrost_screen *screen, struct panfrost_bo *bo)
{
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct drm_gem_close gem_close = {
.handle = bo->gem_handle,
};
int ret;
- ret = drmIoctl(drm->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
+ ret = drmIoctl(screen->fd, DRM_IOCTL_GEM_CLOSE, &gem_close);
if (ret) {
fprintf(stderr, "DRM_IOCTL_GEM_CLOSE failed: %d\n", ret);
assert(0);
bo->gpu = (mali_ptr)NULL;
}
-static int
+int
panfrost_drm_submit_job(struct panfrost_context *ctx, u64 job_desc, int reqs, struct pipe_surface *surf)
{
struct pipe_context *gallium = (struct pipe_context *) ctx;
struct panfrost_screen *screen = pan_screen(gallium->screen);
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct drm_panfrost_submit submit = {0,};
int bo_handles[7];
bo_handles[submit.bo_handle_count++] = ctx->tiler_polygon_list.gem_handle;
submit.bo_handles = (u64) (uintptr_t) bo_handles;
- if (drmIoctl(drm->fd, DRM_IOCTL_PANFROST_SUBMIT, &submit)) {
+ if (drmIoctl(screen->fd, DRM_IOCTL_PANFROST_SUBMIT, &submit)) {
fprintf(stderr, "Error submitting: %m\n");
return errno;
}
return 0;
}
-static int
+int
panfrost_drm_submit_vs_fs_job(struct panfrost_context *ctx, bool has_draws, bool is_scanout)
{
struct pipe_surface *surf = ctx->pipe_framebuffer.cbufs[0];
return ret;
}
-static struct panfrost_fence *
+struct panfrost_fence *
panfrost_fence_create(struct panfrost_context *ctx)
{
struct pipe_context *gallium = (struct pipe_context *) ctx;
struct panfrost_screen *screen = pan_screen(gallium->screen);
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct panfrost_fence *f = calloc(1, sizeof(*f));
if (!f)
return NULL;
* (HandleToFD/FDToHandle just gives you another syncobj ID for the
* same syncobj).
*/
- drmSyncobjExportSyncFile(drm->fd, ctx->out_sync, &f->fd);
+ drmSyncobjExportSyncFile(screen->fd, ctx->out_sync, &f->fd);
if (f->fd == -1) {
fprintf(stderr, "export failed\n");
free(f);
return f;
}
-static void
+void
panfrost_drm_force_flush_fragment(struct panfrost_context *ctx,
struct pipe_fence_handle **fence)
{
struct pipe_context *gallium = (struct pipe_context *) ctx;
struct panfrost_screen *screen = pan_screen(gallium->screen);
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
if (!screen->last_fragment_flushed) {
- drmSyncobjWait(drm->fd, &ctx->out_sync, 1, INT64_MAX, 0, NULL);
+ drmSyncobjWait(screen->fd, &ctx->out_sync, 1, INT64_MAX, 0, NULL);
screen->last_fragment_flushed = true;
/* The job finished up, so we're safe to clean it up now */
}
}
-static unsigned
+unsigned
panfrost_drm_query_gpu_version(struct panfrost_screen *screen)
{
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct drm_panfrost_get_param get_param = {0,};
int ret;
get_param.param = DRM_PANFROST_PARAM_GPU_PROD_ID;
- ret = drmIoctl(drm->fd, DRM_IOCTL_PANFROST_GET_PARAM, &get_param);
+ ret = drmIoctl(screen->fd, DRM_IOCTL_PANFROST_GET_PARAM, &get_param);
assert(!ret);
return get_param.value;
}
-static int
+int
panfrost_drm_init_context(struct panfrost_context *ctx)
{
struct pipe_context *gallium = (struct pipe_context *) ctx;
struct panfrost_screen *screen = pan_screen(gallium->screen);
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
- return drmSyncobjCreate(drm->fd, DRM_SYNCOBJ_CREATE_SIGNALED,
+ return drmSyncobjCreate(screen->fd, DRM_SYNCOBJ_CREATE_SIGNALED,
&ctx->out_sync);
}
-static void
+void
panfrost_drm_fence_reference(struct pipe_screen *screen,
struct pipe_fence_handle **ptr,
struct pipe_fence_handle *fence)
*p = f;
}
-static boolean
+boolean
panfrost_drm_fence_finish(struct pipe_screen *pscreen,
struct pipe_context *ctx,
struct pipe_fence_handle *fence,
uint64_t timeout)
{
struct panfrost_screen *screen = pan_screen(pscreen);
- struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
struct panfrost_fence *f = (struct panfrost_fence *)fence;
int ret;
unsigned syncobj;
- ret = drmSyncobjCreate(drm->fd, 0, &syncobj);
+ ret = drmSyncobjCreate(screen->fd, 0, &syncobj);
if (ret) {
fprintf(stderr, "Failed to create syncobj to wait on: %m\n");
return false;
}
- drmSyncobjImportSyncFile(drm->fd, syncobj, f->fd);
+ drmSyncobjImportSyncFile(screen->fd, syncobj, f->fd);
if (ret) {
fprintf(stderr, "Failed to import fence to syncobj: %m\n");
return false;
if (abs_timeout == OS_TIMEOUT_INFINITE)
abs_timeout = INT64_MAX;
- ret = drmSyncobjWait(drm->fd, &syncobj, 1, abs_timeout, 0, NULL);
+ ret = drmSyncobjWait(screen->fd, &syncobj, 1, abs_timeout, 0, NULL);
- drmSyncobjDestroy(drm->fd, syncobj);
+ drmSyncobjDestroy(screen->fd, syncobj);
return ret >= 0;
}
-
-struct panfrost_driver *
-panfrost_create_drm_driver(int fd)
-{
- struct panfrost_drm *driver = CALLOC_STRUCT(panfrost_drm);
-
- driver->fd = fd;
-
- driver->base.import_bo = panfrost_drm_import_bo;
- driver->base.export_bo = panfrost_drm_export_bo;
- driver->base.free_imported_bo = panfrost_drm_free_imported_bo;
- driver->base.submit_vs_fs_job = panfrost_drm_submit_vs_fs_job;
- driver->base.force_flush_fragment = panfrost_drm_force_flush_fragment;
- driver->base.allocate_slab = panfrost_drm_allocate_slab;
- driver->base.free_slab = panfrost_drm_free_slab;
- driver->base.query_gpu_version = panfrost_drm_query_gpu_version;
- driver->base.init_context = panfrost_drm_init_context;
- driver->base.fence_reference = panfrost_drm_fence_reference;
- driver->base.fence_finish = panfrost_drm_fence_finish;
-
- return &driver->base;
-}
projects / mesa.git / blobdiff