summaryrefslogtreecommitdiff
path: root/linux-core/drm_ttm.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-04-26 15:56:21 +1000
committerDave Airlie <airlied@linux.ie>2007-04-26 15:56:21 +1000
commitb589b846e73bfe6235cd702bb8ae89701c85eaab (patch)
treec54ddc23cfba3b5d9fafb86477d20fde4c36a52a /linux-core/drm_ttm.c
parent34be91fe4e9f0ad73b7c4354aea0c8ce10f45f68 (diff)
parent5c8561aae22138880673503d930af7f1b361d071 (diff)
Merge branch 'origin' into modesetting-101
Diffstat (limited to 'linux-core/drm_ttm.c')
-rw-r--r--linux-core/drm_ttm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c
index 25566340..31503c9c 100644
--- a/linux-core/drm_ttm.c
+++ b/linux-core/drm_ttm.c
@@ -154,7 +154,7 @@ int drm_destroy_ttm(drm_ttm_t * ttm)
be = ttm->be;
if (be) {
- be->destroy(be);
+ be->func->destroy(be);
ttm->be = NULL;
}
@@ -222,7 +222,7 @@ static int drm_ttm_populate(drm_ttm_t * ttm)
if (!page)
return -ENOMEM;
}
- be->populate(be, ttm->num_pages, ttm->pages);
+ be->func->populate(be, ttm->num_pages, ttm->pages);
ttm->state = ttm_unbound;
return 0;
}
@@ -281,7 +281,7 @@ void drm_ttm_evict(drm_ttm_t * ttm)
int ret;
if (ttm->state == ttm_bound) {
- ret = be->unbind(be);
+ ret = be->func->unbind(be);
BUG_ON(ret);
}
@@ -293,7 +293,7 @@ void drm_ttm_fixup_caching(drm_ttm_t * ttm)
if (ttm->state == ttm_evicted) {
drm_ttm_backend_t *be = ttm->be;
- if (be->needs_ub_cache_adjust(be)) {
+ if (be->func->needs_ub_cache_adjust(be)) {
drm_set_caching(ttm, 0);
}
ttm->state = ttm_unbound;
@@ -329,7 +329,7 @@ int drm_bind_ttm(drm_ttm_t * ttm, int cached, unsigned long aper_offset)
drm_set_caching(ttm, DRM_TTM_PAGE_UNCACHED);
}
- if ((ret = be->bind(be, aper_offset, cached))) {
+ if ((ret = be->func->bind(be, aper_offset, cached))) {
ttm->state = ttm_evicted;
DRM_ERROR("Couldn't bind backend.\n");
return ret;