On 2/26/21 4:12 AM, Ville Syrjälä wrote: > On Thu, Feb 25, 2021 at 04:05:37PM -0800, Randy Dunlap wrote: >> Include PPC_PMAC in the configs that use aty_ld_lcd() and >> aty_st_lcd() implementations so that the PM code may work >> correctly for PPC_PMAC. >> >> Suggested-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> >> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> >> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> >> Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> >> Cc: linux-fbdev@xxxxxxxxxxxxxxx >> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx >> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> >> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> >> Cc: David Airlie <airlied@xxxxxxxx> >> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> >> --- >> Daniel- We also need this patch: >> https://lore.kernel.org/dri-devel/20210224215528.822-1-rdunlap@xxxxxxxxxxxxx/ >> to fix a kernel test robot build error. >> >> drivers/video/fbdev/aty/atyfb_base.c | 8 +++----- >> 1 file changed, 3 insertions(+), 5 deletions(-) >> >> --- linux-next-20210219.orig/drivers/video/fbdev/aty/atyfb_base.c >> +++ linux-next-20210219/drivers/video/fbdev/aty/atyfb_base.c >> @@ -132,8 +132,7 @@ >> #define PRINTKI(fmt, args...) printk(KERN_INFO "atyfb: " fmt, ## args) >> #define PRINTKE(fmt, args...) printk(KERN_ERR "atyfb: " fmt, ## args) >> >> -#if defined(CONFIG_PMAC_BACKLIGHT) || defined(CONFIG_FB_ATY_GENERIC_LCD) || \ >> -defined(CONFIG_FB_ATY_BACKLIGHT) >> +#if defined(CONFIG_PPC_PMAC) > > Did you send an old version by accident? That's definitely > not what we want since it would break everything except PPC_PMAC. Yikes! Yes, thanks for catching that. I'll get the newer version out soon. >> static const u32 lt_lcd_regs[] = { >> CNFG_PANEL_LG, >> LCD_GEN_CNTL_LG, >> @@ -175,8 +174,7 @@ u32 aty_ld_lcd(int index, const struct a >> return aty_ld_le32(LCD_DATA, par); >> } >> } >> -#else /* defined(CONFIG_PMAC_BACKLIGHT) || defined(CONFIG_FB_ATY_BACKLIGHT) \ >> - defined(CONFIG_FB_ATY_GENERIC_LCD) */ >> +#else /* defined(CONFIG_PPC_PMAC) */ >> void aty_st_lcd(int index, u32 val, const struct atyfb_par *par) >> { } >> >> @@ -184,7 +182,7 @@ u32 aty_ld_lcd(int index, const struct a >> { >> return 0; >> } >> -#endif /* defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD) */ >> +#endif /* defined(CONFIG_PPC_PMAC) */ >> >> #ifdef CONFIG_FB_ATY_GENERIC_LCD >> /* > -- ~Randy
