radeon: Use symbol visibility.
All the bof_* symbols are now no longer exported. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>main
parent
56c4857f17
commit
58ce9d6292
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
$(WARN_CFLAGS) \
|
$(WARN_CFLAGS) \
|
||||||
|
$(VISIBILITY_CFLAGS) \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_srcdir)/radeon \
|
-I$(top_srcdir)/radeon \
|
||||||
$(PTHREADSTUBS_CFLAGS) \
|
$(PTHREADSTUBS_CFLAGS) \
|
||||||
|
|
|
@ -29,10 +29,14 @@
|
||||||
* Dave Airlie
|
* Dave Airlie
|
||||||
* Jérôme Glisse <glisse@freedesktop.org>
|
* Jérôme Glisse <glisse@freedesktop.org>
|
||||||
*/
|
*/
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
#include <libdrm.h>
|
||||||
#include <radeon_bo.h>
|
#include <radeon_bo.h>
|
||||||
#include <radeon_bo_int.h>
|
#include <radeon_bo_int.h>
|
||||||
|
|
||||||
void radeon_bo_debug(struct radeon_bo *bo, const char *op)
|
drm_public void radeon_bo_debug(struct radeon_bo *bo, const char *op)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
|
|
||||||
|
@ -40,26 +44,23 @@ void radeon_bo_debug(struct radeon_bo *bo, const char *op)
|
||||||
op, bo, bo->handle, boi->size, boi->cref);
|
op, bo, bo->handle, boi->size, boi->cref);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct radeon_bo *radeon_bo_open(struct radeon_bo_manager *bom,
|
drm_public struct radeon_bo *
|
||||||
uint32_t handle,
|
radeon_bo_open(struct radeon_bo_manager *bom, uint32_t handle, uint32_t size,
|
||||||
uint32_t size,
|
uint32_t alignment, uint32_t domains, uint32_t flags)
|
||||||
uint32_t alignment,
|
|
||||||
uint32_t domains,
|
|
||||||
uint32_t flags)
|
|
||||||
{
|
{
|
||||||
struct radeon_bo *bo;
|
struct radeon_bo *bo;
|
||||||
bo = bom->funcs->bo_open(bom, handle, size, alignment, domains, flags);
|
bo = bom->funcs->bo_open(bom, handle, size, alignment, domains, flags);
|
||||||
return bo;
|
return bo;
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_bo_ref(struct radeon_bo *bo)
|
drm_public void radeon_bo_ref(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
boi->cref++;
|
boi->cref++;
|
||||||
boi->bom->funcs->bo_ref(boi);
|
boi->bom->funcs->bo_ref(boi);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo)
|
drm_public struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
if (bo == NULL)
|
if (bo == NULL)
|
||||||
|
@ -69,19 +70,19 @@ struct radeon_bo *radeon_bo_unref(struct radeon_bo *bo)
|
||||||
return boi->bom->funcs->bo_unref(boi);
|
return boi->bom->funcs->bo_unref(boi);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_map(struct radeon_bo *bo, int write)
|
drm_public int radeon_bo_map(struct radeon_bo *bo, int write)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
return boi->bom->funcs->bo_map(boi, write);
|
return boi->bom->funcs->bo_map(boi, write);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_unmap(struct radeon_bo *bo)
|
drm_public int radeon_bo_unmap(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
return boi->bom->funcs->bo_unmap(boi);
|
return boi->bom->funcs->bo_unmap(boi);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_wait(struct radeon_bo *bo)
|
drm_public int radeon_bo_wait(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
if (!boi->bom->funcs->bo_wait)
|
if (!boi->bom->funcs->bo_wait)
|
||||||
|
@ -89,27 +90,29 @@ int radeon_bo_wait(struct radeon_bo *bo)
|
||||||
return boi->bom->funcs->bo_wait(boi);
|
return boi->bom->funcs->bo_wait(boi);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_is_busy(struct radeon_bo *bo, uint32_t *domain)
|
drm_public int radeon_bo_is_busy(struct radeon_bo *bo, uint32_t *domain)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
return boi->bom->funcs->bo_is_busy(boi, domain);
|
return boi->bom->funcs->bo_is_busy(boi, domain);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_set_tiling(struct radeon_bo *bo,
|
drm_public int
|
||||||
uint32_t tiling_flags, uint32_t pitch)
|
radeon_bo_set_tiling(struct radeon_bo *bo,
|
||||||
|
uint32_t tiling_flags, uint32_t pitch)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
return boi->bom->funcs->bo_set_tiling(boi, tiling_flags, pitch);
|
return boi->bom->funcs->bo_set_tiling(boi, tiling_flags, pitch);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_get_tiling(struct radeon_bo *bo,
|
drm_public int
|
||||||
uint32_t *tiling_flags, uint32_t *pitch)
|
radeon_bo_get_tiling(struct radeon_bo *bo,
|
||||||
|
uint32_t *tiling_flags, uint32_t *pitch)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
return boi->bom->funcs->bo_get_tiling(boi, tiling_flags, pitch);
|
return boi->bom->funcs->bo_get_tiling(boi, tiling_flags, pitch);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_is_static(struct radeon_bo *bo)
|
drm_public int radeon_bo_is_static(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
if (boi->bom->funcs->bo_is_static)
|
if (boi->bom->funcs->bo_is_static)
|
||||||
|
@ -117,18 +120,19 @@ int radeon_bo_is_static(struct radeon_bo *bo)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_bo_is_referenced_by_cs(struct radeon_bo *bo, struct radeon_cs *cs)
|
drm_public int
|
||||||
|
radeon_bo_is_referenced_by_cs(struct radeon_bo *bo, struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
return boi->cref > 1;
|
return boi->cref > 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t radeon_bo_get_handle(struct radeon_bo *bo)
|
drm_public uint32_t radeon_bo_get_handle(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
return bo->handle;
|
return bo->handle;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t radeon_bo_get_src_domain(struct radeon_bo *bo)
|
drm_public uint32_t radeon_bo_get_src_domain(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
uint32_t src_domain;
|
uint32_t src_domain;
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include "libdrm.h"
|
||||||
#include "xf86drm.h"
|
#include "xf86drm.h"
|
||||||
#include "xf86atomic.h"
|
#include "xf86atomic.h"
|
||||||
#include "drm.h"
|
#include "drm.h"
|
||||||
|
@ -283,7 +284,7 @@ static struct radeon_bo_funcs bo_gem_funcs = {
|
||||||
bo_is_busy,
|
bo_is_busy,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
|
drm_public struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
|
||||||
{
|
{
|
||||||
struct bo_manager_gem *bomg;
|
struct bo_manager_gem *bomg;
|
||||||
|
|
||||||
|
@ -296,7 +297,7 @@ struct radeon_bo_manager *radeon_bo_manager_gem_ctor(int fd)
|
||||||
return (struct radeon_bo_manager*)bomg;
|
return (struct radeon_bo_manager*)bomg;
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_bo_manager_gem_dtor(struct radeon_bo_manager *bom)
|
drm_public void radeon_bo_manager_gem_dtor(struct radeon_bo_manager *bom)
|
||||||
{
|
{
|
||||||
struct bo_manager_gem *bomg = (struct bo_manager_gem*)bom;
|
struct bo_manager_gem *bomg = (struct bo_manager_gem*)bom;
|
||||||
|
|
||||||
|
@ -306,19 +307,22 @@ void radeon_bo_manager_gem_dtor(struct radeon_bo_manager *bom)
|
||||||
free(bomg);
|
free(bomg);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t radeon_gem_name_bo(struct radeon_bo *bo)
|
drm_public uint32_t
|
||||||
|
radeon_gem_name_bo(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
||||||
return bo_gem->name;
|
return bo_gem->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
void *radeon_gem_get_reloc_in_cs(struct radeon_bo *bo)
|
drm_public void *
|
||||||
|
radeon_gem_get_reloc_in_cs(struct radeon_bo *bo)
|
||||||
{
|
{
|
||||||
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
||||||
return &bo_gem->reloc_in_cs;
|
return &bo_gem->reloc_in_cs;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
|
drm_public int
|
||||||
|
radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
|
||||||
{
|
{
|
||||||
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
|
@ -339,7 +343,8 @@ int radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t write_domain)
|
drm_public int
|
||||||
|
radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t write_domain)
|
||||||
{
|
{
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
struct drm_radeon_gem_set_domain args;
|
struct drm_radeon_gem_set_domain args;
|
||||||
|
@ -356,7 +361,7 @@ int radeon_gem_set_domain(struct radeon_bo *bo, uint32_t read_domains, uint32_t
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle)
|
drm_public int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle)
|
||||||
{
|
{
|
||||||
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -365,9 +370,8 @@ int radeon_gem_prime_share_bo(struct radeon_bo *bo, int *handle)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct radeon_bo *radeon_gem_bo_open_prime(struct radeon_bo_manager *bom,
|
drm_public struct radeon_bo *
|
||||||
int fd_handle,
|
radeon_gem_bo_open_prime(struct radeon_bo_manager *bom, int fd_handle, uint32_t size)
|
||||||
uint32_t size)
|
|
||||||
{
|
{
|
||||||
struct radeon_bo_gem *bo;
|
struct radeon_bo_gem *bo;
|
||||||
int r;
|
int r;
|
||||||
|
|
|
@ -1,19 +1,22 @@
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
#include "libdrm.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "radeon_cs.h"
|
#include "radeon_cs.h"
|
||||||
#include "radeon_cs_int.h"
|
#include "radeon_cs_int.h"
|
||||||
|
|
||||||
struct radeon_cs *radeon_cs_create(struct radeon_cs_manager *csm, uint32_t ndw)
|
drm_public struct radeon_cs *
|
||||||
|
radeon_cs_create(struct radeon_cs_manager *csm, uint32_t ndw)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = csm->funcs->cs_create(csm, ndw);
|
struct radeon_cs_int *csi = csm->funcs->cs_create(csm, ndw);
|
||||||
return (struct radeon_cs *)csi;
|
return (struct radeon_cs *)csi;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_write_reloc(struct radeon_cs *cs,
|
drm_public int
|
||||||
struct radeon_bo *bo,
|
radeon_cs_write_reloc(struct radeon_cs *cs, struct radeon_bo *bo,
|
||||||
uint32_t read_domain,
|
uint32_t read_domain, uint32_t write_domain,
|
||||||
uint32_t write_domain,
|
uint32_t flags)
|
||||||
uint32_t flags)
|
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
|
|
||||||
|
@ -24,56 +27,54 @@ int radeon_cs_write_reloc(struct radeon_cs *cs,
|
||||||
flags);
|
flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_begin(struct radeon_cs *cs,
|
drm_public int
|
||||||
uint32_t ndw,
|
radeon_cs_begin(struct radeon_cs *cs, uint32_t ndw,
|
||||||
const char *file,
|
const char *file, const char *func, int line)
|
||||||
const char *func,
|
|
||||||
int line)
|
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return csi->csm->funcs->cs_begin(csi, ndw, file, func, line);
|
return csi->csm->funcs->cs_begin(csi, ndw, file, func, line);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_end(struct radeon_cs *cs,
|
drm_public int
|
||||||
const char *file,
|
radeon_cs_end(struct radeon_cs *cs,
|
||||||
const char *func,
|
const char *file, const char *func, int line)
|
||||||
int line)
|
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return csi->csm->funcs->cs_end(csi, file, func, line);
|
return csi->csm->funcs->cs_end(csi, file, func, line);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_emit(struct radeon_cs *cs)
|
drm_public int radeon_cs_emit(struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return csi->csm->funcs->cs_emit(csi);
|
return csi->csm->funcs->cs_emit(csi);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_destroy(struct radeon_cs *cs)
|
drm_public int radeon_cs_destroy(struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return csi->csm->funcs->cs_destroy(csi);
|
return csi->csm->funcs->cs_destroy(csi);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_erase(struct radeon_cs *cs)
|
drm_public int radeon_cs_erase(struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return csi->csm->funcs->cs_erase(csi);
|
return csi->csm->funcs->cs_erase(csi);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_need_flush(struct radeon_cs *cs)
|
drm_public int radeon_cs_need_flush(struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return csi->csm->funcs->cs_need_flush(csi);
|
return csi->csm->funcs->cs_need_flush(csi);
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_cs_print(struct radeon_cs *cs, FILE *file)
|
drm_public void radeon_cs_print(struct radeon_cs *cs, FILE *file)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
csi->csm->funcs->cs_print(csi, file);
|
csi->csm->funcs->cs_print(csi, file);
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
|
drm_public void
|
||||||
|
radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
if (domain == RADEON_GEM_DOMAIN_VRAM)
|
if (domain == RADEON_GEM_DOMAIN_VRAM)
|
||||||
|
@ -82,14 +83,15 @@ void radeon_cs_set_limit(struct radeon_cs *cs, uint32_t domain, uint32_t limit)
|
||||||
csi->csm->gart_limit = limit;
|
csi->csm->gart_limit = limit;
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_cs_space_set_flush(struct radeon_cs *cs, void (*fn)(void *), void *data)
|
drm_public void radeon_cs_space_set_flush(struct radeon_cs *cs,
|
||||||
|
void (*fn)(void *), void *data)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
csi->space_flush_fn = fn;
|
csi->space_flush_fn = fn;
|
||||||
csi->space_flush_data = data;
|
csi->space_flush_data = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t radeon_cs_get_id(struct radeon_cs *cs)
|
drm_public uint32_t radeon_cs_get_id(struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return csi->id;
|
return csi->id;
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
* Nicolai Haehnle <prefect_@gmx.net>
|
* Nicolai Haehnle <prefect_@gmx.net>
|
||||||
* Jérôme Glisse <glisse@freedesktop.org>
|
* Jérôme Glisse <glisse@freedesktop.org>
|
||||||
*/
|
*/
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -42,6 +45,7 @@
|
||||||
#include "radeon_cs_gem.h"
|
#include "radeon_cs_gem.h"
|
||||||
#include "radeon_bo_gem.h"
|
#include "radeon_bo_gem.h"
|
||||||
#include "drm.h"
|
#include "drm.h"
|
||||||
|
#include "libdrm.h"
|
||||||
#include "xf86drm.h"
|
#include "xf86drm.h"
|
||||||
#include "xf86atomic.h"
|
#include "xf86atomic.h"
|
||||||
#include "radeon_drm.h"
|
#include "radeon_drm.h"
|
||||||
|
@ -533,7 +537,7 @@ static int radeon_get_device_id(int fd, uint32_t *device_id)
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct radeon_cs_manager *radeon_cs_manager_gem_ctor(int fd)
|
drm_public struct radeon_cs_manager *radeon_cs_manager_gem_ctor(int fd)
|
||||||
{
|
{
|
||||||
struct radeon_cs_manager_gem *csm;
|
struct radeon_cs_manager_gem *csm;
|
||||||
|
|
||||||
|
@ -547,7 +551,7 @@ struct radeon_cs_manager *radeon_cs_manager_gem_ctor(int fd)
|
||||||
return &csm->base;
|
return &csm->base;
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_cs_manager_gem_dtor(struct radeon_cs_manager *csm)
|
drm_public void radeon_cs_manager_gem_dtor(struct radeon_cs_manager *csm)
|
||||||
{
|
{
|
||||||
free(csm);
|
free(csm);
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,9 +25,13 @@
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
*/
|
*/
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include "libdrm.h"
|
||||||
#include "radeon_cs.h"
|
#include "radeon_cs.h"
|
||||||
#include "radeon_bo_int.h"
|
#include "radeon_bo_int.h"
|
||||||
#include "radeon_cs_int.h"
|
#include "radeon_cs_int.h"
|
||||||
|
@ -161,7 +165,9 @@ static int radeon_cs_do_space_check(struct radeon_cs_int *cs, struct radeon_cs_s
|
||||||
return RADEON_CS_SPACE_OK;
|
return RADEON_CS_SPACE_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_cs_space_add_persistent_bo(struct radeon_cs *cs, struct radeon_bo *bo, uint32_t read_domains, uint32_t write_domain)
|
drm_public void
|
||||||
|
radeon_cs_space_add_persistent_bo(struct radeon_cs *cs, struct radeon_bo *bo,
|
||||||
|
uint32_t read_domains, uint32_t write_domain)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
|
@ -203,9 +209,9 @@ again:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_space_check_with_bo(struct radeon_cs *cs,
|
drm_public int
|
||||||
struct radeon_bo *bo,
|
radeon_cs_space_check_with_bo(struct radeon_cs *cs, struct radeon_bo *bo,
|
||||||
uint32_t read_domains, uint32_t write_domain)
|
uint32_t read_domains, uint32_t write_domain)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
struct radeon_bo_int *boi = (struct radeon_bo_int *)bo;
|
||||||
|
@ -224,13 +230,13 @@ int radeon_cs_space_check_with_bo(struct radeon_cs *cs,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_cs_space_check(struct radeon_cs *cs)
|
drm_public int radeon_cs_space_check(struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
return radeon_cs_check_space_internal(csi, NULL);
|
return radeon_cs_check_space_internal(csi, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_cs_space_reset_bos(struct radeon_cs *cs)
|
drm_public void radeon_cs_space_reset_bos(struct radeon_cs *cs)
|
||||||
{
|
{
|
||||||
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
struct radeon_cs_int *csi = (struct radeon_cs_int *)cs;
|
||||||
int i;
|
int i;
|
||||||
|
|
|
@ -26,6 +26,9 @@
|
||||||
* Authors:
|
* Authors:
|
||||||
* Jérôme Glisse <jglisse@redhat.com>
|
* Jérôme Glisse <jglisse@redhat.com>
|
||||||
*/
|
*/
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
@ -35,6 +38,7 @@
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include "drm.h"
|
#include "drm.h"
|
||||||
|
#include "libdrm.h"
|
||||||
#include "xf86drm.h"
|
#include "xf86drm.h"
|
||||||
#include "radeon_drm.h"
|
#include "radeon_drm.h"
|
||||||
#include "radeon_surface.h"
|
#include "radeon_surface.h"
|
||||||
|
@ -2395,7 +2399,8 @@ static int cik_surface_best(struct radeon_surface_manager *surf_man,
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
* public API
|
* public API
|
||||||
*/
|
*/
|
||||||
struct radeon_surface_manager *radeon_surface_manager_new(int fd)
|
drm_public struct radeon_surface_manager *
|
||||||
|
radeon_surface_manager_new(int fd)
|
||||||
{
|
{
|
||||||
struct radeon_surface_manager *surf_man;
|
struct radeon_surface_manager *surf_man;
|
||||||
|
|
||||||
|
@ -2443,7 +2448,8 @@ out_err:
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void radeon_surface_manager_free(struct radeon_surface_manager *surf_man)
|
drm_public void
|
||||||
|
radeon_surface_manager_free(struct radeon_surface_manager *surf_man)
|
||||||
{
|
{
|
||||||
free(surf_man);
|
free(surf_man);
|
||||||
}
|
}
|
||||||
|
@ -2515,8 +2521,9 @@ static int radeon_surface_sanity(struct radeon_surface_manager *surf_man,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_surface_init(struct radeon_surface_manager *surf_man,
|
drm_public int
|
||||||
struct radeon_surface *surf)
|
radeon_surface_init(struct radeon_surface_manager *surf_man,
|
||||||
|
struct radeon_surface *surf)
|
||||||
{
|
{
|
||||||
unsigned mode, type;
|
unsigned mode, type;
|
||||||
int r;
|
int r;
|
||||||
|
@ -2531,8 +2538,9 @@ int radeon_surface_init(struct radeon_surface_manager *surf_man,
|
||||||
return surf_man->surface_init(surf_man, surf);
|
return surf_man->surface_init(surf_man, surf);
|
||||||
}
|
}
|
||||||
|
|
||||||
int radeon_surface_best(struct radeon_surface_manager *surf_man,
|
drm_public int
|
||||||
struct radeon_surface *surf)
|
radeon_surface_best(struct radeon_surface_manager *surf_man,
|
||||||
|
struct radeon_surface *surf)
|
||||||
{
|
{
|
||||||
unsigned mode, type;
|
unsigned mode, type;
|
||||||
int r;
|
int r;
|
||||||
|
|
Loading…
Reference in New Issue