* [PATCH -next] fbdev: atyfb: use LCD management functions for PPC_PMAC also
@ 2021-02-26 0:05 Randy Dunlap
2021-02-26 12:12 ` Ville Syrjälä
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2021-02-26 0:05 UTC (permalink / raw)
To: linux-kernel
Cc: Randy Dunlap, Ville Syrjälä,
Daniel Vetter, Nick Desaulniers, linux-fbdev, dri-devel,
Bartlomiej Zolnierkiewicz, Sam Ravnborg, David Airlie,
Jani Nikula
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@linux.intel.com>
Signed-off-by: Randy 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>
---
Daniel- We also need this patch:
https://lore.kernel.org/dri-devel/20210224215528.822-1-rdunlap@infradead.org/
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)
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
/*
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH -next] fbdev: atyfb: use LCD management functions for PPC_PMAC also
2021-02-26 0:05 [PATCH -next] fbdev: atyfb: use LCD management functions for PPC_PMAC also Randy Dunlap
@ 2021-02-26 12:12 ` Ville Syrjälä
2021-02-26 16:38 ` Randy Dunlap
0 siblings, 1 reply; 3+ messages in thread
From: Ville Syrjälä @ 2021-02-26 12:12 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-kernel, Daniel Vetter, Nick Desaulniers, linux-fbdev,
dri-devel, Bartlomiej Zolnierkiewicz, Sam Ravnborg, David Airlie,
Jani Nikula
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@linux.intel.com>
> Signed-off-by: Randy 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>
> ---
> Daniel- We also need this patch:
> https://lore.kernel.org/dri-devel/20210224215528.822-1-rdunlap@infradead.org/
> 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.
> 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
> /*
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH -next] fbdev: atyfb: use LCD management functions for PPC_PMAC also
2021-02-26 12:12 ` Ville Syrjälä
@ 2021-02-26 16:38 ` Randy Dunlap
0 siblings, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2021-02-26 16:38 UTC (permalink / raw)
To: Ville Syrjälä
Cc: linux-kernel, Daniel Vetter, Nick Desaulniers, linux-fbdev,
dri-devel, Bartlomiej Zolnierkiewicz, Sam Ravnborg, David Airlie,
Jani Nikula
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@linux.intel.com>
>> Signed-off-by: Randy 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>
>> ---
>> Daniel- We also need this patch:
>> https://lore.kernel.org/dri-devel/20210224215528.822-1-rdunlap@infradead.org/
>> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-26 16:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-26 0:05 [PATCH -next] fbdev: atyfb: use LCD management functions for PPC_PMAC also Randy Dunlap
2021-02-26 12:12 ` Ville Syrjälä
2021-02-26 16:38 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).