diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 94a64e3bc682..c1b913541739 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -1037,7 +1037,6 @@ struct amdgpu_uvd { | |||
1037 | bool use_ctx_buf; | 1037 | bool use_ctx_buf; |
1038 | struct amd_sched_entity entity; | 1038 | struct amd_sched_entity entity; |
1039 | uint32_t srbm_soft_reset; | 1039 | uint32_t srbm_soft_reset; |
1040 | bool is_powergated; | ||
1041 | }; | 1040 | }; |
1042 | 1041 | ||
1043 | /* | 1042 | /* |
@@ -1066,7 +1065,6 @@ struct amdgpu_vce { | |||
1066 | struct amd_sched_entity entity; | 1065 | struct amd_sched_entity entity; |
1067 | uint32_t srbm_soft_reset; | 1066 | uint32_t srbm_soft_reset; |
1068 | unsigned num_rings; | 1067 | unsigned num_rings; |
1069 | bool is_powergated; | ||
1070 | }; | 1068 | }; |
1071 | 1069 | ||
1072 | /* | 1070 | /* |
@@ -1484,6 +1482,9 @@ struct amdgpu_device { | |||
1484 | spinlock_t gtt_list_lock; | 1482 | spinlock_t gtt_list_lock; |
1485 | struct list_head gtt_list; | 1483 | struct list_head gtt_list; |
1486 | 1484 | ||
1485 | /* record hw reset is performed */ | ||
1486 | bool has_hw_reset; | ||
1487 | |||
1487 | }; | 1488 | }; |
1488 | 1489 | ||
1489 | static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev) | 1490 | static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev) |
@@ -1702,13 +1703,14 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) | |||
1702 | int amdgpu_gpu_reset(struct amdgpu_device *adev); | 1703 | int amdgpu_gpu_reset(struct amdgpu_device *adev); |
1703 | bool amdgpu_need_backup(struct amdgpu_device *adev); | 1704 | bool amdgpu_need_backup(struct amdgpu_device *adev); |
1704 | void amdgpu_pci_config_reset(struct amdgpu_device *adev); | 1705 | void amdgpu_pci_config_reset(struct amdgpu_device *adev); |
1705 | bool amdgpu_card_posted(struct amdgpu_device *adev); | 1706 | bool amdgpu_need_post(struct amdgpu_device *adev); |
1706 | void amdgpu_update_display_priority(struct amdgpu_device *adev); | 1707 | void amdgpu_update_display_priority(struct amdgpu_device *adev); |
1707 | 1708 | ||
1708 | int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data); | 1709 | int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data); |
1709 | int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type, | 1710 | int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type, |
1710 | u32 ip_instance, u32 ring, | 1711 | u32 ip_instance, u32 ring, |
1711 | struct amdgpu_ring **out_ring); | 1712 | struct amdgpu_ring **out_ring); |
1713 | void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes); | ||
1712 | void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain); | 1714 | void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain); |
1713 | bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo); | 1715 | bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo); |
1714 | int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages); | 1716 | int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages); |