aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_scatter.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/drm_scatter.c')
-rw-r--r--drivers/char/drm/drm_scatter.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index eb7fa437355e..26d8f675ed5d 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -67,7 +67,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
67 struct drm_sg_mem *entry; 67 struct drm_sg_mem *entry;
68 unsigned long pages, i, j; 68 unsigned long pages, i, j;
69 69
70 DRM_DEBUG("%s\n", __FUNCTION__); 70 DRM_DEBUG("\n");
71 71
72 if (!drm_core_check_feature(dev, DRIVER_SG)) 72 if (!drm_core_check_feature(dev, DRIVER_SG))
73 return -EINVAL; 73 return -EINVAL;
@@ -81,7 +81,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
81 81
82 memset(entry, 0, sizeof(*entry)); 82 memset(entry, 0, sizeof(*entry));
83 pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE; 83 pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;
84 DRM_DEBUG("sg size=%ld pages=%ld\n", request->size, pages); 84 DRM_DEBUG("size=%ld pages=%ld\n", request->size, pages);
85 85
86 entry->pages = pages; 86 entry->pages = pages;
87 entry->pagelist = drm_alloc(pages * sizeof(*entry->pagelist), 87 entry->pagelist = drm_alloc(pages * sizeof(*entry->pagelist),
@@ -122,8 +122,8 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
122 122
123 entry->handle = ScatterHandle((unsigned long)entry->virtual); 123 entry->handle = ScatterHandle((unsigned long)entry->virtual);
124 124
125 DRM_DEBUG("sg alloc handle = %08lx\n", entry->handle); 125 DRM_DEBUG("handle = %08lx\n", entry->handle);
126 DRM_DEBUG("sg alloc virtual = %p\n", entry->virtual); 126 DRM_DEBUG("virtual = %p\n", entry->virtual);
127 127
128 for (i = (unsigned long)entry->virtual, j = 0; j < pages; 128 for (i = (unsigned long)entry->virtual, j = 0; j < pages;
129 i += PAGE_SIZE, j++) { 129 i += PAGE_SIZE, j++) {
@@ -210,7 +210,7 @@ int drm_sg_free(struct drm_device *dev, void *data,
210 if (!entry || entry->handle != request->handle) 210 if (!entry || entry->handle != request->handle)
211 return -EINVAL; 211 return -EINVAL;
212 212
213 DRM_DEBUG("sg free virtual = %p\n", entry->virtual); 213 DRM_DEBUG("virtual = %p\n", entry->virtual);
214 214
215 drm_sg_cleanup(entry); 215 drm_sg_cleanup(entry);
216 216