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

Commit 49307da3 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

some big endian fixes and one regression fix.

* 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux:
  radeon: Fix VCE IB test on Big-Endian systems
  radeon: Fix VCE ring test for Big-Endian systems
  radeon/cik: Fix GFX IB test on Big-Endian
  drm/amdgpu: fix the lost duplicates checking
parents 1a6e7601 361c32d3

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -477,6 +477,14 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 
		if (domain == AMDGPU_GEM_DOMAIN_CPU)

		if (domain == AMDGPU_GEM_DOMAIN_CPU)

			goto error_unreserve;

			goto error_unreserve;

	}

	}

	list_for_each_entry(entry, &duplicates, head) {

		domain = amdgpu_mem_type_to_domain(entry->bo->mem.mem_type);

		/* if anything is swapped out don't swap it in here,

		   just abort and wait for the next CS */

		if (domain == AMDGPU_GEM_DOMAIN_CPU)

			goto error_unreserve;

	}



	r = amdgpu_vm_update_page_directory(adev, bo_va->vm);

	r = amdgpu_vm_update_page_directory(adev, bo_va->vm);

	if (r)

	if (r)

		goto error_unreserve;

		goto error_unreserve;

drivers/gpu/drm/radeon/cik.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -4173,11 +4173,7 @@ void cik_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib) 
	control |= ib->length_dw | (vm_id << 24);

	control |= ib->length_dw | (vm_id << 24);





	radeon_ring_write(ring, header);

	radeon_ring_write(ring, header);

	radeon_ring_write(ring,

	radeon_ring_write(ring, (ib->gpu_addr & 0xFFFFFFFC));

#ifdef __BIG_ENDIAN

			  (2 << 0) |

#endif

			  (ib->gpu_addr & 0xFFFFFFFC));

	radeon_ring_write(ring, upper_32_bits(ib->gpu_addr) & 0xFFFF);

	radeon_ring_write(ring, upper_32_bits(ib->gpu_addr) & 0xFFFF);

	radeon_ring_write(ring, control);

	radeon_ring_write(ring, control);

}

}

drivers/gpu/drm/radeon/radeon_vce.c

