summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/ati_pcigart.c94
-rw-r--r--linux-core/drmP.h6
-rw-r--r--linux-core/radeon_buffer.c4
3 files changed, 50 insertions, 54 deletions
diff --git a/linux-core/ati_pcigart.c b/linux-core/ati_pcigart.c
index 66742bbc..08dbfe6c 100644
--- a/linux-core/ati_pcigart.c
+++ b/linux-core/ati_pcigart.c
@@ -261,7 +261,8 @@ static int ati_pcigart_populate(drm_ttm_backend_t *backend,
unsigned long num_pages,
struct page **pages)
{
- ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
+ ati_pcigart_ttm_backend_t *atipci_be =
+ container_of(backend, ati_pcigart_ttm_backend_t, backend);
struct page **cur_page, **last_page = pages + num_pages;
struct ati_pcigart_memory *mem;
unsigned long alloc_size = num_pages * sizeof(struct page *);
@@ -281,7 +282,7 @@ static int ati_pcigart_populate(drm_ttm_backend_t *backend,
for (cur_page = pages; cur_page < last_page; ++cur_page) {
mem->memory[mem->page_count++] = page_to_phys(*cur_page);
}
- atipci_priv->mem = mem;
+ atipci_be->mem = mem;
return 0;
}
@@ -289,18 +290,20 @@ static int ati_pcigart_bind_ttm(drm_ttm_backend_t *backend,
unsigned long offset,
int cached)
{
- ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
- struct ati_pcigart_memory *mem = atipci_priv->mem;
+ ati_pcigart_ttm_backend_t *atipci_be =
+ container_of(backend, ati_pcigart_ttm_backend_t, backend);
+
+ struct ati_pcigart_memory *mem = atipci_be->mem;
off_t j;
j = offset;
- while (j < (pg_start + mem->page_count)) {
+ while (j < (offset + mem->page_count)) {
j++;
}
- for (i = 0, j = offset; i < mem->page_count; i++, j++) {
+// for (i = 0, j = offset; i < mem->page_count; i++, j++) {
/* write value */
- }
+// }
/* need to traverse table and add entries */
DRM_DEBUG("\n");
@@ -309,7 +312,8 @@ static int ati_pcigart_bind_ttm(drm_ttm_backend_t *backend,
static int ati_pcigart_unbind_ttm(drm_ttm_backend_t *backend)
{
- ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
+ ati_pcigart_ttm_backend_t *atipci_be =
+ container_of(backend, ati_pcigart_ttm_backend_t, backend);
DRM_DEBUG("\n");
return -1;
@@ -317,69 +321,59 @@ static int ati_pcigart_unbind_ttm(drm_ttm_backend_t *backend)
static void ati_pcigart_clear_ttm(drm_ttm_backend_t *backend)
{
- ati_pcigart_ttm_priv *atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
- struct ati_pcigart_memory *mem = atipci_priv->mem;
+ ati_pcigart_ttm_backend_t *atipci_be =
+ container_of(backend, ati_pcigart_ttm_backend_t, backend);
+ struct ati_pcigart_memory *mem = atipci_be->mem;
DRM_DEBUG("\n");
if (mem) {
unsigned long num_pages = mem->page_count;
- backend->unbind(backend);
+ backend->func->unbind(backend);
/* free test */
- drm_free(mem, sizeof(struct ati_pcigart_memory), DRM_MEM_MAPPINGS);
- drm_free_memctl(num_pages * sizeof(void *));
+// drm_free(mem, sizeof(struct ati_pcigart_memory), DRM_MEM_MAPPINGS);
+// drm_free_memctl(num_pages * sizeof(void *));
}
- atipci_priv->mem = NULL;
+ atipci_be->mem = NULL;
}
static void ati_pcigart_destroy_ttm(drm_ttm_backend_t *backend)
{
- ati_pcigart_ttm_priv *atipci_priv;
-
+ ati_pcigart_ttm_backend_t *atipci_be;
if (backend) {
DRM_DEBUG("\n");
- atipci_priv = (ati_pcigart_ttm_priv *)backend->private;
- if (atipci_priv) {
- if (atipci_priv->mem) {
- backend->clear(backend);
+ atipci_be = container_of(backend, ati_pcigart_ttm_backend_t, backend);
+ if (atipci_be) {
+ if (atipci_be->mem) {
+ backend->func->clear(backend);
}
- drm_ctl_free(atipci_priv, sizeof(*atipci_priv), DRM_MEM_MAPPINGS);
- backend->private = NULL;
- }
- if (backend->flags & DRM_BE_FLAG_NEEDS_FREE) {
- drm_ctl_free(backend, sizeof(*backend), DRM_MEM_MAPPINGS);
+ drm_ctl_free(atipci_be, sizeof(*atipci_be), DRM_MEM_TTM);
}
}
}
-
-drm_ttm_backend_t *ati_pcigart_init_ttm(struct drm_device *dev,
- drm_ttm_backend_t *backend)
+static drm_ttm_backend_func_t ati_pcigart_ttm_backend =
{
- drm_ttm_backend_t *atipci_be;
- ati_pcigart_ttm_priv *atipci_priv;
-
- atipci_be = (backend != NULL) ? backend :
- drm_ctl_calloc(1, sizeof (*atipci_be), DRM_MEM_MAPPINGS);
+ .needs_ub_cache_adjust = ati_pcigart_needs_unbind_cache_adjust,
+ .populate = ati_pcigart_populate,
+ .clear = ati_pcigart_clear_ttm,
+ .bind = ati_pcigart_bind_ttm,
+ .unbind = ati_pcigart_unbind_ttm,
+ .destroy = ati_pcigart_destroy_ttm,
+};
+
+drm_ttm_backend_t *ati_pcigart_init_ttm(struct drm_device *dev, struct ati_pcigart_info *info)
+{
+ ati_pcigart_ttm_backend_t *atipci_be;
+ atipci_be = drm_ctl_calloc(1, sizeof (*atipci_be), DRM_MEM_TTM);
if (!atipci_be)
return NULL;
-
- atipci_priv = drm_ctl_calloc(1, sizeof(*atipci_priv), DRM_MEM_MAPPINGS);
- if (!atipci_priv) {
- drm_ctl_free(atipci_be, sizeof(*atipci_be), DRM_MEM_MAPPINGS);
- return NULL;
- }
-
- atipci_priv->populated = FALSE;
- atipci_be->needs_ub_cache_adjust = ati_pcigart_needs_unbind_cache_adjust;
- atipci_be->populate = ati_pcigart_populate;
- atipci_be->clear = ati_pcigart_clear_ttm;
- atipci_be->bind = ati_pcigart_bind_ttm;
- atipci_be->unbind = ati_pcigart_unbind_ttm;
- atipci_be->destroy = ati_pcigart_destroy_ttm;
- DRM_FLAG_MASKED(atipci_be->flags, (backend == NULL) ? DRM_BE_FLAG_NEEDS_FREE : 0, DRM_BE_FLAG_NEEDS_FREE);
- atipci_be->drm_map_type = _DRM_SCATTER_GATHER;
- return atipci_be;
+ atipci_be->populated = 0;
+ atipci_be->backend.func = &ati_pcigart_ttm_backend;
+ atipci_be->backend.mem_type = DRM_BO_MEM_TT;
+ atipci_be->gart_info = info;
+
+ return &atipci_be->backend;
}
EXPORT_SYMBOL(ati_pcigart_init_ttm);
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index ec432b2a..ef9e133a 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -850,10 +850,12 @@ struct ati_pcigart_memory {
int flags;
};
-typedef struct ati_pcigart_ttm_priv {
+typedef struct ati_pcigart_ttm_backend {
+ drm_ttm_backend_t backend;
int populated;
+ struct ati_pcigart_info *gart_info;
struct ati_pcigart_memory *mem;
-} ati_pcigart_ttm_priv;
+} ati_pcigart_ttm_backend_t;
static __inline__ int drm_core_check_feature(struct drm_device *dev,
int feature)
diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c
index dd387604..a90dae83 100644
--- a/linux-core/radeon_buffer.c
+++ b/linux-core/radeon_buffer.c
@@ -39,9 +39,9 @@ drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev)
drm_radeon_private_t *dev_priv = dev->dev_private;
if(dev_priv->flags & RADEON_IS_AGP)
- return drm_agp_init_ttm(dev, NULL);
+ return drm_agp_init_ttm(dev);
else
- return ati_pcigart_init_ttm(dev, NULL);
+ return ati_pcigart_init_ttm(dev, &dev_priv->gart_info);
}
int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 01:59:29 +0000