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

Merge tag 'drm-fixes-2024-10-04' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Weekly fixes, xe and amdgpu lead the way, with panthor, and few core
  components getting various fixes. Nothing seems too out of the
  ordinary.

  atomic:
   - Use correct type when reading damage rectangles

  display:
   - Fix kernel docs

  dp-mst:
   - Fix DSC decompression detection

  hdmi:
   - Fix infoframe size

  sched:
   - Update maintainers
   - Fix race condition whne queueing up jobs
   - Fix locking in drm_sched_entity_modify_sched()
   - Fix pointer deref if entity queue changes

  sysfb:
   - Disable sysfb if framebuffer parent device is unknown

  amdgpu:
   - DML2 fix
   - DSC fix
   - Dispclk fix
   - eDP HDR fix
   - IPS fix
   - TBT fix

  i915:
   - One fix for bitwise and logical "and" mixup in PM code

  xe:
   - Restore pci state on resume
   - Fix locking on submission, queue and vm
   - Fix UAF on queue destruction
   - Fix resource release on freq init error path
   - Use rw_semaphore to reduce contention on ASID->VM lookup
   - Fix steering for media on Xe2_HPM
   - Tuning updates to Xe2
   - Resume TDR after GT reset to prevent jobs running forever
   - Move id allocation to avoid userspace using a guessed number to
     trigger UAF
   - Fix OA stream close preventing pbatch buffers to complete
   - Fix NPD when migrating memory on LNL
   - Fix memory leak when aborting binds

  panthor:
   - Fix locking
   - Set FOP_UNSIGNED_OFFSET in fops instance
   - Acquire lock in panthor_vm_prepare_map_op_ctx()
   - Avoid uninitialized variable in tick_ctx_cleanup()
   - Do not block scheduler queue if work is pending
   - Do not add write fences to the shared BOs

  vbox:
   - Fix VLA handling"

* tag 'drm-fixes-2024-10-04' of https://gitlab.freedesktop.org/drm/kernel: (41 commits)
  drm/xe: Fix memory leak when aborting binds
  drm/xe: Prevent null pointer access in xe_migrate_copy
  drm/xe/oa: Don't reset OAC_CONTEXT_ENABLE on OA stream close
  drm/xe/queue: move xa_alloc to prevent UAF
  drm/xe/vm: move xa_alloc to prevent UAF
  drm/xe: Clean up VM / exec queue file lock usage.
  drm/xe: Resume TDR after GT reset
  drm/xe/xe2: Add performance tuning for L3 cache flushing
  drm/xe/xe2: Extend performance tuning to media GT
  drm/xe/mcr: Use Xe2_LPM steering tables for Xe2_HPM
  drm/xe: Use helper for ASID -> VM in GPU faults and access counters
  drm/xe: Convert to USM lock to rwsem
  drm/xe: use devm_add_action_or_reset() helper
  drm/xe: fix UAF around queue destruction
  drm/xe/guc_submit: add missing locking in wedged_fini
  drm/xe: Restore pci state upon resume
  drm/amd/display: Fix system hang while resume with TBT monitor
  drm/amd/display: Enable idle workqueue for more IPS modes
  drm/amd/display: Add HDR workaround for specific eDP
  drm/amd/display: avoid set dispclk to 0
  ...
parents 360c1f1f 5b272bf7

Documentation/gpu/drm-kms-helpers.rst

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ Bridge Operations 
Bridge Connector Helper

-----------------------



.. kernel-doc:: drivers/gpu/drm/drm_bridge_connector.c

.. kernel-doc:: drivers/gpu/drm/display/drm_bridge_connector.c

   :doc: overview
@@ -204,7 +204,7 @@ MIPI-DSI bridge operation 
Bridge Connector Helper Reference

---------------------------------



.. kernel-doc:: drivers/gpu/drm/drm_bridge_connector.c

.. kernel-doc:: drivers/gpu/drm/display/drm_bridge_connector.c

   :export:



Panel-Bridge Helper Reference

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7832,6 +7832,8 @@ F: drivers/gpu/drm/xlnx/ 
DRM GPU SCHEDULER

M:	Luben Tuikov <ltuikov89@gmail.com>

M:	Matthew Brost <matthew.brost@intel.com>

M:	Danilo Krummrich <dakr@kernel.org>

M:	Philipp Stanner <pstanner@redhat.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git

drivers/firmware/sysfb.c

+3 −1
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ static bool sysfb_unregister(void) 
void sysfb_disable(struct device *dev)

{

	struct screen_info *si = &screen_info;

	struct device *parent;



	mutex_lock(&disable_lock);

	if (!dev || dev == sysfb_parent_dev(si)) {

	parent = sysfb_parent_dev(si);

	if (!dev || !parent || dev == parent) {

		sysfb_unregister();

		disabled = true;

	}

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

+18 −2
Original line number Diff line number Diff line
@@ -770,6 +770,12 @@ static void dmub_hpd_callback(struct amdgpu_device *adev, 
		return;

	}



	/* Skip DMUB HPD IRQ in suspend/resume. We will probe them later. */

	if (notify->type == DMUB_NOTIFICATION_HPD && adev->in_suspend) {

		DRM_INFO("Skip DMUB HPD IRQ callback in suspend/resume\n");

		return;

	}



	link_index = notify->link_index;

	link = adev->dm.dc->links[link_index];

	dev = adev->dm.ddev;
@@ -2026,7 +2032,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
			DRM_ERROR("amdgpu: failed to initialize vblank_workqueue.\n");

	}



	if (adev->dm.dc->caps.ips_support && adev->dm.dc->config.disable_ips == DMUB_IPS_ENABLE)

	if (adev->dm.dc->caps.ips_support &&

	    adev->dm.dc->config.disable_ips != DMUB_IPS_DISABLE_ALL)

		adev->dm.idle_workqueue = idle_create_workqueue(adev);



	if (adev->dm.dc->caps.max_links > 0 && adev->family >= AMDGPU_FAMILY_RV) {
@@ -6735,12 +6742,21 @@ create_stream_for_sink(struct drm_connector *connector, 
	if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT ||

	    stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST ||

	    stream->signal == SIGNAL_TYPE_EDP) {

		const struct dc_edid_caps *edid_caps;

		unsigned int disable_colorimetry = 0;



		if (aconnector->dc_sink) {

			edid_caps = &aconnector->dc_sink->edid_caps;

			disable_colorimetry = edid_caps->panel_patch.disable_colorimetry;

		}



		//

		// should decide stream support vsc sdp colorimetry capability

		// before building vsc info packet

		//

		stream->use_vsc_sdp_for_colorimetry = stream->link->dpcd_caps.dpcd_rev.raw >= 0x14 &&

						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED;

						      stream->link->dpcd_caps.dprx_feature.bits.VSC_SDP_COLORIMETRY_SUPPORTED &&

						      !disable_colorimetry;



		if (stream->out_transfer_func.tf == TRANSFER_FUNCTION_GAMMA22)

			tf = TRANSFER_FUNC_GAMMA_22;

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

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ static void apply_edid_quirks(struct edid *edid, struct dc_edid_caps *edid_caps) 
		DRM_DEBUG_DRIVER("Clearing DPCD 0x317 on monitor with panel id %X\n", panel_id);

		edid_caps->panel_patch.remove_sink_ext_caps = true;

		break;

	case drm_edid_encode_panel_id('S', 'D', 'C', 0x4154):

		DRM_DEBUG_DRIVER("Disabling VSC on monitor with panel id %X\n", panel_id);

		edid_caps->panel_patch.disable_colorimetry = true;

		break;

	default:

		return;

	}