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

Commit 92773fc7 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

One last round of fixes for radeon for 3.19:
- fix some fallout from the reservation object integration on the
  test/benchmark options
- fix a crash in the gpu vm code if gfx init fails
- fix a pll issue that leads to a blank screen on older IGP parts

* 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: fix the crash in test functions
  drm/radeon: fix the crash in benchmark functions
  drm/radeon: properly set vm fragment size for TN/RL
  drm/radeon: don't init gpuvm if accel is disabled (v3)
  drm/radeon: fix PLLs on RS880 and older v2
parents e36f014e 92b712b7

drivers/gpu/drm/radeon/radeon_benchmark.c

+8 −5
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 


static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size,

				    uint64_t saddr, uint64_t daddr,

				    int flag, int n)

				    int flag, int n,

				    struct reservation_object *resv)

{

	unsigned long start_jiffies;

	unsigned long end_jiffies;
@@ -47,12 +48,12 @@ static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size, 
		case RADEON_BENCHMARK_COPY_DMA:

			fence = radeon_copy_dma(rdev, saddr, daddr,

						size / RADEON_GPU_PAGE_SIZE,

						NULL);

						resv);

			break;

		case RADEON_BENCHMARK_COPY_BLIT:

			fence = radeon_copy_blit(rdev, saddr, daddr,

						 size / RADEON_GPU_PAGE_SIZE,

						 NULL);

						 resv);

			break;

		default:

			DRM_ERROR("Unknown copy method\n");
@@ -120,7 +121,8 @@ static void radeon_benchmark_move(struct radeon_device *rdev, unsigned size, 


	if (rdev->asic->copy.dma) {

		time = radeon_benchmark_do_move(rdev, size, saddr, daddr,

						RADEON_BENCHMARK_COPY_DMA, n);

						RADEON_BENCHMARK_COPY_DMA, n,

						dobj->tbo.resv);

		if (time < 0)

			goto out_cleanup;

		if (time > 0)
@@ -130,7 +132,8 @@ static void radeon_benchmark_move(struct radeon_device *rdev, unsigned size, 


	if (rdev->asic->copy.blit) {

		time = radeon_benchmark_do_move(rdev, size, saddr, daddr,

						RADEON_BENCHMARK_COPY_BLIT, n);

						RADEON_BENCHMARK_COPY_BLIT, n,

						dobj->tbo.resv);

		if (time < 0)

			goto out_cleanup;

		if (time > 0)

drivers/gpu/drm/radeon/radeon_display.c

+3 −0
Original line number Diff line number Diff line
@@ -960,6 +960,9 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, 
	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV &&

	    pll->flags & RADEON_PLL_USE_REF_DIV)

		ref_div_max = pll->reference_div;

	else if (pll->flags & RADEON_PLL_PREFER_MINM_OVER_MAXP)

		/* fix for problems on RS880 */

		ref_div_max = min(pll->max_ref_div, 7u);

	else

		ref_div_max = pll->max_ref_div;

drivers/gpu/drm/radeon/radeon_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_pri 
	struct radeon_bo_va *bo_va;

	int r;



	if (rdev->family < CHIP_CAYMAN) {

	if ((rdev->family < CHIP_CAYMAN) ||

	    (!rdev->accel_working)) {

		return 0;

	}
@@ -176,7 +177,8 @@ void radeon_gem_object_close(struct drm_gem_object *obj, 
	struct radeon_bo_va *bo_va;

	int r;



	if (rdev->family < CHIP_CAYMAN) {

	if ((rdev->family < CHIP_CAYMAN) ||

	    (!rdev->accel_working)) {

		return;

	}

drivers/gpu/drm/radeon/radeon_kms.c

+8 −8
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
			return -ENOMEM;

		}



		if (rdev->accel_working) {

			vm = &fpriv->vm;

			r = radeon_vm_init(rdev, vm);

			if (r) {
@@ -612,7 +613,6 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
				return r;

			}



		if (rdev->accel_working) {

			r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);

			if (r) {

				radeon_vm_fini(rdev, vm);
@@ -668,9 +668,9 @@ void radeon_driver_postclose_kms(struct drm_device *dev, 
					radeon_vm_bo_rmv(rdev, vm->ib_bo_va);

				radeon_bo_unreserve(rdev->ring_tmp_bo.bo);

			}

			radeon_vm_fini(rdev, vm);

		}



		radeon_vm_fini(rdev, vm);

		kfree(fpriv);

		file_priv->driver_priv = NULL;

	}

drivers/gpu/drm/radeon/radeon_test.c

+4 −4
Original line number Diff line number Diff line
@@ -119,11 +119,11 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) 
		if (ring == R600_RING_TYPE_DMA_INDEX)

			fence = radeon_copy_dma(rdev, gtt_addr, vram_addr,

						size / RADEON_GPU_PAGE_SIZE,

						NULL);

						vram_obj->tbo.resv);

		else

			fence = radeon_copy_blit(rdev, gtt_addr, vram_addr,

						 size / RADEON_GPU_PAGE_SIZE,

						 NULL);

						 vram_obj->tbo.resv);

		if (IS_ERR(fence)) {

			DRM_ERROR("Failed GTT->VRAM copy %d\n", i);

			r = PTR_ERR(fence);
@@ -170,11 +170,11 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) 
		if (ring == R600_RING_TYPE_DMA_INDEX)

			fence = radeon_copy_dma(rdev, vram_addr, gtt_addr,

						size / RADEON_GPU_PAGE_SIZE,

						NULL);

						vram_obj->tbo.resv);

		else

			fence = radeon_copy_blit(rdev, vram_addr, gtt_addr,

						 size / RADEON_GPU_PAGE_SIZE,

						 NULL);

						 vram_obj->tbo.resv);

		if (IS_ERR(fence)) {

			DRM_ERROR("Failed VRAM->GTT copy %d\n", i);

			r = PTR_ERR(fence);