]> Git Repo - linux.git/blobdiff - drivers/gpu/drm/amd/amdgpu/amdgpu.h
Merge tag 'drm-misc-next-2018-11-21' of git://anongit.freedesktop.org/drm/drm-misc...
[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu.h
index 447c4c7a36d686b0e2fb93722611066f8e93db4e..42f882c633eeebff07513f2ba60fb0d995aa6c65 100644 (file)
@@ -28,6 +28,8 @@
 #ifndef __AMDGPU_H__
 #define __AMDGPU_H__
 
+#include "amdgpu_ctx.h"
+
 #include <linux/atomic.h>
 #include <linux/wait.h>
 #include <linux/list.h>
 #include "amdgpu_vcn.h"
 #include "amdgpu_mn.h"
 #include "amdgpu_gmc.h"
+#include "amdgpu_gfx.h"
+#include "amdgpu_sdma.h"
 #include "amdgpu_dm.h"
 #include "amdgpu_virt.h"
+#include "amdgpu_csa.h"
 #include "amdgpu_gart.h"
 #include "amdgpu_debugfs.h"
 #include "amdgpu_job.h"
 #include "amdgpu_bo_list.h"
+#include "amdgpu_gem.h"
+
+#define MAX_GPU_INSTANCE               16
+
+struct amdgpu_gpu_instance
+{
+       struct amdgpu_device            *adev;
+       int                             mgpu_fan_enabled;
+};
+
+struct amdgpu_mgpu_info
+{
+       struct amdgpu_gpu_instance      gpu_ins[MAX_GPU_INSTANCE];
+       struct mutex                    mutex;
+       uint32_t                        num_gpu;
+       uint32_t                        num_dgpu;
+       uint32_t                        num_apu;
+};
 
 /*
  * Modules parameters.
@@ -129,6 +152,8 @@ extern int amdgpu_compute_multipipe;
 extern int amdgpu_gpu_recovery;
 extern int amdgpu_emu_mode;
 extern uint amdgpu_smu_memory_pool_size;
+extern uint amdgpu_dc_feature_mask;
+extern struct amdgpu_mgpu_info mgpu_info;
 
 #ifdef CONFIG_DRM_AMDGPU_SI
 extern int amdgpu_si_support;
@@ -148,9 +173,6 @@ extern int amdgpu_cik_support;
 #define AMDGPUFB_CONN_LIMIT                    4
 #define AMDGPU_BIOS_NUM_SCRATCH                        16
 
-/* max number of IP instances */
-#define AMDGPU_MAX_SDMA_INSTANCES              2
-
 /* hard reset data */
 #define AMDGPU_ASIC_RESET_DATA                  0x39d5e86b
 
@@ -171,13 +193,6 @@ extern int amdgpu_cik_support;
 #define AMDGPU_RESET_VCE                       (1 << 13)
 #define AMDGPU_RESET_VCE1                      (1 << 14)
 
-/* GFX current status */
-#define AMDGPU_GFX_NORMAL_MODE                 0x00000000L
-#define AMDGPU_GFX_SAFE_MODE                   0x00000001L
-#define AMDGPU_GFX_PG_DISABLED_MODE            0x00000002L
-#define AMDGPU_GFX_CG_DISABLED_MODE            0x00000004L
-#define AMDGPU_GFX_LBPW_DISABLED_MODE          0x00000008L
-
 /* max cursor sizes (in pixels) */
 #define CIK_CURSOR_WIDTH 128
 #define CIK_CURSOR_HEIGHT 128
@@ -205,13 +220,6 @@ enum amdgpu_cp_irq {
        AMDGPU_CP_IRQ_LAST
 };
 
-enum amdgpu_sdma_irq {
-       AMDGPU_SDMA_IRQ_TRAP0 = 0,
-       AMDGPU_SDMA_IRQ_TRAP1,
-
-       AMDGPU_SDMA_IRQ_LAST
-};
-
 enum amdgpu_thermal_irq {
        AMDGPU_THERMAL_IRQ_LOW_TO_HIGH = 0,
        AMDGPU_THERMAL_IRQ_HIGH_TO_LOW,
@@ -224,6 +232,10 @@ enum amdgpu_kiq_irq {
        AMDGPU_CP_KIQ_IRQ_LAST
 };
 
+#define MAX_KIQ_REG_WAIT       5000 /* in usecs, 5ms */
+#define MAX_KIQ_REG_BAILOUT_INTERVAL   5 /* in msecs, 5ms */
+#define MAX_KIQ_REG_TRY 20
+
 int amdgpu_device_ip_set_clockgating_state(void *dev,
                                           enum amd_ip_block_type block_type,
                                           enum amd_clockgating_state state);
@@ -271,70 +283,6 @@ amdgpu_device_ip_get_ip_block(struct amdgpu_device *adev,
 int amdgpu_device_ip_block_add(struct amdgpu_device *adev,
                               const struct amdgpu_ip_block_version *ip_block_version);
 
-/* provided by hw blocks that can move/clear data.  e.g., gfx or sdma */
-struct amdgpu_buffer_funcs {
-       /* maximum bytes in a single operation */
-       uint32_t        copy_max_bytes;
-
-       /* number of dw to reserve per operation */
-       unsigned        copy_num_dw;
-
-       /* used for buffer migration */
-       void (*emit_copy_buffer)(struct amdgpu_ib *ib,
-                                /* src addr in bytes */
-                                uint64_t src_offset,
-                                /* dst addr in bytes */
-                                uint64_t dst_offset,
-                                /* number of byte to transfer */
-                                uint32_t byte_count);
-
-       /* maximum bytes in a single operation */
-       uint32_t        fill_max_bytes;
-
-       /* number of dw to reserve per operation */
-       unsigned        fill_num_dw;
-
-       /* used for buffer clearing */
-       void (*emit_fill_buffer)(struct amdgpu_ib *ib,
-                                /* value to write to memory */
-                                uint32_t src_data,
-                                /* dst addr in bytes */
-                                uint64_t dst_offset,
-                                /* number of byte to fill */
-                                uint32_t byte_count);
-};
-
-/* provided by hw blocks that can write ptes, e.g., sdma */
-struct amdgpu_vm_pte_funcs {
-       /* number of dw to reserve per operation */
-       unsigned        copy_pte_num_dw;
-
-       /* copy pte entries from GART */
-       void (*copy_pte)(struct amdgpu_ib *ib,
-                        uint64_t pe, uint64_t src,
-                        unsigned count);
-
-       /* write pte one entry at a time with addr mapping */
-       void (*write_pte)(struct amdgpu_ib *ib, uint64_t pe,
-                         uint64_t value, unsigned count,
-                         uint32_t incr);
-       /* for linear pte/pde updates without addr mapping */
-       void (*set_pte_pde)(struct amdgpu_ib *ib,
-                           uint64_t pe,
-                           uint64_t addr, unsigned count,
-                           uint32_t incr, uint64_t flags);
-};
-
-/* provided by the ih block */
-struct amdgpu_ih_funcs {
-       /* ring read/write ptr handling, called from interrupt context */
-       u32 (*get_wptr)(struct amdgpu_device *adev);
-       bool (*prescreen_iv)(struct amdgpu_device *adev);
-       void (*decode_iv)(struct amdgpu_device *adev,
-                         struct amdgpu_iv_entry *entry);
-       void (*set_rptr)(struct amdgpu_device *adev);
-};
-
 /*
  * BIOS.
  */
@@ -360,34 +308,6 @@ struct amdgpu_clock {
        uint32_t max_pixel_clock;
 };
 
-/*
- * GEM.
- */
-
-#define AMDGPU_GEM_DOMAIN_MAX          0x3
-#define gem_to_amdgpu_bo(gobj) container_of((gobj), struct amdgpu_bo, gem_base)
-
-void amdgpu_gem_object_free(struct drm_gem_object *obj);
-int amdgpu_gem_object_open(struct drm_gem_object *obj,
-                               struct drm_file *file_priv);
-void amdgpu_gem_object_close(struct drm_gem_object *obj,
-                               struct drm_file *file_priv);
-unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);
-struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);
-struct drm_gem_object *
-amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
-                                struct dma_buf_attachment *attach,
-                                struct sg_table *sg);
-struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,
-                                       struct drm_gem_object *gobj,
-                                       int flags);
-struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev,
-                                           struct dma_buf *dma_buf);
-struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *);
-void *amdgpu_gem_prime_vmap(struct drm_gem_object *obj);
-void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
-int amdgpu_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
-
 /* sub-allocation manager, it has to be protected by another lock.
  * By conception this is an helper for other part of the driver
  * like the indirect buffer or semaphore, which both have their
@@ -437,22 +357,6 @@ struct amdgpu_sa_bo {
        struct dma_fence                *fence;
 };
 
-/*
- * GEM objects.
- */
-void amdgpu_gem_force_release(struct amdgpu_device *adev);
-int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
-                            int alignment, u32 initial_domain,
-                            u64 flags, enum ttm_bo_type type,
-                            struct reservation_object *resv,
-                            struct drm_gem_object **obj);
-
-int amdgpu_mode_dumb_create(struct drm_file *file_priv,
-                           struct drm_device *dev,
-                           struct drm_mode_create_dumb *args);
-int amdgpu_mode_dumb_mmap(struct drm_file *filp,
-                         struct drm_device *dev,
-                         uint32_t handle, uint64_t *offset_p);
 int amdgpu_fence_slab_init(void);
 void amdgpu_fence_slab_fini(void);
 
