Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7122e505 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Mostly stability fixes for UVD and VCE, plus a few other bug and regression
fixes.

* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: stop trying to suspend UVD sessions
  drm/radeon: more strictly validate the UVD codec
  drm/radeon: make UVD handle checking more strict
  drm/radeon: make VCE handle check more strict
  drm/radeon: fix userptr lockup
  drm/radeon: fix userptr BO unpin bug v3
  drm/radeon: don't setup audio on asics that don't support it
  drm/radeon: disable semaphores for UVD V1 (v2)
parents 5ebe6afa 12e49fea

drivers/gpu/drm/radeon/radeon.h

+0 −1
Original line number Diff line number Diff line
@@ -1673,7 +1673,6 @@ struct radeon_uvd { 
	struct radeon_bo	*vcpu_bo;

	void			*cpu_addr;

	uint64_t		gpu_addr;

	void			*saved_bo;

	atomic_t		handles[RADEON_MAX_UVD_HANDLES];

	struct drm_file		*filp[RADEON_MAX_UVD_HANDLES];

	unsigned		img_size[RADEON_MAX_UVD_HANDLES];

drivers/gpu/drm/radeon/radeon_asic.c

+1 −1
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ static struct radeon_asic rs780_asic = { 
static struct radeon_asic_ring rv770_uvd_ring = {

	.ib_execute = &uvd_v1_0_ib_execute,

	.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,

	.ring_test = &uvd_v1_0_ring_test,

	.ib_test = &uvd_v1_0_ib_test,

drivers/gpu/drm/radeon/radeon_asic.h

+4 −0
Original line number Diff line number Diff line
@@ -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);

void uvd_v2_2_fence_emit(struct radeon_device *rdev,

			 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 */

bool uvd_v3_1_semaphore_emit(struct radeon_device *rdev,

drivers/gpu/drm/radeon/radeon_audio.c

+4 −0
Original line number Diff line number Diff line
@@ -464,6 +464,10 @@ void radeon_audio_detect(struct drm_connector *connector, 
		return;



	rdev = connector->encoder->dev->dev_private;



	if (!radeon_audio_chipset_supported(rdev))

		return;



	radeon_encoder = to_radeon_encoder(connector->encoder);

	dig = radeon_encoder->enc_priv;

drivers/gpu/drm/radeon/radeon_mn.c

+3 −0
Original line number Diff line number Diff line
@@ -142,6 +142,9 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn, 


		list_for_each_entry(bo, &node->bos, mn_list) {



			if (!bo->tbo.ttm || bo->tbo.ttm->state != tt_bound)

				continue;



			r = radeon_bo_reserve(bo, true);

			if (r) {

				DRM_ERROR("(%ld) failed to reserve user bo\n", r);