Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next (c703bf9e) · Commits · 戴 / test

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -947,10 +947,6 @@ int amdgpu_vm_alloc_pts(struct amdgpu_device *adev,
		if (r)
		return r;

		r = amdgpu_vm_clear_bo(adev, vm, pt, cursor.level, ats);
		if (r)
		goto error_free_pt;

		if (vm->use_cpu_for_update) {
		r = amdgpu_bo_kmap(pt, NULL);
		if (r)
		@@ -963,6 +959,10 @@ int amdgpu_vm_alloc_pts(struct amdgpu_device *adev,
		pt->parent = amdgpu_bo_ref(cursor.parent->base.bo);

		amdgpu_vm_bo_base_init(&entry->base, vm, pt);

		r = amdgpu_vm_clear_bo(adev, vm, pt, cursor.level, ats);
		if (r)
		goto error_free_pt;
		}

		return 0;
		@@ -3033,13 +3033,14 @@ int amdgpu_vm_init(struct amdgpu_device adev, struct amdgpu_vm vm,
		if (r)
		goto error_unreserve;

		amdgpu_vm_bo_base_init(&vm->root.base, vm, root);

		r = amdgpu_vm_clear_bo(adev, vm, root,
		adev->vm_manager.root_level,
		vm->pte_support_ats);
		if (r)
		goto error_unreserve;

		amdgpu_vm_bo_base_init(&vm->root.base, vm, root);
		amdgpu_bo_unreserve(vm->root.base.bo);

		if (pasid) {

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -500,9 +500,7 @@ static bool psp_v3_1_smu_reload_quirk(struct psp_context *psp)
		struct amdgpu_device *adev = psp->adev;
		uint32_t reg;

		reg = smnMP1_FIRMWARE_FLAGS \| 0x03b00000;
		WREG32_SOC15(NBIO, 0, mmPCIE_INDEX2, reg);
		reg = RREG32_SOC15(NBIO, 0, mmPCIE_DATA2);
		reg = RREG32_PCIE(smnMP1_FIRMWARE_FLAGS \| 0x03b00000);
		return (reg & MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK) ? true : false;
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -461,7 +461,6 @@ static int soc15_asic_reset(struct amdgpu_device *adev)

		switch (adev->asic_type) {
		case CHIP_VEGA10:
		case CHIP_VEGA20:
		soc15_asic_get_baco_capability(adev, &baco_reset);
		break;
		default:

drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c

+1 −51

Original line number	Diff line number	Diff line
		@@ -323,57 +323,7 @@ static int init_mqd_hiq(struct mqd_manager mm, void *mqd,
		struct kfd_mem_obj *mqd_mem_obj, uint64_t gart_addr,
		struct queue_properties *q)
		{
		uint64_t addr;
		struct cik_mqd *m;
		int retval;

		retval = kfd_gtt_sa_allocate(mm->dev, sizeof(struct cik_mqd),
		mqd_mem_obj);

		if (retval != 0)
		return -ENOMEM;

		m = (struct cik_mqd ) (mqd_mem_obj)->cpu_ptr;
		addr = (*mqd_mem_obj)->gpu_addr;

		memset(m, 0, ALIGN(sizeof(struct cik_mqd), 256));

		m->header = 0xC0310800;
		m->compute_pipelinestat_enable = 1;
		m->compute_static_thread_mgmt_se0 = 0xFFFFFFFF;
		m->compute_static_thread_mgmt_se1 = 0xFFFFFFFF;
		m->compute_static_thread_mgmt_se2 = 0xFFFFFFFF;
		m->compute_static_thread_mgmt_se3 = 0xFFFFFFFF;

		m->cp_hqd_persistent_state = DEFAULT_CP_HQD_PERSISTENT_STATE \|
		PRELOAD_REQ;
		m->cp_hqd_quantum = QUANTUM_EN \| QUANTUM_SCALE_1MS \|
		QUANTUM_DURATION(10);

		m->cp_mqd_control = MQD_CONTROL_PRIV_STATE_EN;
		m->cp_mqd_base_addr_lo = lower_32_bits(addr);
		m->cp_mqd_base_addr_hi = upper_32_bits(addr);

		m->cp_hqd_ib_control = DEFAULT_MIN_IB_AVAIL_SIZE;

		/*
		* Pipe Priority
		* Identifies the pipe relative priority when this queue is connected
		* to the pipeline. The pipe priority is against the GFX pipe and HP3D.
		* In KFD we are using a fixed pipe priority set to CS_MEDIUM.
		* 0 = CS_LOW (typically below GFX)
		* 1 = CS_MEDIUM (typically between HP3D and GFX
		* 2 = CS_HIGH (typically above HP3D)
		*/
		m->cp_hqd_pipe_priority = 1;
		m->cp_hqd_queue_priority = 15;

		*mqd = m;
		if (gart_addr)
		*gart_addr = addr;
		retval = mm->update_mqd(mm, m, q);

		return retval;
		return init_mqd(mm, mqd, mqd_mem_obj, gart_addr, q);
		}

		static int update_mqd_hiq(struct mqd_manager mm, void mqd,

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+35 −8

Original line number	Diff line number	Diff line
		@@ -886,6 +886,7 @@ static void emulated_link_detect(struct dc_link *link)
		return;
		}

		/* dc_sink_create returns a new reference */
		link->local_sink = sink;

		edid_status = dm_helpers_read_local_edid(
		@@ -952,6 +953,8 @@ static int dm_resume(void *handle)
		if (aconnector->fake_enable && aconnector->dc_link->local_sink)
		aconnector->fake_enable = false;

		if (aconnector->dc_sink)
		dc_sink_release(aconnector->dc_sink);
		aconnector->dc_sink = NULL;
		amdgpu_dm_update_connector_after_detect(aconnector);
		mutex_unlock(&aconnector->hpd_lock);
		@@ -1061,6 +1064,8 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)


		sink = aconnector->dc_link->local_sink;
		if (sink)
		dc_sink_retain(sink);

		/*
		* Edid mgmt connector gets first update only in mode_valid hook and then
		@@ -1085,21 +1090,24 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
		* to it anymore after disconnect, so on next crtc to connector
		* reshuffle by UMD we will get into unwanted dc_sink release
		*/
		if (aconnector->dc_sink != aconnector->dc_em_sink)
		dc_sink_release(aconnector->dc_sink);
		}
		aconnector->dc_sink = sink;
		dc_sink_retain(aconnector->dc_sink);
		amdgpu_dm_update_freesync_caps(connector,
		aconnector->edid);
		} else {
		amdgpu_dm_update_freesync_caps(connector, NULL);
		if (!aconnector->dc_sink)
		if (!aconnector->dc_sink) {
		aconnector->dc_sink = aconnector->dc_em_sink;
		else if (aconnector->dc_sink != aconnector->dc_em_sink)
		dc_sink_retain(aconnector->dc_sink);
		}
		}

		mutex_unlock(&dev->mode_config.mutex);

		if (sink)
		dc_sink_release(sink);
		return;
		}

		@@ -1107,8 +1115,10 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
		* TODO: temporary guard to look for proper fix
		* if this sink is MST sink, we should not do anything
		*/
		if (sink && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
		if (sink && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
		dc_sink_release(sink);
		return;
		}

		if (aconnector->dc_sink == sink) {
		/*
		@@ -1117,6 +1127,8 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
		*/
		DRM_DEBUG_DRIVER("DCHPD: connector_id=%d: dc_sink didn't change.\n",
		aconnector->connector_id);
		if (sink)
		dc_sink_release(sink);
		return;
		}

		@@ -1138,6 +1150,7 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
		amdgpu_dm_update_freesync_caps(connector, NULL);

		aconnector->dc_sink = sink;
		dc_sink_retain(aconnector->dc_sink);
		if (sink->dc_edid.length == 0) {
		aconnector->edid = NULL;
		drm_dp_cec_unset_edid(&aconnector->dm_dp_aux.aux);
		@@ -1158,11 +1171,15 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
		amdgpu_dm_update_freesync_caps(connector, NULL);
		drm_connector_update_edid_property(connector, NULL);
		aconnector->num_modes = 0;
		dc_sink_release(aconnector->dc_sink);
		aconnector->dc_sink = NULL;
		aconnector->edid = NULL;
		}

		mutex_unlock(&dev->mode_config.mutex);

		if (sink)
		dc_sink_release(sink);
		}

		static void handle_hpd_irq(void *param)
		@@ -2977,6 +2994,7 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
		return stream;
		} else {
		sink = aconnector->dc_sink;
		dc_sink_retain(sink);
		}

		stream = dc_create_stream_for_sink(sink);
		@@ -3042,7 +3060,6 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
		update_stream_signal(stream, sink);

		finish:
		if (sink && sink->sink_signal == SIGNAL_TYPE_VIRTUAL && aconnector->base.force != DRM_FORCE_ON)
		dc_sink_release(sink);

		return stream;
		@@ -3301,6 +3318,14 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector)
		dm->backlight_dev = NULL;
		}
		#endif

		if (aconnector->dc_em_sink)
		dc_sink_release(aconnector->dc_em_sink);
		aconnector->dc_em_sink = NULL;
		if (aconnector->dc_sink)
		dc_sink_release(aconnector->dc_sink);
		aconnector->dc_sink = NULL;

		drm_dp_cec_unregister_connector(&aconnector->dm_dp_aux.aux);
		drm_connector_unregister(connector);
		drm_connector_cleanup(connector);
		@@ -3398,10 +3423,12 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector)
		(edid->extensions + 1) * EDID_LENGTH,
		&init_params);

		if (aconnector->base.force == DRM_FORCE_ON)
		if (aconnector->base.force == DRM_FORCE_ON) {
		aconnector->dc_sink = aconnector->dc_link->local_sink ?
		aconnector->dc_link->local_sink :
		aconnector->dc_em_sink;
		dc_sink_retain(aconnector->dc_sink);
		}
		}

		static void handle_edid_mgmt(struct amdgpu_dm_connector *aconnector)

Admin message