Commit b2664093 authored by Randy Dunlap's avatar Randy Dunlap Committed by Maarten Lankhorst
Browse files

fbdev: atyfb: use LCD management functions for PPC_PMAC also 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210226173008.18236-1-rdunlap@infradead.org


Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 39a3898a

drivers/video/fbdev/aty/atyfb_base.c

+5 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
#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)

defined(CONFIG_FB_ATY_BACKLIGHT) || defined (CONFIG_PPC_PMAC)

static const u32 lt_lcd_regs[] = {

	CNFG_PANEL_LG,

	LCD_GEN_CNTL_LG,
@@ -175,8 +175,8 @@ u32 aty_ld_lcd(int index, const struct atyfb_par *par) 
		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_PMAC_BACKLIGHT) || defined(CONFIG_FB_ATY_BACKLIGHT) ||

	 defined(CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_PPC_PMAC) */

void aty_st_lcd(int index, u32 val, const struct atyfb_par *par)

{ }
@@ -184,7 +184,8 @@ u32 aty_ld_lcd(int index, const struct atyfb_par *par) 
{

	return 0;

}

#endif /* defined(CONFIG_PMAC_BACKLIGHT) || defined (CONFIG_FB_ATY_GENERIC_LCD) */

#endif /* defined(CONFIG_PMAC_BACKLIGHT) || defined(CONFIG_FB_ATY_BACKLIGHT) ||

	  defined (CONFIG_FB_ATY_GENERIC_LCD) || defined(CONFIG_PPC_PMAC) */



#ifdef CONFIG_FB_ATY_GENERIC_LCD

/*