drm/amdgpu: Remove in_interrupt() usage in gfx_v9_0_kiq_read_clock()

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vce.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 9791a40..ea6a62f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -179,7 +179,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
        version_major = (ucode_version >> 20) & 0xfff;
        version_minor = (ucode_version >> 8) & 0xfff;
        binary_id = ucode_version & 0xff;
-       DRM_INFO("Found VCE firmware Version: %hhd.%hhd Binary ID: %hhd\n",
+       DRM_INFO("Found VCE firmware Version: %d.%d Binary ID: %d\n",
                version_major, version_minor, binary_id);
        adev->vce.fw_version = ((version_major << 24) | (version_minor << 16) |
                                (binary_id << 8));
@@ -1160,6 +1160,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
 error:
        dma_fence_put(fence);
        amdgpu_bo_unreserve(bo);
-       amdgpu_bo_unref(&bo);
+       amdgpu_bo_free_kernel(&bo, NULL, NULL);
        return r;
 }