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

Commit 0f940fac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Pretty run of the mill for this stage in the cycle: msm, i915, amdgpu,
  qxl, virtio-gpu, sun4i fixes.

  i915:
   - Black screen fixes
   - Display w/a fix
   - HDA codec interop fix

  sun4i:
   - tbsa711 tablet regression fix

  qxl:
   - Regression fixes due to changes in TTM

  virtio:
   - Fix wait event condition

  msm:
   - DSI display fixes

  amdgpu:
   - fix hang on Carrizo
   - DP MST hang fixes
   - irq handling deadlock in DC.

  amdkfd:
   - Fix Kconfig issue
   - Clock retrieval fix
   - Sparse fixes"

* tag 'drm-fixes-for-v4.17-rc3' of git://people.freedesktop.org/~airlied/linux: (27 commits)
  drm/edid: Reset more of the display info
  drm/virtio: fix vq wait_event condition
  qxl: keep separate release_bo pointer
  qxl: fix qxl_release_{map,unmap}
  Revert "drm/sun4i: add lvds mode_valid function"
  drm/amd/display: Check dc_sink every time in MST hotplug
  drm/amd/display: Update MST edid property every time
  drm/amd/display: Don't read EDID in atomic_check
  drm/amd/display: Disallow enabling CRTC without primary plane with FB
  drm/amd/display: Fix deadlock when flushing irq
  drm/i915/fbdev: Enable late fbdev initial configuration
  drm/i915: Use ktime on wait_for
  drm/amdgpu: set COMPUTE_PGM_RSRC1 for SGPR/VGPR clearing shaders
  drm/amdkfd: fix build, select MMU_NOTIFIER
  drm/amdkfd: fix clock counter retrieval for node without GPU
  drm/amdkfd: Fix the error return code in kfd_ioctl_unmap_memory_from_gpu()
  drm/amdkfd: kfd_dev_is_large_bar() can be static
  drm/i915: Enable display WA#1183 from its correct spot
  drm/i915/audio: set minimum CD clock to twice the BCLK
  drm/msm: don't deref error pointer in the msm_fbdev_create error path
  ...
parents 0644f186 24d9092c

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

+5 −2
Original line number Diff line number Diff line
@@ -1459,10 +1459,11 @@ static const u32 sgpr_init_compute_shader[] = 
static const u32 vgpr_init_regs[] =

