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

Merge tag 'amd-drm-next-6.3-2023-02-17' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 



amd-drm-next-6.3-2023-02-17:

amdgpu:
- GC 11 fixes
- Display fixes
- Backlight cleanup
- SMU13 fixes
- SMU7 regression fix
- GFX9 sw queues fix
- AGP fix for GMC 11
- W1 warning fixes
- S/G display fixes
- Misc spelling fixes
- Driver unload fix
- DCN 3.1.4 fixes
- Display code reorg fixes
- Rotation fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230217230930.64821-1-alexander.deucher@amd.com
parents ef042776 80c6d680

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \ 
	-I$(FULL_AMD_PATH)/acp/include \

	-I$(FULL_AMD_DISPLAY_PATH) \

	-I$(FULL_AMD_DISPLAY_PATH)/include \

	-I$(FULL_AMD_DISPLAY_PATH)/modules/inc \

	-I$(FULL_AMD_DISPLAY_PATH)/dc \

	-I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm \

	-I$(FULL_AMD_PATH)/amdkfd
@@ -76,7 +77,7 @@ amdgpu-y += \ 
	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o arct_reg_init.o mxgpu_nv.o \

	nbio_v7_2.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o soc21.o \

	sienna_cichlid.o nbio_v4_3.o hdp_v6_0.o nbio_v7_7.o hdp_v5_2.o lsdma_v6_0.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



# add DF block

amdgpu-y += \

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

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ extern int amdgpu_num_kcq; 


#define AMDGPU_VCNFW_LOG_SIZE (32 * 1024)

extern int amdgpu_vcnfw_log;

extern int amdgpu_sg_display;



#define AMDGPU_VM_MAX_NUM_CTX			4096

#define AMDGPU_SG_THRESHOLD			(256*1024*1024)

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

+5 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void amdgpu_device_get_pcie_info(struct amdgpu_device *adev); 
 *

 * The amdgpu driver provides a sysfs API for reporting the product name

 * for the device

 * The file serial_number is used for this and returns the product name

 * The file product_name is used for this and returns the product name

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */
@@ -186,7 +186,7 @@ static DEVICE_ATTR(product_name, S_IRUGO, 
 *

 * The amdgpu driver provides a sysfs API for reporting the part number

 * for the device

 * The file serial_number is used for this and returns the part number

 * The file product_number is used for this and returns the part number

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */
@@ -4270,6 +4270,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	}

	adev->in_suspend = false;



	if (adev->enable_mes)

		amdgpu_mes_self_test(adev);



	if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D0))

		DRM_WARN("smart shift update failed\n");

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

+11 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ int amdgpu_num_kcq = -1; 
int amdgpu_smartshift_bias;

int amdgpu_use_xgmi_p2p = 1;

int amdgpu_vcnfw_log;

int amdgpu_sg_display = -1; /* auto */



static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work);
@@ -933,6 +934,16 @@ module_param_named(num_kcq, amdgpu_num_kcq, int, 0444); 
MODULE_PARM_DESC(vcnfw_log, "Enable vcnfw log(0 = disable (default value), 1 = enable)");

module_param_named(vcnfw_log, amdgpu_vcnfw_log, int, 0444);



/**

 * DOC: sg_display (int)

 * Disable S/G (scatter/gather) display (i.e., display from system memory).

 * This option is only relevant on APUs.  Set this option to 0 to disable

 * S/G display if you experience flickering or other issues under memory

 * pressure and report the issue.

 */

MODULE_PARM_DESC(sg_display, "S/G Display (-1 = auto (default), 0 = disable)");

module_param_named(sg_display, amdgpu_sg_display, int, 0444);



/**

 * DOC: smu_pptable_id (int)

 * Used to override pptable id. id = 0 use VBIOS pptable.

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

+7 −1
Original line number Diff line number Diff line
@@ -618,7 +618,13 @@ void amdgpu_fence_driver_sw_fini(struct amdgpu_device *adev) 
		if (!ring || !ring->fence_drv.initialized)

			continue;



		if (!ring->no_scheduler)

		/*

		 * Notice we check for sched.ops since there's some

		 * override on the meaning of sched.ready by amdgpu.

		 * The natural check would be sched.ready, which is

		 * set as drm_sched_init() finishes...

		 */

		if (ring->sched.ops)

			drm_sched_fini(&ring->sched);



		for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j)