Merge tag 'acpi-fix-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_virt.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index e97f80f860050edf7f874cfceec083427cb4fd4a..6738df836a70eb45c3643593c3c03dc700ed67f1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -114,18 +114,19 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
 uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
 {
        signed long r;
 uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
 {
        signed long r;

+       unsigned long flags;

        uint32_t val, seq;
        struct amdgpu_kiq *kiq = &adev->gfx.kiq;
        struct amdgpu_ring *ring = &kiq->ring;
 
        BUG_ON(!ring->funcs->emit_rreg);
 
        uint32_t val, seq;
        struct amdgpu_kiq *kiq = &adev->gfx.kiq;
        struct amdgpu_ring *ring = &kiq->ring;
 
        BUG_ON(!ring->funcs->emit_rreg);
 

-       spin_lock(&kiq->ring_lock);
+       spin_lock_irqsave(&kiq->ring_lock, flags);

        amdgpu_ring_alloc(ring, 32);
        amdgpu_ring_emit_rreg(ring, reg);
        amdgpu_fence_emit_polling(ring, &seq);
        amdgpu_ring_commit(ring);
        amdgpu_ring_alloc(ring, 32);
        amdgpu_ring_emit_rreg(ring, reg);
        amdgpu_fence_emit_polling(ring, &seq);
        amdgpu_ring_commit(ring);

-       spin_unlock(&kiq->ring_lock);
+       spin_unlock_irqrestore(&kiq->ring_lock, flags);

 
        r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
        if (r < 1) {
 
        r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
        if (r < 1) {


@@ -140,18 +141,19 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
 void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
 {
        signed long r;
 void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
 {
        signed long r;

+       unsigned long flags;

        uint32_t seq;
        struct amdgpu_kiq *kiq = &adev->gfx.kiq;
        struct amdgpu_ring *ring = &kiq->ring;
 
        BUG_ON(!ring->funcs->emit_wreg);
 
        uint32_t seq;
        struct amdgpu_kiq *kiq = &adev->gfx.kiq;
        struct amdgpu_ring *ring = &kiq->ring;
 
        BUG_ON(!ring->funcs->emit_wreg);
 

-       spin_lock(&kiq->ring_lock);
+       spin_lock_irqsave(&kiq->ring_lock, flags);

        amdgpu_ring_alloc(ring, 32);
        amdgpu_ring_emit_wreg(ring, reg, v);
        amdgpu_fence_emit_polling(ring, &seq);
        amdgpu_ring_commit(ring);
        amdgpu_ring_alloc(ring, 32);
        amdgpu_ring_emit_wreg(ring, reg, v);
        amdgpu_fence_emit_polling(ring, &seq);
        amdgpu_ring_commit(ring);

-       spin_unlock(&kiq->ring_lock);
+       spin_unlock_irqrestore(&kiq->ring_lock, flags);

 
        r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
        if (r < 1)
 
        r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
        if (r < 1)


@@ -328,9 +330,11 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev)
                                        sizeof(amdgim_vf2pf_info));
                                AMDGPU_FW_VRAM_VF2PF_READ(adev, driver_version,
                                        &str);
                                        sizeof(amdgim_vf2pf_info));
                                AMDGPU_FW_VRAM_VF2PF_READ(adev, driver_version,
                                        &str);

+#ifdef MODULE

                                if (THIS_MODULE->version != NULL)
                                        strcpy(str, THIS_MODULE->version);
                                else
                                if (THIS_MODULE->version != NULL)
                                        strcpy(str, THIS_MODULE->version);
                                else

+#endif

                                        strcpy(str, "N/A");
                                AMDGPU_FW_VRAM_VF2PF_WRITE(adev, driver_cert,
                                        0);
                                        strcpy(str, "N/A");
                                AMDGPU_FW_VRAM_VF2PF_WRITE(adev, driver_cert,
                                        0);