Skip to content

Commit 0d9f5ee

Browse files
akhilpo-qcomRob Clark
authored andcommitted
drm/msm/adreno: Add MMU fault handler to adreno_gpu_func
Move MMU fault handler for each generation to adreno function list. This will help to use common code for mmu pagefault handler registration between a6x/a7x and a8x layer. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com> Patchwork: https://patchwork.freedesktop.org/patch/689007/ Message-ID: <20251118-kaana-gpu-support-v4-8-86eeb8e93fb6@oss.qualcomm.com> Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
1 parent d46b25b commit 0d9f5ee

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2641,7 +2641,7 @@ static struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)
26412641
adreno_gpu->uche_trap_base = 0x1fffffffff000ull;
26422642

26432643
msm_mmu_set_fault_handler(to_msm_vm(gpu->vm)->mmu, gpu,
2644-
a6xx_fault_handler);
2644+
adreno_gpu->funcs->mmu_fault_handler);
26452645

26462646
ret = a6xx_calc_ubwc_config(adreno_gpu);
26472647
if (ret) {
@@ -2686,6 +2686,7 @@ const struct adreno_gpu_funcs a6xx_gpu_funcs = {
26862686
.init = a6xx_gpu_init,
26872687
.get_timestamp = a6xx_gmu_get_timestamp,
26882688
.bus_halt = a6xx_bus_clear_pending_transactions,
2689+
.mmu_fault_handler = a6xx_fault_handler,
26892690
};
26902691

26912692
const struct adreno_gpu_funcs a6xx_gmuwrapper_funcs = {
@@ -2717,6 +2718,7 @@ const struct adreno_gpu_funcs a6xx_gmuwrapper_funcs = {
27172718
.init = a6xx_gpu_init,
27182719
.get_timestamp = a6xx_get_timestamp,
27192720
.bus_halt = a6xx_bus_clear_pending_transactions,
2721+
.mmu_fault_handler = a6xx_fault_handler,
27202722
};
27212723

27222724
const struct adreno_gpu_funcs a7xx_gpu_funcs = {
@@ -2750,4 +2752,5 @@ const struct adreno_gpu_funcs a7xx_gpu_funcs = {
27502752
.init = a6xx_gpu_init,
27512753
.get_timestamp = a6xx_gmu_get_timestamp,
27522754
.bus_halt = a6xx_bus_clear_pending_transactions,
2755+
.mmu_fault_handler = a6xx_fault_handler,
27532756
};

drivers/gpu/drm/msm/adreno/adreno_gpu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ struct adreno_gpu_funcs {
7878
struct msm_gpu *(*init)(struct drm_device *dev);
7979
int (*get_timestamp)(struct msm_gpu *gpu, uint64_t *value);
8080
void (*bus_halt)(struct adreno_gpu *adreno_gpu, bool gx_off);
81+
int (*mmu_fault_handler)(void *arg, unsigned long iova, int flags, void *data);
8182
};
8283

8384
struct adreno_reglist {

0 commit comments

Comments
 (0)