Commit 777c1e01 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.2-2023-02-09' of... 

Merge tag 'amd-drm-fixes-6.2-2023-02-09' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.2-2023-02-09:

amdgpu:
- Add a parameter to disable S/G display
- Re-enable S/G display on all DCNs

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230209174504.7577-1-alexander.deucher@amd.com
parents 0ed90416 e7d63647

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

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,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_drv.c

+11 −0
Original line number Diff line number Diff line
@@ -186,6 +186,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);
@@ -931,6 +932,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/display/amdgpu_dm/amdgpu_dm.c

+7 −0
Original line number Diff line number Diff line
@@ -1513,8 +1513,12 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
			    (adev->apu_flags & AMD_APU_IS_PICASSO))

				init_data.flags.gpu_vm_support = true;

			break;

		case IP_VERSION(2, 1, 0):

		case IP_VERSION(3, 0, 1):

		case IP_VERSION(3, 1, 2):

		case IP_VERSION(3, 1, 3):

		case IP_VERSION(3, 1, 4):

		case IP_VERSION(3, 1, 5):

		case IP_VERSION(3, 1, 6):

			init_data.flags.gpu_vm_support = true;

			break;
@@ -1523,6 +1527,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
		}

		break;

	}

	if (init_data.flags.gpu_vm_support &&

	    (amdgpu_sg_display == 0))

		init_data.flags.gpu_vm_support = false;



	if (init_data.flags.gpu_vm_support)

		adev->mode_info.gpu_vm_support = true;