From: Likun Gao <likun....@amd.com>

separate the function and struct of RLC from the file of GFX

Signed-off-by: Likun Gao <likun....@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/Makefile     |   1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 202 +---------------------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h |  70 +---------
 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 228 ++++++++++++++++++++++++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h |  98 ++++++++++++++
 5 files changed, 329 insertions(+), 270 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h

diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile 
b/drivers/gpu/drm/amd/amdgpu/Makefile
index ec4a9d5..f76bcb9 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -105,6 +105,7 @@ amdgpu-y += \
 # add GFX block
 amdgpu-y += \
        amdgpu_gfx.o \
+       amdgpu_rlc.o \
        gfx_v8_0.o \
        gfx_v9_0.o
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index 7821768..6a70c0b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -22,10 +22,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <linux/firmware.h>
 #include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
+#include "amdgpu_rlc.h"
 
 /* delay 0.1 second to enable gfx off feature */
 #define GFX_OFF_DELAY_ENABLE         msecs_to_jiffies(100)
@@ -413,203 +413,3 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool 
enable)
 
        mutex_unlock(&adev->gfx.gfx_off_mutex);
 }
-
-void amdgpu_gfx_rlc_enter_safe_mode(struct amdgpu_device *adev)
-{
-       if (adev->gfx.rlc.in_safe_mode)
-               return;
-
-       /* if RLC is not enabled, do nothing */
-       if (!adev->gfx.rlc.funcs->is_rlc_enabled(adev))
-               return;
-
-       if (adev->cg_flags &
-           (AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_MGCG |
-            AMD_CG_SUPPORT_GFX_3D_CGCG)) {
-               adev->gfx.rlc.funcs->set_safe_mode(adev);
-               adev->gfx.rlc.in_safe_mode = true;
-       }
-}
-
-void amdgpu_gfx_rlc_exit_safe_mode(struct amdgpu_device *adev)
-{
-       if (!(adev->gfx.rlc.in_safe_mode))
-               return;
-
-       /* if RLC is not enabled, do nothing */
-       if (!adev->gfx.rlc.funcs->is_rlc_enabled(adev))
-               return;
-
-       if (adev->cg_flags &
-           (AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_MGCG |
-            AMD_CG_SUPPORT_GFX_3D_CGCG)) {
-               adev->gfx.rlc.funcs->unset_safe_mode(adev);
-               adev->gfx.rlc.in_safe_mode = false;
-       }
-}
-
-int amdgpu_gfx_rlc_init_sr(struct amdgpu_device *adev, u32 dws)
-{
-       const u32 *src_ptr;
-       volatile u32 *dst_ptr;
-       u32 i;
-       int r;
-
-       /* allocate save restore block */
-       r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE,
-                                     AMDGPU_GEM_DOMAIN_VRAM,
-                                     &adev->gfx.rlc.save_restore_obj,
-                                     &adev->gfx.rlc.save_restore_gpu_addr,
-                                     (void **)&adev->gfx.rlc.sr_ptr);
-       if (r) {
-               dev_warn(adev->dev, "(%d) create RLC sr bo failed\n", r);
-               amdgpu_gfx_rlc_fini(adev);
-               return r;
-       }
-
-       /* write the sr buffer */
-       src_ptr = adev->gfx.rlc.reg_list;
-       dst_ptr = adev->gfx.rlc.sr_ptr;
-       for (i = 0; i < adev->gfx.rlc.reg_list_size; i++)
-               dst_ptr[i] = cpu_to_le32(src_ptr[i]);
-       amdgpu_bo_kunmap(adev->gfx.rlc.save_restore_obj);
-       amdgpu_bo_unreserve(adev->gfx.rlc.save_restore_obj);
-
-       return 0;
-}
-
-int amdgpu_gfx_rlc_init_csb(struct amdgpu_device *adev)
-{
-       volatile u32 *dst_ptr;
-       u32 dws;
-       int r;
-
-       /* allocate clear state block */
-       adev->gfx.rlc.clear_state_size = dws = 
adev->gfx.rlc.funcs->get_csb_size(adev);
-       r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE,
-                                     AMDGPU_GEM_DOMAIN_VRAM,
-                                     &adev->gfx.rlc.clear_state_obj,
-                                     &adev->gfx.rlc.clear_state_gpu_addr,
-                                     (void **)&adev->gfx.rlc.cs_ptr);
-       if (r) {
-               dev_err(adev->dev, "(%d) failed to create rlc csb bo\n", r);
-               amdgpu_gfx_rlc_fini(adev);
-               return r;
-       }
-
-       /* set up the cs buffer */
-       dst_ptr = adev->gfx.rlc.cs_ptr;
-       adev->gfx.rlc.funcs->get_csb_buffer(adev, dst_ptr);
-       amdgpu_bo_kunmap(adev->gfx.rlc.clear_state_obj);
-       amdgpu_bo_unpin(adev->gfx.rlc.clear_state_obj);
-       amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);
-
-       return 0;
-}
-
-int amdgpu_gfx_rlc_init_cpt(struct amdgpu_device *adev)
-{
-       int r;
-
-       r = amdgpu_bo_create_reserved(adev, adev->gfx.rlc.cp_table_size,
-                                     PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
-                                     &adev->gfx.rlc.cp_table_obj,
-                                     &adev->gfx.rlc.cp_table_gpu_addr,
-                                     (void **)&adev->gfx.rlc.cp_table_ptr);
-       if (r) {
-               dev_err(adev->dev, "(%d) failed to create cp table bo\n", r);
-               amdgpu_gfx_rlc_fini(adev);
-               return r;
-       }
-
-       /* set up the cp table */
-       amdgpu_gfx_rlc_init_cp_table(adev);
-       amdgpu_bo_kunmap(adev->gfx.rlc.cp_table_obj);
-       amdgpu_bo_unreserve(adev->gfx.rlc.cp_table_obj);
-
-       return 0;
-}
-
-void amdgpu_gfx_rlc_init_cp_table(struct amdgpu_device *adev)
-{
-       const __le32 *fw_data;
-       volatile u32 *dst_ptr;
-       int me, i, max_me;
-       u32 bo_offset = 0;
-       u32 table_offset, table_size;
-
-       max_me = adev->gfx.rlc.funcs->get_cp_table_num(adev);
-
-       /* write the cp table buffer */
-       dst_ptr = adev->gfx.rlc.cp_table_ptr;
-       for (me = 0; me < max_me; me++) {
-               if (me == 0) {
-                       const struct gfx_firmware_header_v1_0 *hdr =
-                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.ce_fw->data;
-                       fw_data = (const __le32 *)
-                               (adev->gfx.ce_fw->data +
-                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
-                       table_offset = le32_to_cpu(hdr->jt_offset);
-                       table_size = le32_to_cpu(hdr->jt_size);
-               } else if (me == 1) {
-                       const struct gfx_firmware_header_v1_0 *hdr =
-                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.pfp_fw->data;
-                       fw_data = (const __le32 *)
-                               (adev->gfx.pfp_fw->data +
-                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
-                       table_offset = le32_to_cpu(hdr->jt_offset);
-                       table_size = le32_to_cpu(hdr->jt_size);
-               } else if (me == 2) {
-                       const struct gfx_firmware_header_v1_0 *hdr =
-                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.me_fw->data;
-                       fw_data = (const __le32 *)
-                               (adev->gfx.me_fw->data +
-                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
-                       table_offset = le32_to_cpu(hdr->jt_offset);
-                       table_size = le32_to_cpu(hdr->jt_size);
-               } else if (me == 3) {
-                       const struct gfx_firmware_header_v1_0 *hdr =
-                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.mec_fw->data;
-                       fw_data = (const __le32 *)
-                               (adev->gfx.mec_fw->data +
-                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
-                       table_offset = le32_to_cpu(hdr->jt_offset);
-                       table_size = le32_to_cpu(hdr->jt_size);
-               } else  if (me == 4) {
-                       const struct gfx_firmware_header_v1_0 *hdr =
-                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.mec2_fw->data;
-                       fw_data = (const __le32 *)
-                               (adev->gfx.mec2_fw->data +
-                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
-                       table_offset = le32_to_cpu(hdr->jt_offset);
-                       table_size = le32_to_cpu(hdr->jt_size);
-               }
-
-               for (i = 0; i < table_size; i ++) {
-                       dst_ptr[bo_offset + i] =
-                               cpu_to_le32(le32_to_cpu(fw_data[table_offset + 
i]));
-               }
-
-               bo_offset += table_size;
-       }
-}
-
-void amdgpu_gfx_rlc_fini(struct amdgpu_device *adev)
-{
-       /* save restore block */
-       if (adev->gfx.rlc.save_restore_obj) {
-               amdgpu_bo_free_kernel(&adev->gfx.rlc.save_restore_obj,
-                                     &adev->gfx.rlc.save_restore_gpu_addr,
-                                     (void **)&adev->gfx.rlc.sr_ptr);
-       }
-
-       /* clear state block */
-       amdgpu_bo_free_kernel(&adev->gfx.rlc.clear_state_obj,
-                             &adev->gfx.rlc.clear_state_gpu_addr,
-                             (void **)&adev->gfx.rlc.cs_ptr);
-
-       /* jump table block */
-       amdgpu_bo_free_kernel(&adev->gfx.rlc.cp_table_obj,
-                             &adev->gfx.rlc.cp_table_gpu_addr,
-                             (void **)&adev->gfx.rlc.cp_table_ptr);
-}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
index 0435f66..f790e15 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
@@ -29,6 +29,7 @@
  */
 #include "clearstate_defs.h"
 #include "amdgpu_ring.h"
+#include "amdgpu_rlc.h"
 
 /* GFX current status */
 #define AMDGPU_GFX_NORMAL_MODE                 0x00000000L
@@ -37,68 +38,6 @@
 #define AMDGPU_GFX_CG_DISABLED_MODE            0x00000004L
 #define AMDGPU_GFX_LBPW_DISABLED_MODE          0x00000008L
 
-
-struct amdgpu_rlc_funcs {
-       bool (*is_rlc_enabled)(struct amdgpu_device *adev);
-       void (*set_safe_mode)(struct amdgpu_device *adev);
-       void (*unset_safe_mode)(struct amdgpu_device *adev);
-       int  (*init)(struct amdgpu_device *adev);
-       u32  (*get_csb_size)(struct amdgpu_device *adev);
-       void (*get_csb_buffer)(struct amdgpu_device *adev, volatile u32 
*buffer);
-       int  (*get_cp_table_num)(struct amdgpu_device *adev);
-       int  (*resume)(struct amdgpu_device *adev);
-       void (*stop)(struct amdgpu_device *adev);
-       void (*reset)(struct amdgpu_device *adev);
-       void (*start)(struct amdgpu_device *adev);
-};
-
-struct amdgpu_rlc {
-       /* for power gating */
-       struct amdgpu_bo        *save_restore_obj;
-       uint64_t                save_restore_gpu_addr;
-       volatile uint32_t       *sr_ptr;
-       const u32               *reg_list;
-       u32                     reg_list_size;
-       /* for clear state */
-       struct amdgpu_bo        *clear_state_obj;
-       uint64_t                clear_state_gpu_addr;
-       volatile uint32_t       *cs_ptr;
-       const struct cs_section_def   *cs_data;
-       u32                     clear_state_size;
-       /* for cp tables */
-       struct amdgpu_bo        *cp_table_obj;
-       uint64_t                cp_table_gpu_addr;
-       volatile uint32_t       *cp_table_ptr;
-       u32                     cp_table_size;
-
-       /* safe mode for updating CG/PG state */
-       bool in_safe_mode;
-       const struct amdgpu_rlc_funcs *funcs;
-
-       /* for firmware data */
-       u32 save_and_restore_offset;
-       u32 clear_state_descriptor_offset;
-       u32 avail_scratch_ram_locations;
-       u32 reg_restore_list_size;
-       u32 reg_list_format_start;
-       u32 reg_list_format_separate_start;
-       u32 starting_offsets_start;
-       u32 reg_list_format_size_bytes;
-       u32 reg_list_size_bytes;
-       u32 reg_list_format_direct_reg_list_length;
-       u32 save_restore_list_cntl_size_bytes;
-       u32 save_restore_list_gpm_size_bytes;
-       u32 save_restore_list_srm_size_bytes;
-
-       u32 *register_list_format;
-       u32 *register_restore;
-       u8 *save_restore_list_cntl;
-       u8 *save_restore_list_gpm;
-       u8 *save_restore_list_srm;
-
-       bool is_rlc_v2_1;
-};
-
 #define AMDGPU_MAX_COMPUTE_QUEUES KGD_MAX_QUEUES
 
 struct amdgpu_mec {
@@ -367,12 +306,5 @@ void amdgpu_gfx_bit_to_queue(struct amdgpu_device *adev, 
int bit,
 bool amdgpu_gfx_is_mec_queue_enabled(struct amdgpu_device *adev, int mec,
                                     int pipe, int queue);
 void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable);
-void amdgpu_gfx_rlc_enter_safe_mode(struct amdgpu_device *adev);
-void amdgpu_gfx_rlc_exit_safe_mode(struct amdgpu_device *adev);
-int amdgpu_gfx_rlc_init_sr(struct amdgpu_device *adev, u32 dws);
-int amdgpu_gfx_rlc_init_csb(struct amdgpu_device *adev);
-int amdgpu_gfx_rlc_init_cpt(struct amdgpu_device *adev);
-void amdgpu_gfx_rlc_init_cp_table(struct amdgpu_device *adev);
-void amdgpu_gfx_rlc_fini(struct amdgpu_device *adev);
 
 #endif
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c
new file mode 100644
index 0000000..4d0419a
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2014 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
+ * Copyright 2009 Jerome Glisse.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+#include <linux/firmware.h>
+#include "amdgpu.h"
+#include "amdgpu_gfx.h"
+#include "amdgpu_rlc.h"
+
+void amdgpu_gfx_rlc_enter_safe_mode(struct amdgpu_device *adev)
+{
+       if (adev->gfx.rlc.in_safe_mode)
+               return;
+
+       /* if RLC is not enabled, do nothing */
+       if (!adev->gfx.rlc.funcs->is_rlc_enabled(adev))
+               return;
+
+       if (adev->cg_flags &
+           (AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_MGCG |
+            AMD_CG_SUPPORT_GFX_3D_CGCG)) {
+               adev->gfx.rlc.funcs->set_safe_mode(adev);
+               adev->gfx.rlc.in_safe_mode = true;
+       }
+}
+
+void amdgpu_gfx_rlc_exit_safe_mode(struct amdgpu_device *adev)
+{
+       if (!(adev->gfx.rlc.in_safe_mode))
+               return;
+
+       /* if RLC is not enabled, do nothing */
+       if (!adev->gfx.rlc.funcs->is_rlc_enabled(adev))
+               return;
+
+       if (adev->cg_flags &
+           (AMD_CG_SUPPORT_GFX_CGCG | AMD_CG_SUPPORT_GFX_MGCG |
+            AMD_CG_SUPPORT_GFX_3D_CGCG)) {
+               adev->gfx.rlc.funcs->unset_safe_mode(adev);
+               adev->gfx.rlc.in_safe_mode = false;
+       }
+}
+
+int amdgpu_gfx_rlc_init_sr(struct amdgpu_device *adev, u32 dws)
+{
+       const u32 *src_ptr;
+       volatile u32 *dst_ptr;
+       u32 i;
+       int r;
+
+       /* allocate save restore block */
+       r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE,
+                                     AMDGPU_GEM_DOMAIN_VRAM,
+                                     &adev->gfx.rlc.save_restore_obj,
+                                     &adev->gfx.rlc.save_restore_gpu_addr,
+                                     (void **)&adev->gfx.rlc.sr_ptr);
+       if (r) {
+               dev_warn(adev->dev, "(%d) create RLC sr bo failed\n", r);
+               amdgpu_gfx_rlc_fini(adev);
+               return r;
+       }
+
+       /* write the sr buffer */
+       src_ptr = adev->gfx.rlc.reg_list;
+       dst_ptr = adev->gfx.rlc.sr_ptr;
+       for (i = 0; i < adev->gfx.rlc.reg_list_size; i++)
+               dst_ptr[i] = cpu_to_le32(src_ptr[i]);
+       amdgpu_bo_kunmap(adev->gfx.rlc.save_restore_obj);
+       amdgpu_bo_unreserve(adev->gfx.rlc.save_restore_obj);
+
+       return 0;
+}
+
+int amdgpu_gfx_rlc_init_csb(struct amdgpu_device *adev)
+{
+       volatile u32 *dst_ptr;
+       u32 dws;
+       int r;
+
+       /* allocate clear state block */
+       adev->gfx.rlc.clear_state_size = dws = 
adev->gfx.rlc.funcs->get_csb_size(adev);
+       r = amdgpu_bo_create_reserved(adev, dws * 4, PAGE_SIZE,
+                                     AMDGPU_GEM_DOMAIN_VRAM,
+                                     &adev->gfx.rlc.clear_state_obj,
+                                     &adev->gfx.rlc.clear_state_gpu_addr,
+                                     (void **)&adev->gfx.rlc.cs_ptr);
+       if (r) {
+               dev_err(adev->dev, "(%d) failed to create rlc csb bo\n", r);
+               amdgpu_gfx_rlc_fini(adev);
+               return r;
+       }
+
+       /* set up the cs buffer */
+       dst_ptr = adev->gfx.rlc.cs_ptr;
+       adev->gfx.rlc.funcs->get_csb_buffer(adev, dst_ptr);
+       amdgpu_bo_kunmap(adev->gfx.rlc.clear_state_obj);
+       amdgpu_bo_unpin(adev->gfx.rlc.clear_state_obj);
+       amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);
+
+       return 0;
+}
+
+int amdgpu_gfx_rlc_init_cpt(struct amdgpu_device *adev)
+{
+       int r;
+
+       r = amdgpu_bo_create_reserved(adev, adev->gfx.rlc.cp_table_size,
+                                     PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
+                                     &adev->gfx.rlc.cp_table_obj,
+                                     &adev->gfx.rlc.cp_table_gpu_addr,
+                                     (void **)&adev->gfx.rlc.cp_table_ptr);
+       if (r) {
+               dev_err(adev->dev, "(%d) failed to create cp table bo\n", r);
+               amdgpu_gfx_rlc_fini(adev);
+               return r;
+       }
+
+       /* set up the cp table */
+       amdgpu_gfx_rlc_init_cp_table(adev);
+       amdgpu_bo_kunmap(adev->gfx.rlc.cp_table_obj);
+       amdgpu_bo_unreserve(adev->gfx.rlc.cp_table_obj);
+
+       return 0;
+}
+
+void amdgpu_gfx_rlc_init_cp_table(struct amdgpu_device *adev)
+{
+       const __le32 *fw_data;
+       volatile u32 *dst_ptr;
+       int me, i, max_me;
+       u32 bo_offset = 0;
+       u32 table_offset, table_size;
+
+       max_me = adev->gfx.rlc.funcs->get_cp_table_num(adev);
+
+       /* write the cp table buffer */
+       dst_ptr = adev->gfx.rlc.cp_table_ptr;
+       for (me = 0; me < max_me; me++) {
+               if (me == 0) {
+                       const struct gfx_firmware_header_v1_0 *hdr =
+                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.ce_fw->data;
+                       fw_data = (const __le32 *)
+                               (adev->gfx.ce_fw->data +
+                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
+                       table_offset = le32_to_cpu(hdr->jt_offset);
+                       table_size = le32_to_cpu(hdr->jt_size);
+               } else if (me == 1) {
+                       const struct gfx_firmware_header_v1_0 *hdr =
+                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.pfp_fw->data;
+                       fw_data = (const __le32 *)
+                               (adev->gfx.pfp_fw->data +
+                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
+                       table_offset = le32_to_cpu(hdr->jt_offset);
+                       table_size = le32_to_cpu(hdr->jt_size);
+               } else if (me == 2) {
+                       const struct gfx_firmware_header_v1_0 *hdr =
+                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.me_fw->data;
+                       fw_data = (const __le32 *)
+                               (adev->gfx.me_fw->data +
+                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
+                       table_offset = le32_to_cpu(hdr->jt_offset);
+                       table_size = le32_to_cpu(hdr->jt_size);
+               } else if (me == 3) {
+                       const struct gfx_firmware_header_v1_0 *hdr =
+                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.mec_fw->data;
+                       fw_data = (const __le32 *)
+                               (adev->gfx.mec_fw->data +
+                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
+                       table_offset = le32_to_cpu(hdr->jt_offset);
+                       table_size = le32_to_cpu(hdr->jt_size);
+               } else  if (me == 4) {
+                       const struct gfx_firmware_header_v1_0 *hdr =
+                               (const struct gfx_firmware_header_v1_0 
*)adev->gfx.mec2_fw->data;
+                       fw_data = (const __le32 *)
+                               (adev->gfx.mec2_fw->data +
+                                
le32_to_cpu(hdr->header.ucode_array_offset_bytes));
+                       table_offset = le32_to_cpu(hdr->jt_offset);
+                       table_size = le32_to_cpu(hdr->jt_size);
+               }
+
+               for (i = 0; i < table_size; i ++) {
+                       dst_ptr[bo_offset + i] =
+                               cpu_to_le32(le32_to_cpu(fw_data[table_offset + 
i]));
+               }
+
+               bo_offset += table_size;
+       }
+}
+
+void amdgpu_gfx_rlc_fini(struct amdgpu_device *adev)
+{
+       /* save restore block */
+       if (adev->gfx.rlc.save_restore_obj) {
+               amdgpu_bo_free_kernel(&adev->gfx.rlc.save_restore_obj,
+                                     &adev->gfx.rlc.save_restore_gpu_addr,
+                                     (void **)&adev->gfx.rlc.sr_ptr);
+       }
+
+       /* clear state block */
+       amdgpu_bo_free_kernel(&adev->gfx.rlc.clear_state_obj,
+                             &adev->gfx.rlc.clear_state_gpu_addr,
+                             (void **)&adev->gfx.rlc.cs_ptr);
+
+       /* jump table block */
+       amdgpu_bo_free_kernel(&adev->gfx.rlc.cp_table_obj,
+                             &adev->gfx.rlc.cp_table_gpu_addr,
+                             (void **)&adev->gfx.rlc.cp_table_ptr);
+}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
new file mode 100644
index 0000000..798c910
--- /dev/null
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2014 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef __AMDGPU_RLC_H__
+#define __AMDGPU_RLC_H__
+
+#include "clearstate_defs.h"
+
+struct amdgpu_rlc_funcs {
+       bool (*is_rlc_enabled)(struct amdgpu_device *adev);
+       void (*set_safe_mode)(struct amdgpu_device *adev);
+       void (*unset_safe_mode)(struct amdgpu_device *adev);
+       int  (*init)(struct amdgpu_device *adev);
+       u32  (*get_csb_size)(struct amdgpu_device *adev);
+       void (*get_csb_buffer)(struct amdgpu_device *adev, volatile u32 
*buffer);
+       int  (*get_cp_table_num)(struct amdgpu_device *adev);
+       int  (*resume)(struct amdgpu_device *adev);
+       void (*stop)(struct amdgpu_device *adev);
+       void (*reset)(struct amdgpu_device *adev);
+       void (*start)(struct amdgpu_device *adev);
+};
+
+struct amdgpu_rlc {
+       /* for power gating */
+       struct amdgpu_bo        *save_restore_obj;
+       uint64_t                save_restore_gpu_addr;
+       volatile uint32_t       *sr_ptr;
+       const u32               *reg_list;
+       u32                     reg_list_size;
+       /* for clear state */
+       struct amdgpu_bo        *clear_state_obj;
+       uint64_t                clear_state_gpu_addr;
+       volatile uint32_t       *cs_ptr;
+       const struct cs_section_def   *cs_data;
+       u32                     clear_state_size;
+       /* for cp tables */
+       struct amdgpu_bo        *cp_table_obj;
+       uint64_t                cp_table_gpu_addr;
+       volatile uint32_t       *cp_table_ptr;
+       u32                     cp_table_size;
+
+       /* safe mode for updating CG/PG state */
+       bool in_safe_mode;
+       const struct amdgpu_rlc_funcs *funcs;
+
+       /* for firmware data */
+       u32 save_and_restore_offset;
+       u32 clear_state_descriptor_offset;
+       u32 avail_scratch_ram_locations;
+       u32 reg_restore_list_size;
+       u32 reg_list_format_start;
+       u32 reg_list_format_separate_start;
+       u32 starting_offsets_start;
+       u32 reg_list_format_size_bytes;
+       u32 reg_list_size_bytes;
+       u32 reg_list_format_direct_reg_list_length;
+       u32 save_restore_list_cntl_size_bytes;
+       u32 save_restore_list_gpm_size_bytes;
+       u32 save_restore_list_srm_size_bytes;
+
+       u32 *register_list_format;
+       u32 *register_restore;
+       u8 *save_restore_list_cntl;
+       u8 *save_restore_list_gpm;
+       u8 *save_restore_list_srm;
+
+       bool is_rlc_v2_1;
+};
+
+void amdgpu_gfx_rlc_enter_safe_mode(struct amdgpu_device *adev);
+void amdgpu_gfx_rlc_exit_safe_mode(struct amdgpu_device *adev);
+int amdgpu_gfx_rlc_init_sr(struct amdgpu_device *adev, u32 dws);
+int amdgpu_gfx_rlc_init_csb(struct amdgpu_device *adev);
+int amdgpu_gfx_rlc_init_cpt(struct amdgpu_device *adev);
+void amdgpu_gfx_rlc_init_cp_table(struct amdgpu_device *adev);
+void amdgpu_gfx_rlc_fini(struct amdgpu_device *adev);
+
+#endif
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to