samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: update smmu fault handler to print debug info"

Browse Source
This commit is contained in:
qctecmdr
2021-04-02 18:50:48 -07:00
committed by Gerrit - the friendly Code Review server
parent a8bdcf2e77 0623a02a84
commit 72fb431a00
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
msm/msm_smmu.c
View File

@@ -427,11 +427,10 @@ static int msm_smmu_fault_handler(struct iommu_domain *domain,
int flags, void *token) int flags, void *token)
{ {
struct msm_smmu_client *client; struct msm_smmu_client *client;
int rc = -EINVAL;
if (!token) { if (!token) {
DRM_ERROR("Error: token is NULL\n"); DRM_ERROR("Error: token is NULL\n");
return -EINVAL; return -ENOSYS;
} }
client = (struct msm_smmu_client *)token; client = (struct msm_smmu_client *)token;
@@ -445,7 +444,7 @@ static int msm_smmu_fault_handler(struct iommu_domain *domain,
* return -ENOSYS to allow smmu driver to dump out useful * return -ENOSYS to allow smmu driver to dump out useful
* debug info. * debug info.
*/ */
return rc; return -ENOSYS;
} }
/** /**

7
rotator/sde_rotator_smmu.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
*/ */
#define pr_fmt(fmt) "%s: " fmt, __func__ #define pr_fmt(fmt) "%s: " fmt, __func__
@@ -459,11 +459,10 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain,
int flags, void *token) int flags, void *token)
{ {
struct sde_smmu_client *sde_smmu; struct sde_smmu_client *sde_smmu;
int rc = -EINVAL;
if (!token) { if (!token) {
SDEROT_ERR("Error: token is NULL\n"); SDEROT_ERR("Error: token is NULL\n");
return -EINVAL; return -ENOSYS;
} }
sde_smmu = (struct sde_smmu_client *)token; sde_smmu = (struct sde_smmu_client *)token;
@@ -480,7 +479,7 @@ static int sde_smmu_fault_handler(struct iommu_domain *domain,
* return -ENOSYS to allow smmu driver to dump out useful * return -ENOSYS to allow smmu driver to dump out useful
* debug info. * debug info.
*/ */
return rc; return -ENOSYS;
} }
static struct sde_smmu_domain sde_rot_unsec = { static struct sde_smmu_domain sde_rot_unsec = {