|
@@ -244,7 +244,7 @@ static int atyfb_sync(struct fb_info *info);
|
|
|
*/
|
|
|
|
|
|
static int aty_init(struct fb_info *info);
|
|
|
-static void aty_resume_chip(struct fb_info *info);
|
|
|
+
|
|
|
#ifdef CONFIG_ATARI
|
|
|
static int store_video_par(char *videopar, unsigned char m64_num);
|
|
|
#endif
|
|
@@ -2023,6 +2023,20 @@ static int atyfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static void aty_resume_chip(struct fb_info *info)
|
|
|
+{
|
|
|
+ struct atyfb_par *par = info->par;
|
|
|
+
|
|
|
+ aty_st_le32(MEM_CNTL, par->mem_cntl, par);
|
|
|
+
|
|
|
+ if (par->pll_ops->resume_pll)
|
|
|
+ par->pll_ops->resume_pll(info, &par->pll);
|
|
|
+
|
|
|
+ if (par->aux_start)
|
|
|
+ aty_st_le32(BUS_CNTL,
|
|
|
+ aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
|
|
|
+}
|
|
|
+
|
|
|
static int atyfb_pci_resume(struct pci_dev *pdev)
|
|
|
{
|
|
|
struct fb_info *info = pci_get_drvdata(pdev);
|
|
@@ -2659,19 +2673,6 @@ aty_init_exit:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static void aty_resume_chip(struct fb_info *info)
|
|
|
-{
|
|
|
- struct atyfb_par *par = info->par;
|
|
|
-
|
|
|
- aty_st_le32(MEM_CNTL, par->mem_cntl, par);
|
|
|
-
|
|
|
- if (par->pll_ops->resume_pll)
|
|
|
- par->pll_ops->resume_pll(info, &par->pll);
|
|
|
-
|
|
|
- if (par->aux_start)
|
|
|
- aty_st_le32(BUS_CNTL, aty_ld_le32(BUS_CNTL, par) | BUS_APER_REG_DIS, par);
|
|
|
-}
|
|
|
-
|
|
|
#ifdef CONFIG_ATARI
|
|
|
static int __devinit store_video_par(char *video_str, unsigned char m64_num)
|
|
|
{
|