Commit e8573000 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.1-2022-09-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 



amd-drm-next-6.1-2022-09-23:

amdgpu:
- SDMA fix
- Add new firmware types to debugfs/IOCTL version queries
- Misc spelling and grammar fixes
- Misc code cleanups
- DCN 3.2.x fixes
- DCN 3.1.x fixes
- CS cleanup
- Gang submit support
- Clang fixes
- Non-DC audio fix
- GPUVM locking fixes
- Vega10 PWN fan speed fix

amdkgd:
- MQD manager cleanup
- Misc spelling and grammar fixes

UAPI:
- Add new firmware types to the FW version query IOCTL

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220923215729.6061-1-alexander.deucher@amd.com
parents 907cc346 3e43b760

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

+3 −0
Original line number Diff line number Diff line
@@ -885,6 +885,7 @@ struct amdgpu_device { 
	u64				fence_context;

	unsigned			num_rings;

	struct amdgpu_ring		*rings[AMDGPU_MAX_RINGS];

	struct dma_fence __rcu		*gang_submit;

	bool				ib_pool_ready;

	struct amdgpu_sa_manager	ib_pools[AMDGPU_IB_POOL_MAX];

	struct amdgpu_sched		gpu_sched[AMDGPU_HW_IP_NUM][AMDGPU_RING_PRIO_MAX];
@@ -1294,6 +1295,8 @@ u32 amdgpu_device_pcie_port_rreg(struct amdgpu_device *adev, 
				u32 reg);

void amdgpu_device_pcie_port_wreg(struct amdgpu_device *adev,

				u32 reg, u32 v);

struct dma_fence *amdgpu_device_switch_gang(struct amdgpu_device *adev,

					    struct dma_fence *gang);



/* atpx handler */

#if defined(CONFIG_VGA_SWITCHEROO)

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

+1 −0
Original line number Diff line number Diff line
@@ -686,6 +686,7 @@ int amdgpu_amdkfd_submit_ib(struct amdgpu_device *adev, 
	ib->length_dw = ib_len;

	/* This works for NO_HWS. TODO: need to handle without knowing VMID */

	job->vmid = vmid;

	job->num_ibs = 1;



	ret = amdgpu_ib_schedule(ring, 1, ib, job, &f);

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

+6 −1
Original line number Diff line number Diff line
@@ -1674,10 +1674,12 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
						   adev->mode_info.dither_property,

						   AMDGPU_FMT_DITHER_DISABLE);



			if (amdgpu_audio != 0)

			if (amdgpu_audio != 0) {

				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}



			subpixel_order = SubPixelHorizontalRGB;

			connector->interlace_allowed = true;
@@ -1799,6 +1801,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}

			drm_object_attach_property(&amdgpu_connector->base.base,

						   adev->mode_info.dither_property,
@@ -1852,6 +1855,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}

			drm_object_attach_property(&amdgpu_connector->base.base,

						   adev->mode_info.dither_property,
@@ -1902,6 +1906,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}

			drm_object_attach_property(&amdgpu_connector->base.base,

						   adev->mode_info.dither_property,

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

+338 −269

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −3

File changed.

Preview size limit exceeded, changes collapsed.