@@ -525,16 +429,25 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT
        AMDGPU_DOORBELL64_GFX_RING0               = 0x8b,
 
        /*
-        * Other graphics doorbells can be allocated here: from 0x8c to 0xef
+        * Other graphics doorbells can be allocated here: from 0x8c to 0xdf
         * Graphics voltage island aperture 1
-        * default non-graphics QWORD index is 0xF0 - 0xFF inclusive
+        * default non-graphics QWORD index is 0xe0 - 0xFF inclusive
         */
 
-       /* sDMA engines */
-       AMDGPU_DOORBELL64_sDMA_ENGINE0            = 0xF0,
-       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xF1,
-       AMDGPU_DOORBELL64_sDMA_ENGINE1            = 0xF2,
-       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xF3,
+       /* sDMA engines  reserved from 0xe0 -0xef  */
+       AMDGPU_DOORBELL64_sDMA_ENGINE0            = 0xE0,
+       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xE1,
+       AMDGPU_DOORBELL64_sDMA_ENGINE1            = 0xE8,
+       AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xE9,
+
+       /* For vega10 sriov, the sdma doorbell must be fixed as follow
+        * to keep the same setting with host driver, or it will
+        * happen conflicts
+        */
+       AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0            = 0xF0,
+       AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xF1,
+       AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1            = 0xF2,
+       AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xF3,
 
        /* Interrupt handler */
        AMDGPU_DOORBELL64_IH                      = 0xF4,  /* For legacy interrupt ring buffer */
