Commit 02e778f1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-7.1-2026-03-12' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 

amd-drm-next-7.1-2026-03-12:

amdgpu:
- SMU13 fix
- SMU14 fix
- Fixes for bring up hw testing
- Kerneldoc fix
- GC12 idle power fix for compute workloads
- DCCG fixes
- UserQ fixes
- Move test for fbdev object to a generic helper
- GC 12.1 updates
- Use struct drm_edid in non-DC code
- Include IP discovery data in devcoredump
- SMU 13.x updates
- Misc cleanups
- DML 2.1 fixes
- Enable NV12/P010 support on primary planes
- Enable color encoding and color range on overlay planes
- DC underflow fixes
- HWSS fast path fixes
- Replay fixes
- DCN 4.2 updates
- Support newer IP discovery tables
- LSDMA 7.1 support
- IH 7.1 fixes
- SoC v1 updates
- GC12.1 updates
- PSP 15 updates
- XGMI fixes
- GPUVM locking fix

amdkfd:
- Fix missing BO unreserve in an error path

radeon:
- Move test for fbdev object to a generic helper

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260312184425.3875669-1-alexander.deucher@amd.com


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 3f071d00 7a9419ab

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ amdgpu-y += \ 
	nbio_v7_2.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o soc21.o soc24.o \

	sienna_cichlid.o smu_v13_0_10.o nbio_v4_3.o hdp_v6_0.o nbio_v7_7.o hdp_v5_2.o lsdma_v6_0.o \

	nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o lsdma_v7_0.o hdp_v7_0.o nbif_v6_3_1.o \

	cyan_skillfish_reg_init.o soc_v1_0.o

	cyan_skillfish_reg_init.o soc_v1_0.o lsdma_v7_1.o



# add DF block

amdgpu-y += \

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

+23 −31
Original line number Diff line number Diff line
@@ -246,10 +246,10 @@ amdgpu_connector_find_encoder(struct drm_connector *connector, 
	return NULL;

}



static struct edid *

static const struct drm_edid *

amdgpu_connector_get_hardcoded_edid(struct amdgpu_device *adev)

{

	return drm_edid_duplicate(drm_edid_raw(adev->mode_info.bios_hardcoded_edid));

	return drm_edid_dup(adev->mode_info.bios_hardcoded_edid);

}



static void amdgpu_connector_get_edid(struct drm_connector *connector)
@@ -268,7 +268,7 @@ static void amdgpu_connector_get_edid(struct drm_connector *connector) 
	if ((amdgpu_connector_encoder_get_dp_bridge_encoder_id(connector) !=

	     ENCODER_OBJECT_ID_NONE) &&

	    amdgpu_connector->ddc_bus->has_aux) {

		amdgpu_connector->edid = drm_get_edid(connector,

		amdgpu_connector->edid = drm_edid_read_ddc(connector,

							  &amdgpu_connector->ddc_bus->aux.ddc);

	} else if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||

		   (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {
@@ -277,13 +277,13 @@ static void amdgpu_connector_get_edid(struct drm_connector *connector) 
		if ((dig->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT ||

		     dig->dp_sink_type == CONNECTOR_OBJECT_ID_eDP) &&

		    amdgpu_connector->ddc_bus->has_aux)

			amdgpu_connector->edid = drm_get_edid(connector,

			amdgpu_connector->edid = drm_edid_read_ddc(connector,

								  &amdgpu_connector->ddc_bus->aux.ddc);

		else if (amdgpu_connector->ddc_bus)

			amdgpu_connector->edid = drm_get_edid(connector,

			amdgpu_connector->edid = drm_edid_read_ddc(connector,

								  &amdgpu_connector->ddc_bus->adapter);

	} else if (amdgpu_connector->ddc_bus) {

		amdgpu_connector->edid = drm_get_edid(connector,

		amdgpu_connector->edid = drm_edid_read_ddc(connector,

							  &amdgpu_connector->ddc_bus->adapter);

	}
@@ -292,30 +292,22 @@ static void amdgpu_connector_get_edid(struct drm_connector *connector) 
		if (((connector->connector_type == DRM_MODE_CONNECTOR_LVDS) ||

		     (connector->connector_type == DRM_MODE_CONNECTOR_eDP))) {

			amdgpu_connector->edid = amdgpu_connector_get_hardcoded_edid(adev);

			drm_connector_update_edid_property(connector, amdgpu_connector->edid);

			drm_edid_connector_update(connector, amdgpu_connector->edid);

		}

	}

}



static void amdgpu_connector_free_edid(struct drm_connector *connector)

{

	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);



	kfree(amdgpu_connector->edid);

	amdgpu_connector->edid = NULL;

}



static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)

{

	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);

	int ret;



	if (amdgpu_connector->edid) {

		drm_connector_update_edid_property(connector, amdgpu_connector->edid);

		ret = drm_add_edid_modes(connector, amdgpu_connector->edid);

		drm_edid_connector_update(connector, amdgpu_connector->edid);

		ret = drm_edid_connector_add_modes(connector);

		return ret;

	}

	drm_connector_update_edid_property(connector, NULL);

	drm_edid_connector_update(connector, NULL);

	return 0;

}
@@ -754,7 +746,7 @@ static void amdgpu_connector_destroy(struct drm_connector *connector) 
{

	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);



	amdgpu_connector_free_edid(connector);

	drm_edid_free(amdgpu_connector->edid);

	kfree(amdgpu_connector->con_priv);

	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);
