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

Merge tag 'amd-drm-fixes-5.12-2021-03-10' of... 

Merge tag 'amd-drm-fixes-5.12-2021-03-10' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.12-2021-03-10:

amdgpu:
- Fix aux backlight control
- Add a backlight override parameter
- Various display fixes
- PCIe DPM fix for vega
- Polaris watermark fixes
- Additional S0ix fix

radeon:
- Fix GEM regression
- Fix AGP dependency handling

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

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ source "drivers/gpu/drm/arm/Kconfig" 
config DRM_RADEON

	tristate "ATI Radeon"

	depends on DRM && PCI && MMU

	depends on AGP || !AGP

	select FW_LOADER

        select DRM_KMS_HELPER

        select DRM_TTM

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

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ extern uint amdgpu_smu_memory_pool_size; 
extern uint amdgpu_dc_feature_mask;

extern uint amdgpu_dc_debug_mask;

extern uint amdgpu_dm_abm_level;

extern int amdgpu_backlight;

extern struct amdgpu_mgpu_info mgpu_info;

extern int amdgpu_ras_enable;

extern uint amdgpu_ras_mask;

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

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ void amdgpu_acpi_fini(struct amdgpu_device *adev) 
 */

bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev)

{

#if defined(CONFIG_AMD_PMC)

#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return true;

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

+4 −0
Original line number Diff line number Diff line
@@ -781,6 +781,10 @@ uint amdgpu_dm_abm_level; 
MODULE_PARM_DESC(abmlevel, "ABM level (0 = off (default), 1-4 = backlight reduction level) ");

module_param_named(abmlevel, amdgpu_dm_abm_level, uint, 0444);



int amdgpu_backlight = -1;

MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))");

module_param_named(backlight, amdgpu_backlight, bint, 0444);



/**

 * DOC: tmz (int)

 * Trusted Memory Zone (TMZ) is a method to protect data being written

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
	size = mode_cmd->pitches[0] * height;

	aligned_size = ALIGN(size, PAGE_SIZE);

	ret = amdgpu_gem_object_create(adev, aligned_size, 0, domain, flags,

				       ttm_bo_type_kernel, NULL, &gobj);

				       ttm_bo_type_device, NULL, &gobj);

	if (ret) {

		pr_err("failed to allocate framebuffer (%d)\n", aligned_size);

		return -ENOMEM;