I am under the impression that it only makes sense to call the ATIF method if the graphics device has an ACPI handle attached. So we could skip the call altogether if there is no such handle. Signed-off-by: Jean Delvare <jdelvare@xxxxxxx> Cc: David Airlie <airlied@xxxxxxxx> Cc: Alex Deucher <alexander.deucher@xxxxxxx> --- This is only tested on a system where the Radeon device has no ACPI handle and there is no ATIF method. This should also be tested on systems with ATIF, presumably laptops. drivers/gpu/drm/radeon/radeon_acpi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- linux-3.2-rc3.orig/drivers/gpu/drm/radeon/radeon_acpi.c 2011-11-29 18:12:02.000000000 +0100 +++ linux-3.2-rc3/drivers/gpu/drm/radeon/radeon_acpi.c 2011-11-29 18:59:46.000000000 +0100 @@ -51,13 +51,13 @@ int radeon_acpi_init(struct radeon_devic acpi_handle handle; int ret; - /* No need to proceed if we're sure that ATIF is not supported */ - if (!ASIC_IS_AVIVO(rdev) || !rdev->bios) - return 0; - /* Get the device handle */ handle = DEVICE_ACPI_HANDLE(&rdev->pdev->dev); + /* No need to proceed if we're sure that ATIF is not supported */ + if (!ASIC_IS_AVIVO(rdev) || !rdev->bios || !handle) + return 0; + /* Call the ATIF method */ ret = radeon_atif_call(handle); if (ret) -- Jean Delvare Suse L3 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
