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

Commit 77c01bef authored by Dave Airlie's avatar Dave Airlie
Browse files

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

radeon fixes, VCE one is big but does fix a userspace crash.

* 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon/pm: don't allow debugfs/sysfs access when PX card is off (v2)
  drm/radeon: avoid segfault on device open when accel is not working.
  drm/radeon: fix typo in finding PLL params
  drm/radeon: fix register typo on si
  drm/radeon: fix buffer placement under memory pressure v2
  drm/radeon: fix page directory update size estimation
  drm/radeon: handle non-VGA class pci devices with ATRM
  drm/radeon: fix DCE83 check for mullins
  drm/radeon: check VCE relocation buffer range v3
  drm/radeon: also try GART for CPU accessed buffers
parents 763b2573 4f2f2039

drivers/gpu/drm/radeon/radeon.h

+4 −2
Original line number Diff line number Diff line
@@ -1642,6 +1642,7 @@ struct radeon_vce { 
	unsigned		fb_version;

	atomic_t		handles[RADEON_MAX_VCE_HANDLES];

	struct drm_file		*filp[RADEON_MAX_VCE_HANDLES];

	unsigned		img_size[RADEON_MAX_VCE_HANDLES];

	struct delayed_work	idle_work;

};
@@ -1655,7 +1656,7 @@ int radeon_vce_get_destroy_msg(struct radeon_device *rdev, int ring, 
			       uint32_t handle, struct radeon_fence **fence);

void radeon_vce_free_handles(struct radeon_device *rdev, struct drm_file *filp);

void radeon_vce_note_usage(struct radeon_device *rdev);

int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int lo, int hi);

int radeon_vce_cs_reloc(struct radeon_cs_parser *p, int lo, int hi, unsigned size);

int radeon_vce_cs_parse(struct radeon_cs_parser *p);

bool radeon_vce_semaphore_emit(struct radeon_device *rdev,

			       struct radeon_ring *ring,
@@ -2640,7 +2641,8 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); 
#define ASIC_IS_DCE8(rdev) ((rdev->family >= CHIP_BONAIRE))

#define ASIC_IS_DCE81(rdev) ((rdev->family == CHIP_KAVERI))

#define ASIC_IS_DCE82(rdev) ((rdev->family == CHIP_BONAIRE))

#define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI))

#define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI) || \

			     (rdev->family == CHIP_MULLINS))



#define ASIC_IS_LOMBOK(rdev) ((rdev->ddev->pdev->device == 0x6849) || \

			      (rdev->ddev->pdev->device == 0x6850) || \

drivers/gpu/drm/radeon/radeon_bios.c

+14 −0
Original line number Diff line number Diff line
@@ -196,6 +196,20 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) 
		}

	}



	if (!found) {

		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {

			dhandle = ACPI_HANDLE(&pdev->dev);

			if (!dhandle)

				continue;



			status = acpi_get_handle(dhandle, "ATRM", &atrm_handle);

			if (!ACPI_FAILURE(status)) {

				found = true;

				break;

			}

		}

	}



	if (!found)

		return false;

drivers/gpu/drm/radeon/radeon_display.c

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, 


	/* avoid high jitter with small fractional dividers */

	if (pll->flags & RADEON_PLL_USE_FRAC_FB_DIV && (fb_div % 10)) {

		fb_div_min = max(fb_div_min, (9 - (fb_div % 10)) * 20 + 60);

		fb_div_min = max(fb_div_min, (9 - (fb_div % 10)) * 20 + 50);

		if (fb_div < fb_div_min) {

			unsigned tmp = DIV_ROUND_UP(fb_div_min, fb_div);

			fb_div *= tmp;

drivers/gpu/drm/radeon/radeon_kms.c

+29 −26
Original line number Diff line number Diff line
@@ -577,6 +577,7 @@ 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, &fpriv->vm);
@@ -598,7 +599,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
				kfree(fpriv);

				return r;

			}



		}

		file_priv->driver_priv = fpriv;

	}
@@ -626,6 +627,7 @@ void radeon_driver_postclose_kms(struct drm_device *dev, 
		struct radeon_bo_va *bo_va;

		int r;



		if (rdev->accel_working) {

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

			if (!r) {

				bo_va = radeon_vm_bo_find(&fpriv->vm,
@@ -634,6 +636,7 @@ void radeon_driver_postclose_kms(struct drm_device *dev, 
					radeon_vm_bo_rmv(rdev, bo_va);

				radeon_bo_unreserve(rdev->ring_tmp_bo.bo);

			}

		}



		radeon_vm_fini(rdev, &fpriv->vm);

		kfree(fpriv);

drivers/gpu/drm/radeon/radeon_object.c

+24 −16
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ int radeon_bo_list_validate(struct radeon_device *rdev, 
			 * into account. We don't want to disallow buffer moves

			 * completely.

			 */

			if (current_domain != RADEON_GEM_DOMAIN_CPU &&

			if ((lobj->alt_domain & current_domain) != 0 &&

			    (domain & current_domain) == 0 && /* will be moved */

			    bytes_moved > bytes_moved_threshold) {

				/* don't move it */
@@ -699,22 +699,30 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	rbo = container_of(bo, struct radeon_bo, tbo);

	radeon_bo_check_tiling(rbo, 0, 0);

	rdev = rbo->rdev;

	if (bo->mem.mem_type == TTM_PL_VRAM) {

	if (bo->mem.mem_type != TTM_PL_VRAM)

		return 0;



	size = bo->mem.num_pages << PAGE_SHIFT;

	offset = bo->mem.start << PAGE_SHIFT;

		if ((offset + size) > rdev->mc.visible_vram_size) {

	if ((offset + size) <= rdev->mc.visible_vram_size)

		return 0;



	/* hurrah the memory is not visible ! */

	radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_VRAM);

	rbo->placement.lpfn = rdev->mc.visible_vram_size >> PAGE_SHIFT;

	r = ttm_bo_validate(bo, &rbo->placement, false, false);

			if (unlikely(r != 0))

	if (unlikely(r == -ENOMEM)) {

		radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);

		return ttm_bo_validate(bo, &rbo->placement, false, false);

	} else if (unlikely(r != 0)) {

		return r;

	}



	offset = bo->mem.start << PAGE_SHIFT;

			/* this should not happen */

	/* this should never happen */

	if ((offset + size) > rdev->mc.visible_vram_size)

		return -EINVAL;

		}

	}



	return 0;

}