Merge tag 'irqchip-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Pull irqchip updates for 4.16-rc2 from Marc Zyngier

 - A MIPS GIC fix for spurious, masked interrupts
 - A fix for a subtle IPI bug in GICv3
 - Do not probe GICv3 ITSs that are marked as disabled
 - Multi-MSI support for GICv2m
 - Various cleanups

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
index 93d86619e802..262c1267249e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
@@ -225,7 +225,7 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
 
         /* Right now all IPs have only one instance - multiple rings. */
         if (instance != 0) {
-                DRM_ERROR("invalid ip instance: %d\n", instance);
+                DRM_DEBUG("invalid ip instance: %d\n", instance);
                 return -EINVAL;
         }
 
@@ -255,13 +255,13 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
                 ip_num_rings = adev->vcn.num_enc_rings;
                 break;
         default:
-                DRM_ERROR("unknown ip type: %d\n", hw_ip);
+                DRM_DEBUG("unknown ip type: %d\n", hw_ip);
                 return -EINVAL;
         }
 
         if (ring >= ip_num_rings) {
-                DRM_ERROR("Ring index:%d exceeds maximum:%d for ip:%d\n",
-                                ring, ip_num_rings, hw_ip);
+                DRM_DEBUG("Ring index:%d exceeds maximum:%d for ip:%d\n",
+                          ring, ip_num_rings, hw_ip);
                 return -EINVAL;
         }
 
@@ -292,7 +292,7 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
         default:
                 *out_ring = NULL;
                 r = -EINVAL;
-                DRM_ERROR("unknown HW IP type: %d\n", mapper->hw_ip);
+                DRM_DEBUG("unknown HW IP type: %d\n", mapper->hw_ip);
         }
 
 out_unlock: