[Public] > -----Original Message----- > From: Sasha Levin <sashal@xxxxxxxxxx> > Sent: Tuesday, August 22, 2023 7:37 AM > To: linux-kernel@xxxxxxxxxxxxxxx; stable@xxxxxxxxxxxxxxx > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Kuehling, Felix > <Felix.Kuehling@xxxxxxx>; Koenig, Christian <Christian.Koenig@xxxxxxx>; > Mike Lothian <mike@xxxxxxxxxxxxxx>; Sasha Levin <sashal@xxxxxxxxxx>; Pan, > Xinhui <Xinhui.Pan@xxxxxxx>; airlied@xxxxxxxxx; daniel@xxxxxxxx; amd- > gfx@xxxxxxxxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx > Subject: [PATCH AUTOSEL 5.15 6/6] drm/amdkfd: ignore crat by default > > From: Alex Deucher <alexander.deucher@xxxxxxx> > > [ Upstream commit a6dea2d64ff92851e68cd4e20a35f6534286e016 ] > > We are dropping the IOMMUv2 path, so no need to enable this. > It's often buggy on consumer platforms anyway. This is not needed for stable. Alex > > Reviewed-by: Felix Kuehling <Felix.Kuehling@xxxxxxx> > Acked-by: Christian König <christian.koenig@xxxxxxx> > Tested-by: Mike Lothian <mike@xxxxxxxxxxxxxx> > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c > b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c > index e574aa32a111d..46dfd9baeb013 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c > @@ -1523,11 +1523,7 @@ static bool kfd_ignore_crat(void) > if (ignore_crat) > return true; > > -#ifndef KFD_SUPPORT_IOMMU_V2 > ret = true; > -#else > - ret = false; > -#endif > > return ret; > } > -- > 2.40.1
