drm/radeon: disable semaphores for UVD V1 (v2)
Hardware doesn't seem to work correctly, just block userspace in this case. v2: add missing defines Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=85320 Signed-off-by: Christian König <christian.koenig@amd.com> CC: stable@vger.kernel.org Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
71aee81937
commit
013ead48a8
5 changed files with 39 additions and 13 deletions
|
@ -1202,7 +1202,7 @@ static struct radeon_asic rs780_asic = {
|
||||||
static struct radeon_asic_ring rv770_uvd_ring = {
|
static struct radeon_asic_ring rv770_uvd_ring = {
|
||||||
.ib_execute = &uvd_v1_0_ib_execute,
|
.ib_execute = &uvd_v1_0_ib_execute,
|
||||||
.emit_fence = &uvd_v2_2_fence_emit,
|
.emit_fence = &uvd_v2_2_fence_emit,
|
||||||
.emit_semaphore = &uvd_v1_0_semaphore_emit,
|
.emit_semaphore = &uvd_v2_2_semaphore_emit,
|
||||||
.cs_parse = &radeon_uvd_cs_parse,
|
.cs_parse = &radeon_uvd_cs_parse,
|
||||||
.ring_test = &uvd_v1_0_ring_test,
|
.ring_test = &uvd_v1_0_ring_test,
|
||||||
.ib_test = &uvd_v1_0_ib_test,
|
.ib_test = &uvd_v1_0_ib_test,
|
||||||
|
|
|
@ -949,6 +949,10 @@ void uvd_v1_0_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);
|
||||||
int uvd_v2_2_resume(struct radeon_device *rdev);
|
int uvd_v2_2_resume(struct radeon_device *rdev);
|
||||||
void uvd_v2_2_fence_emit(struct radeon_device *rdev,
|
void uvd_v2_2_fence_emit(struct radeon_device *rdev,
|
||||||
struct radeon_fence *fence);
|
struct radeon_fence *fence);
|
||||||
|
bool uvd_v2_2_semaphore_emit(struct radeon_device *rdev,
|
||||||
|
struct radeon_ring *ring,
|
||||||
|
struct radeon_semaphore *semaphore,
|
||||||
|
bool emit_wait);
|
||||||
|
|
||||||
/* uvd v3.1 */
|
/* uvd v3.1 */
|
||||||
bool uvd_v3_1_semaphore_emit(struct radeon_device *rdev,
|
bool uvd_v3_1_semaphore_emit(struct radeon_device *rdev,
|
||||||
|
|
|
@ -989,6 +989,9 @@
|
||||||
((n) & 0x3FFF) << 16)
|
((n) & 0x3FFF) << 16)
|
||||||
|
|
||||||
/* UVD */
|
/* UVD */
|
||||||
|
#define UVD_SEMA_ADDR_LOW 0xef00
|
||||||
|
#define UVD_SEMA_ADDR_HIGH 0xef04
|
||||||
|
#define UVD_SEMA_CMD 0xef08
|
||||||
#define UVD_GPCOM_VCPU_CMD 0xef0c
|
#define UVD_GPCOM_VCPU_CMD 0xef0c
|
||||||
#define UVD_GPCOM_VCPU_DATA0 0xef10
|
#define UVD_GPCOM_VCPU_DATA0 0xef10
|
||||||
#define UVD_GPCOM_VCPU_DATA1 0xef14
|
#define UVD_GPCOM_VCPU_DATA1 0xef14
|
||||||
|
|
|
@ -466,18 +466,8 @@ bool uvd_v1_0_semaphore_emit(struct radeon_device *rdev,
|
||||||
struct radeon_semaphore *semaphore,
|
struct radeon_semaphore *semaphore,
|
||||||
bool emit_wait)
|
bool emit_wait)
|
||||||
{
|
{
|
||||||
uint64_t addr = semaphore->gpu_addr;
|
/* disable semaphores for UVD V1 hardware */
|
||||||
|
return false;
|
||||||
radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_LOW, 0));
|
|
||||||
radeon_ring_write(ring, (addr >> 3) & 0x000FFFFF);
|
|
||||||
|
|
||||||
radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_HIGH, 0));
|
|
||||||
radeon_ring_write(ring, (addr >> 23) & 0x000FFFFF);
|
|
||||||
|
|
||||||
radeon_ring_write(ring, PACKET0(UVD_SEMA_CMD, 0));
|
|
||||||
radeon_ring_write(ring, emit_wait ? 1 : 0);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -59,6 +59,35 @@ void uvd_v2_2_fence_emit(struct radeon_device *rdev,
|
||||||
radeon_ring_write(ring, 2);
|
radeon_ring_write(ring, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* uvd_v2_2_semaphore_emit - emit semaphore command
|
||||||
|
*
|
||||||
|
* @rdev: radeon_device pointer
|
||||||
|
* @ring: radeon_ring pointer
|
||||||
|
* @semaphore: semaphore to emit commands for
|
||||||
|
* @emit_wait: true if we should emit a wait command
|
||||||
|
*
|
||||||
|
* Emit a semaphore command (either wait or signal) to the UVD ring.
|
||||||
|
*/
|
||||||
|
bool uvd_v2_2_semaphore_emit(struct radeon_device *rdev,
|
||||||
|
struct radeon_ring *ring,
|
||||||
|
struct radeon_semaphore *semaphore,
|
||||||
|
bool emit_wait)
|
||||||
|
{
|
||||||
|
uint64_t addr = semaphore->gpu_addr;
|
||||||
|
|
||||||
|
radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_LOW, 0));
|
||||||
|
radeon_ring_write(ring, (addr >> 3) & 0x000FFFFF);
|
||||||
|
|
||||||
|
radeon_ring_write(ring, PACKET0(UVD_SEMA_ADDR_HIGH, 0));
|
||||||
|
radeon_ring_write(ring, (addr >> 23) & 0x000FFFFF);
|
||||||
|
|
||||||
|
radeon_ring_write(ring, PACKET0(UVD_SEMA_CMD, 0));
|
||||||
|
radeon_ring_write(ring, emit_wait ? 1 : 0);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* uvd_v2_2_resume - memory controller programming
|
* uvd_v2_2_resume - memory controller programming
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue