From: Alex Deucher <alexdeucher@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 02/12] drm/amdgpu: clean up atpx power control handling
Date: Wed, 1 Jun 2016 16:53:15 -0400 [thread overview]
Message-ID: <1464814405-19729-3-git-send-email-alexander.deucher@amd.com> (raw)
In-Reply-To: <1464814405-19729-1-git-send-email-alexander.deucher@amd.com>
The presence of the power control method should be determined
via the presence of the method in function 0. However, some
sbioses only set the appropriate bits in function 1 so use
then to override a missing power control function.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 51 ++++++++++++++----------
1 file changed, 29 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index 3af1c3a..1be2ce4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -142,18 +142,12 @@ static void amdgpu_atpx_parse_functions(struct amdgpu_atpx_functions *f, u32 mas
*/
static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx)
{
- /* make sure required functions are enabled */
- /* dGPU power control is required */
- if (atpx->functions.power_cntl == false) {
- printk("ATPX dGPU power cntl not present, forcing\n");
- atpx->functions.power_cntl = true;
- }
+ u32 valid_bits = 0;
if (atpx->functions.px_params) {
union acpi_object *info;
struct atpx_px_params output;
size_t size;
- u32 valid_bits;
info = amdgpu_atpx_call(atpx->handle, ATPX_FUNCTION_GET_PX_PARAMETERS, NULL);
if (!info)
@@ -172,24 +166,37 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx)
memcpy(&output, info->buffer.pointer, size);
valid_bits = output.flags & output.valid_flags;
- /* if separate mux flag is set, mux controls are required */
- if (valid_bits & ATPX_SEPARATE_MUX_FOR_I2C) {
- atpx->functions.i2c_mux_cntl = true;
- atpx->functions.disp_mux_cntl = true;
- }
- /* if any outputs are muxed, mux controls are required */
- if (valid_bits & (ATPX_CRT1_RGB_SIGNAL_MUXED |
- ATPX_TV_SIGNAL_MUXED |
- ATPX_DFP_SIGNAL_MUXED))
- atpx->functions.disp_mux_cntl = true;
-
- if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
- printk("Hybrid Graphics, ATPX dGPU power cntl disabled\n");
- atpx->functions.power_cntl = false;
- }
kfree(info);
}
+
+ /* if separate mux flag is set, mux controls are required */
+ if (valid_bits & ATPX_SEPARATE_MUX_FOR_I2C) {
+ atpx->functions.i2c_mux_cntl = true;
+ atpx->functions.disp_mux_cntl = true;
+ }
+ /* if any outputs are muxed, mux controls are required */
+ if (valid_bits & (ATPX_CRT1_RGB_SIGNAL_MUXED |
+ ATPX_TV_SIGNAL_MUXED |
+ ATPX_DFP_SIGNAL_MUXED))
+ atpx->functions.disp_mux_cntl = true;
+
+
+ /* some bioses set these bits rather than flagging power_cntl as supported */
+ if (valid_bits & (ATPX_DYNAMIC_PX_SUPPORTED |
+ ATPX_DYNAMIC_DGPU_POWER_OFF_SUPPORTED))
+ atpx->functions.power_cntl = true;
+
+ if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
+ printk("Hybrid Graphics, ATPX dGPU power cntl disabled\n");
+ atpx->functions.power_cntl = false;
+ } else if (atpx->functions.power_cntl == false) {
+ /* make sure required functions are enabled */
+ /* dGPU power control is required */
+ printk("ATPX dGPU power cntl not present, forcing\n");
+ atpx->functions.power_cntl = true;
+ }
+
return 0;
}
--
2.5.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-06-01 20:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 20:53 [PATCH 00/12] Improve PX support in radeon and amdgpu Alex Deucher
2016-06-01 20:53 ` [PATCH 01/12] drm/amdgpu: disable power control on hybrid laptops Alex Deucher
2016-06-01 20:53 ` Alex Deucher [this message]
2016-06-01 20:53 ` [PATCH 03/12] drm/amdgpu: add a delay after ATPX dGPU power off Alex Deucher
2016-06-01 20:53 ` [PATCH 04/12] drm/amdgpu/atpx: add a query for ATPX dGPU power control Alex Deucher
2016-06-01 20:53 ` [PATCH 05/12] drm/amdgpu: use PCI_D3hot for PX systems without " Alex Deucher
2016-06-01 20:53 ` [PATCH 06/12] drm/amdgpu/atpx: drop forcing of " Alex Deucher
2016-06-01 20:53 ` [PATCH 07/12] drm/radeon: disable power control on hybrid laptops Alex Deucher
2016-06-01 20:53 ` [PATCH 08/12] drm/radeon: clean up atpx power control handling Alex Deucher
2016-06-01 20:53 ` [PATCH 09/12] drm/radeon: add a delay after ATPX dGPU power off Alex Deucher
2016-06-01 20:53 ` [PATCH 10/12] drm/radeon/atpx: add a query for ATPX dGPU power control Alex Deucher
2016-06-01 20:53 ` [PATCH 11/12] drm/radeon: use PCI_D3hot for PX systems without " Alex Deucher
2016-06-01 20:53 ` [PATCH 12/12] drm/radeon/atpx: drop forcing of " Alex Deucher
2016-06-02 0:02 ` [PATCH 00/12] Improve PX support in radeon and amdgpu Mike Lothian
2016-06-02 12:31 ` Alex Deucher
2016-06-02 7:17 ` Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464814405-19729-3-git-send-email-alexander.deucher@amd.com \
--to=alexdeucher@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox