Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 359095 | Differences between
and this patch

Collapse All | Expand All

(-)ati.orig/common/lib/modules/fglrx/build_mod/firegl_public.c (-4 / +4 lines)
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
        console_lock();
852
852
853
    if (firegl_cail_powerdown(privdev, state))
853
    if (firegl_cail_powerdown(privdev, state))
854
        ret = -EIO;
854
        ret = -EIO;
Lines 870-876 Link Here
870
    }
870
    }
871
871
872
    if (state == PM_EVENT_SUSPEND)
872
    if (state == PM_EVENT_SUSPEND)
873
        release_console_sem();
873
        console_unlock();
874
874
875
    KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);  
875
    KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, ret, NULL);  
876
    
876
    
Lines 894-900 Link Here
894
    if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
894
    if (PMSG_EVENT(pdev->dev.power.power_state) == 0) return 0;
895
895
896
    if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
896
    if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
897
        acquire_console_sem();
897
        console_lock();
898
898
899
#ifdef FIREGL_USWC_SUPPORT
899
#ifdef FIREGL_USWC_SUPPORT
900
    // Restore the PAT after resuming from S3 or S4.
900
    // Restore the PAT after resuming from S3 or S4.
Lines 919-925 Link Here
919
    firegl_cail_powerup(privdev);
919
    firegl_cail_powerup(privdev);
920
920
921
    if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
921
    if (PMSG_EVENT(pdev->dev.power.power_state) == PM_EVENT_SUSPEND)
922
        release_console_sem();
922
        console_unlock();
923
923
924
    PMSG_EVENT(pdev->dev.power.power_state) = 0;
924
    PMSG_EVENT(pdev->dev.power.power_state) = 0;
925
    KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);  
925
    KCL_DEBUG_TRACEOUT(FN_FIREGL_ACPI, 0, NULL);  

Return to bug 359095