From b7f723108883e4ffbcfbd9528febffc8696f2b11 Mon Sep 17 00:00:00 2001 From: Carter Cooper Date: Wed, 16 Sep 2020 15:00:40 -0600 Subject: [PATCH 1/2] msm: kgsl: Initialize data sent in hfi_test message Ensure we don't send garbage as the message data. Change-Id: I35786a1a6d8c86a555198ae07d688048f5b6bc6c Signed-off-by: Carter Cooper --- drivers/gpu/msm/adreno_a6xx_hfi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/msm/adreno_a6xx_hfi.c b/drivers/gpu/msm/adreno_a6xx_hfi.c index f0dd27cf3f81..396966ae7b96 100644 --- a/drivers/gpu/msm/adreno_a6xx_hfi.c +++ b/drivers/gpu/msm/adreno_a6xx_hfi.c @@ -469,6 +469,7 @@ static int a6xx_hfi_send_test(struct adreno_device *adreno_dev) struct hfi_test_cmd cmd; CMD_MSG_HDR(cmd, H2F_MSG_TEST); + cmd.data = 0; return a6xx_hfi_send_generic_req(adreno_dev, &cmd); } From 45e6a28c090fe16970566f6c9d22f6fd4d978134 Mon Sep 17 00:00:00 2001 From: Carter Cooper Date: Wed, 16 Sep 2020 15:21:05 -0600 Subject: [PATCH 2/2] msm: kgsl: Stay in bounds when setting up legacy HFI queues Legacy targets don't use HFI dispatch queues so there is no need to "fix" their dispatch queue ID. Change-Id: I8444c41c18721198bee8501b8d0ef19ea2b0192e Signed-off-by: Carter Cooper --- drivers/gpu/msm/adreno_a6xx_hfi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/msm/adreno_a6xx_hfi.c b/drivers/gpu/msm/adreno_a6xx_hfi.c index 396966ae7b96..3a7841c40407 100644 --- a/drivers/gpu/msm/adreno_a6xx_hfi.c +++ b/drivers/gpu/msm/adreno_a6xx_hfi.c @@ -176,12 +176,12 @@ static void init_queues(struct adreno_device *adreno_dev) /* * Overwrite the queue IDs for A630, A615 and A616 as they use * legacy firmware. Legacy firmware has different queue IDs for - * message, debug and dispatch queues. + * message, debug and dispatch queues (dispatch queues aren't used + * on these targets so the queue idx value update is not needed). */ if (adreno_is_a630(adreno_dev) || adreno_is_a615_family(adreno_dev)) { queue[HFI_MSG_ID].idx = HFI_MSG_IDX_LEGACY; queue[HFI_DBG_ID].idx = HFI_DBG_IDX_LEGACY; - queue[HFI_DSP_ID_0].idx = HFI_DSP_IDX_0_LEGACY; } /* Fill Table Header */