From c79cda3408cafa7ec96a4abb910f5a48bc7ca174 Mon Sep 17 00:00:00 2001 From: Harshdeep Dhatt Date: Wed, 7 Oct 2020 08:28:08 -0600 Subject: [PATCH] msm: kgsl: Initialize drawctxt active node earlier gpudev->preemption_context_init() can fail and invoke adreno_drawctxt_detach(). This causes a crash because drawctxt->active_node is not initialized. Change-Id: I201759316cfa5dc831e1987d209c73efb97bb9ee Signed-off-by: Harshdeep Dhatt --- drivers/gpu/msm/adreno_drawctxt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/msm/adreno_drawctxt.c b/drivers/gpu/msm/adreno_drawctxt.c index 165912dda049..417b853fe30f 100644 --- a/drivers/gpu/msm/adreno_drawctxt.c +++ b/drivers/gpu/msm/adreno_drawctxt.c @@ -401,6 +401,13 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv, adreno_context_debugfs_init(ADRENO_DEVICE(device), drawctxt); + if (!test_bit(GMU_DISPATCH, &device->gmu_core.flags)) { + /* set the context ringbuffer */ + drawctxt->rb = adreno_ctx_get_rb(adreno_dev, drawctxt); + + INIT_LIST_HEAD(&drawctxt->active_node); + } + if (gpudev->preemption_context_init) { ret = gpudev->preemption_context_init(&drawctxt->base); if (ret != 0) { @@ -412,13 +419,6 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv, /* copy back whatever flags we dediced were valid */ *flags = drawctxt->base.flags; - if (!test_bit(GMU_DISPATCH, &device->gmu_core.flags)) { - /* set the context ringbuffer */ - drawctxt->rb = adreno_ctx_get_rb(adreno_dev, drawctxt); - - INIT_LIST_HEAD(&drawctxt->active_node); - } - return &drawctxt->base; }