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

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

Pull drm fixes from Dave Airlie:
 "Regular fixes (two weeks for i915), scattered across drivers, amdgpu
  and i915 being the main ones, with nouveau having a couple of fixes.
  One patch got applied for udl, but reverted soon after as the
  maintainer has missed some crucial prior discussion.

  Seems quiet and normal enough for this stage.

  MAINTAINERS
   - update email address

  core:
   - fix polling in certain configurations

  buddy:
   - fix kunit test warning

  panel:
   - boe-tv101wum-nl6: timing tuning fixes

  i915:
   - Fix to extract HDCP information from primary connector
   - Check for NULL mmu_interval_notifier before removing
   - Fix for #10184: Kernel crash on UHD Graphics 730 (Cc stable)
   - Fix for #10284: Boot delay regresion with PSR
   - Fix DP connector DSC HW state readout
   - Selftest fix to convert msecs to jiffies

  xe:
   - error path fix

  amdgpu:
   - SMU14 fix
   - Fix possible NULL pointer
   - VRR fix
   - pwm fix

  nouveau:
   - fix deadlock in new ioctls fail path
   - fix missing locking around object rbtree

  udl:
   - apply and revert format change"

* tag 'drm-fixes-2024-03-08' of https://gitlab.freedesktop.org/drm/kernel: (21 commits)
  nouveau: lock the client object tree.
  drm/tests/buddy: fix print format
  drm/xe: Return immediately on tile_init failure
  drm/amdgpu/pm: Fix the error of pwm1_enable setting
  drm/amd/display: handle range offsets in VRR ranges
  drm/amd/display: check dc_link before dereferencing
  drm/amd/swsmu: modify the gfx activity scaling
  Revert "drm/udl: Add ARGB8888 as a format"
  drm/i915/panelreplay: Move out psr_init_dpcd() from init_connector()
  drm/i915/dp: Fix connector DSC HW state readout
  drm/i915/selftests: Fix dependency of some timeouts on HZ
  drm/udl: Add ARGB8888 as a format
  drm/nouveau: fix stale locked mutex in nouveau_gem_ioctl_pushbuf
  drm/i915: Don't explode when the dig port we don't have an AUX CH
  MAINTAINERS: Update email address for Tvrtko Ursulin
  drm/panel: boe-tv101wum-nl6: Fine tune Himax83102-j02 panel HFP and HBP (again)
  drm: Fix output poll work for drm_kms_helper_poll=n
  drm/i915: Check before removing mm notifier
  drm/i915/hdcp: Extract hdcp structure from correct connector
  drm/i915/hdcp: Remove additional timing for reading mst hdcp message
  ...
parents 3aaa8ce7 b7cc4ff7

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -610,6 +610,11 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org> 
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>

Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@intel.com>

Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@linux.intel.com>

Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@sophos.com>

Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>

Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10735,7 +10735,7 @@ INTEL DRM I915 DRIVER (Meteor Lake, DG2 and older excluding Poulsbo, Moorestown 
M:	Jani Nikula <jani.nikula@linux.intel.com>

M:	Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

M:	Rodrigo Vivi <rodrigo.vivi@intel.com>

M:	Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>

M:	Tvrtko Ursulin <tursulin@ursulin.net>

L:	intel-gfx@lists.freedesktop.org

S:	Supported

W:	https://drm.pages.freedesktop.org/intel-docs/

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

+15 −6
Original line number Diff line number Diff line
@@ -6539,7 +6539,7 @@ static void amdgpu_dm_connector_funcs_force(struct drm_connector *connector) 
	struct edid *edid;

	struct i2c_adapter *ddc;



	if (dc_link->aux_mode)

	if (dc_link && dc_link->aux_mode)

		ddc = &aconnector->dm_dp_aux.aux.ddc;

	else

		ddc = &aconnector->i2c->base;
@@ -11169,14 +11169,23 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, 
				if (range->flags != 1)

					continue;



				amdgpu_dm_connector->min_vfreq = range->min_vfreq;

				amdgpu_dm_connector->max_vfreq = range->max_vfreq;

				amdgpu_dm_connector->pixel_clock_mhz =

					range->pixel_clock_mhz * 10;



				connector->display_info.monitor_range.min_vfreq = range->min_vfreq;

				connector->display_info.monitor_range.max_vfreq = range->max_vfreq;



				if (edid->revision >= 4) {

					if (data->pad2 & DRM_EDID_RANGE_OFFSET_MIN_VFREQ)

						connector->display_info.monitor_range.min_vfreq += 255;

					if (data->pad2 & DRM_EDID_RANGE_OFFSET_MAX_VFREQ)

						connector->display_info.monitor_range.max_vfreq += 255;

				}



				amdgpu_dm_connector->min_vfreq =

					connector->display_info.monitor_range.min_vfreq;

				amdgpu_dm_connector->max_vfreq =

					connector->display_info.monitor_range.max_vfreq;

				amdgpu_dm_connector->pixel_clock_mhz =

					range->pixel_clock_mhz * 10;



				break;

			}

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+11 −1
Original line number Diff line number Diff line
@@ -2558,6 +2558,7 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev, 
{

	struct amdgpu_device *adev = dev_get_drvdata(dev);

	int err, ret;

	u32 pwm_mode;

	int value;



	if (amdgpu_in_reset(adev))
@@ -2569,13 +2570,22 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev, 
	if (err)

		return err;



	if (value == 0)

		pwm_mode = AMD_FAN_CTRL_NONE;

	else if (value == 1)

		pwm_mode = AMD_FAN_CTRL_MANUAL;

	else if (value == 2)

		pwm_mode = AMD_FAN_CTRL_AUTO;

	else

		return -EINVAL;



	ret = pm_runtime_get_sync(adev_to_drm(adev)->dev);

	if (ret < 0) {

		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

		return ret;

	}



	ret = amdgpu_dpm_set_fan_control_mode(adev, value);

	ret = amdgpu_dpm_set_fan_control_mode(adev, pwm_mode);



	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c

+0 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ int smu_v14_0_check_fw_version(struct smu_context *smu) 
		smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_2;

		break;

	case IP_VERSION(14, 0, 0):

		if ((smu->smc_fw_version < 0x5d3a00))

			dev_warn(smu->adev->dev, "The PMFW version(%x) is behind in this BIOS!\n", smu->smc_fw_version);

		smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_0;

		break;

	default: