Lines 848-854
Link Here
|
848 |
* happen much less frequent then without this workaround. |
848 |
* happen much less frequent then without this workaround. |
849 |
*/ |
849 |
*/ |
850 |
if (state == PM_EVENT_SUSPEND) |
850 |
if (state == PM_EVENT_SUSPEND) |
851 |
acquire_console_sem(); |
851 |
|
|
|
852 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
853 |
console_lock(); |
854 |
#else |
855 |
acquire_console_sem(); |
856 |
#endif |
852 |
|
857 |
|
853 |
if (firegl_cail_powerdown(privdev, state)) |
858 |
if (firegl_cail_powerdown(privdev, state)) |
854 |
ret = -EIO; |
859 |
ret = -EIO; |
Lines 870-877
Link Here
|
870 |
} |
875 |
} |
871 |
|
876 |
|
872 |
if (state == PM_EVENT_SUSPEND) |
877 |
if (state == PM_EVENT_SUSPEND) |
873 |
release_console_sem(); |
878 |
|
874 |
|
879 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
|
|
880 |
console_unlock(); |
881 |
#else |
882 |
release_console_sem(); |
883 |
#endif |
884 |
|
875 |
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL); |
885 |
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL); |
876 |
|
886 |
|
877 |
return ret; |
887 |
return ret; |
Lines 894-900
Link Here
|
894 |
if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0; |
904 |
if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0; |
895 |
|
905 |
|
896 |
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) |
906 |
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) |
897 |
acquire_console_sem(); |
907 |
|
|
|
908 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
909 |
console_lock(); |
910 |
#else |
911 |
acquire_console_sem(); |
912 |
#endif |
898 |
|
913 |
|
899 |
#ifdef FIREGL_USWC_SUPPORT |
914 |
#ifdef FIREGL_USWC_SUPPORT |
900 |
// Restore the PAT after resuming from S3 or S4. |
915 |
// Restore the PAT after resuming from S3 or S4. |
Lines 919-925
Link Here
|
919 |
firegl_cail_powerup(privdev); |
934 |
firegl_cail_powerup(privdev); |
920 |
|
935 |
|
921 |
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) |
936 |
if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND) |
922 |
release_console_sem(); |
937 |
|
|
|
938 |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) |
939 |
console_unlock(); |
940 |
#else |
941 |
release_console_sem(); |
942 |
#endif |
923 |
|
943 |
|
924 |
PMSG_EVENT(pdev->dev.power.power_state) = 0; |
944 |
PMSG_EVENT(pdev->dev.power.power_state) = 0; |
925 |
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL); |
945 |
KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL); |