diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-10-02 13:01:36 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-01-08 18:42:22 -0500 |
commit | 1a0041b8f99656a4600b587a491a1caa0e979e18 (patch) | |
tree | 9769fdbb34acc9c32c554702b833258d02b52645 | |
parent | 363eb0b4b787ea6ebb7a58d15df032126c111770 (diff) |
drm/radeon: add pci config hard reset
This is used to hard reset the asic. If a soft
reset is not able to reset things, a hard reset
can be used.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 9dd6cc49b877..746c0c6c269b 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -140,6 +140,9 @@ extern int radeon_hard_reset; | |||
140 | #define RADEON_VA_RESERVED_SIZE (8 << 20) | 140 | #define RADEON_VA_RESERVED_SIZE (8 << 20) |
141 | #define RADEON_IB_VM_MAX_SIZE (64 << 10) | 141 | #define RADEON_IB_VM_MAX_SIZE (64 << 10) |
142 | 142 | ||
143 | /* hard reset data */ | ||
144 | #define RADEON_ASIC_RESET_DATA 0x39d5e86b | ||
145 | |||
143 | /* reset flags */ | 146 | /* reset flags */ |
144 | #define RADEON_RESET_GFX (1 << 0) | 147 | #define RADEON_RESET_GFX (1 << 0) |
145 | #define RADEON_RESET_COMPUTE (1 << 1) | 148 | #define RADEON_RESET_COMPUTE (1 << 1) |
@@ -2675,6 +2678,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); | |||
2675 | /* Common functions */ | 2678 | /* Common functions */ |
2676 | /* AGP */ | 2679 | /* AGP */ |
2677 | extern int radeon_gpu_reset(struct radeon_device *rdev); | 2680 | extern int radeon_gpu_reset(struct radeon_device *rdev); |
2681 | extern void radeon_pci_config_reset(struct radeon_device *rdev); | ||
2678 | extern void r600_set_bios_scratch_engine_hung(struct radeon_device *rdev, bool hung); | 2682 | extern void r600_set_bios_scratch_engine_hung(struct radeon_device *rdev, bool hung); |
2679 | extern void radeon_agp_disable(struct radeon_device *rdev); | 2683 | extern void radeon_agp_disable(struct radeon_device *rdev); |
2680 | extern int radeon_modeset_init(struct radeon_device *rdev); | 2684 | extern int radeon_modeset_init(struct radeon_device *rdev); |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 4d20e78b9b70..b012cbbc3ed5 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
@@ -144,6 +144,11 @@ void radeon_program_register_sequence(struct radeon_device *rdev, | |||
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
147 | void radeon_pci_config_reset(struct radeon_device *rdev) | ||
148 | { | ||
149 | pci_write_config_dword(rdev->pdev, 0x7c, RADEON_ASIC_RESET_DATA); | ||
150 | } | ||
151 | |||
147 | /** | 152 | /** |
148 | * radeon_surface_init - Clear GPU surface registers. | 153 | * radeon_surface_init - Clear GPU surface registers. |
149 | * | 154 | * |