[PATCH] powerpc: radeon and CONFIG_PM

[Michael Neuling]

Mike,

You may want to repost this patch as it's been line wrapped.

Mikey

Mike Wolf <mjw at us.ibm.com> wrote:
> The following comment is in drivers/video/aty/radeon_pm.c
> 
>         /* Check if we can power manage on suspend/resume. We can do
>          * D2 on M6, M7 and M9, and we can resume from D3 cold a few other
>          * "Mac" cards, but that's all. We need more infos about what the
>          * BIOS does tho. Right now, all this PM stuff is pmac-only for that
>          * reason. --BenH
>          */
> 
> but it didnt check that CONFIG_PMAC was selected with CONFIG_PM.  This
> results in build errors when CONFIG_PM is selected and pseries is built.
> 
> Signed-off-by: Mike Wolf <mjw at us.ibm.com>
> 
> ======================================================================
> 
> 
> --- a/drivers/video/aty/radeon_pm.c     2005-12-08 14:17:45.000000000 +0800
> +++ b/drivers/video/aty/radeon_pm.c     2005-12-08 14:35:57.000000000 +0800
> @@ -2734,7 +2734,7 @@
>          * BIOS does tho. Right now, all this PM stuff is pmac-only for that
>          * reason. --BenH
>          */
> -#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF)
> +#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF) && 
> defined(CONFIG_PPC_PMAC)
>         if (_machine == _MACH_Pmac && rinfo->of_node) {
>                 if (rinfo->is_mobility && rinfo->pm_reg &&
>                     rinfo->family <= CHIP_FAMILY_RV250)
> @@ -2778,12 +2778,12 @@
>                 OUTREG(TV_DAC_CNTL, INREG(TV_DAC_CNTL) | 0x07000000);
>  #endif
>         }
> -#endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) */
> +#endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) && 
> defined(CONFIG_PPC_PMAC) */
>  }
> 
>  void radeonfb_pm_exit(struct radeonfb_info *rinfo)
>  {
> -#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF)
> +#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF) && 
> defined(CONFIG_PPC_PMAC)
>         if (rinfo->pm_mode != radeon_pm_none)
>                 pmac_set_early_video_resume(NULL, NULL);
>  #endif
> 
> _______________________________________________
> Linuxppc64-dev mailing list
> Linuxppc64-dev at ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc64-dev
>