Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92339d10 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 545a357b e8f29d1b

drivers/gpu/msm/adreno_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/msm/kgsl.c

+2 −3
Original line number Diff line number Diff line
@@ -3890,9 +3890,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);

drivers/gpu/msm/kgsl_cffdump.c

+0 −7
Original line number Diff line number Diff line
@@ -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) {

drivers/gpu/msm/kgsl_cmdbatch.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/msm/kgsl_iommu.c

+8 −8
Original line number Diff line number Diff line
@@ -323,8 +323,8 @@ static int _iommu_map_sync_pc(struct kgsl_pagetable *pt, 
	_unlock_if_secure_mmu(memdesc, pt->mmu);



	if (ret) {

		KGSL_CORE_ERR("map err: %p, 0x%016llX, 0x%llx, 0x%x, %d\n",

			iommu_pt->domain, gpuaddr, size, flags, ret);

		KGSL_CORE_ERR("map err: 0x%016llX, 0x%llx, 0x%x, %d\n",

			gpuaddr, size, flags, ret);

		return -ENODEV;

	}
@@ -351,8 +351,8 @@ static int _iommu_unmap_sync_pc(struct kgsl_pagetable *pt, 
	_unlock_if_secure_mmu(memdesc, pt->mmu);



	if (unmapped != size) {

		KGSL_CORE_ERR("unmap err: %p, 0x%016llx, 0x%llx, %zd\n",

			iommu_pt->domain, addr, size, unmapped);

		KGSL_CORE_ERR("unmap err: 0x%016llx, 0x%llx, %zd\n",

			addr, size, unmapped);

		return -ENODEV;

	}
@@ -421,8 +421,8 @@ static int _iommu_map_sg_offset_sync_pc(struct kgsl_pagetable *pt, 
	if (size != 0) {

		/* Cleanup on error */

		_iommu_unmap_sync_pc(pt, memdesc, addr, mapped);

		KGSL_CORE_ERR("map err: %p, 0x%016llX, %d, %x, %zd\n",

			iommu_pt->domain, addr, nents, flags, mapped);

		KGSL_CORE_ERR("map err: 0x%016llX, %d, %x, %zd\n",

			addr, nents, flags, mapped);

		return  -ENODEV;

	}
@@ -451,8 +451,8 @@ static int _iommu_map_sg_sync_pc(struct kgsl_pagetable *pt, 
	_unlock_if_secure_mmu(memdesc, pt->mmu);



	if (mapped == 0) {

		KGSL_CORE_ERR("map err: %p, 0x%016llX, %d, %x, %zd\n",

			iommu_pt->domain, addr, nents, flags, mapped);

		KGSL_CORE_ERR("map err: 0x%016llX, %d, %x, %zd\n",

			addr, nents, flags, mapped);

		return  -ENODEV;

	}