4 files changed, 34 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 973df064c14f..21cbd2e90f3b 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1006,6 +1006,34 @@ static void evergreen_init_golden_registers(struct radeon_device *rdev)
         }
 }
 
+/**
+ * evergreen_get_allowed_info_register - fetch the register for the info ioctl
+ *
+ * @rdev: radeon_device pointer
+ * @reg: register offset in bytes
+ * @val: register value
+ *
+ * Returns 0 for success or -EINVAL for an invalid register
+ *
+ */
+int evergreen_get_allowed_info_register(struct radeon_device *rdev,
+                                        u32 reg, u32 *val)
+{
+        switch (reg) {
+        case GRBM_STATUS:
+        case GRBM_STATUS_SE0:
+        case GRBM_STATUS_SE1:
+        case SRBM_STATUS:
+        case SRBM_STATUS2:
+        case DMA_STATUS_REG:
+        case UVD_STATUS:
+                *val = RREG32(reg);
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
+
 void evergreen_tiling_fields(unsigned tiling_flags, unsigned *bankw,
                              unsigned *bankh, unsigned *mtaspect,
                              unsigned *tile_split)
diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
index a8d1d5240fcb..4aa5f755572b 100644
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
@@ -1520,6 +1520,7 @@
 #define UVD_UDEC_DBW_ADDR_CONFIG                        0xef54
 #define UVD_RBC_RB_RPTR                                 0xf690
 #define UVD_RBC_RB_WPTR                                 0xf694
+#define UVD_STATUS                                      0xf6bc
 
 /*
  * PM4
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index f2c343717c4b..0db4ee71fa69 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1344,6 +1344,7 @@ static struct radeon_asic evergreen_asic = {
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &rv770_get_xclk,
         .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
+        .get_allowed_info_register = evergreen_get_allowed_info_register,
         .gart = {
                 .tlb_flush = &evergreen_pcie_gart_tlb_flush,
                 .get_page_entry = &rs600_gart_get_page_entry,
@@ -1437,6 +1438,7 @@ static struct radeon_asic sumo_asic = {
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &r600_get_xclk,
         .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
+        .get_allowed_info_register = evergreen_get_allowed_info_register,
         .gart = {
                 .tlb_flush = &evergreen_pcie_gart_tlb_flush,
                 .get_page_entry = &rs600_gart_get_page_entry,
@@ -1529,6 +1531,7 @@ static struct radeon_asic btc_asic = {
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &rv770_get_xclk,
         .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
+        .get_allowed_info_register = evergreen_get_allowed_info_register,
         .gart = {
                 .tlb_flush = &evergreen_pcie_gart_tlb_flush,
                 .get_page_entry = &rs600_gart_get_page_entry,
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 3e1346d585b3..b632e35248b1 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -548,6 +548,8 @@ struct radeon_fence *evergreen_copy_dma(struct radeon_device *rdev,
                                         unsigned num_gpu_pages,
                                         struct reservation_object *resv);
 int evergreen_get_temp(struct radeon_device *rdev);
+int evergreen_get_allowed_info_register(struct radeon_device *rdev,
+                                        u32 reg, u32 *val);
 int sumo_get_temp(struct radeon_device *rdev);
 int tn_get_temp(struct radeon_device *rdev);
 int cypress_dpm_init(struct radeon_device *rdev);