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

Commit 01d07351 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:
 "I really need to get back to sending these on my Friday, instead of my
  Monday morning, but nothing too amazing in here: a few amdkfd fixes, a
  few radeon fixes, i915 fixes, one tegra fix and one core fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
  drm/tegra: Don't use vblank_disable_immediate on incapable driver.
  drm/radeon: stop trying to suspend UVD sessions
  drm/radeon: more strictly validate the UVD codec
  drm/radeon: make UVD handle checking more strict
  drm/radeon: make VCE handle check more strict
  drm/radeon: fix userptr lockup
  drm/radeon: fix userptr BO unpin bug v3
  drm/amdkfd: Initialize sdma vm when creating sdma queue
  drm/amdkfd: Don't report local memory size
  drm/amdkfd: allow unregister process with queues
  drm/i915: Drop PIPE-A quirk for 945GSE HP Mini
  drm/i915: Sink rate read should be saved in deca-kHz
  drm/i915/dp: there is no audio on port A
  drm/i915: Add missing MacBook Pro models with dual channel LVDS
  drm/i915: Assume dual channel LVDS if pixel clock necessitates it
  drm/radeon: don't setup audio on asics that don't support it
  drm/radeon: disable semaphores for UVD V1 (v2)
parents 41f2a93c 332545b3

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

+5 −2
Original line number Diff line number Diff line
@@ -430,9 +430,10 @@ static int unregister_process_nocpsch(struct device_queue_manager *dqm, 


	BUG_ON(!dqm || !qpd);



	BUG_ON(!list_empty(&qpd->queues_list));

	pr_debug("In func %s\n", __func__);



	pr_debug("kfd: In func %s\n", __func__);

	pr_debug("qpd->queues_list is %s\n",

			list_empty(&qpd->queues_list) ? "empty" : "not empty");



	retval = 0;

	mutex_lock(&dqm->lock);
@@ -882,6 +883,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q, 
		return -ENOMEM;

	}



	init_sdma_vm(dqm, q, qpd);



	retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj,

				&q->gart_mqd_addr, &q->properties);

	if (retval != 0)

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

+2 −2
Original line number Diff line number Diff line
@@ -728,9 +728,9 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, 
		sysfs_show_32bit_prop(buffer, "max_engine_clk_fcompute",

			dev->gpu->kfd2kgd->get_max_engine_clock_in_mhz(

					dev->gpu->kgd));



		sysfs_show_64bit_prop(buffer, "local_mem_size",

			dev->gpu->kfd2kgd->get_vmem_size(

					dev->gpu->kgd));

				(unsigned long long int) 0);



		sysfs_show_32bit_prop(buffer, "fw_version",

			dev->gpu->kfd2kgd->get_fw_version(

drivers/gpu/drm/drm_irq.c

+4 −5
Original line number Diff line number Diff line
@@ -131,12 +131,11 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc) 


	/* Reinitialize corresponding vblank timestamp if high-precision query

	 * available. Skip this step if query unsupported or failed. Will

	 * reinitialize delayed at next vblank interrupt in that case.

	 * reinitialize delayed at next vblank interrupt in that case and

	 * assign 0 for now, to mark the vblanktimestamp as invalid.

	 */

	if (rc) {

	tslot = atomic_read(&vblank->count) + diff;

		vblanktimestamp(dev, crtc, tslot) = t_vblank;

	}

	vblanktimestamp(dev, crtc, tslot) = rc ? t_vblank : (struct timeval) {0, 0};



	smp_mb__before_atomic();

	atomic_add(diff, &vblank->count);

drivers/gpu/drm/i915/intel_display.c

+0 −3
Original line number Diff line number Diff line
@@ -13635,9 +13635,6 @@ static const struct intel_dmi_quirk intel_dmi_quirks[] = { 
};



static struct intel_quirk intel_quirks[] = {

	/* HP Mini needs pipe A force quirk (LP: #322104) */

	{ 0x27ae, 0x103c, 0x361a, quirk_pipea_force },



	/* Toshiba Protege R-205, S-209 needs pipe A force quirk */

	{ 0x2592, 0x1179, 0x0001, quirk_pipea_force },

drivers/gpu/drm/i915/intel_dp.c

+5 −4
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, 


	pipe_config->has_dp_encoder = true;

	pipe_config->has_drrs = false;

	pipe_config->has_audio = intel_dp->has_audio;

	pipe_config->has_audio = intel_dp->has_audio && port != PORT_A;



	if (is_edp(intel_dp) && intel_connector->panel.fixed_mode) {

		intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
@@ -2211,8 +2211,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder, 
	int dotclock;



	tmp = I915_READ(intel_dp->output_reg);

	if (tmp & DP_AUDIO_OUTPUT_ENABLE)

		pipe_config->has_audio = true;



	pipe_config->has_audio = tmp & DP_AUDIO_OUTPUT_ENABLE && port != PORT_A;



	if ((port == PORT_A) || !HAS_PCH_CPT(dev)) {

		if (tmp & DP_SYNC_HS_HIGH)
@@ -3812,7 +3812,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) 
			if (val == 0)

				break;



			intel_dp->sink_rates[i] = val * 200;

			/* Value read is in kHz while drm clock is saved in deca-kHz */

			intel_dp->sink_rates[i] = (val * 200) / 10;

		}

		intel_dp->num_sink_rates = i;

	}