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

Commit b9cc335f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "A few fixes all over the place:

  radeon is probably the biggest standout, it's a fix for screen
  corruption or hung black outputs so I thought it was worth pulling in.

  Otherwise some amdgpu power control fixes, some misc vmwgfx fixes, one
  etnaviv fix, one virtio-gpu fix, two DP MST fixes, and a single TTM
  fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix order of operation
  drm/vmwgfx: use vmw_cmd_dx_cid_check for query commands.
  drm/vmwgfx: Enable SVGA_3D_CMD_DX_SET_PREDICATION
  drm/amdgpu: disable vm interrupts with vm_fault_stop=2
  drm/amdgpu: print a message if ATPX dGPU power control is missing
  Revert "drm/amdgpu: disable runtime pm on PX laptops without dGPU power control"
  drm/radeon: fix vertical bars appear on monitor (v2)
  drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail
  drm/virtio: send vblank event after crtc updates
  drm/dp/mst: Restore primary hub guid on resume
  drm/dp/mst: Get validated port ref in drm_dp_update_payload_part1()
  drm/etnaviv: don't move linear memory window on 3D cores without MC2.0
parents 925d96a0 ea996978

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

+7 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ bool amdgpu_has_atpx(void) { 
	return amdgpu_atpx_priv.atpx_detected;

}



bool amdgpu_has_atpx_dgpu_power_cntl(void) {

	return amdgpu_atpx_priv.atpx.functions.power_cntl;

}



/**

 * amdgpu_atpx_call - call an ATPX method

 *
@@ -146,6 +142,13 @@ static void amdgpu_atpx_parse_functions(struct amdgpu_atpx_functions *f, u32 mas 
 */

static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx)

{

	/* make sure required functions are enabled */

	/* dGPU power control is required */

	if (atpx->functions.power_cntl == false) {

		printk("ATPX dGPU power cntl not present, forcing\n");

		atpx->functions.power_cntl = true;

	}



	if (atpx->functions.px_params) {

		union acpi_object *info;

		struct atpx_px_params output;

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

+1 −7
Original line number Diff line number Diff line
@@ -62,12 +62,6 @@ static const char *amdgpu_asic_name[] = { 
	"LAST",

};



#if defined(CONFIG_VGA_SWITCHEROO)

bool amdgpu_has_atpx_dgpu_power_cntl(void);

#else

static inline bool amdgpu_has_atpx_dgpu_power_cntl(void) { return false; }

#endif



bool amdgpu_device_is_px(struct drm_device *dev)

{

	struct amdgpu_device *adev = dev->dev_private;
@@ -1485,7 +1479,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 


	if (amdgpu_runtime_pm == 1)

		runtime = true;

	if (amdgpu_device_is_px(ddev) && amdgpu_has_atpx_dgpu_power_cntl())

	if (amdgpu_device_is_px(ddev))

		runtime = true;

	vga_switcheroo_register_client(adev->pdev, &amdgpu_switcheroo_ops, runtime);

	if (runtime)

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

+4 −1
Original line number Diff line number Diff line
@@ -910,7 +910,10 @@ static int gmc_v7_0_late_init(void *handle) 
{

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



	if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)

		return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0);

	else

		return 0;

}



static int gmc_v7_0_sw_init(void *handle)

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

+4 −1
Original line number Diff line number Diff line
@@ -870,7 +870,10 @@ static int gmc_v8_0_late_init(void *handle) 
{

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



	if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)

		return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0);

	else

		return 0;

}



#define mmMC_SEQ_MISC0_FIJI 0xA71

drivers/gpu/drm/drm_dp_mst_topology.c

+20 −0
Original line number Diff line number Diff line
@@ -1796,6 +1796,11 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) 
		req_payload.start_slot = cur_slots;

		if (mgr->proposed_vcpis[i]) {

			port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);

			port = drm_dp_get_validated_port_ref(mgr, port);

			if (!port) {

				mutex_unlock(&mgr->payload_lock);

				return -EINVAL;

			}

			req_payload.num_slots = mgr->proposed_vcpis[i]->num_slots;

			req_payload.vcpi = mgr->proposed_vcpis[i]->vcpi;

		} else {
@@ -1823,6 +1828,9 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) 
			mgr->payloads[i].payload_state = req_payload.payload_state;

		}

		cur_slots += req_payload.num_slots;



		if (port)

			drm_dp_put_port(port);

	}



	for (i = 0; i < mgr->max_payloads; i++) {
@@ -2128,6 +2136,8 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr) 


	if (mgr->mst_primary) {

		int sret;

		u8 guid[16];



		sret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, mgr->dpcd, DP_RECEIVER_CAP_SIZE);

		if (sret != DP_RECEIVER_CAP_SIZE) {

			DRM_DEBUG_KMS("dpcd read failed - undocked during suspend?\n");
@@ -2142,6 +2152,16 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr) 
			ret = -1;

			goto out_unlock;

		}



		/* Some hubs forget their guids after they resume */

		sret = drm_dp_dpcd_read(mgr->aux, DP_GUID, guid, 16);

		if (sret != 16) {

			DRM_DEBUG_KMS("dpcd read failed - undocked during suspend?\n");

			ret = -1;

			goto out_unlock;

		}

		drm_dp_check_mstb_guid(mgr->mst_primary, guid);



		ret = 0;

	} else

		ret = -1;