Merge "msm: kgsl: Fix parameter undeclared error in trace_kgsl_mem_sync_full_cache" (be66cef9) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/kgsl.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -2846,10 +2846,8 @@ static inline bool check_full_flush(size_t size, int op)
		bool ret = (kgsl_driver.full_cache_threshold != 0) &&
		(size >= kgsl_driver.full_cache_threshold) &&
		(op == KGSL_GPUMEM_CACHE_FLUSH);
		if (ret) {
		trace_kgsl_mem_sync_full_cache(actual_count, op_size);
		if (ret)
		flush_cache_all();
		}
		return ret;
		}
		#endif
		@@ -2913,8 +2911,10 @@ long kgsl_ioctl_gpumem_sync_cache_bulk(struct kgsl_device_private *dev_priv,
		entries[actual_count++] = entry;

		full_flush = check_full_flush(op_size, param->op);
		if (full_flush)
		if (full_flush) {
		trace_kgsl_mem_sync_full_cache(actual_count, op_size);
		break;
		}

		last_id = id;
		}
		@@ -3002,8 +3002,10 @@ long kgsl_ioctl_gpuobj_sync(struct kgsl_device_private *dev_priv,
		size += (entries[i]->memdesc.size - objs[i].offset);

		full_flush = check_full_flush(size, objs[i].op);
		if (full_flush)
		if (full_flush) {
		trace_kgsl_mem_sync_full_cache(i, size);
		break;
		}

		ptr += sizeof(*objs);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -182,8 +182,8 @@ static int alloc_and_map(struct gmu_device *gmu, unsigned int ctx_id,

		if (ret) {
		dev_err(&gmu->pdev->dev,
		"gmu map err: gaddr=0x%016llX, paddr=0x%016llX\n",
		md->gmuaddr, md->physaddr);
		"gmu map err: gaddr=0x%016llX, paddr=0x%pa\n",
		md->gmuaddr, &(md->physaddr));
		free_gmu_mem(gmu, md);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ long kgsl_ioctl_helper(struct file *filep, unsigned int cmd, unsigned long arg,

		if (_IOC_SIZE(cmds[nr].cmd) > sizeof(data)) {
		if (__ratelimit(&_rs))
		WARN(1, "data too big for ioctl 0x%08X: %d/%ld\n",
		WARN(1, "data too big for ioctl 0x%08X: %d/%zu\n",
		cmd, _IOC_SIZE(cmds[nr].cmd), sizeof(data));
		return -EINVAL;
		}