Merge tag 'amd-drm-next-5.14-2021-06-02' of https://gitlab.freedesktop.org/agd5f...

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index d1bb69a..425596c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -92,6 +92,9 @@ void amdgpu_driver_unload_kms(struct drm_device *dev)
                pm_runtime_forbid(dev->dev);
        }
 
+       if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DRV_UNLOAD))
+               DRM_WARN("smart shift update failed\n");
+
        amdgpu_acpi_fini(adev);
        amdgpu_device_fini_hw(adev);
 }
@@ -215,6 +218,9 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags)
                pm_runtime_put_autosuspend(dev->dev);
        }
 
+       if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DRV_LOAD))
+               DRM_WARN("smart shift update failed\n");
+
 out:
        if (r) {
                /* balance pm_runtime_get_sync in amdgpu_driver_unload_kms */
@@ -862,6 +868,21 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
                                            min((size_t)size, (size_t)(bios_size - bios_offset)))
                                        ? -EFAULT : 0;
                }
+               case AMDGPU_INFO_VBIOS_INFO: {
+                       struct drm_amdgpu_info_vbios vbios_info = {};
+                       struct atom_context *atom_context;
+
+                       atom_context = adev->mode_info.atom_context;
+                       memcpy(vbios_info.name, atom_context->name, sizeof(atom_context->name));
+                       memcpy(vbios_info.vbios_pn, atom_context->vbios_pn, sizeof(atom_context->vbios_pn));
+                       vbios_info.version = atom_context->version;
+                       memcpy(vbios_info.vbios_ver_str, atom_context->vbios_ver_str,
+                                               sizeof(atom_context->vbios_ver_str));
+                       memcpy(vbios_info.date, atom_context->date, sizeof(atom_context->date));
+
+                       return copy_to_user(out, &vbios_info,
+                                               min((size_t)size, sizeof(vbios_info))) ? -EFAULT : 0;
+               }
                default:
                        DRM_DEBUG_KMS("Invalid request %d\n",
                                        info->vbios_info.type);