+50 −50
Original line number Original line Diff line number Diff line
@@ -361,31 +361,31 @@ int radeon_vce_get_create_msg(struct radeon_device *rdev, int ring, 




	/* stitch together an VCE create msg */

	/* stitch together an VCE create msg */

	ib.length_dw = 0;

	ib.length_dw = 0;

	ib.ptr[ib.length_dw++] = 0x0000000c; /* len */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000c); /* len */

	ib.ptr[ib.length_dw++] = 0x00000001; /* session cmd */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001); /* session cmd */

	ib.ptr[ib.length_dw++] = handle;

	ib.ptr[ib.length_dw++] = cpu_to_le32(handle);





	ib.ptr[ib.length_dw++] = 0x00000030; /* len */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000030); /* len */

	ib.ptr[ib.length_dw++] = 0x01000001; /* create cmd */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x01000001); /* create cmd */

	ib.ptr[ib.length_dw++] = 0x00000000;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000000);

	ib.ptr[ib.length_dw++] = 0x00000042;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000042);

	ib.ptr[ib.length_dw++] = 0x0000000a;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000a);

	ib.ptr[ib.length_dw++] = 0x00000001;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001);

	ib.ptr[ib.length_dw++] = 0x00000080;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000080);

	ib.ptr[ib.length_dw++] = 0x00000060;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000060);

	ib.ptr[ib.length_dw++] = 0x00000100;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000100);

	ib.ptr[ib.length_dw++] = 0x00000100;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000100);

	ib.ptr[ib.length_dw++] = 0x0000000c;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000c);

	ib.ptr[ib.length_dw++] = 0x00000000;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000000);





	ib.ptr[ib.length_dw++] = 0x00000014; /* len */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000014); /* len */

	ib.ptr[ib.length_dw++] = 0x05000005; /* feedback buffer */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x05000005); /* feedback buffer */

	ib.ptr[ib.length_dw++] = upper_32_bits(dummy);

	ib.ptr[ib.length_dw++] = cpu_to_le32(upper_32_bits(dummy));

	ib.ptr[ib.length_dw++] = dummy;

	ib.ptr[ib.length_dw++] = cpu_to_le32(dummy);

	ib.ptr[ib.length_dw++] = 0x00000001;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001);





	for (i = ib.length_dw; i < ib_size_dw; ++i)

	for (i = ib.length_dw; i < ib_size_dw; ++i)

		ib.ptr[i] = 0x0;

		ib.ptr[i] = cpu_to_le32(0x0);





	r = radeon_ib_schedule(rdev, &ib, NULL, false);

	r = radeon_ib_schedule(rdev, &ib, NULL, false);

	if (r) {

	if (r) {
@@ -428,21 +428,21 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rdev, int ring, 




	/* stitch together an VCE destroy msg */

	/* stitch together an VCE destroy msg */

	ib.length_dw = 0;

	ib.length_dw = 0;

	ib.ptr[ib.length_dw++] = 0x0000000c; /* len */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x0000000c); /* len */

	ib.ptr[ib.length_dw++] = 0x00000001; /* session cmd */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001); /* session cmd */

	ib.ptr[ib.length_dw++] = handle;

	ib.ptr[ib.length_dw++] = cpu_to_le32(handle);





	ib.ptr[ib.length_dw++] = 0x00000014; /* len */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000014); /* len */

	ib.ptr[ib.length_dw++] = 0x05000005; /* feedback buffer */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x05000005); /* feedback buffer */

	ib.ptr[ib.length_dw++] = upper_32_bits(dummy);

	ib.ptr[ib.length_dw++] = cpu_to_le32(upper_32_bits(dummy));

	ib.ptr[ib.length_dw++] = dummy;

	ib.ptr[ib.length_dw++] = cpu_to_le32(dummy);

	ib.ptr[ib.length_dw++] = 0x00000001;

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000001);





	ib.ptr[ib.length_dw++] = 0x00000008; /* len */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x00000008); /* len */

	ib.ptr[ib.length_dw++] = 0x02000001; /* destroy cmd */

	ib.ptr[ib.length_dw++] = cpu_to_le32(0x02000001); /* destroy cmd */





	for (i = ib.length_dw; i < ib_size_dw; ++i)

	for (i = ib.length_dw; i < ib_size_dw; ++i)

		ib.ptr[i] = 0x0;

		ib.ptr[i] = cpu_to_le32(0x0);





	r = radeon_ib_schedule(rdev, &ib, NULL, false);

	r = radeon_ib_schedule(rdev, &ib, NULL, false);

	if (r) {

	if (r) {
@@ -699,12 +699,12 @@ bool radeon_vce_semaphore_emit(struct radeon_device *rdev, 
{

{

	uint64_t addr = semaphore->gpu_addr;

	uint64_t addr = semaphore->gpu_addr;





	radeon_ring_write(ring, VCE_CMD_SEMAPHORE);

	radeon_ring_write(ring, cpu_to_le32(VCE_CMD_SEMAPHORE));

	radeon_ring_write(ring, (addr >> 3) & 0x000FFFFF);

	radeon_ring_write(ring, cpu_to_le32((addr >> 3) & 0x000FFFFF));

	radeon_ring_write(ring, (addr >> 23) & 0x000FFFFF);

	radeon_ring_write(ring, cpu_to_le32((addr >> 23) & 0x000FFFFF));

	radeon_ring_write(ring, 0x01003000 | (emit_wait ? 1 : 0));

	radeon_ring_write(ring, cpu_to_le32(0x01003000 | (emit_wait ? 1 : 0)));

	if (!emit_wait)

	if (!emit_wait)

		radeon_ring_write(ring, VCE_CMD_END);

		radeon_ring_write(ring, cpu_to_le32(VCE_CMD_END));





	return true;

	return true;

}

}
@@ -719,10 +719,10 @@ bool radeon_vce_semaphore_emit(struct radeon_device *rdev, 
void radeon_vce_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)

void radeon_vce_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib)

{

{

	struct radeon_ring *ring = &rdev->ring[ib->ring];

	struct radeon_ring *ring = &rdev->ring[ib->ring];

	radeon_ring_write(ring, VCE_CMD_IB);

	radeon_ring_write(ring, cpu_to_le32(VCE_CMD_IB));

	radeon_ring_write(ring, ib->gpu_addr);

	radeon_ring_write(ring, cpu_to_le32(ib->gpu_addr));

	radeon_ring_write(ring, upper_32_bits(ib->gpu_addr));

	radeon_ring_write(ring, cpu_to_le32(upper_32_bits(ib->gpu_addr)));

	radeon_ring_write(ring, ib->length_dw);

	radeon_ring_write(ring, cpu_to_le32(ib->length_dw));

}

}





/**

/**
@@ -738,12 +738,12 @@ void radeon_vce_fence_emit(struct radeon_device *rdev, 
	struct radeon_ring *ring = &rdev->ring[fence->ring];

	struct radeon_ring *ring = &rdev->ring[fence->ring];

	uint64_t addr = rdev->fence_drv[fence->ring].gpu_addr;

	uint64_t addr = rdev->fence_drv[fence->ring].gpu_addr;





	radeon_ring_write(ring, VCE_CMD_FENCE);

	radeon_ring_write(ring, cpu_to_le32(VCE_CMD_FENCE));

	radeon_ring_write(ring, addr);

	radeon_ring_write(ring, cpu_to_le32(addr));

	radeon_ring_write(ring, upper_32_bits(addr));

	radeon_ring_write(ring, cpu_to_le32(upper_32_bits(addr)));

	radeon_ring_write(ring, fence->seq);

	radeon_ring_write(ring, cpu_to_le32(fence->seq));

	radeon_ring_write(ring, VCE_CMD_TRAP);

	radeon_ring_write(ring, cpu_to_le32(VCE_CMD_TRAP));

	radeon_ring_write(ring, VCE_CMD_END);

	radeon_ring_write(ring, cpu_to_le32(VCE_CMD_END));

}

}





/**

/**
@@ -765,7 +765,7 @@ int radeon_vce_ring_test(struct radeon_device *rdev, struct radeon_ring *ring) 
			  ring->idx, r);

			  ring->idx, r);

		return r;

		return r;

	}

	}

	radeon_ring_write(ring, VCE_CMD_END);

	radeon_ring_write(ring, cpu_to_le32(VCE_CMD_END));

	radeon_ring_unlock_commit(rdev, ring, false);

	radeon_ring_unlock_commit(rdev, ring, false);





	for (i = 0; i < rdev->usec_timeout; i++) {

	for (i = 0; i < rdev->usec_timeout; i++) {