Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi'

[linux-2.6-block.git] / drivers / gpu / drm / radeon / radeon_atpx_handler.c

diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 56482e35d43e334d7b2a8bc170a241f4a5643d96..95f4fea893021cb8f233244404fed6878742dd3b 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -143,7 +143,10 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
 {
        /* make sure required functions are enabled */
        /* dGPU power control is required */
-       atpx->functions.power_cntl = true;
+       if (atpx->functions.power_cntl == false) {
+               printk("ATPX dGPU power cntl not present, forcing\n");
+               atpx->functions.power_cntl = true;
+       }
 
        if (atpx->functions.px_params) {
                union acpi_object *info;