diff options
| author | Maxime Ripard <mripard@kernel.org> | 2024-06-14 09:55:46 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2024-06-14 09:55:46 +0200 |
| commit | 14731a640e5513bd514adcf35e96c84ad42f540d (patch) | |
| tree | ab909e6f1506c1d2cff57fbb86a1d6f295b1b413 /drivers/iommu/amd/amd_iommu.h | |
| parent | 41f590e31c6c8b8a0a490b7c1ad2e57c20ec3d9b (diff) | |
| parent | f1909e859753c9bda87c6d2b82a7f832ef80aa2d (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Roll -rc3 and current drm/fixes in.
This will also unstuck our for-next branch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/iommu/amd/amd_iommu.h')
| -rw-r--r-- | drivers/iommu/amd/amd_iommu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h index 2fde1302a584..2d5945c982bd 100644 --- a/drivers/iommu/amd/amd_iommu.h +++ b/drivers/iommu/amd/amd_iommu.h @@ -129,7 +129,8 @@ static inline int check_feature_gpt_level(void) static inline bool amd_iommu_gt_ppr_supported(void) { return (check_feature(FEATURE_GT) && - check_feature(FEATURE_PPR)); + check_feature(FEATURE_PPR) && + check_feature(FEATURE_EPHSUP)); } static inline u64 iommu_virt_to_phys(void *vaddr) |