| Message ID | 20230417125651.25126-17-tzimmermann@suse.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arch: Consolidate <asm/fb.h> | expand |
Hi Thomas! On Mon, 2023-04-17 at 14:56 +0200, Thomas Zimmermann wrote: > Replace the architecture's fbdev helpers with the generic > ones from <asm-generic/fb.h>. No functional changes. > > v2: > * use default implementation for fb_pgprotect() (Arnd) > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Yoshinori Sato <ysato@users.sourceforge.jp> > Cc: Rich Felker <dalias@libc.org> > Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> > --- > arch/sh/include/asm/fb.h | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h > index 9a0bca2686fd..19df13ee9ca7 100644 > --- a/arch/sh/include/asm/fb.h > +++ b/arch/sh/include/asm/fb.h > @@ -2,19 +2,6 @@ > #ifndef _ASM_FB_H_ > #define _ASM_FB_H_ > > -#include <linux/fb.h> > -#include <linux/fs.h> > -#include <asm/page.h> > - > -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > - unsigned long off) > -{ > - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > -} Looking at the macro in asm-generic/fb.h, fb_pgprotect() is being replaced with a no-op function. Is that intentional? Can you briefly explain the background for this change? > -static inline int fb_is_primary_device(struct fb_info *info) > -{ > - return 0; > -} > +#include <asm-generic/fb.h> > > #endif /* _ASM_FB_H_ */ Thanks, Adrian
Hi Am 17.04.23 um 15:02 schrieb John Paul Adrian Glaubitz: > Hi Thomas! > > On Mon, 2023-04-17 at 14:56 +0200, Thomas Zimmermann wrote: >> Replace the architecture's fbdev helpers with the generic >> ones from <asm-generic/fb.h>. No functional changes. >> >> v2: >> * use default implementation for fb_pgprotect() (Arnd) >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> >> Cc: Rich Felker <dalias@libc.org> >> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> >> --- >> arch/sh/include/asm/fb.h | 15 +-------------- >> 1 file changed, 1 insertion(+), 14 deletions(-) >> >> diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h >> index 9a0bca2686fd..19df13ee9ca7 100644 >> --- a/arch/sh/include/asm/fb.h >> +++ b/arch/sh/include/asm/fb.h >> @@ -2,19 +2,6 @@ >> #ifndef _ASM_FB_H_ >> #define _ASM_FB_H_ >> >> -#include <linux/fb.h> >> -#include <linux/fs.h> >> -#include <asm/page.h> >> - >> -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, >> - unsigned long off) >> -{ >> - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); >> -} > > Looking at the macro in asm-generic/fb.h, fb_pgprotect() is being replaced with > a no-op function. Is that intentional? Can you briefly explain the background > for this change? Patch 01 of this patchset changes the generic fb_pgprotect() to set pgprot_writecombine(). So on SH, there should be no change at all. Best regards Thomas > >> -static inline int fb_is_primary_device(struct fb_info *info) >> -{ >> - return 0; >> -} >> +#include <asm-generic/fb.h> >> >> #endif /* _ASM_FB_H_ */ > > Thanks, > Adrian >
Am 17.04.23 um 16:06 schrieb Thomas Zimmermann: > Hi > > Am 17.04.23 um 15:02 schrieb John Paul Adrian Glaubitz: >> Hi Thomas! >> >> On Mon, 2023-04-17 at 14:56 +0200, Thomas Zimmermann wrote: >>> Replace the architecture's fbdev helpers with the generic >>> ones from <asm-generic/fb.h>. No functional changes. >>> >>> v2: >>> * use default implementation for fb_pgprotect() (Arnd) >>> >>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >>> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> >>> Cc: Rich Felker <dalias@libc.org> >>> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> >>> --- >>> arch/sh/include/asm/fb.h | 15 +-------------- >>> 1 file changed, 1 insertion(+), 14 deletions(-) >>> >>> diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h >>> index 9a0bca2686fd..19df13ee9ca7 100644 >>> --- a/arch/sh/include/asm/fb.h >>> +++ b/arch/sh/include/asm/fb.h >>> @@ -2,19 +2,6 @@ >>> #ifndef _ASM_FB_H_ >>> #define _ASM_FB_H_ >>> -#include <linux/fb.h> >>> -#include <linux/fs.h> >>> -#include <asm/page.h> >>> - >>> -static inline void fb_pgprotect(struct file *file, struct >>> vm_area_struct *vma, >>> - unsigned long off) >>> -{ >>> - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); >>> -} >> >> Looking at the macro in asm-generic/fb.h, fb_pgprotect() is being >> replaced with >> a no-op function. Is that intentional? Can you briefly explain the >> background >> for this change? > > Patch 01 of this patchset changes the generic fb_pgprotect() to set > pgprot_writecombine(). So on SH, there should be no change at all. In case you didn't receive that patch: https://patchwork.freedesktop.org/patch/532493/?series=116157&rev=3 > > Best regards > Thomas > >> >>> -static inline int fb_is_primary_device(struct fb_info *info) >>> -{ >>> - return 0; >>> -} >>> +#include <asm-generic/fb.h> >>> #endif /* _ASM_FB_H_ */ >> >> Thanks, >> Adrian >> >
Hi Thomas! On Mon, 2023-04-17 at 16:06 +0200, Thomas Zimmermann wrote: > Hi > > Am 17.04.23 um 15:02 schrieb John Paul Adrian Glaubitz: > > Hi Thomas! > > > > On Mon, 2023-04-17 at 14:56 +0200, Thomas Zimmermann wrote: > > > Replace the architecture's fbdev helpers with the generic > > > ones from <asm-generic/fb.h>. No functional changes. > > > > > > v2: > > > * use default implementation for fb_pgprotect() (Arnd) > > > > > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > > > Cc: Yoshinori Sato <ysato@users.sourceforge.jp> > > > Cc: Rich Felker <dalias@libc.org> > > > Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> > > > --- > > > arch/sh/include/asm/fb.h | 15 +-------------- > > > 1 file changed, 1 insertion(+), 14 deletions(-) > > > > > > diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h > > > index 9a0bca2686fd..19df13ee9ca7 100644 > > > --- a/arch/sh/include/asm/fb.h > > > +++ b/arch/sh/include/asm/fb.h > > > @@ -2,19 +2,6 @@ > > > #ifndef _ASM_FB_H_ > > > #define _ASM_FB_H_ > > > > > > -#include <linux/fb.h> > > > -#include <linux/fs.h> > > > -#include <asm/page.h> > > > - > > > -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > > > - unsigned long off) > > > -{ > > > - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > > > -} > > > > Looking at the macro in asm-generic/fb.h, fb_pgprotect() is being replaced with > > a no-op function. Is that intentional? Can you briefly explain the background > > for this change? > > Patch 01 of this patchset changes the generic fb_pgprotect() to set > pgprot_writecombine(). So on SH, there should be no change at all. > Ah, I missed that, thanks for the explanation. Let me check and Ack your patch then. I assume you will be taking this patch as part of the whole series through your own tree? Thanks, Adrian
Hi Am 17.04.23 um 16:13 schrieb John Paul Adrian Glaubitz: > Hi Thomas! > > On Mon, 2023-04-17 at 16:06 +0200, Thomas Zimmermann wrote: >> Hi >> >> Am 17.04.23 um 15:02 schrieb John Paul Adrian Glaubitz: >>> Hi Thomas! >>> >>> On Mon, 2023-04-17 at 14:56 +0200, Thomas Zimmermann wrote: >>>> Replace the architecture's fbdev helpers with the generic >>>> ones from <asm-generic/fb.h>. No functional changes. >>>> >>>> v2: >>>> * use default implementation for fb_pgprotect() (Arnd) >>>> >>>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >>>> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> >>>> Cc: Rich Felker <dalias@libc.org> >>>> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> >>>> --- >>>> arch/sh/include/asm/fb.h | 15 +-------------- >>>> 1 file changed, 1 insertion(+), 14 deletions(-) >>>> >>>> diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h >>>> index 9a0bca2686fd..19df13ee9ca7 100644 >>>> --- a/arch/sh/include/asm/fb.h >>>> +++ b/arch/sh/include/asm/fb.h >>>> @@ -2,19 +2,6 @@ >>>> #ifndef _ASM_FB_H_ >>>> #define _ASM_FB_H_ >>>> >>>> -#include <linux/fb.h> >>>> -#include <linux/fs.h> >>>> -#include <asm/page.h> >>>> - >>>> -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, >>>> - unsigned long off) >>>> -{ >>>> - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); >>>> -} >>> >>> Looking at the macro in asm-generic/fb.h, fb_pgprotect() is being replaced with >>> a no-op function. Is that intentional? Can you briefly explain the background >>> for this change? >> >> Patch 01 of this patchset changes the generic fb_pgprotect() to set >> pgprot_writecombine(). So on SH, there should be no change at all. >> > > Ah, I missed that, thanks for the explanation. Let me check and Ack your patch Thanks! > then. I assume you will be taking this patch as part of the whole series through > your own tree? Yes, I'd merge it through drm-misc-next ideally. Best regards Thomas > > Thanks, > Adrian >
On Mon, 2023-04-17 at 14:56 +0200, Thomas Zimmermann wrote: > Replace the architecture's fbdev helpers with the generic > ones from <asm-generic/fb.h>. No functional changes. > > v2: > * use default implementation for fb_pgprotect() (Arnd) > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Yoshinori Sato <ysato@users.sourceforge.jp> > Cc: Rich Felker <dalias@libc.org> > Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> > --- > arch/sh/include/asm/fb.h | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h > index 9a0bca2686fd..19df13ee9ca7 100644 > --- a/arch/sh/include/asm/fb.h > +++ b/arch/sh/include/asm/fb.h > @@ -2,19 +2,6 @@ > #ifndef _ASM_FB_H_ > #define _ASM_FB_H_ > > -#include <linux/fb.h> > -#include <linux/fs.h> > -#include <asm/page.h> > - > -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > - unsigned long off) > -{ > - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > -} > - > -static inline int fb_is_primary_device(struct fb_info *info) > -{ > - return 0; > -} > +#include <asm-generic/fb.h> > > #endif /* _ASM_FB_H_ */ Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h index 9a0bca2686fd..19df13ee9ca7 100644 --- a/arch/sh/include/asm/fb.h +++ b/arch/sh/include/asm/fb.h @@ -2,19 +2,6 @@ #ifndef _ASM_FB_H_ #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h> -#include <asm/page.h> - -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, - unsigned long off) -{ - vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); -} - -static inline int fb_is_primary_device(struct fb_info *info) -{ - return 0; -} +#include <asm-generic/fb.h> #endif /* _ASM_FB_H_ */
Replace the architecture's fbdev helpers with the generic ones from <asm-generic/fb.h>. No functional changes. v2: * use default implementation for fb_pgprotect() (Arnd) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Rich Felker <dalias@libc.org> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> --- arch/sh/include/asm/fb.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)