drm/amdgpu: disable ring_muxer if mcbp is off

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e68bd6f8a6a43fffbe068bfd14c171c9fa166633..1e9454e6e4cb4edaccd731b415a049ea83cff45f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4056,13 +4056,13 @@ int amdgpu_device_init(struct amdgpu_device *adev,
                goto unmap_memory;
        }
 
+       amdgpu_device_set_mcbp(adev);
+
        /* early init functions */
        r = amdgpu_device_ip_early_init(adev);
        if (r)
                goto unmap_memory;
 
-       amdgpu_device_set_mcbp(adev);
-
        /* Get rid of things like offb */
        r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);
        if (r)