android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: kgsl: Add target specific check for SP_DBG_CNTL programming"

Browse Source
This commit is contained in:
qctecmdr 2023-03-20 05:57:34 -07:00 committed by Gerrit - the friendly Code Review server
commit e3f49b3f2b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/msm/adreno.h
View File

@ -1211,6 +1211,12 @@ ADRENO_TARGET(gen7_4_0, ADRENO_REV_GEN7_4_0)
ADRENO_TARGET(gen7_3_0, ADRENO_REV_GEN7_3_0)
ADRENO_TARGET(gen7_6_0, ADRENO_REV_GEN7_6_0)
static inline int adreno_is_gen7_0_x_family(struct adreno_device *adreno_dev)
{
return adreno_is_gen7_0_0(adreno_dev) || adreno_is_gen7_0_1(adreno_dev) ||
adreno_is_gen7_4_0(adreno_dev) || adreno_is_gen7_3_0(adreno_dev);
}
/*
* adreno_checkreg_off() - Checks the validity of a register enum
* @adreno_dev: Pointer to adreno device

12
drivers/gpu/msm/adreno_gen7_snapshot.c
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include "adreno.h"
@ -251,8 +251,7 @@ static size_t gen7_legacy_snapshot_shader(struct kgsl_device *device,
* AHB path might fail. Hence, skip SP_INST_TAG and SP_INST_DATA*
* state types during snapshot dump in legacy flow.
*/
if (adreno_is_gen7_0_0(adreno_dev) || adreno_is_gen7_0_1(adreno_dev) ||
adreno_is_gen7_4_0(adreno_dev) || adreno_is_gen7_3_0(adreno_dev)) {
if (adreno_is_gen7_0_x_family(adreno_dev)) {
if (block->statetype == SP_INST_TAG ||
block->statetype == SP_INST_DATA ||
block->statetype == SP_INST_DATA_1 ||
@ -324,8 +323,10 @@ static void gen7_snapshot_shader(struct kgsl_device *device,
unsigned int usptp;
size_t (*func)(struct kgsl_device *device, u8 *buf, size_t remain,
void *priv) = gen7_legacy_snapshot_shader;
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
kgsl_regrmw(device, GEN7_SP_DBG_CNTL, GENMASK(1, 0), BIT(0) | BIT(1));
if (adreno_is_gen7_0_x_family(adreno_dev))
kgsl_regrmw(device, GEN7_SP_DBG_CNTL, GENMASK(1, 0), BIT(0) | BIT(1));
if (CD_SCRIPT_CHECK(device)) {
for (i = 0; i < num_shader_blocks; i++) {
@ -395,7 +396,8 @@ static void gen7_snapshot_shader(struct kgsl_device *device,
}
done:
kgsl_regrmw(device, GEN7_SP_DBG_CNTL, GENMASK(1, 0), 0x0);
if (adreno_is_gen7_0_x_family(adreno_dev))
kgsl_regrmw(device, GEN7_SP_DBG_CNTL, GENMASK(1, 0), 0x0);
}
static void gen7_snapshot_mempool(struct kgsl_device *device,