Merge tag 'drm-misc-next-2018-02-13' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-block.git] / drivers / gpu / drm / amd / amdgpu / gmc_v9_0.c

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 71d3aedefd69efa9cb63cc10cfdc92147f702fbf..100ec69f020a67a473aa2a8da57de19a8a5b485c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -635,14 +635,16 @@ static int gmc_v9_0_late_init(void *handle)
        for(i = 0; i < AMDGPU_MAX_VMHUBS; ++i)
                BUG_ON(vm_inv_eng[i] > 16);
 
-       r = gmc_v9_0_ecc_available(adev);
-       if (r == 1) {
-               DRM_INFO("ECC is active.\n");
-       } else if (r == 0) {
-               DRM_INFO("ECC is not present.\n");
-       } else {
-               DRM_ERROR("gmc_v9_0_ecc_available() failed. r: %d\n", r);
-               return r;
+       if (adev->asic_type == CHIP_VEGA10) {
+               r = gmc_v9_0_ecc_available(adev);
+               if (r == 1) {
+                       DRM_INFO("ECC is active.\n");
+               } else if (r == 0) {
+                       DRM_INFO("ECC is not present.\n");
+               } else {
+                       DRM_ERROR("gmc_v9_0_ecc_available() failed. r: %d\n", r);
+                       return r;
+               }
        }
 
        return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0);