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

Commit 00da9008 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.7-rc3' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "This weeks instalment of fixes:

  amdgpu:
     Lots of memory leak and firmware leak fixes

  nouveau:
     Collection of display fixes, KASAN fixes

  vc4:
     vblank/pageflipping fixes

  fsl-dcu:
     Regmap cache fix

  omap:
     Unused variable warning fix.

  Nothing too surprising so far"

* tag 'drm-fixes-for-v4.7-rc3' of git://people.freedesktop.org/~airlied/linux: (46 commits)
  drm/amdgpu: fix warning with powerplay disabled.
  drm/amd/powerplay: delete useless code as pptable changed in vbios.
  drm/amd/powerplay: fix bug visit array out of bounds
  drm/amdgpu: fix smu ucode memleak (v2)
  drm/amdgpu: add release firmware for cgs
  drm/amdgpu: fix tonga smu_fini mem leak
  drm/amdgpu: fix fiji smu fini mem leak
  drm/amdgpu: fix cik sdma ucode memleak
  drm/amdgpu: fix sdma24 ucode mem leak
  drm/amdgpu: fix sdma3 ucode mem leak
  drm/amdgpu: fix uvd fini mem leak
  drm/amdgpu: fix gfx 7 ucode mem leak
  drm/amdgpu: fix gfx8 ucode mem leak
  drm/amdgpu: fix missing free wb for cond_exec
  drm/amdgpu: fix memleak in pptable_init
  drm/amdgpu: fix mem leak in atombios
  drm/amdgpu: fix mem leak in pplib/hwmgr
  drm/amdgpu: fix mem leak in smumgr
  drm/amdgpu: add pipeline sync while vmid switch in same ctx
  drm/amdgpu: vBIOS post only call when mem_size zero
  ...
parents f758bbd4 7ff6977b

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

+3 −1
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ struct amdgpu_ring { 
	unsigned		cond_exe_offs;

	u64				cond_exe_gpu_addr;

	volatile u32	*cond_exe_cpu_addr;

	int                     vmid;

};



/*
@@ -936,7 +937,8 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, 
		    unsigned vm_id, uint64_t pd_addr,

		    uint32_t gds_base, uint32_t gds_size,

		    uint32_t gws_base, uint32_t gws_size,

		    uint32_t oa_base, uint32_t oa_size);

		    uint32_t oa_base, uint32_t oa_size,

		    bool vmid_switch);

void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vm_id);

uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr);

int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,

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

+12 −0
Original line number Diff line number Diff line
@@ -696,6 +696,17 @@ static uint32_t fw_type_convert(struct cgs_device *cgs_device, uint32_t fw_type) 
	return result;

}



static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucode_id type)

{

	CGS_FUNC_ADEV;

	if ((CGS_UCODE_ID_SMU == type) || (CGS_UCODE_ID_SMU_SK == type)) {

		release_firmware(adev->pm.fw);

		return 0;

	}

	/* cannot release other firmware because they are not created by cgs */

	return -EINVAL;

}



static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,

					enum cgs_ucode_id type,

					struct cgs_firmware_info *info)
@@ -1125,6 +1136,7 @@ static const struct cgs_ops amdgpu_cgs_ops = { 
	amdgpu_cgs_pm_query_clock_limits,

	amdgpu_cgs_set_camera_voltages,

	amdgpu_cgs_get_firmware_info,

	amdgpu_cgs_rel_firmware,

	amdgpu_cgs_set_powergating_state,

	amdgpu_cgs_set_clockgating_state,

	amdgpu_cgs_get_active_displays_info,

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

+9 −3
Original line number Diff line number Diff line
@@ -827,8 +827,10 @@ static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg) 
 */

static void amdgpu_atombios_fini(struct amdgpu_device *adev)