@@ -599,84 +512,6 @@ struct amdgpu_ib {
 
 extern const struct drm_sched_backend_ops amdgpu_sched_ops;
 
-/*
- * Queue manager
- */
-struct amdgpu_queue_mapper {
-       int             hw_ip;
-       struct mutex    lock;
-       /* protected by lock */
-       struct amdgpu_ring *queue_map[AMDGPU_MAX_RINGS];
-};
-
-struct amdgpu_queue_mgr {
-       struct amdgpu_queue_mapper mapper[AMDGPU_MAX_IP_NUM];
-};
-
-int amdgpu_queue_mgr_init(struct amdgpu_device *adev,
-                         struct amdgpu_queue_mgr *mgr);
-int amdgpu_queue_mgr_fini(struct amdgpu_device *adev,
-                         struct amdgpu_queue_mgr *mgr);
-int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
-                        struct amdgpu_queue_mgr *mgr,
-                        u32 hw_ip, u32 instance, u32 ring,
-                        struct amdgpu_ring **out_ring);
-
-/*
- * context related structures
- */
-
-struct amdgpu_ctx_ring {
-       uint64_t                sequence;
-       struct dma_fence        **fences;
-       struct drm_sched_entity entity;
-};
-
-struct amdgpu_ctx {
-       struct kref             refcount;
-       struct amdgpu_device    *adev;
-       struct amdgpu_queue_mgr queue_mgr;
-       unsigned                reset_counter;
-       unsigned        reset_counter_query;
-       uint32_t                vram_lost_counter;
-       spinlock_t              ring_lock;
-       struct dma_fence        **fences;
-       struct amdgpu_ctx_ring  rings[AMDGPU_MAX_RINGS];
-       bool                    preamble_presented;
-       enum drm_sched_priority init_priority;
-       enum drm_sched_priority override_priority;
-       struct mutex            lock;
-       atomic_t        guilty;
-};
-
-struct amdgpu_ctx_mgr {
-       struct amdgpu_device    *adev;
-       struct mutex            lock;
-       /* protected by lock */
-       struct idr              ctx_handles;
-};
-
-struct amdgpu_ctx *amdgpu_ctx_get(struct amdgpu_fpriv *fpriv, uint32_t id);
-int amdgpu_ctx_put(struct amdgpu_ctx *ctx);
-
-int amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, struct amdgpu_ring *ring,
-                             struct dma_fence *fence, uint64_t *seq);
-struct dma_fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx,
-                                  struct amdgpu_ring *ring, uint64_t seq);
-void amdgpu_ctx_priority_override(struct amdgpu_ctx *ctx,
-                                 enum drm_sched_priority priority);
-
-int amdgpu_ctx_ioctl(struct drm_device *dev, void *data,
-                    struct drm_file *filp);
-
-int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx, unsigned ring_id);
-
-void amdgpu_ctx_mgr_init(struct amdgpu_ctx_mgr *mgr);
-void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr);
-void amdgpu_ctx_mgr_entity_flush(struct amdgpu_ctx_mgr *mgr);
-void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr);
-
-
 /*
  * file private structure
  */
