Re: [PATCH 12/12] drm/format-helper: Move destination-buffer handling into internal helper
Hi Thomas, > > > - static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > > > - 0, 0, 0, 0 > > > - }; > > > const struct drm_format_info *format = fb->format; > > > - u8 cpp = format->cpp[0]; > > > void (*swab_line)(void *dbuf, const void *sbuf, unsigned int > > > npixels); > > > - switch (cpp) { > > > + switch (format->cpp[0]) { > > > case 4: > > > swab_line = drm_fb_swab32_line; > > > break; > > > @@ -230,21 +249,10 @@ void drm_fb_swab(struct iosys_map *dst, const > > > unsigned int *dst_pitch, > > > default: > > > drm_warn_once(fb->dev, "Format %p4cc has unsupported > > > pixel size.\n", > > > &format->format); > > > - swab_line = NULL; > > > - break; > > > - } > > > - if (!swab_line) > > > return; > > > + } > > > - if (!dst_pitch) > > > - dst_pitch = default_dst_pitch; > > > - > > > - if (dst->is_iomem) > > > - drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], cpp, > > > - vmap[0].vaddr, fb, clip, cached, swab_line); > > > - else > > > - drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], cpp, vmap[0].vaddr, fb, > > > - clip, cached, swab_line); > > > + drm_fb_xfrm(dst, dst_pitch, format->cpp, vmap, fb, clip, cached, > > > swab_line); > > > > In this case we pass fb->format-cpp as dst_pitch - so we could retreive > > is via the fb pointer. > > I don't understand this comment. We're passing format->cpp as dst_pixsize. > I've meanwhile updated the code to compute the value from > drm_format_info_bpp(). I wanted to ask if we could drop the format->cpp argument and in drm_fb_xfrm() use fb->format to retrieve the char per pixel. So we move this part down in drm_fb_xfrm(), rather than finding the char per pixel in all callers. Maybe some of the other callers do not allow this and then this comment can be ignored. I have not yet looked at the updated patch-set. Sam
Re: [PATCH 12/12] drm/format-helper: Move destination-buffer handling into internal helper
Hi Sam Am 05.08.22 um 19:52 schrieb Sam Ravnborg: Hi Thomas, On Wed, Jul 27, 2022 at 01:33:12PM +0200, Thomas Zimmermann wrote: The format-convertion helpers handle several cases for different values of destination buffer and pitch. Move that code into the internal helper drm_fb_xfrm() and avoid quite a bit of duplucation. This is very nice patch that should come before all the conversion patches - but then you have had to come up with another name. So I think this is fine. A few comments below, mostly in the same area as the comments from José. Sam Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/drm_format_helper.c | 169 +++- 1 file changed, 64 insertions(+), 105 deletions(-) diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c index d296d181659d..35aebdb90165 100644 --- a/drivers/gpu/drm/drm_format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -41,11 +41,11 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, const struct drm_format_info } EXPORT_SYMBOL(drm_fb_clip_offset); -/* TODO: Make this functon work with multi-plane formats. */ -static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pixsize, - const void *vaddr, const struct drm_framebuffer *fb, - const struct drm_rect *clip, bool vaddr_cached_hint, - void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) +/* TODO: Make this function work with multi-plane formats. */ +static int __drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pixsize, +const void *vaddr, const struct drm_framebuffer *fb, +const struct drm_rect *clip, bool vaddr_cached_hint, +void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) { unsigned long linepixels = drm_rect_width(clip); unsigned long lines = drm_rect_height(clip); @@ -84,11 +84,11 @@ static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pix return 0; } -/* TODO: Make this functon work with multi-plane formats. */ -static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned long dst_pixsize, - const void *vaddr, const struct drm_framebuffer *fb, - const struct drm_rect *clip, bool vaddr_cached_hint, - void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) +/* TODO: Make this function work with multi-plane formats. */ +static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned long dst_pixsize, + const void *vaddr, const struct drm_framebuffer *fb, + const struct drm_rect *clip, bool vaddr_cached_hint, + void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) { unsigned long linepixels = drm_rect_width(clip); unsigned long lines = drm_rect_height(clip); @@ -129,6 +129,29 @@ static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned return 0; } +/* TODO: Make this function work with multi-plane formats. */ +static int drm_fb_xfrm(struct iosys_map *dst, + const unsigned int *dst_pitch, const u8 *dst_pixsize, + const struct iosys_map *vmap, const struct drm_framebuffer *fb, + const struct drm_rect *clip, bool vaddr_cached_hint, + void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) +{ Just to repeat myself a little, this assumes src (vmap) is always system memory (not io). + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { + 0, 0, 0, 0 + }; + + if (!dst_pitch) + dst_pitch = default_dst_pitch; + + if (dst[0].is_iomem) + return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], dst_pixsize[0], + vmap[0].vaddr, fb, clip, false, xfrm_line); + else + return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0], +vmap[0].vaddr, fb, clip, false, xfrm_line); It looks like vaddr_cached_hint is always false, so can we remove it? Always passing false is a bug. drm_fb_swab() uses vaddr_cached_hint and we should forward the value here. +} + + /** * drm_fb_memcpy - Copy clip buffer * @dst: Array of destination buffers @@ -213,14 +236,10 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch, const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct drm_rect *clip, bool cached) { - static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { - 0, 0, 0, 0 - };
Re: [PATCH 12/12] drm/format-helper: Move destination-buffer handling into internal helper
Hi Thomas, On Wed, Jul 27, 2022 at 01:33:12PM +0200, Thomas Zimmermann wrote: > The format-convertion helpers handle several cases for different > values of destination buffer and pitch. Move that code into the > internal helper drm_fb_xfrm() and avoid quite a bit of duplucation. This is very nice patch that should come before all the conversion patches - but then you have had to come up with another name. So I think this is fine. A few comments below, mostly in the same area as the comments from José. Sam > > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/drm_format_helper.c | 169 +++- > 1 file changed, 64 insertions(+), 105 deletions(-) > > diff --git a/drivers/gpu/drm/drm_format_helper.c > b/drivers/gpu/drm/drm_format_helper.c > index d296d181659d..35aebdb90165 100644 > --- a/drivers/gpu/drm/drm_format_helper.c > +++ b/drivers/gpu/drm/drm_format_helper.c > @@ -41,11 +41,11 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, const > struct drm_format_info > } > EXPORT_SYMBOL(drm_fb_clip_offset); > > -/* TODO: Make this functon work with multi-plane formats. */ > -static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long > dst_pixsize, > -const void *vaddr, const struct drm_framebuffer *fb, > -const struct drm_rect *clip, bool vaddr_cached_hint, > -void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned > int npixels)) > +/* TODO: Make this function work with multi-plane formats. */ > +static int __drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long > dst_pixsize, > + const void *vaddr, const struct drm_framebuffer *fb, > + const struct drm_rect *clip, bool vaddr_cached_hint, > + void (*xfrm_line)(void *dbuf, const void *sbuf, > unsigned int npixels)) > { > unsigned long linepixels = drm_rect_width(clip); > unsigned long lines = drm_rect_height(clip); > @@ -84,11 +84,11 @@ static int drm_fb_xfrm(void *dst, unsigned long > dst_pitch, unsigned long dst_pix > return 0; > } > > -/* TODO: Make this functon work with multi-plane formats. */ > -static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, > unsigned long dst_pixsize, > - const void *vaddr, const struct drm_framebuffer *fb, > - const struct drm_rect *clip, bool vaddr_cached_hint, > - void (*xfrm_line)(void *dbuf, const void *sbuf, > unsigned int npixels)) > +/* TODO: Make this function work with multi-plane formats. */ > +static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, > unsigned long dst_pixsize, > + const void *vaddr, const struct drm_framebuffer > *fb, > + const struct drm_rect *clip, bool > vaddr_cached_hint, > + void (*xfrm_line)(void *dbuf, const void *sbuf, > unsigned int npixels)) > { > unsigned long linepixels = drm_rect_width(clip); > unsigned long lines = drm_rect_height(clip); > @@ -129,6 +129,29 @@ static int drm_fb_xfrm_toio(void __iomem *dst, unsigned > long dst_pitch, unsigned > return 0; > } > > +/* TODO: Make this function work with multi-plane formats. */ > +static int drm_fb_xfrm(struct iosys_map *dst, > +const unsigned int *dst_pitch, const u8 *dst_pixsize, > +const struct iosys_map *vmap, const struct > drm_framebuffer *fb, > +const struct drm_rect *clip, bool vaddr_cached_hint, > +void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned > int npixels)) > +{ Just to repeat myself a little, this assumes src (vmap) is always system memory (not io). > + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > + 0, 0, 0, 0 > + }; > + > + if (!dst_pitch) > + dst_pitch = default_dst_pitch; > + > + if (dst[0].is_iomem) > + return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], > dst_pixsize[0], > + vmap[0].vaddr, fb, clip, false, > xfrm_line); > + else > + return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0], > + vmap[0].vaddr, fb, clip, false, xfrm_line); It looks like vaddr_cached_hint is always false, so can we remove it? > +} > + > + > /** > * drm_fb_memcpy - Copy clip buffer > * @dst: Array of destination buffers > @@ -213,14 +236,10 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned > int *dst_pitch, >const struct iosys_map *vmap, const struct drm_framebuffer *fb, >const struct drm_rect *clip, bool cached) > { > - static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > - 0, 0, 0, 0 > - }; > const struct drm_format_info *format = fb->format; >
Re: [PATCH 12/12] drm/format-helper: Move destination-buffer handling into internal helper
On Thu, Jul 28, 2022 at 09:45:27AM +0200, Thomas Zimmermann wrote: > Hi > > Am 28.07.22 um 09:26 schrieb José Expósito: > > Hi! > > > > On Wed, Jul 27, 2022 at 01:33:12PM +0200, Thomas Zimmermann wrote: > > > The format-convertion helpers handle several cases for different > > > values of destination buffer and pitch. Move that code into the > > > internal helper drm_fb_xfrm() and avoid quite a bit of duplucation. > > > > > > Signed-off-by: Thomas Zimmermann > > > --- > > > drivers/gpu/drm/drm_format_helper.c | 169 +++- > > > 1 file changed, 64 insertions(+), 105 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/drm_format_helper.c > > > b/drivers/gpu/drm/drm_format_helper.c > > > index d296d181659d..35aebdb90165 100644 > > > --- a/drivers/gpu/drm/drm_format_helper.c > > > +++ b/drivers/gpu/drm/drm_format_helper.c > > > @@ -41,11 +41,11 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, > > > const struct drm_format_info > > > } > > > EXPORT_SYMBOL(drm_fb_clip_offset); > > > -/* TODO: Make this functon work with multi-plane formats. */ > > > -static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long > > > dst_pixsize, > > > -const void *vaddr, const struct drm_framebuffer *fb, > > > -const struct drm_rect *clip, bool vaddr_cached_hint, > > > -void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned > > > int npixels)) > > > +/* TODO: Make this function work with multi-plane formats. */ > > > +static int __drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned > > > long dst_pixsize, > > > + const void *vaddr, const struct drm_framebuffer *fb, > > > + const struct drm_rect *clip, bool vaddr_cached_hint, > > > + void (*xfrm_line)(void *dbuf, const void *sbuf, > > > unsigned int npixels)) > > > { > > > unsigned long linepixels = drm_rect_width(clip); > > > unsigned long lines = drm_rect_height(clip); > > > @@ -84,11 +84,11 @@ static int drm_fb_xfrm(void *dst, unsigned long > > > dst_pitch, unsigned long dst_pix > > > return 0; > > > } > > > -/* TODO: Make this functon work with multi-plane formats. */ > > > -static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, > > > unsigned long dst_pixsize, > > > - const void *vaddr, const struct drm_framebuffer *fb, > > > - const struct drm_rect *clip, bool vaddr_cached_hint, > > > - void (*xfrm_line)(void *dbuf, const void *sbuf, > > > unsigned int npixels)) > > > +/* TODO: Make this function work with multi-plane formats. */ > > > +static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long > > > dst_pitch, unsigned long dst_pixsize, > > > + const void *vaddr, const struct drm_framebuffer > > > *fb, > > > + const struct drm_rect *clip, bool > > > vaddr_cached_hint, > > > + void (*xfrm_line)(void *dbuf, const void *sbuf, > > > unsigned int npixels)) > > > { > > > unsigned long linepixels = drm_rect_width(clip); > > > unsigned long lines = drm_rect_height(clip); > > > @@ -129,6 +129,29 @@ static int drm_fb_xfrm_toio(void __iomem *dst, > > > unsigned long dst_pitch, unsigned > > > return 0; > > > } > > > +/* TODO: Make this function work with multi-plane formats. */ > > > +static int drm_fb_xfrm(struct iosys_map *dst, > > > +const unsigned int *dst_pitch, const u8 *dst_pixsize, > > > +const struct iosys_map *vmap, const struct > > > drm_framebuffer *fb, > > > +const struct drm_rect *clip, bool vaddr_cached_hint, > > > +void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned > > > int npixels)) > > > +{ > > > + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > > > + 0, 0, 0, 0 > > > + }; > > > + > > > + if (!dst_pitch) > > > + dst_pitch = default_dst_pitch; > > > + > > > + if (dst[0].is_iomem) > > > + return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], > > > dst_pixsize[0], > > > + vmap[0].vaddr, fb, clip, false, > > > xfrm_line); > > > + else > > > + return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0], > > > + vmap[0].vaddr, fb, clip, false, xfrm_line); > > > +} > > > + > > > + > > > > Nit: Extra blank line > > Oh! > > > > > > /** > > >* drm_fb_memcpy - Copy clip buffer > > >* @dst: Array of destination buffers > > > @@ -213,14 +236,10 @@ void drm_fb_swab(struct iosys_map *dst, const > > > unsigned int *dst_pitch, > > >const struct iosys_map *vmap, const struct > > > drm_framebuffer *fb, > > >const struct drm_rect *clip, bool cached) > > > { > > > - static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > > > -
Re: [PATCH 12/12] drm/format-helper: Move destination-buffer handling into internal helper
Hi Am 28.07.22 um 09:26 schrieb José Expósito: Hi! On Wed, Jul 27, 2022 at 01:33:12PM +0200, Thomas Zimmermann wrote: The format-convertion helpers handle several cases for different values of destination buffer and pitch. Move that code into the internal helper drm_fb_xfrm() and avoid quite a bit of duplucation. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/drm_format_helper.c | 169 +++- 1 file changed, 64 insertions(+), 105 deletions(-) diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c index d296d181659d..35aebdb90165 100644 --- a/drivers/gpu/drm/drm_format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -41,11 +41,11 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, const struct drm_format_info } EXPORT_SYMBOL(drm_fb_clip_offset); -/* TODO: Make this functon work with multi-plane formats. */ -static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pixsize, - const void *vaddr, const struct drm_framebuffer *fb, - const struct drm_rect *clip, bool vaddr_cached_hint, - void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) +/* TODO: Make this function work with multi-plane formats. */ +static int __drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pixsize, +const void *vaddr, const struct drm_framebuffer *fb, +const struct drm_rect *clip, bool vaddr_cached_hint, +void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) { unsigned long linepixels = drm_rect_width(clip); unsigned long lines = drm_rect_height(clip); @@ -84,11 +84,11 @@ static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pix return 0; } -/* TODO: Make this functon work with multi-plane formats. */ -static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned long dst_pixsize, - const void *vaddr, const struct drm_framebuffer *fb, - const struct drm_rect *clip, bool vaddr_cached_hint, - void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) +/* TODO: Make this function work with multi-plane formats. */ +static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned long dst_pixsize, + const void *vaddr, const struct drm_framebuffer *fb, + const struct drm_rect *clip, bool vaddr_cached_hint, + void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) { unsigned long linepixels = drm_rect_width(clip); unsigned long lines = drm_rect_height(clip); @@ -129,6 +129,29 @@ static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned return 0; } +/* TODO: Make this function work with multi-plane formats. */ +static int drm_fb_xfrm(struct iosys_map *dst, + const unsigned int *dst_pitch, const u8 *dst_pixsize, + const struct iosys_map *vmap, const struct drm_framebuffer *fb, + const struct drm_rect *clip, bool vaddr_cached_hint, + void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) +{ + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { + 0, 0, 0, 0 + }; + + if (!dst_pitch) + dst_pitch = default_dst_pitch; + + if (dst[0].is_iomem) + return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], dst_pixsize[0], + vmap[0].vaddr, fb, clip, false, xfrm_line); + else + return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0], +vmap[0].vaddr, fb, clip, false, xfrm_line); +} + + Nit: Extra blank line Oh! /** * drm_fb_memcpy - Copy clip buffer * @dst: Array of destination buffers @@ -213,14 +236,10 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch, const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct drm_rect *clip, bool cached) { - static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { - 0, 0, 0, 0 - }; const struct drm_format_info *format = fb->format; - u8 cpp = format->cpp[0]; void (*swab_line)(void *dbuf, const void *sbuf, unsigned int npixels); - switch (cpp) { + switch (format->cpp[0]) { case 4: swab_line = drm_fb_swab32_line; break; @@ -230,21 +249,10 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch, default: drm_warn_once(fb->dev, "Format %p4cc has unsupported pixel
Re: [PATCH 12/12] drm/format-helper: Move destination-buffer handling into internal helper
Hi! On Wed, Jul 27, 2022 at 01:33:12PM +0200, Thomas Zimmermann wrote: > The format-convertion helpers handle several cases for different > values of destination buffer and pitch. Move that code into the > internal helper drm_fb_xfrm() and avoid quite a bit of duplucation. > > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/drm_format_helper.c | 169 +++- > 1 file changed, 64 insertions(+), 105 deletions(-) > > diff --git a/drivers/gpu/drm/drm_format_helper.c > b/drivers/gpu/drm/drm_format_helper.c > index d296d181659d..35aebdb90165 100644 > --- a/drivers/gpu/drm/drm_format_helper.c > +++ b/drivers/gpu/drm/drm_format_helper.c > @@ -41,11 +41,11 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, const > struct drm_format_info > } > EXPORT_SYMBOL(drm_fb_clip_offset); > > -/* TODO: Make this functon work with multi-plane formats. */ > -static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long > dst_pixsize, > -const void *vaddr, const struct drm_framebuffer *fb, > -const struct drm_rect *clip, bool vaddr_cached_hint, > -void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned > int npixels)) > +/* TODO: Make this function work with multi-plane formats. */ > +static int __drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long > dst_pixsize, > + const void *vaddr, const struct drm_framebuffer *fb, > + const struct drm_rect *clip, bool vaddr_cached_hint, > + void (*xfrm_line)(void *dbuf, const void *sbuf, > unsigned int npixels)) > { > unsigned long linepixels = drm_rect_width(clip); > unsigned long lines = drm_rect_height(clip); > @@ -84,11 +84,11 @@ static int drm_fb_xfrm(void *dst, unsigned long > dst_pitch, unsigned long dst_pix > return 0; > } > > -/* TODO: Make this functon work with multi-plane formats. */ > -static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, > unsigned long dst_pixsize, > - const void *vaddr, const struct drm_framebuffer *fb, > - const struct drm_rect *clip, bool vaddr_cached_hint, > - void (*xfrm_line)(void *dbuf, const void *sbuf, > unsigned int npixels)) > +/* TODO: Make this function work with multi-plane formats. */ > +static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, > unsigned long dst_pixsize, > + const void *vaddr, const struct drm_framebuffer > *fb, > + const struct drm_rect *clip, bool > vaddr_cached_hint, > + void (*xfrm_line)(void *dbuf, const void *sbuf, > unsigned int npixels)) > { > unsigned long linepixels = drm_rect_width(clip); > unsigned long lines = drm_rect_height(clip); > @@ -129,6 +129,29 @@ static int drm_fb_xfrm_toio(void __iomem *dst, unsigned > long dst_pitch, unsigned > return 0; > } > > +/* TODO: Make this function work with multi-plane formats. */ > +static int drm_fb_xfrm(struct iosys_map *dst, > +const unsigned int *dst_pitch, const u8 *dst_pixsize, > +const struct iosys_map *vmap, const struct > drm_framebuffer *fb, > +const struct drm_rect *clip, bool vaddr_cached_hint, > +void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned > int npixels)) > +{ > + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > + 0, 0, 0, 0 > + }; > + > + if (!dst_pitch) > + dst_pitch = default_dst_pitch; > + > + if (dst[0].is_iomem) > + return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], > dst_pixsize[0], > + vmap[0].vaddr, fb, clip, false, > xfrm_line); > + else > + return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0], > + vmap[0].vaddr, fb, clip, false, xfrm_line); > +} > + > + Nit: Extra blank line > /** > * drm_fb_memcpy - Copy clip buffer > * @dst: Array of destination buffers > @@ -213,14 +236,10 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned > int *dst_pitch, >const struct iosys_map *vmap, const struct drm_framebuffer *fb, >const struct drm_rect *clip, bool cached) > { > - static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > - 0, 0, 0, 0 > - }; > const struct drm_format_info *format = fb->format; > - u8 cpp = format->cpp[0]; > void (*swab_line)(void *dbuf, const void *sbuf, unsigned int npixels); > > - switch (cpp) { > + switch (format->cpp[0]) { > case 4: > swab_line = drm_fb_swab32_line; > break; > @@ -230,21 +249,10 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned > int *dst_pitch, > default: >