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

Commit 1e8ad3d8 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Some ttm/amd fixes.

* 'drm-next-4.11' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/powerplay: fix PSI feature on Polars12.
  drm/amdgpu: refuse to reserve io mem for split VRAM buffers
  drm/ttm: fix use-after-free races in vm fault handling
  drm/amd/amdgpu: post card if there is real hw resetting performed
parents 894ebc41 187368a5

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+4 −1
Original line number Diff line number Diff line
@@ -1482,6 +1482,9 @@ struct amdgpu_device { 
	spinlock_t			gtt_list_lock;

	struct list_head                gtt_list;



	/* record hw reset is performed */

	bool has_hw_reset;



};



static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev)
@@ -1700,7 +1703,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
int amdgpu_gpu_reset(struct amdgpu_device *adev);

bool amdgpu_need_backup(struct amdgpu_device *adev);

void amdgpu_pci_config_reset(struct amdgpu_device *adev);

bool amdgpu_card_posted(struct amdgpu_device *adev);

bool amdgpu_need_post(struct amdgpu_device *adev);

void amdgpu_update_display_priority(struct amdgpu_device *adev);



int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data);

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev) 
	resource_size_t size = 256 * 1024; /* ??? */



	if (!(adev->flags & AMD_IS_APU))

		if (!amdgpu_card_posted(adev))

		if (amdgpu_need_post(adev))

			return false;



	adev->bios = NULL;

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

+13 −9
Original line number Diff line number Diff line
@@ -619,26 +619,30 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) 
 * GPU helpers function.

 */

/**

 * amdgpu_card_posted - check if the hw has already been initialized

 * amdgpu_need_post - check if the hw need post or not

 *

 * @adev: amdgpu_device pointer

 *

 * Check if the asic has been initialized (all asics).

 * Used at driver startup.

 * Returns true if initialized or false if not.

 * Check if the asic has been initialized (all asics) at driver startup

 * or post is needed if  hw reset is performed.

 * Returns true if need or false if not.

 */

bool amdgpu_card_posted(struct amdgpu_device *adev)

bool amdgpu_need_post(struct amdgpu_device *adev)

{

	uint32_t reg;



	if (adev->has_hw_reset) {

		adev->has_hw_reset = false;

		return true;

	}

	/* then check MEM_SIZE, in case the crtcs are off */

	reg = RREG32(mmCONFIG_MEMSIZE);



	if (reg)

		return true;



		return false;



	return true;



}



static bool amdgpu_vpost_needed(struct amdgpu_device *adev)
@@ -665,7 +669,7 @@ static bool amdgpu_vpost_needed(struct amdgpu_device *adev) 
				return true;

		}

	}

	return !amdgpu_card_posted(adev);

	return amdgpu_need_post(adev);

}



/**
@@ -2071,7 +2075,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) 
	amdgpu_atombios_scratch_regs_restore(adev);



	/* post card */

	if (!amdgpu_card_posted(adev) || !resume) {

	if (amdgpu_need_post(adev)) {

		r = amdgpu_atom_asic_init(adev->mode_info.atom_context);

		if (r)

			DRM_ERROR("amdgpu asic init failed\n");

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

+3 −0
Original line number Diff line number Diff line
@@ -529,6 +529,9 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_ 
	case TTM_PL_TT:

		break;

	case TTM_PL_VRAM:

		if (mem->start == AMDGPU_BO_INVALID_OFFSET)

			return -EINVAL;



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

		/* check if it's visible */

		if ((mem->bus.offset + mem->bus.size) > adev->mc.visible_vram_size)

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

+1 −0
Original line number Diff line number Diff line
@@ -1176,6 +1176,7 @@ static int cik_gpu_pci_config_reset(struct amdgpu_device *adev) 
		if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) {

			/* enable BM */

			pci_set_master(adev->pdev);

			adev->has_hw_reset = true;

			r = 0;

			break;

		}