@@ -690,271 +525,6 @@ struct amdgpu_fpriv {
        struct amdgpu_ctx_mgr   ctx_mgr;
 };
 
-/*
- * GFX stuff
- */
-#include "clearstate_defs.h"
-
-struct amdgpu_rlc_funcs {
-       void (*enter_safe_mode)(struct amdgpu_device *adev);
-       void (*exit_safe_mode)(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 {
-       struct amdgpu_bo        *hpd_eop_obj;
-       u64                     hpd_eop_gpu_addr;
-       struct amdgpu_bo        *mec_fw_obj;
-       u64                     mec_fw_gpu_addr;
-       u32 num_mec;
-       u32 num_pipe_per_mec;
-       u32 num_queue_per_pipe;
-       void                    *mqd_backup[AMDGPU_MAX_COMPUTE_RINGS + 1];
-
-       /* These are the resources for which amdgpu takes ownership */
-       DECLARE_BITMAP(queue_bitmap, AMDGPU_MAX_COMPUTE_QUEUES);
-};
-
-struct amdgpu_kiq {
-       u64                     eop_gpu_addr;
-       struct amdgpu_bo        *eop_obj;
-       spinlock_t              ring_lock;
-       struct amdgpu_ring      ring;
-       struct amdgpu_irq_src   irq;
-};
-
-/*
- * GPU scratch registers structures, functions & helpers
- */
-struct amdgpu_scratch {
-       unsigned                num_reg;
-       uint32_t                reg_base;
-       uint32_t                free_mask;
-};
-
-/*
- * GFX configurations
- */
-#define AMDGPU_GFX_MAX_SE 4
-#define AMDGPU_GFX_MAX_SH_PER_SE 2
-
-struct amdgpu_rb_config {
-       uint32_t rb_backend_disable;
-       uint32_t user_rb_backend_disable;
-       uint32_t raster_config;
-       uint32_t raster_config_1;
-};
-
-struct gb_addr_config {
-       uint16_t pipe_interleave_size;
-       uint8_t num_pipes;
-       uint8_t max_compress_frags;
-       uint8_t num_banks;
-       uint8_t num_se;
-       uint8_t num_rb_per_se;
-};
-
-struct amdgpu_gfx_config {
-       unsigned max_shader_engines;
-       unsigned max_tile_pipes;
-       unsigned max_cu_per_sh;
-       unsigned max_sh_per_se;
-       unsigned max_backends_per_se;
-       unsigned max_texture_channel_caches;
-       unsigned max_gprs;
-       unsigned max_gs_threads;
-       unsigned max_hw_contexts;
-       unsigned sc_prim_fifo_size_frontend;
-       unsigned sc_prim_fifo_size_backend;
-       unsigned sc_hiz_tile_fifo_size;
-       unsigned sc_earlyz_tile_fifo_size;
-
-       unsigned num_tile_pipes;
-       unsigned backend_enable_mask;
-       unsigned mem_max_burst_length_bytes;
-       unsigned mem_row_size_in_kb;
-       unsigned shader_engine_tile_size;
-       unsigned num_gpus;
-       unsigned multi_gpu_tile_size;
-       unsigned mc_arb_ramcfg;
-       unsigned gb_addr_config;
-       unsigned num_rbs;
-       unsigned gs_vgt_table_depth;
-       unsigned gs_prim_buffer_depth;
-
-       uint32_t tile_mode_array[32];
-       uint32_t macrotile_mode_array[16];
-
-       struct gb_addr_config gb_addr_config_fields;
-       struct amdgpu_rb_config rb_config[AMDGPU_GFX_MAX_SE][AMDGPU_GFX_MAX_SH_PER_SE];
-
-       /* gfx configure feature */
-       uint32_t double_offchip_lds_buf;
-       /* cached value of DB_DEBUG2 */
-       uint32_t db_debug2;
-};
-
-struct amdgpu_cu_info {
-       uint32_t simd_per_cu;
-       uint32_t max_waves_per_simd;
-       uint32_t wave_front_size;
-       uint32_t max_scratch_slots_per_cu;
-       uint32_t lds_size;
-
-       /* total active CU number */
-       uint32_t number;
-       uint32_t ao_cu_mask;
-       uint32_t ao_cu_bitmap[4][4];
-       uint32_t bitmap[4][4];
-};
-
-struct amdgpu_gfx_funcs {
-       /* get the gpu clock counter */
-       uint64_t (*get_gpu_clock_counter)(struct amdgpu_device *adev);
-       void (*select_se_sh)(struct amdgpu_device *adev, u32 se_num, u32 sh_num, u32 instance);
-       void (*read_wave_data)(struct amdgpu_device *adev, uint32_t simd, uint32_t wave, uint32_t *dst, int *no_fields);
-       void (*read_wave_vgprs)(struct amdgpu_device *adev, uint32_t simd, uint32_t wave, uint32_t thread, uint32_t start, uint32_t size, uint32_t *dst);
-       void (*read_wave_sgprs)(struct amdgpu_device *adev, uint32_t simd, uint32_t wave, uint32_t start, uint32_t size, uint32_t *dst);
-       void (*select_me_pipe_q)(struct amdgpu_device *adev, u32 me, u32 pipe, u32 queue);
-};
-
-struct amdgpu_ngg_buf {
-       struct amdgpu_bo        *bo;
-       uint64_t                gpu_addr;
-       uint32_t                size;
-       uint32_t                bo_size;
-};
-
-enum {
-       NGG_PRIM = 0,
-       NGG_POS,
-       NGG_CNTL,
-       NGG_PARAM,
-       NGG_BUF_MAX
-};
-
-struct amdgpu_ngg {
-       struct amdgpu_ngg_buf   buf[NGG_BUF_MAX];
-       uint32_t                gds_reserve_addr;
-       uint32_t                gds_reserve_size;
-       bool                    init;
-};
-
-struct sq_work {
-       struct work_struct      work;
-       unsigned ih_data;
-};
-
-struct amdgpu_gfx {
-       struct mutex                    gpu_clock_mutex;
-       struct amdgpu_gfx_config        config;
-       struct amdgpu_rlc               rlc;
-       struct amdgpu_mec               mec;
-       struct amdgpu_kiq               kiq;
-       struct amdgpu_scratch           scratch;
-       const struct firmware           *me_fw; /* ME firmware */
-       uint32_t                        me_fw_version;
-       const struct firmware           *pfp_fw; /* PFP firmware */
-       uint32_t                        pfp_fw_version;
-       const struct firmware           *ce_fw; /* CE firmware */
-       uint32_t                        ce_fw_version;
-       const struct firmware           *rlc_fw; /* RLC firmware */
-       uint32_t                        rlc_fw_version;
-       const struct firmware           *mec_fw; /* MEC firmware */
-       uint32_t                        mec_fw_version;
-       const struct firmware           *mec2_fw; /* MEC2 firmware */
-       uint32_t                        mec2_fw_version;
-       uint32_t                        me_feature_version;
-       uint32_t                        ce_feature_version;
-       uint32_t                        pfp_feature_version;
-       uint32_t                        rlc_feature_version;
-       uint32_t                        rlc_srlc_fw_version;
-       uint32_t                        rlc_srlc_feature_version;
-       uint32_t                        rlc_srlg_fw_version;
-       uint32_t                        rlc_srlg_feature_version;
-       uint32_t                        rlc_srls_fw_version;
-       uint32_t                        rlc_srls_feature_version;
-       uint32_t                        mec_feature_version;
-       uint32_t                        mec2_feature_version;
-       struct amdgpu_ring              gfx_ring[AMDGPU_MAX_GFX_RINGS];
-       unsigned                        num_gfx_rings;
-       struct amdgpu_ring              compute_ring[AMDGPU_MAX_COMPUTE_RINGS];
-       unsigned                        num_compute_rings;
-       struct amdgpu_irq_src           eop_irq;
-       struct amdgpu_irq_src           priv_reg_irq;
-       struct amdgpu_irq_src           priv_inst_irq;
-       struct amdgpu_irq_src           cp_ecc_error_irq;
-       struct amdgpu_irq_src           sq_irq;
-       struct sq_work                  sq_work;
-
-       /* gfx status */
-       uint32_t                        gfx_current_status;
-       /* ce ram size*/
-       unsigned                        ce_ram_size;
-       struct amdgpu_cu_info           cu_info;
-       const struct amdgpu_gfx_funcs   *funcs;
-
-       /* reset mask */
-       uint32_t                        grbm_soft_reset;
-       uint32_t                        srbm_soft_reset;
-       /* s3/s4 mask */
-       bool                            in_suspend;
-       /* NGG */
-       struct amdgpu_ngg               ngg;
-
-       /* pipe reservation */
-       struct mutex                    pipe_reserve_mutex;
-       DECLARE_BITMAP                  (pipe_reserve_bitmap, AMDGPU_MAX_COMPUTE_QUEUES);
-};
-
 int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                  unsigned size, struct amdgpu_ib *ib);
 void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib,
@@ -986,7 +556,7 @@ struct amdgpu_cs_parser {
 
        /* scheduler job object */
        struct amdgpu_job       *job;
-       struct amdgpu_ring      *ring;
+       struct drm_sched_entity *entity;
 
        /* buffer objects */
        struct ww_acquire_ctx           ticket;
@@ -1037,58 +607,6 @@ struct amdgpu_wb {
 int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb);
 void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb);
 
-/*
- * SDMA
- */
-struct amdgpu_sdma_instance {
-       /* SDMA firmware */
-       const struct firmware   *fw;
-       uint32_t                fw_version;
-       uint32_t                feature_version;
-
-       struct amdgpu_ring      ring;
-       bool                    burst_nop;
-};
-
-struct amdgpu_sdma {
-       struct amdgpu_sdma_instance instance[AMDGPU_MAX_SDMA_INSTANCES];
-#ifdef CONFIG_DRM_AMDGPU_SI
-       //SI DMA has a difference trap irq number for the second engine
-       struct amdgpu_irq_src   trap_irq_1;
-#endif
-       struct amdgpu_irq_src   trap_irq;
-       struct amdgpu_irq_src   illegal_inst_irq;
-       int                     num_instances;
-       uint32_t                    srbm_soft_reset;
-};
-
-/*
- * Firmware
- */
-enum amdgpu_firmware_load_type {
-       AMDGPU_FW_LOAD_DIRECT = 0,
-       AMDGPU_FW_LOAD_SMU,
-       AMDGPU_FW_LOAD_PSP,
-};
-
-struct amdgpu_firmware {
-       struct amdgpu_firmware_info ucode[AMDGPU_UCODE_ID_MAXIMUM];
-       enum amdgpu_firmware_load_type load_type;
-       struct amdgpu_bo *fw_buf;
-       unsigned int fw_size;
-       unsigned int max_ucodes;
-       /* firmwares are loaded by psp instead of smu from vega10 */
-       const struct amdgpu_psp_funcs *funcs;
-       struct amdgpu_bo *rbuf;
-       struct mutex mutex;
-
-       /* gpu info firmware data pointer */
-       const struct firmware *gpu_info_fw;
-
-       void *fw_buf_ptr;
-       uint64_t fw_buf_mc;
-};
-
 /*
  * Benchmarking
  */
@@ -1100,31 +618,6 @@ void amdgpu_benchmark(struct amdgpu_device *adev, int test_number);
  */
 void amdgpu_test_moves(struct amdgpu_device *adev);
 
-
-/*
- * amdgpu smumgr functions
- */
-struct amdgpu_smumgr_funcs {
-       int (*check_fw_load_finish)(struct amdgpu_device *adev, uint32_t fwtype);
-       int (*request_smu_load_fw)(struct amdgpu_device *adev);
-       int (*request_smu_specific_fw)(struct amdgpu_device *adev, uint32_t fwtype);
-};
-
-/*
- * amdgpu smumgr
- */
-struct amdgpu_smumgr {
-       struct amdgpu_bo *toc_buf;
-       struct amdgpu_bo *smu_buf;
-       /* asic priv smu data */
-       void *priv;
-       spinlock_t smu_lock;
-       /* smumgr functions */
-       const struct amdgpu_smumgr_funcs *smumgr_funcs;
-       /* ucode loading complete flag */
-       uint32_t fw_flags;
-};
-
 /*
  * ASIC specific register table accessible by UMD
  */
@@ -1166,23 +659,9 @@ struct amdgpu_asic_funcs {
 /*
  * IOCTL.
  */
-int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
-                           struct drm_file *filp);
 int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,
                                struct drm_file *filp);
 
