evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: kgsl: Change %p to %pK in debug messages"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-30 05:43:43 -07:00 • committed by Gerrit - the friendly Code Review server
commit 81d6052b05
5 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/msm/adreno_debugfs.c
View file

@ -138,7 +138,7 @@ static void sync_event_print(struct seq_file *s,
break;
}
case KGSL_CMD_SYNCPOINT_TYPE_FENCE:
seq_printf(s, "sync: [%p] %s", sync_event->handle,
seq_printf(s, "sync: [%pK] %s", sync_event->handle,
(sync_event->handle && sync_event->handle->fence)
? sync_event->handle->fence->name : "NULL");
break;

5
drivers/gpu/msm/kgsl.c
View file

@ -4457,9 +4457,8 @@ int kgsl_device_platform_probe(struct kgsl_device *device)
disable_irq(device->pwrctrl.interrupt_num);
KGSL_DRV_INFO(device,
"dev_id %d regs phys 0x%08lx size 0x%08x virt %p\n",
device->id, device->reg_phys, device->reg_len,
device->reg_virt);
"dev_id %d regs phys 0x%08lx size 0x%08x\n",
device->id, device->reg_phys, device->reg_len);
rwlock_init(&device->context_lock);

7
drivers/gpu/msm/kgsl_cffdump.c
View file

@ -513,10 +513,6 @@ EXPORT_SYMBOL(kgsl_cffdump_waitirq);
static int subbuf_start_handler(struct rchan_buf *buf,
void *subbuf, void *prev_subbuf, size_t prev_padding)
{
pr_debug("kgsl: cffdump: subbuf_start_handler(subbuf=%p, prev_subbuf"
"=%p, prev_padding=%08zx)\n", subbuf, prev_subbuf,
prev_padding);
if (relay_buf_full(buf)) {
if (!suspended) {
suspended = 1;
@ -573,9 +569,6 @@ static struct rchan *create_channel(unsigned subbuf_size, unsigned n_subbufs)
{
struct rchan *chan;
pr_info("kgsl: cffdump: relay: create_channel: subbuf_size %u, "
"n_subbufs %u, dir 0x%p\n", subbuf_size, n_subbufs, dir);
chan = relay_open("cpu", dir, subbuf_size,
n_subbufs, &relay_callbacks, NULL);
if (!chan) {

2
drivers/gpu/msm/kgsl_cmdbatch.c
View file

@ -80,7 +80,7 @@ void kgsl_dump_syncpoints(struct kgsl_device *device,
}
case KGSL_CMD_SYNCPOINT_TYPE_FENCE:
if (event->handle)
dev_err(device->dev, " fence: [%p] %s\n",
dev_err(device->dev, " fence: [%pK] %s\n",
event->handle->fence,
event->handle->name);
else

3
drivers/gpu/msm/kgsl_snapshot.c
View file

@ -1042,9 +1042,6 @@ void kgsl_snapshot_save_frozen_objs(struct work_struct *work)
goto done;
snapshot->mempool = vmalloc(size);
if (snapshot->mempool != NULL)
KGSL_CORE_ERR("snapshot: mempool address %p, size %zx\n",
snapshot->mempool, size);
ptr = snapshot->mempool;
snapshot->mempool_size = 0;