{

	if (adev->mode_info.atom_context)

	if (adev->mode_info.atom_context) {

		kfree(adev->mode_info.atom_context->scratch);

		kfree(adev->mode_info.atom_context->iio);

	}

	kfree(adev->mode_info.atom_context);

	adev->mode_info.atom_context = NULL;

	kfree(adev->mode_info.atom_card_info);
@@ -1325,6 +1327,11 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
		adev->ip_block_status[i].valid = false;

	}



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (adev->ip_blocks[i].funcs->late_fini)

			adev->ip_blocks[i].funcs->late_fini((void *)adev);

	}



	return 0;

}
@@ -1513,8 +1520,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
		amdgpu_atombios_has_gpu_virtualization_table(adev);



	/* Post card if necessary */

	if (!amdgpu_card_posted(adev) ||

	    adev->virtualization.supports_sr_iov) {

	if (!amdgpu_card_posted(adev)) {

		if (!adev->bios) {

			dev_err(adev->dev, "Card not posted and no BIOS - ignoring\n");

			return -EINVAL;

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

+7 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	bool skip_preamble, need_ctx_switch;

	unsigned patch_offset = ~0;

	struct amdgpu_vm *vm;

	int vmid = 0, old_vmid = ring->vmid;

	struct fence *hwf;

	uint64_t ctx;
@@ -135,9 +136,11 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	if (job) {

		vm = job->vm;

		ctx = job->ctx;

		vmid = job->vm_id;

	} else {

		vm = NULL;

		ctx = 0;

		vmid = 0;

	}



	if (!ring->ready) {
@@ -163,7 +166,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
		r = amdgpu_vm_flush(ring, job->vm_id, job->vm_pd_addr,

				    job->gds_base, job->gds_size,

				    job->gws_base, job->gws_size,

				    job->oa_base, job->oa_size);

				    job->oa_base, job->oa_size,

				    (ring->current_ctx == ctx) && (old_vmid != vmid));

		if (r) {

			amdgpu_ring_undo(ring);

			return r;
@@ -180,7 +184,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	need_ctx_switch = ring->current_ctx != ctx;

	for (i = 0; i < num_ibs; ++i) {

		ib = &ibs[i];



		/* drop preamble IBs if we don't have a context switch */

		if ((ib->flags & AMDGPU_IB_FLAG_PREAMBLE) && skip_preamble)

			continue;
@@ -188,6 +191,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
		amdgpu_ring_emit_ib(ring, ib, job ? job->vm_id : 0,

				    need_ctx_switch);

		need_ctx_switch = false;

		ring->vmid = vmid;

	}



	if (ring->funcs->emit_hdp_invalidate)
@@ -198,6 +202,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
		dev_err(adev->dev, "failed to emit fence (%d)\n", r);

		if (job && job->vm_id)

			amdgpu_vm_reset_id(adev, job->vm_id);

		ring->vmid = old_vmid;

		amdgpu_ring_undo(ring);

		return r;

	}

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

+17 −7
Original line number Diff line number Diff line
@@ -183,13 +183,6 @@ static int amdgpu_pp_sw_fini(void *handle) 
	if (ret)

		return ret;



#ifdef CONFIG_DRM_AMD_POWERPLAY

	if (adev->pp_enabled) {

		amdgpu_pm_sysfs_fini(adev);

		amd_powerplay_fini(adev->powerplay.pp_handle);

	}

#endif



	return ret;

}
@@ -223,6 +216,22 @@ static int amdgpu_pp_hw_fini(void *handle) 
	return ret;

}



static void amdgpu_pp_late_fini(void *handle)

{

#ifdef CONFIG_DRM_AMD_POWERPLAY

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (adev->pp_enabled) {

		amdgpu_pm_sysfs_fini(adev);

		amd_powerplay_fini(adev->powerplay.pp_handle);

	}



	if (adev->powerplay.ip_funcs->late_fini)

		adev->powerplay.ip_funcs->late_fini(

			  adev->powerplay.pp_handle);

#endif

}



static int amdgpu_pp_suspend(void *handle)

{

	int ret = 0;
@@ -311,6 +320,7 @@ const struct amd_ip_funcs amdgpu_pp_ip_funcs = { 
	.sw_fini = amdgpu_pp_sw_fini,

	.hw_init = amdgpu_pp_hw_init,

	.hw_fini = amdgpu_pp_hw_fini,

	.late_fini = amdgpu_pp_late_fini,

	.suspend = amdgpu_pp_suspend,

	.resume = amdgpu_pp_resume,

	.is_idle = amdgpu_pp_is_idle,