diff options
| author | Raghuram Subramani <raghus2247@gmail.com> | 2024-12-10 19:24:06 +0530 |
|---|---|---|
| committer | Raghuram Subramani <raghus2247@gmail.com> | 2024-12-10 19:24:06 +0530 |
| commit | 6fcfee9ad063deee7ebf0cfe679a26a7d3bb0018 (patch) | |
| tree | d64b0946ed627a54bac6a1ee0c7e6e2615bb334b /drivers/gpu/msm/adreno_iommu.c | |
| parent | 75aa08b2b132058296cf4d7ceb5fde8fa08d9585 (diff) | |
| parent | cab36b84b72b7eabba1639dc7520161d7de8567b (diff) | |
Merge remote-tracking branch 'los/lineage-20' into lineage-21HEADlineage-21
Diffstat (limited to 'drivers/gpu/msm/adreno_iommu.c')
| -rw-r--r-- | drivers/gpu/msm/adreno_iommu.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/msm/adreno_iommu.c b/drivers/gpu/msm/adreno_iommu.c index 4bb7f6286664..9216d6f07119 100644 --- a/drivers/gpu/msm/adreno_iommu.c +++ b/drivers/gpu/msm/adreno_iommu.c @@ -1,4 +1,5 @@ /* Copyright (c) 2002,2007-2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -890,5 +891,17 @@ int adreno_iommu_set_pt_ctx(struct adreno_ringbuffer *rb, else result = _set_ctxt_gpu(rb, drawctxt); + /* + * In case ctxt switch fails, revert the pagetable back to the + * original. Not reverting the pagetable will lead to incorrect + * hardware state in the ringbuffer. + */ + if (result && (new_pt != cur_pt)) { + if (cpu_path) + result = _set_pagetable_cpu(rb, cur_pt); + else + result = _set_pagetable_gpu(rb, cur_pt); + } + return result; } |