]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amdgpu/gmc11: fix logic typo in AGP check
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 14 Nov 2023 16:36:56 +0000 (11:36 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 17 Nov 2023 05:58:11 +0000 (00:58 -0500)
Should be && rather than ||.

Fixes: b2e1cbe6281f ("drm/amdgpu/gmc11: disable AGP on GC 11.5")
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Tested-by: Mario Limonciello <mario.limonciello@amd.com> # PHX & Navi33
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c

index 6dce9b29f675631c2049d1f2ef50b5ea64bff7fc..ba4c82f5e6178bf5f8ef606754758569d5a95742 100644 (file)
@@ -640,7 +640,7 @@ static void gmc_v11_0_vram_gtt_location(struct amdgpu_device *adev,
        amdgpu_gmc_set_agp_default(adev, mc);
        amdgpu_gmc_vram_location(adev, &adev->gmc, base);
        amdgpu_gmc_gart_location(adev, mc, AMDGPU_GART_PLACEMENT_HIGH);
-       if (!amdgpu_sriov_vf(adev) ||
+       if (!amdgpu_sriov_vf(adev) &&
            (amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(11, 5, 0)))
                amdgpu_gmc_agp_location(adev, mc);