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

Commit 2f4fcb3e authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Just a few fixes for 4.6 this week:
- Add some SI DPM quirks
- Improve the ACP Kconfig text
- Additional BO pinning checks

* 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: Don't move pinned BOs
  drm/radeon: Don't move pinned BOs
  drm/radeon: add a dpm quirk for all R7 370 parts
  drm/radeon: add another R7 370 quirk
  drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
  drm/amd: Beef up ACP Kconfig menu text
parents c05c2ec9 104ece97

drivers/gpu/drm/amd/acp/Kconfig

+6 −2
Original line number Diff line number Diff line 
menu "ACP Configuration"

menu "ACP (Audio CoProcessor) Configuration"



config DRM_AMD_ACP

       bool "Enable ACP IP support"

       bool "Enable AMD Audio CoProcessor IP support"

       select MFD_CORE

       select PM_GENERIC_DOMAINS if PM

       help

	Choose this option to enable ACP IP support for AMD SOCs.

	This adds the ACP (Audio CoProcessor) IP driver and wires

	it up into the amdgpu driver.  The ACP block provides the DMA

	engine for the i2s-based ALSA driver. It is required for audio

	on APUs which utilize an i2s codec.



endmenu

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

+4 −0
Original line number Diff line number Diff line
@@ -608,6 +608,10 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	if ((offset + size) <= adev->mc.visible_vram_size)

		return 0;



	/* Can't move a pinned BO to visible VRAM */

	if (abo->pin_count > 0)

		return -EINVAL;



	/* hurrah the memory is not visible ! */

	amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM);

	lpfn =	adev->mc.visible_vram_size >> PAGE_SHIFT;

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

+6 −0
Original line number Diff line number Diff line
@@ -384,9 +384,15 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, 
			struct ttm_mem_reg *new_mem)

{

	struct amdgpu_device *adev;

	struct amdgpu_bo *abo;

	struct ttm_mem_reg *old_mem = &bo->mem;

	int r;



	/* Can't move a pinned BO */

	abo = container_of(bo, struct amdgpu_bo, tbo);

	if (WARN_ON_ONCE(abo->pin_count > 0))

		return -EINVAL;



	adev = amdgpu_get_adev(bo->bdev);

	if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {

		amdgpu_move_null(bo, new_mem);

drivers/gpu/drm/radeon/radeon_object.c

+4 −0
Original line number Diff line number Diff line
@@ -799,6 +799,10 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo) 
	if ((offset + size) <= rdev->mc.visible_vram_size)

		return 0;



	/* Can't move a pinned BO to visible VRAM */

	if (rbo->pin_count > 0)

		return -EINVAL;



	/* hurrah the memory is not visible ! */

	radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_VRAM);

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

drivers/gpu/drm/radeon/radeon_ttm.c

+6 −0
Original line number Diff line number Diff line
@@ -397,9 +397,15 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, 
			struct ttm_mem_reg *new_mem)

{

	struct radeon_device *rdev;

	struct radeon_bo *rbo;

	struct ttm_mem_reg *old_mem = &bo->mem;

	int r;



	/* Can't move a pinned BO */

	rbo = container_of(bo, struct radeon_bo, tbo);

	if (WARN_ON_ONCE(rbo->pin_count > 0))

		return -EINVAL;



	rdev = radeon_get_rdev(bo->bdev);

	if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {

		radeon_move_null(bo, new_mem);