TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpu: ion: Add error message when allocation fails

Browse Source 
Add error message when allocation from ion fails.

Change-Id: If2efa95c563c9f076b85958a70ea66afa3983325
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
This commit is contained in:
Olav Haugan
2012-01-11 17:31:47 -08:00
committed by Stephen Boyd
parent 167e3462da
commit 0a0df35f5b
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/ion/ion.c
View File

@@ -386,6 +386,11 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
struct ion_device *dev = client->dev; struct ion_device *dev = client->dev;
struct ion_buffer *buffer = NULL; struct ion_buffer *buffer = NULL;
unsigned long secure_allocation = flags & ION_SECURE; unsigned long secure_allocation = flags & ION_SECURE;
const unsigned int MAX_DBG_STR_LEN = 64;
char dbg_str[MAX_DBG_STR_LEN];
unsigned int dbg_str_idx = 0;
dbg_str[0] = '\0';
/* /*
* traverse the list of heaps available in this system in priority * traverse the list of heaps available in this system in priority
@@ -413,14 +418,34 @@ struct ion_handle *ion_alloc(struct ion_client *client, size_t len,
buffer = ion_buffer_create(heap, dev, len, align, flags); buffer = ion_buffer_create(heap, dev, len, align, flags);
if (!IS_ERR_OR_NULL(buffer)) if (!IS_ERR_OR_NULL(buffer))
break; break;
if (dbg_str_idx < MAX_DBG_STR_LEN) {
unsigned int len_left = MAX_DBG_STR_LEN-dbg_str_idx-1;
int ret_value = snprintf(&dbg_str[dbg_str_idx],
len_left, "%s ", heap->name);
if (ret_value >= len_left) {
/* overflow */
dbg_str[MAX_DBG_STR_LEN-1] = '\0';
dbg_str_idx = MAX_DBG_STR_LEN;
} else if (ret_value >= 0) {
dbg_str_idx += ret_value;
} else {
/* error */
dbg_str[MAX_DBG_STR_LEN-1] = '\0';
}
}
} }
mutex_unlock(&dev->lock); mutex_unlock(&dev->lock);
if (buffer == NULL) if (buffer == NULL)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
if (IS_ERR(buffer)) if (IS_ERR(buffer)) {
pr_debug("ION is unable to allocate 0x%x bytes (alignment: "
"0x%x) from heap(s) %sfor client %s with heap "
"mask 0x%x\n",
len, align, dbg_str, client->name, client->heap_mask);
return ERR_PTR(PTR_ERR(buffer)); return ERR_PTR(PTR_ERR(buffer));
}
handle = ion_handle_create(client, buffer); handle = ion_handle_create(client, buffer);