OSDN Git Service

drm/amdgpu: add reset_method asic callback for cik
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 24 Jul 2019 04:45:39 +0000 (23:45 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 31 Jul 2019 04:24:06 +0000 (23:24 -0500)
CIK always uses the legacy pci based reset.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/cik.c

index 1ffbc0d..b81bb41 100644 (file)
@@ -1291,6 +1291,12 @@ static int cik_asic_reset(struct amdgpu_device *adev)
        return r;
 }
 
+static enum amd_reset_method
+cik_asic_reset_method(struct amdgpu_device *adev)
+{
+       return AMD_RESET_METHOD_LEGACY;
+}
+
 static u32 cik_get_config_memsize(struct amdgpu_device *adev)
 {
        return RREG32(mmCONFIG_MEMSIZE);
@@ -1823,6 +1829,7 @@ static const struct amdgpu_asic_funcs cik_asic_funcs =
        .read_bios_from_rom = &cik_read_bios_from_rom,
        .read_register = &cik_read_register,
        .reset = &cik_asic_reset,
+       .reset_method = &cik_asic_reset_method,
        .set_vga_state = &cik_vga_set_state,
        .get_xclk = &cik_get_xclk,
        .set_uvd_clocks = &cik_set_uvd_clocks,