History

drm/format-helper: Add destination-buffer pitch to drm_fb_swab()

Add destination-buffer pitch as argument to drm_fb_swab(). Done for consistency with the rest of the interface. v2: * update documentation (Noralf)

Thomas Zimmermann committed 5 years ago

Commit 3e3543c1 parent 27bd66d4 files · +21 −9Browse files

Unified · Split

4 files
  1. drivers/gpu/drm/drm_format_helper.c +16 −5
  2. drivers/gpu/drm/drm_mipi_dbi.c +1 −1
  3. drivers/gpu/drm/gud/gud_pipe.c +1 −1
  4. include/drm/drm_format_helper.h +3 −2
drivers/gpu/drm/drm_format_helper.c+16−5
@@ -101,6 +101,7 @@ EXPORT_SYMBOL(drm_fb_memcpy_toio); · 100 unmodified lines
101101 /**
102102 * drm_fb_swab - Swap bytes into clip buffer
103103 * @dst: Destination buffer
104+ * @dst_pitch: Number of bytes between two consecutive scanlines within dst
104105 * @src: Source buffer
105106 * @fb: DRM framebuffer
106107 * @clip: Clip rectangle area to copy
@@ -110,21 +111,27 @@ EXPORT_SYMBOL(drm_fb_memcpy_toio); · 3 unmodified lines
110111 * time to speed up slow uncached reads.
111112 *
112113 * This function does not apply clipping on dst, i.e. the destination
113− * is a small buffer containing the clip rect only.
114+ * is at the top-left corner.
114115 */
115−void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb,
116− struct drm_rect *clip, bool cached)
116+void drm_fb_swab(void *dst, unsigned int dst_pitch, const void *src,
117+ const struct drm_framebuffer *fb, const struct drm_rect *clip,
118+ bool cached)
117119 {
118120 u8 cpp = fb->format->cpp[0];
119121 size_t len = drm_rect_width(clip) * cpp;
120− u16 *src16, *dst16 = dst;
121− u32 *src32, *dst32 = dst;
122+ const u16 *src16;
123+ const u32 *src32;
124+ u16 *dst16;
125+ u32 *dst32;
122126 unsigned int x, y;
123127 void *buf = NULL;
124128
125129 if (WARN_ON_ONCE(cpp != 2 && cpp != 4))
126130 return;
127131
132+ if (!dst_pitch)
133+ dst_pitch = len;
134+
128135 if (!cached)
129136 buf = kmalloc(len, GFP_KERNEL);
130137
@@ -140,6 +147,9 @@ void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb, · 9 unmodified lines
140147 src32 = src;
141148 }
142149
150+ dst16 = dst;
151+ dst32 = dst;
152+
143153 for (x = clip->x1; x < clip->x2; x++) {
144154 if (cpp == 4)
145155 *dst32++ = swab32(*src32++);
@@ -148,6 +158,7 @@ void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb, · 2 unmodified lines
148158 }
149159
150160 src += fb->pitches[0];
161+ dst += dst_pitch;
151162 }
152163
153164 kfree(buf);
drivers/gpu/drm/drm_mipi_dbi.c+1−1
@@ -211,7 +211,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb, · 210 unmodified lines
211211 switch (fb->format->format) {
212212 case DRM_FORMAT_RGB565:
213213 if (swap)
214− drm_fb_swab(dst, src, fb, clip, !gem->import_attach);
214+ drm_fb_swab(dst, 0, src, fb, clip, !gem->import_attach);
215215 else
216216 drm_fb_memcpy(dst, 0, src, fb, clip);
217217 break;
drivers/gpu/drm/gud/gud_pipe.c+1−1
@@ -201,7 +201,7 @@ retry: · 200 unmodified lines
201201 len = gud_xrgb8888_to_color(buf, format, vaddr, fb, rect);
202202 }
203203 } else if (gud_is_big_endian() && format->cpp[0] > 1) {
204− drm_fb_swab(buf, vaddr, fb, rect, !import_attach);
204+ drm_fb_swab(buf, 0, vaddr, fb, rect, !import_attach);
205205 } else if (compression && !import_attach && pitch == fb->pitches[0]) {
206206 /* can compress directly from the framebuffer */
207207 buf = vaddr + rect->y1 * pitch;
include/drm/drm_format_helper.h+3−2
@@ -17,8 +17,9 @@ void drm_fb_memcpy(void *dst, unsigned int dst_pitch, const void *vaddr, · 16 unmodified lines
1717 const struct drm_framebuffer *fb, const struct drm_rect *clip);
1818 void drm_fb_memcpy_toio(void __iomem *dst, unsigned int dst_pitch, const void *vaddr,
1919 const struct drm_framebuffer *fb, const struct drm_rect *clip);
20−void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb,
21− struct drm_rect *clip, bool cached);
20+void drm_fb_swab(void *dst, unsigned int dst_pitch, const void *src,
21+ const struct drm_framebuffer *fb, const struct drm_rect *clip,
22+ bool cached);
2223 void drm_fb_xrgb8888_to_rgb332(void *dst, void *vaddr, struct drm_framebuffer *fb,
2324 struct drm_rect *clip);
2425 void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t