Skip to contentSkip to conversation

pm_message_t fix for radeon_pm.c

PATCH Henrik Brix Andersen 3 participants 5 messages May 21, 2005 – May 23, 2005 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

This patch adds a missing .event to pm_message_t handling in drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.

drivers/video/aty/radeon_pm.c +2 -2
@@ -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.

Signature · 2 lines
Henrik Brix Andersen <[email protected]>
Gentoo Linux
#1 lore raw
Quoted 9 lines · Henrik Brix Andersen

This patch adds a missing .event to pm_message_t handling in drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.

drivers/video/aty/radeon_pm.c +0 -0
@@ -2526,11 +2526,11 @@ int radeonfb_pci_suspend(struct pci_dev 
         struct radeonfb_info *rinfo = info->par;
 	int i;
 

drivers/video/aty/radeon_pm.c int radeonfb_pci_suspend(struct pci_dev · line 2536

Quoted 10 lines
drivers/video/aty/radeon_pm.c +2 -2
-	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

#2 lore raw

Hi Pavel and Henrik.

Quoted 18 lines · Pavel Machek
Quoted 17 lines · Henrik Brix Andersen

This patch adds a missing .event to pm_message_t handling in drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.

drivers/video/aty/radeon_pm.c +2 -2
@@ -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);
 
Quoted 5 lines

drivers/video/aty/radeon_pm.c int radeonfb_pci_suspend(struct pci_dev · line 2536

Quoted 2 lines
drivers/video/aty/radeon_pm.c +0 -0
 	/* 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

#3 lore raw
Quoted 21 lines · Nigel Cunningham

Hi Pavel and Henrik.

Quoted 18 lines · Pavel Machek
Quoted 17 lines · Henrik Brix Andersen

This patch adds a missing .event to pm_message_t handling in drivers/video/aty/radeon_pm.c for linux-2.6.12-rc4.

drivers/video/aty/radeon_pm.c +2 -2
@@ -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);
 
Quoted 8 lines
Quoted 5 lines

drivers/video/aty/radeon_pm.c int radeonfb_pci_suspend(struct pci_dev · line 2536

Quoted 2 lines
drivers/video/aty/radeon_pm.c +0 -0
 	/* 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

#4 lore raw
In reply to Pavel Machek

Hi Pavel,

Quoted 2 lines · Pavel Machek

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

Signature · 2 lines
Henrik Brix Andersen <[email protected]>
Gentoo Linux