aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_mem.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/i915_mem.c')
-rw-r--r--drivers/char/drm/i915_mem.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index 9b1698f521be..13176d136a99 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -86,7 +86,7 @@ static void mark_block(drm_device_t * dev, struct mem_block *p, int in_use)
86} 86}
87 87
88/* Very simple allocator for agp memory, working on a static range 88/* Very simple allocator for agp memory, working on a static range
89 * already mapped into each client's address space. 89 * already mapped into each client's address space.
90 */ 90 */
91 91
92static struct mem_block *split_block(struct mem_block *p, int start, int size, 92static struct mem_block *split_block(struct mem_block *p, int start, int size,
@@ -94,7 +94,8 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
94{ 94{
95 /* Maybe cut off the start of an existing block */ 95 /* Maybe cut off the start of an existing block */
96 if (start > p->start) { 96 if (start > p->start) {
97 struct mem_block *newblock = drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS); 97 struct mem_block *newblock =
98 drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS);
98 if (!newblock) 99 if (!newblock)
99 goto out; 100 goto out;
100 newblock->start = start; 101 newblock->start = start;
@@ -110,7 +111,8 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
110 111
111 /* Maybe cut off the end of an existing block */ 112 /* Maybe cut off the end of an existing block */
112 if (size < p->size) { 113 if (size < p->size) {
113 struct mem_block *newblock = drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS); 114 struct mem_block *newblock =
115 drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS);
114 if (!newblock) 116 if (!newblock)
115 goto out; 117 goto out;
116 newblock->start = start + size; 118 newblock->start = start + size;