Merge "msm: kgsl: Fix context initialization sequence" (32688397) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/adreno_drawctxt.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -424,16 +424,6 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv,
		return ERR_PTR(ret);
		}

		if (gpudev->preemption_context_init) {
		ret = gpudev->preemption_context_init(&drawctxt->base);
		if (ret != 0) {
		kgsl_context_detach(&drawctxt->base);
		kgsl_context_put(&drawctxt->base);
		kfree(drawctxt);
		return ERR_PTR(ret);
		}
		}

		kgsl_sharedmem_writel(device, &device->memstore,
		KGSL_MEMSTORE_OFFSET(drawctxt->base.id, soptimestamp),
		0);
		@@ -445,6 +435,14 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv,

		INIT_LIST_HEAD(&drawctxt->active_node);

		if (gpudev->preemption_context_init) {
		ret = gpudev->preemption_context_init(&drawctxt->base);
		if (ret != 0) {
		kgsl_context_detach(&drawctxt->base);
		return ERR_PTR(ret);
		}
		}

		/* copy back whatever flags we dediced were valid */
		*flags = drawctxt->base.flags;
		return &drawctxt->base;