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

Commit 503505bf authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Fixes for 4.15.  Highlights:
- DC fixes for S3, gamma, audio, pageflipping, etc.
- fix a regression in radeon from kfd removal
- fix a ttm regression with swiotlb disabled
- misc other fixes

* 'drm-fixes-4.15' of git://people.freedesktop.org/~agd5f/linux: (36 commits)
  drm/radeon: remove init of CIK VMIDs 8-16 for amdkfd
  drm/ttm: fix populate_and_map() functions once more
  drm/amd/display: USB-C / thunderbolt dock specific workaround
  drm/amd/display: Switch to drm_atomic_helper_wait_for_flip_done
  drm/amd/display: fix gamma setting
  drm/amd/display: Do not put drm_atomic_state on resume
  drm/amd/display: Fix couple more inconsistent NULL checks in dc_resource
  drm/amd/display: Fix potential NULL and mem leak in create_links
  drm/amd/display: Fix hubp check in set_cursor_position
  drm/amd/display: Fix use before NULL check in validate_timing
  drm/amd/display: Bunch of smatch error and warning fixes in DC
  drm/amd/display: Fix amdgpu_dm bugs found by smatch
  drm/amd/display: try to find matching audio inst for enc inst first
  drm/amd/display: fix seq issue: turn on clock before programming afmt.
  drm/amd/display: fix memory leaks on error exit return
  drm/amd/display: check plane state before validating fbc
  drm/amd/display: Do DC mode-change check when adding CRTCs
  drm/amd/display: Revert noisy assert messages
  drm/amd/display: fix split viewport rounding error
  drm/amd/display: Check aux channel before MST resume
  ...
parents 062076e8 7fdf165a

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

+7 −11
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ int amdgpu_queue_mgr_fini(struct amdgpu_device *adev, 
			  struct amdgpu_queue_mgr *mgr);

int amdgpu_queue_mgr_map(struct amdgpu_device *adev,

			 struct amdgpu_queue_mgr *mgr,

			 int hw_ip, int instance, int ring,

			 u32 hw_ip, u32 instance, u32 ring,

			 struct amdgpu_ring **out_ring);



/*
@@ -1572,18 +1572,14 @@ struct amdgpu_device { 
	/* sdma */

	struct amdgpu_sdma		sdma;



	union {

		struct {

	/* uvd */

	struct amdgpu_uvd		uvd;



	/* vce */

	struct amdgpu_vce		vce;

		};



	/* vcn */

	struct amdgpu_vcn		vcn;

	};



	/* firmwares */

	struct amdgpu_firmware		firmware;

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

+4 −0
Original line number Diff line number Diff line
@@ -409,6 +409,10 @@ static bool amdgpu_cs_try_evict(struct amdgpu_cs_parser *p, 
		if (candidate->robj == validated)

			break;



		/* We can't move pinned BOs here */

		if (bo->pin_count)

			continue;



		other = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);



		/* Check if this BO is in one of the domains we need space for */

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

+0 −3
Original line number Diff line number Diff line
@@ -1837,9 +1837,6 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.hw = false;

	}



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)

		amdgpu_ucode_fini_bo(adev);



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

		if (!adev->ip_blocks[i].status.sw)

			continue;

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

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x686c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x687f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	/* Raven */

	{0x1002, 0x15dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x15dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU},



	{0, 0, 0}

};

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

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ static int amdgpu_pp_hw_fini(void *handle) 
		ret = adev->powerplay.ip_funcs->hw_fini(

					adev->powerplay.pp_handle);



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_SMU)

		amdgpu_ucode_fini_bo(adev);



	return ret;

}