Generic AGP PM support.
PATCH 1/1 Generic AGP PM support.
Hi.
This patch implements generic AGP power management support, and uses it for the Ati and NVidia drivers. It is an update on the patch that Matthew Garrett broke out of Suspend2 a while ago and sent to the list.
Regards,
Nigel
agp_suspend.h | 43 +++++++++++++++++++++++++++++++++++++++++++ ati-agp.c | 14 ++++++++++++++ nvidia-agp.c | 14 ++++++++++++++ 3 files changed, 71 insertions(+)
drivers/char/agp/agp_suspend.h +43 -0
@@ -0,0 +1,43 @@ +/* +* Generic routines for suspending and resuming an agp bridge. +* +* Include "agp.h" first. +*/ + +#ifdef CONFIG_PM +static int agp_common_suspend (struct pci_dev *pdev,pm_message_t state) +{ +pci_save_state (pdev); +pci_set_power_state (pdev,3 ); + +return 0 ; +} + +static int agp_common_resume (struct pci_dev *pdev, +struct agp_bridge_driver * generic_bridge, +int reconfigure (void )) +{ +struct agp_bridge_data *bridge =pci_get_drvdata (pdev); + +/* set power state 0 and restore PCI space */ +pci_set_power_state (pdev,0 ); +pci_restore_state (pdev); + +/* reconfigure AGP hardware again */ +if (bridge->driver == generic_bridge) +return reconfigure (); + +return 0 ; +} +#else +static int agp_common_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return 0 ; +} + +static int agp_common_resume (struct pci_dev *pdev,_something_ * bridge, +void *reconfigure) +{ +return 0 ; +} +#endif
drivers/char/agp/ati-agp.c +14 -0
@@ -9,6 +9,7 @@#include <linux/agp_backend.h> #include <asm/agp.h> #include "agp.h" +#include "agp_suspend.h" #define ATI_GART_MMBASE_ADDR 0x14#define ATI_RS100_APSIZE 0xac
@@ -507,6 +508,17 @@ static void __devexit agp_ati_remove(stragp_put_bridge (bridge); } +static int agp_ati_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return (agp_common_suspend (pdev, state)); +} + +static int agp_ati_resume (struct pci_dev *pdev) +{ +return agp_common_resume (pdev, &ati_generic_bridge, + ati_configure); +} +static struct pci_device_id agp_ati_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST <<8 ),
@@ -526,6 +538,8 @@ static struct pci_driver agp_ati_pci_dri .id_table = agp_ati_pci_table, .probe = agp_ati_probe, .remove = agp_ati_remove, + .suspend = agp_ati_suspend, + .resume = agp_ati_resume, };static int __init agp_ati_init (void )
drivers/char/agp/nvidia-agp.c +14 -0
@@ -12,6 +12,7 @@#include <linux/page-flags.h> #include <linux/mm.h> #include "agp.h" +#include "agp_suspend.h" /* NVIDIA registers */ #define NVIDIA_0_APSIZE 0x80
@@ -397,11 +398,24 @@ static struct pci_device_id agp_nvidia_pMODULE_DEVICE_TABLE (pci, agp_nvidia_pci_table); +static int agp_nvidia_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return (agp_common_suspend (pdev, state)); +} + +static int agp_nvidia_resume (struct pci_dev *pdev) +{ +return agp_common_resume (pdev, &agp_bridge, + nvidia_configure); +} +static struct pci_driver agp_nvidia_pci_driver = { .name ="agpgart-nvidia" , .id_table = agp_nvidia_pci_table, .probe = agp_nvidia_probe, .remove = agp_nvidia_remove, + .suspend = agp_nvidia_suspend, + .resume = agp_nvidia_resume, };static int __init agp_nvidia_init (void )
Quoted 7 lines · Nigel Cunningham
Hi.
This patch implements generic AGP power management support, and uses it for the Ati and NVidia drivers. It is an update on the patch that Matthew Garrett broke out of Suspend2 a while ago and sent to the list.
(Don't forget the signed-off-by:s, please)
Quoted 42 lines
agp_suspend.h | 43 +++++++++++++++++++++++++++++++++++++++++++ ati-agp.c | 14 ++++++++++++++ nvidia-agp.c | 14 ++++++++++++++ 3 files changed, 71 insertions(+)diff -ruNp
3030-agp-resume-support.patch-old/drivers/char/agp/agp_suspend.h3030-agp-resume-support.patch-new/drivers/char/agp/agp_suspend.hdrivers/char/agp/agp_suspend.h +33
-0@@ -0,0 +1,43 @@ +/* +* Generic routines for suspending and resuming an agp bridge. +* +* Include "agp.h" first. +*/ + +#ifdef CONFIG_PM +static int agp_common_suspend (struct pci_dev *pdev,pm_message_t state) +{ +pci_save_state (pdev); +pci_set_power_state (pdev,3 ); + +return 0 ; +} + +static int agp_common_resume (struct pci_dev *pdev, +struct agp_bridge_driver * generic_bridge, +int reconfigure (void )) +{ +struct agp_bridge_data *bridge =pci_get_drvdata (pdev); + +/* set power state 0 and restore PCI space */ +pci_set_power_state (pdev,0 ); +pci_restore_state (pdev); + +/* reconfigure AGP hardware again */ +if (bridge->driver == generic_bridge) +return reconfigure (); + +return 0 ; +} +#else +static int agp_common_suspend (struct pci_dev *pdev,pm_message_t state)
drivers/char/agp/agp_suspend.h line 43
Quoted 10 lines
drivers/char/agp/agp_suspend.h +10
-0+{ +return 0 ; +} + +static int agp_common_resume (struct pci_dev *pdev,_something_ * bridge, +void *reconfigure) +{ +return 0 ; +} +#endif
What we tend to do is this:
#ifdef CONFIG_PM
static int foo_resume(...)
{
...
}#else
#define foo_resume(...) NULL
#endif
...
static struct pci_driver foo_driver = {
...
.resume = foo_resume;
...
};I think you could do it that way, so the stubbed agp_common_suspend() and agp_common_resume() won't need to exist.
Quoted 12 lines
diff -ruNp
3030-agp-resume-support.patch-old/drivers/char/agp/ati-agp.c3030-agp-resume-support.patch-new/drivers/char/agp/ati-agp.cdrivers/char/agp/ati-agp.c +1
-0@@ -9,6 +9,7 @@#include <linux/agp_backend.h> #include <asm/agp.h> #include "agp.h" +#include "agp_suspend.h" #define ATI_GART_MMBASE_ADDR 0x14#define ATI_RS100_APSIZE 0xac
drivers/char/agp/ati-agp.c static void __devexit agp_ati_remove(str · line 514
Quoted 7 lines
drivers/char/agp/ati-agp.c +4
-0@@ -507,6 +508,17 @@ static void __devexit agp_ati_remove(stragp_put_bridge (bridge); } +static int agp_ati_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return (agp_common_suspend (pdev, state)); +}
Lose the extra parens, please.
drivers/char/agp/ati-agp.c static void __devexit agp_ati_remove(str · line 520
Quoted 5 lines
drivers/char/agp/ati-agp.c +5
-0+static int agp_ati_resume (struct pci_dev *pdev) +{ +return agp_common_resume (pdev, &ati_generic_bridge, + ati_configure); +}
Current ati-agp.c already has suspend and resume implementations.
Hi!
Quoted 30 lines
diff -ruNp
3030-agp-resume-support.patch-old/drivers/char/agp/ati-agp.c3030-agp-resume-support.patch-new/drivers/char/agp/ati-agp.cdrivers/char/agp/ati-agp.c +12
-0@@ -9,6 +9,7 @@#include <linux/agp_backend.h> #include <asm/agp.h> #include "agp.h" +#include "agp_suspend.h" #define ATI_GART_MMBASE_ADDR 0x14#define ATI_RS100_APSIZE 0xac@@ -507,6 +508,17 @@ static void __devexit agp_ati_remove(stragp_put_bridge (bridge); } +static int agp_ati_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return (agp_common_suspend (pdev, state)); +} + +static int agp_ati_resume (struct pci_dev *pdev) +{ +return agp_common_resume (pdev, &ati_generic_bridge, + ati_configure); +} +static struct pci_device_id agp_ati_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST <<8 ),
drivers/char/agp/ati-agp.c static struct pci_driver agp_ati_pci_dri · line 541
Quoted 4 lines
drivers/char/agp/ati-agp.c +1
-0@@ -526,6 +538,8 @@ static struct pci_driver agp_ati_pci_dri .id_table = agp_ati_pci_table, .probe = agp_ati_probe, .remove = agp_ati_remove, + .suspend = agp_ati_suspend,
Why not = agp_common_suspend here ?
Pavel
Signature · 1 line
Web maintainer for suspend.sf.net (www.sf.net/projects/suspend) wanted...
Quoted 5 lines · Nigel Cunningham
Hi.
This patch implements generic AGP power management support, and uses it for the Ati and NVidia drivers. It is an update on the patch that Matthew Garrett broke out of Suspend2 a while ago and sent to the list.
Are you aware that this will not work in a number of cases because there is no proper ordering between suspend/resume of the AGP bridge and of the video card ? Yes it sucks, no we don't have any infrastructure to deal with that... we sucks for anything remotely related to gfx, news at 11.
Ben.
Quoted 129 lines
Regards,
Nigel
agp_suspend.h | 43 +++++++++++++++++++++++++++++++++++++++++++ ati-agp.c | 14 ++++++++++++++ nvidia-agp.c | 14 ++++++++++++++ 3 files changed, 71 insertions(+)diff -ruNp
3030-agp-resume-support.patch-old/drivers/char/agp/agp_suspend.h3030-agp-resume-support.patch-new/drivers/char/agp/agp_suspend.hdrivers/char/agp/agp_suspend.h +43
-0@@ -0,0 +1,43 @@ +/* +* Generic routines for suspending and resuming an agp bridge. +* +* Include "agp.h" first. +*/ + +#ifdef CONFIG_PM +static int agp_common_suspend (struct pci_dev *pdev,pm_message_t state) +{ +pci_save_state (pdev); +pci_set_power_state (pdev,3 ); + +return 0 ; +} + +static int agp_common_resume (struct pci_dev *pdev, +struct agp_bridge_driver * generic_bridge, +int reconfigure (void )) +{ +struct agp_bridge_data *bridge =pci_get_drvdata (pdev); + +/* set power state 0 and restore PCI space */ +pci_set_power_state (pdev,0 ); +pci_restore_state (pdev); + +/* reconfigure AGP hardware again */ +if (bridge->driver == generic_bridge) +return reconfigure (); + +return 0 ; +} +#else +static int agp_common_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return 0 ; +} + +static int agp_common_resume (struct pci_dev *pdev,_something_ * bridge, +void *reconfigure) +{ +return 0 ; +} +#endif diff -ruNp
3030-agp-resume-support.patch-old/drivers/char/agp/ati-agp.c3030-agp-resume-support.patch-new/drivers/char/agp/ati-agp.cdrivers/char/agp/ati-agp.c +14
-0@@ -9,6 +9,7 @@#include <linux/agp_backend.h> #include <asm/agp.h> #include "agp.h" +#include "agp_suspend.h" #define ATI_GART_MMBASE_ADDR 0x14#define ATI_RS100_APSIZE 0xac@@ -507,6 +508,17 @@ static void __devexit agp_ati_remove(stragp_put_bridge (bridge); } +static int agp_ati_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return (agp_common_suspend (pdev, state)); +} + +static int agp_ati_resume (struct pci_dev *pdev) +{ +return agp_common_resume (pdev, &ati_generic_bridge, + ati_configure); +} +static struct pci_device_id agp_ati_pci_table[] = { { .class = (PCI_CLASS_BRIDGE_HOST <<8 ),@@ -526,6 +538,8 @@ static struct pci_driver agp_ati_pci_dri .id_table = agp_ati_pci_table, .probe = agp_ati_probe, .remove = agp_ati_remove, + .suspend = agp_ati_suspend, + .resume = agp_ati_resume, };static int __init agp_ati_init (void )diff -ruNp
3030-agp-resume-support.patch-old/drivers/char/agp/nvidia-agp.c3030-agp-resume-support.patch-new/drivers/char/agp/nvidia-agp.cdrivers/char/agp/nvidia-agp.c +14
-0@@ -12,6 +12,7 @@#include <linux/page-flags.h> #include <linux/mm.h> #include "agp.h" +#include "agp_suspend.h" /* NVIDIA registers */ #define NVIDIA_0_APSIZE 0x80@@ -397,11 +398,24 @@ static struct pci_device_id agp_nvidia_pMODULE_DEVICE_TABLE (pci, agp_nvidia_pci_table); +static int agp_nvidia_suspend (struct pci_dev *pdev,pm_message_t state) +{ +return (agp_common_suspend (pdev, state)); +} + +static int agp_nvidia_resume (struct pci_dev *pdev) +{ +return agp_common_resume (pdev, &agp_bridge, + nvidia_configure); +} +static struct pci_driver agp_nvidia_pci_driver = { .name ="agpgart-nvidia" , .id_table = agp_nvidia_pci_table, .probe = agp_nvidia_probe, .remove = agp_nvidia_remove, + .suspend = agp_nvidia_suspend, + .resume = agp_nvidia_resume, };static int __init agp_nvidia_init (void )