@@ -873,7 +865,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) 
		dret = amdgpu_display_ddc_probe(amdgpu_connector, false);

	if (dret) {

		amdgpu_connector->detected_by_load = false;

		amdgpu_connector_free_edid(connector);

		drm_edid_free(amdgpu_connector->edid);

		amdgpu_connector_get_edid(connector);



		if (!amdgpu_connector->edid) {
@@ -883,13 +875,13 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) 
			ret = connector_status_connected;

		} else {

			amdgpu_connector->use_digital =

				!!(amdgpu_connector->edid->input & DRM_EDID_INPUT_DIGITAL);

				drm_edid_is_digital(amdgpu_connector->edid);



			/* some oems have boards with separate digital and analog connectors

			 * with a shared ddc line (often vga + hdmi)

			 */

			if (amdgpu_connector->use_digital && amdgpu_connector->shared_ddc) {

				amdgpu_connector_free_edid(connector);

				drm_edid_free(amdgpu_connector->edid);

				ret = connector_status_disconnected;

			} else {

				ret = connector_status_connected;
@@ -984,7 +976,7 @@ static void amdgpu_connector_shared_ddc(enum drm_connector_status *status, 
					/* hpd is our only option in this case */

					if (!amdgpu_display_hpd_sense(adev,

								      amdgpu_connector->hpd.hpd)) {

						amdgpu_connector_free_edid(connector);

						drm_edid_free(amdgpu_connector->edid);

						*status = connector_status_disconnected;

					}

				}
@@ -1053,7 +1045,7 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
	}

	if (dret) {

		amdgpu_connector->detected_by_load = false;

		amdgpu_connector_free_edid(connector);

		drm_edid_free(amdgpu_connector->edid);

		amdgpu_connector_get_edid(connector);



		if (!amdgpu_connector->edid) {
@@ -1063,13 +1055,13 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
			broken_edid = true; /* defer use_digital to later */

		} else {

			amdgpu_connector->use_digital =

				!!(amdgpu_connector->edid->input & DRM_EDID_INPUT_DIGITAL);

				drm_edid_is_digital(amdgpu_connector->edid);



			/* some oems have boards with separate digital and analog connectors

			 * with a shared ddc line (often vga + hdmi)

			 */

			if ((!amdgpu_connector->use_digital) && amdgpu_connector->shared_ddc) {

				amdgpu_connector_free_edid(connector);

				drm_edid_free(amdgpu_connector->edid);

				ret = connector_status_disconnected;

			} else {

				ret = connector_status_connected;
@@ -1417,7 +1409,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) 
		goto out;

	}



	amdgpu_connector_free_edid(connector);

	drm_edid_free(amdgpu_connector->edid);



	if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) ||

	    (connector->connector_type == DRM_MODE_CONNECTOR_LVDS)) {

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

+53 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include "amdgpu_reset.h"

#include "amdgpu_psp_ta.h"

#include "amdgpu_userq.h"



#if defined(CONFIG_DEBUG_FS)
@@ -2156,6 +2157,53 @@ static const struct file_operations amdgpu_pt_info_fops = { 
	.release = single_release,

};



static int amdgpu_mqd_info_read(struct seq_file *m, void *unused)

{

	struct amdgpu_usermode_queue *queue = m->private;

	struct amdgpu_bo *bo;

	int r;



	if (!queue || !queue->mqd.obj)

		return -EINVAL;



	bo = amdgpu_bo_ref(queue->mqd.obj);

	r = amdgpu_bo_reserve(bo, true);

	if (r) {

		amdgpu_bo_unref(&bo);

		return -EINVAL;

	}



	seq_printf(m, "queue_type: %d\n", queue->queue_type);

	seq_printf(m, "mqd_gpu_address: 0x%llx\n", amdgpu_bo_gpu_offset(queue->mqd.obj));



	amdgpu_bo_unreserve(bo);

	amdgpu_bo_unref(&bo);



	return 0;

}



static int amdgpu_mqd_info_open(struct inode *inode, struct file *file)

{

	return single_open(file, amdgpu_mqd_info_read, inode->i_private);

}



static const struct file_operations amdgpu_mqd_info_fops = {

	.owner = THIS_MODULE,

	.open = amdgpu_mqd_info_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};



void amdgpu_debugfs_userq_init(struct drm_file *file, struct amdgpu_usermode_queue *queue, int qid)

{

	char queue_name[32];



	scnprintf(queue_name, sizeof(queue_name), "queue_%d", qid);

	queue->debugfs_queue = debugfs_create_dir(queue_name, file->debugfs_client);

	debugfs_create_file("mqd_info", 0444, queue->debugfs_queue, queue, &amdgpu_mqd_info_fops);

}



void amdgpu_debugfs_vm_init(struct drm_file *file)

{

	debugfs_create_file("vm_pagetable_info", 0444, file->debugfs_client, file,
@@ -2174,4 +2222,9 @@ int amdgpu_debugfs_regs_init(struct amdgpu_device *adev) 
void amdgpu_debugfs_vm_init(struct drm_file *file)

{

}

void amdgpu_debugfs_userq_init(struct drm_file *file,

			       struct amdgpu_usermode_queue *queue,

			       int qid)

{

}

#endif

drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
/*

 * Debugfs

 */

struct amdgpu_usermode_queue;



int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);

int amdgpu_debugfs_init(struct amdgpu_device *adev);
@@ -34,4 +35,7 @@ void amdgpu_debugfs_firmware_init(struct amdgpu_device *adev); 
void amdgpu_debugfs_gem_init(struct amdgpu_device *adev);

void amdgpu_debugfs_mes_event_log_init(struct amdgpu_device *adev);

void amdgpu_debugfs_vm_init(struct drm_file *file);

void amdgpu_debugfs_userq_init(struct drm_file *file,

			       struct amdgpu_usermode_queue *queue,

			       int qid);

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

+2 −0
Original line number Diff line number Diff line
@@ -261,6 +261,8 @@ amdgpu_devcoredump_read(char *buffer, loff_t offset, size_t count, 
		}

	}



	amdgpu_discovery_dump(coredump->adev, &p);



	/* IP firmware information */

	drm_printf(&p, "\nIP Firmwares\n");

	amdgpu_devcoredump_fw_info(coredump->adev, &p);