This patch adds a missing .event to pm_message_t handling in
drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.
--- linux-2.6.12-rc4/drivers/video/aty/radeon_pm.c 2005-05-21 11:31:32.000000000 +0200
+++ linux-2.6.12-rc4-radeon_pm/drivers/video/aty/radeon_pm.c 2005-05-21 11:34:51.000000000 +0200
@@ -2526,11 +2526,11 @@ int radeonfb_pci_suspend(struct pci_dev
struct radeonfb_info *rinfo = info->par;
int i;
- if (state == pdev->dev.power.power_state)
+ if (state.event == pdev->dev.power.power_state.event)
return 0;
printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
- pci_name(pdev), state);
+ pci_name(pdev), state.event);
/* For suspend-to-disk, we cheat here. We don't suspend anything and
* let fbcon continue drawing until we are all set. That shouldn't
Sincerely,
Brix
Please CC: me on replies as I am not subscribed to LKML.
--
Henrik Brix Andersen <[email protected]>
Gentoo Linux
On So 21-05-05 12:02:24, Henrik Brix Andersen wrote:
> This patch adds a missing .event to pm_message_t handling in
> drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.
>
> --- linux-2.6.12-rc4/drivers/video/aty/radeon_pm.c 2005-05-21 11:31:32.000000000 +0200
> +++ linux-2.6.12-rc4-radeon_pm/drivers/video/aty/radeon_pm.c 2005-05-21 11:34:51.000000000 +0200
> @@ -2526,11 +2526,11 @@ int radeonfb_pci_suspend(struct pci_dev
> struct radeonfb_info *rinfo = info->par;
> int i;
>
> - if (state == pdev->dev.power.power_state)
> + if (state.event == pdev->dev.power.power_state.event)
> return 0;
>
> printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
> - pci_name(pdev), state);
> + pci_name(pdev), state.event);
>
> /* For suspend-to-disk, we cheat here. We don't suspend anything and
> * let fbcon continue drawing until we are all set. That shouldn't
Are you sure? I think you'll _break_ compilation by doing
this. pm_message_t becoming struct is not yet merged in rc4, IIRC.
Pavel
Hi Pavel and Henrik.
On Sun, 2005-05-22 at 20:50, Pavel Machek wrote:
> On So 21-05-05 12:02:24, Henrik Brix Andersen wrote:
> > This patch adds a missing .event to pm_message_t handling in
> > drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.
> >
> > --- linux-2.6.12-rc4/drivers/video/aty/radeon_pm.c 2005-05-21 11:31:32.000000000 +0200
> > +++ linux-2.6.12-rc4-radeon_pm/drivers/video/aty/radeon_pm.c 2005-05-21 11:34:51.000000000 +0200
> > @@ -2526,11 +2526,11 @@ int radeonfb_pci_suspend(struct pci_dev
> > struct radeonfb_info *rinfo = info->par;
> > int i;
> >
> > - if (state == pdev->dev.power.power_state)
> > + if (state.event == pdev->dev.power.power_state.event)
> > return 0;
> >
> > printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
> > - pci_name(pdev), state);
> > + pci_name(pdev), state.event);
> >
> > /* For suspend-to-disk, we cheat here. We don't suspend anything and
> > * let fbcon continue drawing until we are all set. That shouldn't
>
> Are you sure? I think you'll _break_ compilation by doing
> this. pm_message_t becoming struct is not yet merged in rc4, IIRC.
You're right. As you know, we've included this in Suspend2 for a while
now. Brix is being a bit zealous about getting it in :>
Nigel
Hi Pavel,
On Sun, 2005-05-22 at 12:50 +0200, Pavel Machek wrote:
> Are you sure? I think you'll _break_ compilation by doing
> this. pm_message_t becoming struct is not yet merged in rc4, IIRC.
Argh - I suffered from patchset-confusion-disorder there for a moment, I
apologize. Please disregard this patch for now.
Sincerely,
Brix
--
Henrik Brix Andersen <[email protected]>
Gentoo Linux
On Ne 22-05-05 20:54:11, Nigel Cunningham wrote:
> Hi Pavel and Henrik.
>
> On Sun, 2005-05-22 at 20:50, Pavel Machek wrote:
> > On So 21-05-05 12:02:24, Henrik Brix Andersen wrote:
> > > This patch adds a missing .event to pm_message_t handling in
> > > drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.
> > >
> > > --- linux-2.6.12-rc4/drivers/video/aty/radeon_pm.c 2005-05-21 11:31:32.000000000 +0200
> > > +++ linux-2.6.12-rc4-radeon_pm/drivers/video/aty/radeon_pm.c 2005-05-21 11:34:51.000000000 +0200
> > > @@ -2526,11 +2526,11 @@ int radeonfb_pci_suspend(struct pci_dev
> > > struct radeonfb_info *rinfo = info->par;
> > > int i;
> > >
> > > - if (state == pdev->dev.power.power_state)
> > > + if (state.event == pdev->dev.power.power_state.event)
> > > return 0;
> > >
> > > printk(KERN_DEBUG "radeonfb (%s): suspending to state: %d...\n",
> > > - pci_name(pdev), state);
> > > + pci_name(pdev), state.event);
> > >
> > > /* For suspend-to-disk, we cheat here. We don't suspend anything and
> > > * let fbcon continue drawing until we are all set. That shouldn't
> >
> > Are you sure? I think you'll _break_ compilation by doing
> > this. pm_message_t becoming struct is not yet merged in rc4, IIRC.
>
> You're right. As you know, we've included this in Suspend2 for a while
> now. Brix is being a bit zealous about getting it in :>
I hope to get turn pm_message_t into struct shortly after 2.6.12, so
this kind of confusion ends... [Or perhaps I should just do it in the
-mm tree?]
Pavel