Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 114362
Collapse All | Expand All

(-)NVIDIA-Linux-x86-1.0-7676-pkg0/usr/src/nv/nv.c.orig (-7 / +7 lines)
Lines 235-241 unsigned int nv_kern_ctl_poll(struct fi Link Here
235
235
236
int nv_kern_probe(struct pci_dev *, const struct pci_device_id *);
236
int nv_kern_probe(struct pci_dev *, const struct pci_device_id *);
237
#if defined(NV_PM_SUPPORT_ACPI)
237
#if defined(NV_PM_SUPPORT_ACPI)
238
int nv_kern_acpi_standby(struct pci_dev *, u32);
238
int nv_kern_acpi_standby(struct pci_dev *, pm_message_t);
239
int nv_kern_acpi_resume(struct pci_dev *);
239
int nv_kern_acpi_resume(struct pci_dev *);
240
#endif
240
#endif
241
241
Lines 3649-3655 int Link Here
3649
nv_acpi_event
3649
nv_acpi_event
3650
(
3650
(
3651
    struct pci_dev *dev, 
3651
    struct pci_dev *dev, 
3652
    u32 state
3652
    int state
3653
)
3653
)
3654
{
3654
{
3655
    nv_state_t *nv;
3655
    nv_state_t *nv;
Lines 3678-3689 nv_acpi_event Link Here
3678
3678
3679
    switch (state)
3679
    switch (state)
3680
    {
3680
    {
3681
        case PM_SUSPEND_MEM:
3681
        case PM_EVENT_SUSPEND:
3682
            nv_printf(NV_DBG_INFO, "NVRM: ACPI: received suspend event\n");
3682
            nv_printf(NV_DBG_INFO, "NVRM: ACPI: received suspend event\n");
3683
            status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
3683
            status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
3684
            break;
3684
            break;
3685
3685
3686
        case PM_SUSPEND_ON:
3686
        case PM_EVENT_ON:
3687
            nv_printf(NV_DBG_INFO, "NVRM: ACPI: received resume event\n");
3687
            nv_printf(NV_DBG_INFO, "NVRM: ACPI: received resume event\n");
3688
            status = rm_power_management(nv, 0, NV_PM_ACPI_RESUME);
3688
            status = rm_power_management(nv, 0, NV_PM_ACPI_RESUME);
3689
            break;
3689
            break;
Lines 3703-3712 int Link Here
3703
nv_kern_acpi_standby
3703
nv_kern_acpi_standby
3704
(
3704
(
3705
    struct pci_dev *dev, 
3705
    struct pci_dev *dev, 
3706
    u32 state
3706
    pm_message_t state
3707
)
3707
)
3708
{
3708
{
3709
    return nv_acpi_event(dev, state);
3709
    return nv_acpi_event(dev, state.event);
3710
}
3710
}
3711
3711
3712
int
3712
int
Lines 3715-3721 nv_kern_acpi_resume Link Here
3715
    struct pci_dev *dev
3715
    struct pci_dev *dev
3716
)
3716
)
3717
{
3717
{
3718
    return nv_acpi_event(dev, PM_SUSPEND_ON);
3718
    return nv_acpi_event(dev, PM_EVENT_ON);
3719
}
3719
}
3720
3720
3721
#endif
3721
#endif

Return to bug 114362