Attachment 137651 Details for Bug 104064 – patch to test

[patch] patch to test

0001-drm-amdgpu-add-a-parameter-to-force-ATPX-rather-than.patch (text/plain), 3.05 KB, created by Alex Deucher on 2018-02-27 16:41:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2018-02-27 16:41:16 UTC

Size: 3.05 KB

patch

obsolete

>From 4dfa6eec93c1ef6203f9520074d58432c06d6036 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 27 Feb 2018 11:35:35 -0500
>Subject: [PATCH] drm/amdgpu: add a parameter to force ATPX rather than HG
>
>On laptops with Hybrid Graphics (HG) sometimes the HG ACPI
>power control method (_PR3) doesn't work.  In some cases
>forcing the driver to use the old ATPX ACPI method works.
>This patch provides an option to force the legacy method.
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h              | 1 +
> drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 5 +++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c          | 4 ++++
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>index 3e6f27d363e9..860187867e24 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>@@ -129,6 +129,7 @@ extern int amdgpu_lbpw;
> extern int amdgpu_compute_multipipe;
> extern int amdgpu_gpu_recovery;
> extern int amdgpu_emu_mode;
>+extern int amdgpu_force_atpx;
> 
> #ifdef CONFIG_DRM_AMDGPU_SI
> extern int amdgpu_si_support;
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
>index c53095b3b0fb..54769a64d568 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
>@@ -11,7 +11,7 @@
> #include <linux/acpi.h>
> #include <linux/pci.h>
> #include <linux/delay.h>
>-
>+#include "amdgpu.h"
> #include "amd_acpi.h"
> 
> #define AMDGPU_PX_QUIRK_FORCE_ATPX  (1 << 0)
>@@ -216,7 +216,8 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx)
> 
> 	atpx->is_hybrid = false;
> 	if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
>-		if (amdgpu_atpx_priv.quirks & AMDGPU_PX_QUIRK_FORCE_ATPX) {
>+		if ((amdgpu_force_atpx == 1) ||
>+		    (amdgpu_atpx_priv.quirks & AMDGPU_PX_QUIRK_FORCE_ATPX)) {
> 			printk("ATPX Hybrid Graphics, forcing to ATPX\n");
> 			atpx->functions.power_cntl = true;
> 			atpx->is_hybrid = false;
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>index 85ceed702fb2..4dcddb3d0973 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>@@ -132,6 +132,7 @@ int amdgpu_lbpw = -1;
> int amdgpu_compute_multipipe = -1;
> int amdgpu_gpu_recovery = -1; /* auto */
> int amdgpu_emu_mode = 0;
>+int amdgpu_force_atpx = 0;
> 
> MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes");
> module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
>@@ -290,6 +291,9 @@ module_param_named(gpu_recovery, amdgpu_gpu_recovery, int, 0444);
> MODULE_PARM_DESC(emu_mode, "Emulation mode, (1 = enable, 0 = disable");
> module_param_named(emu_mode, amdgpu_emu_mode, int, 0444);
> 
>+MODULE_PARM_DESC(force_atpx, "Force ATPX rather than HG, (1 = enable, 0 = disable (default))");
>+module_param_named(force_atpx, amdgpu_force_atpx, int, 0444);
>+
> #ifdef CONFIG_DRM_AMDGPU_SI
> 
> #if defined(CONFIG_DRM_RADEON) || defined(CONFIG_DRM_RADEON_MODULE)
>-- 
>2.13.6
>

Actions: View | Splinter Review

Attachments on bug 104064: 135921 | 135922 | 137103 | 137643 | 137646 | 137647 | 137651 | 137668 | 137732 | 137733 | 137816 | 137817 | 137825 | 137852 | 137979 | 138027 | 138028 | 138032 | 138267 | 138278 | 138279

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.