-int amdgpu_gem_info_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *filp);
-int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
-                       struct drm_file *filp);
-int amdgpu_gem_mmap_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *filp);
-int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
-                             struct drm_file *filp);
-int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
-                         struct drm_file *filp);
-int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
-                       struct drm_file *filp);
 int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);
 int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data,
                                    struct drm_file *filp);
@@ -1190,9 +669,6 @@ int amdgpu_cs_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *fi
 int amdgpu_cs_wait_fences_ioctl(struct drm_device *dev, void *data,
                                struct drm_file *filp);
 
-int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
-                               struct drm_file *filp);
-
 /* VRAM scratch page for HDP bug, default vram page */
 struct amdgpu_vram_scratch {
        struct amdgpu_bo                *robj;
@@ -1356,7 +832,6 @@ struct amdgpu_device {
        bool                            need_dma32;
        bool                            need_swiotlb;
        bool                            accel_working;
-       struct work_struct              reset_work;
        struct notifier_block           acpi_nb;
        struct amdgpu_i2c_chan          *i2c_bus[AMDGPU_MAX_I2C_BUS];
        struct amdgpu_debugfs           debugfs[AMDGPU_DEBUGFS_MAX_COMPONENTS];
@@ -1477,9 +952,6 @@ struct amdgpu_device {
        u32                             cg_flags;
        u32                             pg_flags;
 
-       /* amdgpu smumgr */
-       struct amdgpu_smumgr smu;
-
        /* gfx */
        struct amdgpu_gfx               gfx;
 
@@ -1544,6 +1016,9 @@ struct amdgpu_device {
        bool has_hw_reset;
        u8                              reset_magic[AMDGPU_RESET_MAGIC_NUM];
 
+       /* s3/s4 mask */
+       bool                            in_suspend;
+
        /* record last mm index being written through WREG32*/
        unsigned long last_mm_index;
        bool                            in_gpu_reset;
@@ -1666,22 +1141,6 @@ int emu_soc_asic_init(struct amdgpu_device *adev);
 #define RBIOS16(i) (RBIOS8(i) | (RBIOS8((i)+1) << 8))
 #define RBIOS32(i) ((RBIOS16(i)) | (RBIOS16((i)+2) << 16))
 
-static inline struct amdgpu_sdma_instance *
-amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
-{
-       struct amdgpu_device *adev = ring->adev;
-       int i;
-
-       for (i = 0; i < adev->sdma.num_instances; i++)
-               if (&adev->sdma.instance[i].ring == ring)
-                       break;
-
-       if (i < AMDGPU_MAX_SDMA_INSTANCES)
-               return &adev->sdma.instance[i];
-       else
-               return NULL;
-}
-
 /*
  * ASICs macro.
  */
@@ -1700,74 +1159,16 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
 #define amdgpu_asic_flush_hdp(adev, r) (adev)->asic_funcs->flush_hdp((adev), (r))
 #define amdgpu_asic_invalidate_hdp(adev, r) (adev)->asic_funcs->invalidate_hdp((adev), (r))
 #define amdgpu_asic_need_full_reset(adev) (adev)->asic_funcs->need_full_reset((adev))
-#define amdgpu_gmc_flush_gpu_tlb(adev, vmid) (adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid))
-#define amdgpu_gmc_emit_flush_gpu_tlb(r, vmid, addr) (r)->adev->gmc.gmc_funcs->emit_flush_gpu_tlb((r), (vmid), (addr))
-#define amdgpu_gmc_emit_pasid_mapping(r, vmid, pasid) (r)->adev->gmc.gmc_funcs->emit_pasid_mapping((r), (vmid), (pasid))
-#define amdgpu_gmc_set_pte_pde(adev, pt, idx, addr, flags) (adev)->gmc.gmc_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))
-#define amdgpu_gmc_get_vm_pde(adev, level, dst, flags) (adev)->gmc.gmc_funcs->get_vm_pde((adev), (level), (dst), (flags))
-#define amdgpu_gmc_get_pte_flags(adev, flags) (adev)->gmc.gmc_funcs->get_vm_pte_flags((adev),(flags))
-#define amdgpu_vm_copy_pte(adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))
-#define amdgpu_vm_write_pte(adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))
-#define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))
-#define amdgpu_ring_parse_cs(r, p, ib) ((r)->funcs->parse_cs((p), (ib)))
-#define amdgpu_ring_patch_cs_in_place(r, p, ib) ((r)->funcs->patch_cs_in_place((p), (ib)))
-#define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r))
-#define amdgpu_ring_test_ib(r, t) (r)->funcs->test_ib((r), (t))
-#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))
-#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))
-#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))
-#define amdgpu_ring_emit_ib(r, ib, vmid, c) (r)->funcs->emit_ib((r), (ib), (vmid), (c))
-#define amdgpu_ring_emit_pipeline_sync(r) (r)->funcs->emit_pipeline_sync((r))
-#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))
-#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))
-#define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as))
-#define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))
-#define amdgpu_ring_emit_switch_buffer(r) (r)->funcs->emit_switch_buffer((r))
-#define amdgpu_ring_emit_cntxcntl(r, d) (r)->funcs->emit_cntxcntl((r), (d))
-#define amdgpu_ring_emit_rreg(r, d) (r)->funcs->emit_rreg((r), (d))
-#define amdgpu_ring_emit_wreg(r, d, v) (r)->funcs->emit_wreg((r), (d), (v))
-#define amdgpu_ring_emit_reg_wait(r, d, v, m) (r)->funcs->emit_reg_wait((r), (d), (v), (m))
-#define amdgpu_ring_emit_reg_write_reg_wait(r, d0, d1, v, m) (r)->funcs->emit_reg_write_reg_wait((r), (d0), (d1), (v), (m))
-#define amdgpu_ring_emit_tmz(r, b) (r)->funcs->emit_tmz((r), (b))
-#define amdgpu_ring_pad_ib(r, ib) ((r)->funcs->pad_ib((r), (ib)))
-#define amdgpu_ring_init_cond_exec(r) (r)->funcs->init_cond_exec((r))
-#define amdgpu_ring_patch_cond_exec(r,o) (r)->funcs->patch_cond_exec((r),(o))
-#define amdgpu_ih_get_wptr(adev) (adev)->irq.ih_funcs->get_wptr((adev))
-#define amdgpu_ih_prescreen_iv(adev) (adev)->irq.ih_funcs->prescreen_iv((adev))
-#define amdgpu_ih_decode_iv(adev, iv) (adev)->irq.ih_funcs->decode_iv((adev), (iv))
-#define amdgpu_ih_set_rptr(adev) (adev)->irq.ih_funcs->set_rptr((adev))
-#define amdgpu_display_vblank_get_counter(adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))
-#define amdgpu_display_backlight_set_level(adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l))
-#define amdgpu_display_backlight_get_level(adev, e) (adev)->mode_info.funcs->backlight_get_level((e))
-#define amdgpu_display_hpd_sense(adev, h) (adev)->mode_info.funcs->hpd_sense((adev), (h))
-#define amdgpu_display_hpd_set_polarity(adev, h) (adev)->mode_info.funcs->hpd_set_polarity((adev), (h))
-#define amdgpu_display_hpd_get_gpio_reg(adev) (adev)->mode_info.funcs->hpd_get_gpio_reg((adev))
-#define amdgpu_display_bandwidth_update(adev) (adev)->mode_info.funcs->bandwidth_update((adev))
-#define amdgpu_display_page_flip(adev, crtc, base, async) (adev)->mode_info.funcs->page_flip((adev), (crtc), (base), (async))
-#define amdgpu_display_page_flip_get_scanoutpos(adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos))
-#define amdgpu_display_add_encoder(adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c))
-#define amdgpu_display_add_connector(adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r))
-#define amdgpu_emit_copy_buffer(adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_copy_buffer((ib),  (s), (d), (b))
-#define amdgpu_emit_fill_buffer(adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_fill_buffer((ib), (s), (d), (b))
-#define amdgpu_gfx_get_gpu_clock_counter(adev) (adev)->gfx.funcs->get_gpu_clock_counter((adev))
-#define amdgpu_gfx_select_se_sh(adev, se, sh, instance) (adev)->gfx.funcs->select_se_sh((adev), (se), (sh), (instance))
-#define amdgpu_gds_switch(adev, r, v, d, w, a) (adev)->gds.funcs->patch_gds_switch((r), (v), (d), (w), (a))
-#define amdgpu_psp_check_fw_loading_status(adev, i) (adev)->firmware.funcs->check_fw_loading_status((adev), (i))
-#define amdgpu_gfx_select_me_pipe_q(adev, me, pipe, q) (adev)->gfx.funcs->select_me_pipe_q((adev), (me), (pipe), (q))
 
 /* Common functions */
+bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);
 int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
-                             struct amdgpu_job* job, bool force);
+                             struct amdgpu_job* job);
 void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
 bool amdgpu_device_need_post(struct amdgpu_device *adev);
-void amdgpu_display_update_priority(struct amdgpu_device *adev);
 
 void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes,
                                  u64 num_vis_bytes);
-void amdgpu_device_vram_location(struct amdgpu_device *adev,
-                                struct amdgpu_gmc *mc, u64 base);
-void amdgpu_device_gart_location(struct amdgpu_device *adev,
-                                struct amdgpu_gmc *mc);
 int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev);
 void amdgpu_device_program_register_sequence(struct amdgpu_device *adev,
                                             const u32 *registers,
@@ -1818,6 +1219,12 @@ void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe);
 long amdgpu_kms_compat_ioctl(struct file *filp, unsigned int cmd,
                             unsigned long arg);
 
+
+/*
+ * functions used by amdgpu_xgmi.c
+ */
+int amdgpu_xgmi_add_device(struct amdgpu_device *adev);
+
 /*
  * functions used by amdgpu_encoder.c
  */
This page took 0.07956 seconds and 4 git commands to generate.