Merge "msm: kgsl: Access dma_buf_attachment pointer only if its valid" (388c29ac) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/msm/kgsl.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -2662,6 +2662,12 @@ static int kgsl_setup_dma_buf(struct kgsl_device *device,
		return -ENOMEM;

		attach = dma_buf_attach(dmabuf, device->dev);

		if (IS_ERR(attach)) {
		ret = PTR_ERR(attach);
		goto out;
		}

		/*
		* If dma buffer is marked IO coherent, skip sync at attach,
		* which involves flushing the buffer on CPU.
		@@ -2670,11 +2676,6 @@ static int kgsl_setup_dma_buf(struct kgsl_device *device,
		if (entry->memdesc.flags & KGSL_MEMFLAGS_IOCOHERENT)
		attach->dma_map_attrs \|= DMA_ATTR_SKIP_CPU_SYNC;

		if (IS_ERR_OR_NULL(attach)) {
		ret = attach ? PTR_ERR(attach) : -EINVAL;
		goto out;
		}

		meta->dmabuf = dmabuf;
		meta->attach = attach;
		meta->entry = entry;