{

	mmCOMPUTE_STATIC_THREAD_MGMT_SE0, 0xffffffff,

	mmCOMPUTE_RESOURCE_LIMITS, 0,

	mmCOMPUTE_RESOURCE_LIMITS, 0x1000000, /* CU_GROUP_COUNT=1 */

	mmCOMPUTE_NUM_THREAD_X, 256*4,

	mmCOMPUTE_NUM_THREAD_Y, 1,

	mmCOMPUTE_NUM_THREAD_Z, 1,

	mmCOMPUTE_PGM_RSRC1, 0x100004f, /* VGPRS=15 (64 logical VGPRs), SGPRS=1 (16 SGPRs), BULKY=1 */

	mmCOMPUTE_PGM_RSRC2, 20,

	mmCOMPUTE_USER_DATA_0, 0xedcedc00,

	mmCOMPUTE_USER_DATA_1, 0xedcedc01,
@@ -1479,10 +1480,11 @@ static const u32 vgpr_init_regs[] = 
static const u32 sgpr1_init_regs[] =

{

	mmCOMPUTE_STATIC_THREAD_MGMT_SE0, 0x0f,

	mmCOMPUTE_RESOURCE_LIMITS, 0x1000000,

	mmCOMPUTE_RESOURCE_LIMITS, 0x1000000, /* CU_GROUP_COUNT=1 */

	mmCOMPUTE_NUM_THREAD_X, 256*5,

	mmCOMPUTE_NUM_THREAD_Y, 1,

	mmCOMPUTE_NUM_THREAD_Z, 1,

	mmCOMPUTE_PGM_RSRC1, 0x240, /* SGPRS=9 (80 GPRS) */

	mmCOMPUTE_PGM_RSRC2, 20,

	mmCOMPUTE_USER_DATA_0, 0xedcedc00,

	mmCOMPUTE_USER_DATA_1, 0xedcedc01,
@@ -1503,6 +1505,7 @@ static const u32 sgpr2_init_regs[] = 
	mmCOMPUTE_NUM_THREAD_X, 256*5,

	mmCOMPUTE_NUM_THREAD_Y, 1,

	mmCOMPUTE_NUM_THREAD_Z, 1,

	mmCOMPUTE_PGM_RSRC1, 0x240, /* SGPRS=9 (80 GPRS) */

	mmCOMPUTE_PGM_RSRC2, 20,

	mmCOMPUTE_USER_DATA_0, 0xedcedc00,

	mmCOMPUTE_USER_DATA_1, 0xedcedc01,

drivers/gpu/drm/amd/amdkfd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ config HSA_AMD 
	tristate "HSA kernel driver for AMD GPU devices"

	depends on DRM_AMDGPU && X86_64

	imply AMD_IOMMU_V2

	select MMU_NOTIFIER

	help

	  Enable this if you want to use HSA features on AMD GPU devices.

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

+9 −8
Original line number Diff line number Diff line
@@ -749,12 +749,13 @@ static int kfd_ioctl_get_clock_counters(struct file *filep, 
	struct timespec64 time;



	dev = kfd_device_by_id(args->gpu_id);

	if (dev == NULL)

		return -EINVAL;



	if (dev)

		/* Reading GPU clock counter from KGD */

		args->gpu_clock_counter =

			dev->kfd2kgd->get_gpu_clock_counter(dev->kgd);

	else

		/* Node without GPU resource */

		args->gpu_clock_counter = 0;



	/* No access to rdtsc. Using raw monotonic time */

	getrawmonotonic64(&time);
@@ -1147,7 +1148,7 @@ static int kfd_ioctl_acquire_vm(struct file *filep, struct kfd_process *p, 
	return ret;

}



bool kfd_dev_is_large_bar(struct kfd_dev *dev)

static bool kfd_dev_is_large_bar(struct kfd_dev *dev)

{

	struct kfd_local_mem_info mem_info;
@@ -1421,7 +1422,7 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep, 


	pdd = kfd_get_process_device_data(dev, p);

	if (!pdd) {

		err = PTR_ERR(pdd);

		err = -EINVAL;

		goto bind_process_to_device_failed;

	}

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

+9 −1
Original line number Diff line number Diff line
@@ -4557,6 +4557,7 @@ static int dm_update_crtcs_state(struct dc *dc, 
		struct amdgpu_dm_connector *aconnector = NULL;

		struct drm_connector_state *new_con_state = NULL;

		struct dm_connector_state *dm_conn_state = NULL;

		struct drm_plane_state *new_plane_state = NULL;



		new_stream = NULL;
@@ -4564,6 +4565,13 @@ static int dm_update_crtcs_state(struct dc *dc, 
		dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);

		acrtc = to_amdgpu_crtc(crtc);



		new_plane_state = drm_atomic_get_new_plane_state(state, new_crtc_state->crtc->primary);



		if (new_crtc_state->enable && new_plane_state && !new_plane_state->fb) {

			ret = -EINVAL;

			goto fail;

		}



		aconnector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc);



		/* TODO This hack should go away */
@@ -4760,7 +4768,7 @@ static int dm_update_planes_state(struct dc *dc, 
			if (!dm_old_crtc_state->stream)

				continue;



			DRM_DEBUG_DRIVER("Disabling DRM plane: %d on DRM crtc %d\n",

			DRM_DEBUG_ATOMIC("Disabling DRM plane: %d on DRM crtc %d\n",

					plane->base.id, old_plane_crtc->base.id);



			if (!dc_remove_plane_from_context(

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

+3 −2
Original line number Diff line number Diff line
@@ -329,14 +329,15 @@ void amdgpu_dm_irq_fini(struct amdgpu_device *adev) 
{

	int src;

	struct irq_list_head *lh;

	unsigned long irq_table_flags;

	DRM_DEBUG_KMS("DM_IRQ: releasing resources.\n");



	for (src = 0; src < DAL_IRQ_SOURCES_NUMBER; src++) {



		DM_IRQ_TABLE_LOCK(adev, irq_table_flags);

		/* The handler was removed from the table,

		 * it means it is safe to flush all the 'work'

		 * (because no code can schedule a new one). */

		lh = &adev->dm.irq_handler_list_low_tab[src];

		DM_IRQ_TABLE_UNLOCK(adev, irq_table_flags);

		flush_work(&lh->work);

	}

}