drm/amdgpu: remove detect_hw_virtualization interface
Subsystems (2)
PATCH v2 2/2 drm/amdgpu: remove detect_hw_virtualization interface
Call detection function driectly, so remove the interface.
V2: ci and si also need to call the detec function.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 -- drivers/gpu/drm/amd/amdgpu/cik.c | 3 ++- drivers/gpu/drm/amd/amdgpu/si.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
@@ -1192,7 +1192,6 @@ struct amdgpu_asic_funcs {bool (*read_disabled_bios)(struct amdgpu_device *adev);bool (*read_bios_from_rom)(struct amdgpu_device *adev,u8 *bios,u32 length_bytes); -void (*detect_hw_virtualization) (struct amdgpu_device *adev);int (*read_register)(struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 reg_offset,u32 *value);void (*set_vga_state)(struct amdgpu_device *adev,bool state);
@@ -1626,7 +1625,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_asic_get_gpu_clock_counter (adev) (adev)->asic_funcs->get_gpu_clock_counter((adev))#define amdgpu_asic_read_disabled_bios (adev) (adev)->asic_funcs->read_disabled_bios((adev))#define amdgpu_asic_read_bios_from_rom (adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l)) -#define amdgpu_asic_detect_hw_virtualization (adev) (adev)->asic_funcs->detect_hw_virtualization((adev))#define amdgpu_asic_read_register (adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v)))#define amdgpu_gart_flush_gpu_tlb (adev, vmid) (adev)->gart.gart_funcs->flush_gpu_tlb((adev), (vmid))#define amdgpu_gart_set_pte_pde (adev, pt, idx, addr, flags) (adev)->gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))
drivers/gpu/drm/amd/amdgpu/cik.c +2 -1
@@ -1635,7 +1635,6 @@ static const struct amdgpu_asic_funcs cik_asic_funcs = { .read_disabled_bios = &cik_read_disabled_bios, .read_bios_from_rom = &cik_read_bios_from_rom, - .detect_hw_virtualization = cik_detect_hw_virtualization, .read_register = &cik_read_register, .reset = &cik_asic_reset, .set_vga_state = &cik_vga_set_state,
@@ -1891,6 +1890,8 @@ static const struct amdgpu_ip_block_version cik_common_ip_block =int cik_set_ip_blocks (struct amdgpu_device *adev) { +cik_detect_hw_virtualization (adev); +switch (adev->asic_type) {case CHIP_BONAIRE :amdgpu_ip_block_add (adev, &cik_common_ip_block);
drivers/gpu/drm/amd/amdgpu/si.c +2 -1
@@ -1144,7 +1144,6 @@ static void si_detect_hw_virtualization(struct amdgpu_device *adev)static const struct amdgpu_asic_funcs si_asic_funcs = { .read_disabled_bios = &si_read_disabled_bios, - .detect_hw_virtualization = si_detect_hw_virtualization, .read_register = &si_read_register, .reset = &si_asic_reset, .set_vga_state = &si_vga_set_state,
@@ -1861,6 +1860,8 @@ static const struct amdgpu_ip_block_version si_common_ip_block =int si_set_ip_blocks (struct amdgpu_device *adev) { +si_detect_hw_virtualization (adev); +switch (adev->asic_type) {case CHIP_VERDE :case CHIP_TAHITI :
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1483938367-14826-1-git-send-email-Xiangliang.Yu-5C7GfCeVMHo@public.gmane.org
RB as well
________________________________
发件人: amd-gfx <[email protected]> 代表 Xiangliang Yu <[email protected]> 发送时间: 2017年1月9日 13:06:07
收件人: [email protected]
抄送: Yu, Xiangliang
主题: [V2 2/2] drm/amdgpu: remove detect_hw_virtualization interface
Call detection function driectly, so remove the interface.
V2: ci and si also need to call the detec function.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 -- drivers/gpu/drm/amd/amdgpu/cik.c | 3 ++- drivers/gpu/drm/amd/amdgpu/si.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
@@ -1192,7 +1192,6 @@ struct amdgpu_asic_funcs {bool (*read_disabled_bios)(struct amdgpu_device *adev);bool (*read_bios_from_rom)(struct amdgpu_device *adev,u8 *bios,u32 length_bytes); -void (*detect_hw_virtualization) (struct amdgpu_device *adev);int (*read_register)(struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 reg_offset,u32 *value);void (*set_vga_state)(struct amdgpu_device *adev,bool state);
@@ -1626,7 +1625,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_asic_get_gpu_clock_counter (adev) (adev)->asic_funcs->get_gpu_clock_counter((adev))#define amdgpu_asic_read_disabled_bios (adev) (adev)->asic_funcs->read_disabled_bios((adev))#define amdgpu_asic_read_bios_from_rom (adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l)) -#define amdgpu_asic_detect_hw_virtualization (adev) (adev)->asic_funcs->detect_hw_virtualization((adev))#define amdgpu_asic_read_register (adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v)))#define amdgpu_gart_flush_gpu_tlb (adev, vmid) (adev)->gart.gart_funcs->flush_gpu_tlb((adev), (vmid))#define amdgpu_gart_set_pte_pde (adev, pt, idx, addr, flags) (adev)->gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))
drivers/gpu/drm/amd/amdgpu/cik.c +2 -1
@@ -1635,7 +1635,6 @@ static const struct amdgpu_asic_funcs cik_asic_funcs = { .read_disabled_bios = &cik_read_disabled_bios, .read_bios_from_rom = &cik_read_bios_from_rom, - .detect_hw_virtualization = cik_detect_hw_virtualization, .read_register = &cik_read_register, .reset = &cik_asic_reset, .set_vga_state = &cik_vga_set_state,
@@ -1891,6 +1890,8 @@ static const struct amdgpu_ip_block_version cik_common_ip_block =int cik_set_ip_blocks (struct amdgpu_device *adev) { +cik_detect_hw_virtualization (adev); +switch (adev->asic_type) {case CHIP_BONAIRE :amdgpu_ip_block_add (adev, &cik_common_ip_block);
drivers/gpu/drm/amd/amdgpu/si.c +2 -1
@@ -1144,7 +1144,6 @@ static void si_detect_hw_virtualization(struct amdgpu_device *adev)static const struct amdgpu_asic_funcs si_asic_funcs = { .read_disabled_bios = &si_read_disabled_bios, - .detect_hw_virtualization = si_detect_hw_virtualization, .read_register = &si_read_register, .reset = &si_asic_reset, .set_vga_state = &si_vga_set_state,
@@ -1861,6 +1860,8 @@ static const struct amdgpu_ip_block_version si_common_ip_block =int si_set_ip_blocks (struct amdgpu_device *adev) { +si_detect_hw_virtualization (adev); +switch (adev->asic_type) {case CHIP_VERDE :case CHIP_TAHITI :
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Xiangliang Yu
Sent: Monday, January 09, 2017 12:06 AM
To: [email protected]
Cc: Yu, Xiangliang
Subject: [V2 2/2] drm/amdgpu: removedetect_hw_virtualizationinterface
Quoted 5 lines
Call detection function driectly, so remove the interface.
V2: ci and si also need to call the detec function.
Signed-off-by Xiangliang Yu <[email protected]>
Series is:
Quoted 86 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 -- drivers/gpu/drm/amd/amdgpu/cik.c | 3 ++- drivers/gpu/drm/amd/amdgpu/si.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-1@@ -1192,7 +1192,6 @@ struct amdgpu_asic_funcs {bool (*read_disabled_bios)(struct amdgpu_device *adev);bool (*read_bios_from_rom)(struct amdgpu_device *adev,u8 *bios,u32 length_bytes); -void (*detect_hw_virtualization) (struct amdgpu_device *adev);int (*read_register)(struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 reg_offset,u32 *value);void (*set_vga_state)(struct amdgpu_device *adev,bool state);@@ -1626,7 +1625,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) #define amdgpu_asic_get_gpu_clock_counter(adev) (adev)->asic_funcs- >get_gpu_clock_counter((adev)) #define amdgpu_asic_read_disabled_bios(adev) (adev)->asic_funcs- >read_disabled_bios((adev))#define amdgpu_asic_read_bios_from_rom (adev, b, l) (adev)->asic_funcs-Quoted 1 line
read_bios_from_rom((adev), (b), (l))-#define
amdgpu_asic_detect_hw_virtualization(adev)(adev)->asic_funcs-Quoted 1 line
detect_hw_virtualization((adev))
#define
amdgpu_asic_read_register(adev, se, sh, offset, v)((adev)-Quoted 1 line
asic_funcs->read_register((adev), (se), (sh), (offset), (v)))#define
amdgpu_gart_flush_gpu_tlb(adev, vmid)(adev)->gart.gart_funcs-Quoted 1 line
flush_gpu_tlb((adev), (vmid))#define
amdgpu_gart_set_pte_pde(adev, pt, idx, addr, flags)(adev)-Quoted 1 line
gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))drivers/gpu/drm/amd/amdgpu/cik.c +0
-0@@ -1635,7 +1635,6 @@ static const struct amdgpu_asic_funcs
cik_asic_funcs=
{drivers/gpu/drm/amd/amdgpu/cik.c +0
-1.read_disabled_bios = &cik_read_disabled_bios, .read_bios_from_rom = &cik_read_bios_from_rom, - .detect_hw_virtualization = cik_detect_hw_virtualization, .read_register = &cik_read_register, .reset = &cik_asic_reset, .set_vga_state = &cik_vga_set_state,@@ -1891,6 +1890,8 @@ static const struct amdgpu_ip_block_version
cik_common_ip_block=int
cik_set_ip_blocks(struct amdgpu_device *adev){drivers/gpu/drm/amd/amdgpu/cik.c +2
-0+cik_detect_hw_virtualization (adev); +switch (adev->asic_type) {case CHIP_BONAIRE :amdgpu_ip_block_add (adev, &cik_common_ip_block);drivers/gpu/drm/amd/amdgpu/si.c +0
-1@@ -1144,7 +1144,6 @@ static void si_detect_hw_virtualization(struct amdgpu_device *adev)static const struct amdgpu_asic_funcs si_asic_funcs = { .read_disabled_bios = &si_read_disabled_bios, - .detect_hw_virtualization = si_detect_hw_virtualization, .read_register = &si_read_register, .reset = &si_asic_reset,drivers/gpu/drm/amd/amdgpu/si.c +0
-0.set_vga_state = &si_vga_set_state,@@ -1861,6 +1860,8 @@ static const struct amdgpu_ip_block_version
si_common_ip_block=int
si_set_ip_blocks(struct amdgpu_device *adev)
{drivers/gpu/drm/amd/amdgpu/si.c +2
-1+si_detect_hw_virtualization (adev); +switch (adev->asic_type) {case CHIP_VERDE :case CHIP_TAHITI : --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx