Merge tag 'drm-fixes-2025-02-28' of https://gitlab.freedesktop.org/drm/kernel (76544811) · Commits · git / linux-net

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -522,6 +522,7 @@ Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
		Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
		Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
		Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
		Natalie Vock <natalie.vock@gmx.de> <friedrich.vock@gmx.de>
		Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
		Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.ibm.com>
		Naveen N Rao <naveen@kernel.org> <naveen.n.rao@linux.vnet.ibm.com>
		@@ -613,6 +614,8 @@ Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
		Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
		Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
		Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
		Rodrigo Siqueira <siqueira@igalia.com> <rodrigosiqueiramelo@gmail.com>
		Rodrigo Siqueira <siqueira@igalia.com> <Rodrigo.Siqueira@amd.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>

MAINTAINERS

+13 −3

Original line number	Diff line number	Diff line
		@@ -1046,14 +1046,14 @@ F: drivers/crypto/ccp/hsti.*
		AMD DISPLAY CORE
		M: Harry Wentland <harry.wentland@amd.com>
		M: Leo Li <sunpeng.li@amd.com>
		M: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
		R: Rodrigo Siqueira <siqueira@igalia.com>
		L: amd-gfx@lists.freedesktop.org
		S: Supported
		T: git https://gitlab.freedesktop.org/agd5f/linux.git
		F: drivers/gpu/drm/amd/display/

		AMD DISPLAY CORE - DML
		M: Chaitanya Dhere <chaitanya.dhere@amd.com>
		M: Austin Zheng <austin.zheng@amd.com>
		M: Jun Lei <jun.lei@amd.com>
		S: Supported
		F: drivers/gpu/drm/amd/display/dc/dml/
		@@ -5926,6 +5926,17 @@ F: tools/testing/selftests/cgroup/test_cpuset.c
		F: tools/testing/selftests/cgroup/test_cpuset_prs.sh
		F: tools/testing/selftests/cgroup/test_cpuset_v1_base.sh

		CONTROL GROUP - DEVICE MEMORY CONTROLLER (DMEM)
		M: Maarten Lankhorst <dev@lankhorst.se>
		M: Maxime Ripard <mripard@kernel.org>
		M: Natalie Vock <natalie.vock@gmx.de>
		L: cgroups@vger.kernel.org
		L: dri-devel@lists.freedesktop.org
		S: Maintained
		T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
		F: include/linux/cgroup_dmem.h
		F: kernel/cgroup/dmem.c

		CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
		M: Johannes Weiner <hannes@cmpxchg.org>
		M: Michal Hocko <mhocko@kernel.org>
		@@ -19655,7 +19666,6 @@ F: drivers/net/wireless/quantenna
		RADEON and AMDGPU DRM DRIVERS
		M: Alex Deucher <alexander.deucher@amd.com>
		M: Christian König <christian.koenig@amd.com>
		M: Xinhui Pan <Xinhui.Pan@amd.com>
		L: amd-gfx@lists.freedesktop.org
		S: Supported
		B: https://gitlab.freedesktop.org/drm/amd/-/issues

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -1638,6 +1638,13 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev)
		if (amdgpu_sriov_vf(adev))
		return 0;

		/* resizing on Dell G5 SE platforms causes problems with runtime pm */
		if ((amdgpu_runtime_pm != 0) &&
		adev->pdev->vendor == PCI_VENDOR_ID_ATI &&
		adev->pdev->device == 0x731f &&
		adev->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)
		return 0;

		/* PCI_EXT_CAP_ID_VNDR extended capability is located at 0x100 */
		if (!pci_find_ext_capability(adev->pdev, PCI_EXT_CAP_ID_VNDR))
		DRM_WARN("System can't access extended configuration space, please check!!\n");

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -1638,22 +1638,19 @@ static ssize_t amdgpu_gfx_set_enforce_isolation(struct device *dev,
		}

		mutex_lock(&adev->enforce_isolation_mutex);

		for (i = 0; i < num_partitions; i++) {
		if (adev->enforce_isolation[i] && !partition_values[i]) {
		if (adev->enforce_isolation[i] && !partition_values[i])
		/* Going from enabled to disabled */
		amdgpu_vmid_free_reserved(adev, AMDGPU_GFXHUB(i));
		amdgpu_mes_set_enforce_isolation(adev, i, false);
		} else if (!adev->enforce_isolation[i] && partition_values[i]) {
		else if (!adev->enforce_isolation[i] && partition_values[i])
		/* Going from disabled to enabled */
		amdgpu_vmid_alloc_reserved(adev, AMDGPU_GFXHUB(i));
		amdgpu_mes_set_enforce_isolation(adev, i, true);
		}
		adev->enforce_isolation[i] = partition_values[i];
		}

		mutex_unlock(&adev->enforce_isolation_mutex);

		amdgpu_mes_update_enforce_isolation(adev);

		return count;
		}

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

+19 −1

Original line number	Diff line number	Diff line
		@@ -1681,7 +1681,8 @@ bool amdgpu_mes_suspend_resume_all_supported(struct amdgpu_device *adev)
		}

		/* Fix me -- node_id is used to identify the correct MES instances in the future */
		int amdgpu_mes_set_enforce_isolation(struct amdgpu_device *adev, uint32_t node_id, bool enable)
		static int amdgpu_mes_set_enforce_isolation(struct amdgpu_device *adev,
		uint32_t node_id, bool enable)
		{
		struct mes_misc_op_input op_input = {0};
		int r;
		@@ -1703,6 +1704,23 @@ int amdgpu_mes_set_enforce_isolation(struct amdgpu_device *adev, uint32_t node_i
		return r;
		}

		int amdgpu_mes_update_enforce_isolation(struct amdgpu_device *adev)
		{
		int i, r = 0;

		if (adev->enable_mes && adev->gfx.enable_cleaner_shader) {
		mutex_lock(&adev->enforce_isolation_mutex);
		for (i = 0; i < (adev->xcp_mgr ? adev->xcp_mgr->num_xcps : 1); i++) {
		if (adev->enforce_isolation[i])
		r \|= amdgpu_mes_set_enforce_isolation(adev, i, true);
		else
		r \|= amdgpu_mes_set_enforce_isolation(adev, i, false);
		}
		mutex_unlock(&adev->enforce_isolation_mutex);
		}
		return r;
		}

		#if defined(CONFIG_DEBUG_FS)

		static int amdgpu_debugfs_mes_event_log_show(struct seq_file m, void unused)