Commit b2cb931d authored Dec 13, 2019 by Linus Torvalds

Merge tag 'drm-fixes-2019-12-13' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Usual round of rc2 fixes.

  i915 and amdgpu leading the charge, but a few others in here,
  including some nouveau fixes, all seems pretty for rc2, but hey it's a
  Fri 13th pull so I'm sure it'll cause untold bad fortune.

  dma-buf:
   - memory leak fix
   - expand MAINTAINERS scope

  core:
   - fix mode matching for drivers not using picture_aspect_ratio

  nouveau:
   - panel scaling fix
   - MST BPC fix
   - atomic fixes

  i915:
   - GPU hang on idle transition
   - GLK+ FBC corruption fix
   - non-priv OA access on Tigerlake
   - HDCP state fix
   - CI found race fixes

  amdgpu:
   - renoir DC fixes
   - GFX8 fence flush alignment with userspace
   - Arcturus power profile fix
   - DC aux + i2c over aux fixes
   - GPUVM invalidation semaphore fixes
   - gfx10 golden registers update

  mgag200:
   - expand startadd fix

  panfrost:
   - devfreq fix
   - memory fixes

  mcde:
   - DSI pointer deref fix"

* tag 'drm-fixes-2019-12-13' of git://anongit.freedesktop.org/drm/drm: (51 commits)
  drm/amdgpu: add invalidate semaphore limit for SRIOV in gmc10
  drm/amdgpu: add invalidate semaphore limit for SRIOV and picasso in gmc9
  drm/amdgpu: avoid using invalidate semaphore for picasso
  Revert "drm/amdgpu: dont schedule jobs while in reset"
  drm/amdgpu: fix license on Kconfig and Makefiles
  drm/amdgpu/gfx10: update gfx golden settings for navi14
  drm/amdgpu/gfx10: update gfx golden settings
  drm/amdgpu/gfx10: update gfx golden settings for navi14
  drm/amdgpu/gfx10: update gfx golden settings
  drm/i915: Serialise with remote retirement
  drm/amd/display: include linux/slab.h where needed
  drm/amd/display: fix undefined struct member reference
  drm/nouveau/kms/nv50-: fix panel scaling
  drm/nouveau/kms/nv50-: Limit MST BPC to 8
  drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom
  drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN
  drm/nouveau: Fix drm-core using atomic code-paths on pre-nv50 hardware
  drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit
  drm/i915/gt: Detect if we miss WaIdleLiteRestore
  drm/i915/hdcp: Nuke intel_hdcp_transcoder_config()
  ...

parents f1fcd778 d16f0f61

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -4970,6 +4970,7 @@ F: include/linux/dma-buf*
		F: include/linux/reservation.h
		F: include/linux/*fence.h
		F: Documentation/driver-api/dma-buf.rst
		K: dma_(buf\|fence\|resv)
		T: git git://anongit.freedesktop.org/drm/drm-misc

		DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

drivers/dma-buf/sync_file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ static struct sync_file sync_file_merge(const char name, struct sync_file *a,
		a_fences = get_fences(a, &a_num_fences);
		b_fences = get_fences(b, &b_num_fences);
		if (a_num_fences > INT_MAX - b_num_fences)
		return NULL;
		goto err;

		num_fences = a_num_fences + b_num_fences;

drivers/gpu/drm/amd/acp/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		# SPDX-License-Identifier: MIT
		menu "ACP (Audio CoProcessor) Configuration"

		config DRM_AMD_ACP

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		# SPDX-License-Identifier: MIT
		config DRM_AMDGPU_SI
		bool "Enable amdgpu support for SI parts"
		depends on DRM_AMDGPU

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -604,11 +604,8 @@ void amdgpu_ctx_mgr_entity_fini(struct amdgpu_ctx_mgr *mgr)
		continue;
		}

		for (i = 0; i < num_entities; i++) {
		mutex_lock(&ctx->adev->lock_reset);
		for (i = 0; i < num_entities; i++)
		drm_sched_entity_fini(&ctx->entities[0][i].entity);
		mutex_unlock(&ctx->adev->lock_reset);
		}
		}
		}

Admin message