| Message ID | 20220404204515.42144-9-igormtorrente@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add new formats support to vkms | expand |
On Mon, 4 Apr 2022 17:45:14 -0300 Igor Torrente <igormtorrente@gmail.com> wrote: > This will be useful to write tests that depends on these formats. > > ARGB and XRGB follows the a similar implementation of the former formats. > Just adjusting for 16 bits per channel. > > V3: Adapt the handlers to the new format introduced in patch 7 V3. > V5: Minor improvements > Added le16_to_cpu/cpu_to_le16 to the 16 bits color read/writes. > > Signed-off-by: Igor Torrente <igormtorrente@gmail.com> > --- > drivers/gpu/drm/vkms/vkms_formats.c | 77 +++++++++++++++++++++++++++ > drivers/gpu/drm/vkms/vkms_plane.c | 5 +- > drivers/gpu/drm/vkms/vkms_writeback.c | 2 + > 3 files changed, 83 insertions(+), 1 deletion(-) Hi, aside from the comments I already gave on the other patch adding the *RGB8888 variants that apply here too, this looks good to me, with or without those changes. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com> Thanks, pq > > diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c > index 931a61405d6a..8d913fa7dbde 100644 > --- a/drivers/gpu/drm/vkms/vkms_formats.c > +++ b/drivers/gpu/drm/vkms/vkms_formats.c > @@ -78,6 +78,41 @@ static void XRGB8888_to_argb_u16(struct line_buffer *stage_buffer, > } > } > > +static void ARGB16161616_to_argb_u16(struct line_buffer *stage_buffer, > + const struct vkms_frame_info *frame_info, > + int y) > +{ > + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; > + u16 *src_pixels = get_packed_src_addr(frame_info, y); > + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + stage_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, src_pixels += 4) { > + out_pixels[x].a = le16_to_cpu(src_pixels[3]); > + out_pixels[x].r = le16_to_cpu(src_pixels[2]); > + out_pixels[x].g = le16_to_cpu(src_pixels[1]); > + out_pixels[x].b = le16_to_cpu(src_pixels[0]); > + } > +} > + > +static void XRGB16161616_to_argb_u16(struct line_buffer *stage_buffer, > + const struct vkms_frame_info *frame_info, > + int y) > +{ > + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; > + u16 *src_pixels = get_packed_src_addr(frame_info, y); > + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + stage_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, src_pixels += 4) { > + out_pixels[x].a = (u16)0xffff; > + out_pixels[x].r = le16_to_cpu(src_pixels[2]); > + out_pixels[x].g = le16_to_cpu(src_pixels[1]); > + out_pixels[x].b = le16_to_cpu(src_pixels[0]); > + } > +} > + > + > /* > * The following functions take an line of argb_u16 pixels from the > * src_buffer, convert them to a specific format, and store them in the > @@ -130,12 +165,50 @@ static void argb_u16_to_XRGB8888(struct vkms_frame_info *frame_info, > } > } > > +static void argb_u16_to_ARGB16161616(struct vkms_frame_info *frame_info, > + const struct line_buffer *src_buffer, int y) > +{ > + int x, x_dst = frame_info->dst.x1; > + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); > + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; > + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + src_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, dst_pixels += 4) { > + dst_pixels[3] = cpu_to_le16(in_pixels[x].a); > + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); > + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); > + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); > + } > +} > + > +static void argb_u16_to_XRGB16161616(struct vkms_frame_info *frame_info, > + const struct line_buffer *src_buffer, int y) > +{ > + int x, x_dst = frame_info->dst.x1; > + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); > + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; > + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + src_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, dst_pixels += 4) { > + dst_pixels[3] = (u8)0xffff; > + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); > + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); > + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); > + } > +} > + > plane_format_transform_func get_plane_fmt_transform_function(u32 format) > { > if (format == DRM_FORMAT_ARGB8888) > return &ARGB8888_to_argb_u16; > else if (format == DRM_FORMAT_XRGB8888) > return &XRGB8888_to_argb_u16; > + else if (format == DRM_FORMAT_ARGB16161616) > + return &ARGB16161616_to_argb_u16; > + else if (format == DRM_FORMAT_XRGB16161616) > + return &XRGB16161616_to_argb_u16; > else > return NULL; > } > @@ -146,6 +219,10 @@ wb_format_transform_func get_wb_fmt_transform_function(u32 format) > return &argb_u16_to_ARGB8888; > else if (format == DRM_FORMAT_XRGB8888) > return &argb_u16_to_XRGB8888; > + else if (format == DRM_FORMAT_ARGB16161616) > + return &argb_u16_to_ARGB16161616; > + else if (format == DRM_FORMAT_XRGB16161616) > + return &argb_u16_to_XRGB16161616; > else > return NULL; > } > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c > index 798243837fd0..60054a85204a 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.c > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > @@ -14,11 +14,14 @@ > > static const u32 vkms_formats[] = { > DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XRGB16161616 > }; > > static const u32 vkms_plane_formats[] = { > DRM_FORMAT_ARGB8888, > - DRM_FORMAT_XRGB8888 > + DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XRGB16161616, > + DRM_FORMAT_ARGB16161616 > }; > > static struct drm_plane_state * > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c > index 97f71e784bbf..cb63a5da9af1 100644 > --- a/drivers/gpu/drm/vkms/vkms_writeback.c > +++ b/drivers/gpu/drm/vkms/vkms_writeback.c > @@ -15,6 +15,8 @@ > > static const u32 vkms_wb_formats[] = { > DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XRGB16161616, > + DRM_FORMAT_ARGB16161616 > }; > > static const struct drm_connector_funcs vkms_wb_connector_funcs = {
Hi Am 04.04.22 um 22:45 schrieb Igor Torrente: > This will be useful to write tests that depends on these formats. > > ARGB and XRGB follows the a similar implementation of the former formats. > Just adjusting for 16 bits per channel. > > V3: Adapt the handlers to the new format introduced in patch 7 V3. > V5: Minor improvements > Added le16_to_cpu/cpu_to_le16 to the 16 bits color read/writes. Is there something we could add to the DRM's format-conversion helpers? Best regards Thomas > > Signed-off-by: Igor Torrente <igormtorrente@gmail.com> > --- > drivers/gpu/drm/vkms/vkms_formats.c | 77 +++++++++++++++++++++++++++ > drivers/gpu/drm/vkms/vkms_plane.c | 5 +- > drivers/gpu/drm/vkms/vkms_writeback.c | 2 + > 3 files changed, 83 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c > index 931a61405d6a..8d913fa7dbde 100644 > --- a/drivers/gpu/drm/vkms/vkms_formats.c > +++ b/drivers/gpu/drm/vkms/vkms_formats.c > @@ -78,6 +78,41 @@ static void XRGB8888_to_argb_u16(struct line_buffer *stage_buffer, > } > } > > +static void ARGB16161616_to_argb_u16(struct line_buffer *stage_buffer, > + const struct vkms_frame_info *frame_info, > + int y) > +{ > + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; > + u16 *src_pixels = get_packed_src_addr(frame_info, y); > + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + stage_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, src_pixels += 4) { > + out_pixels[x].a = le16_to_cpu(src_pixels[3]); > + out_pixels[x].r = le16_to_cpu(src_pixels[2]); > + out_pixels[x].g = le16_to_cpu(src_pixels[1]); > + out_pixels[x].b = le16_to_cpu(src_pixels[0]); > + } > +} > + > +static void XRGB16161616_to_argb_u16(struct line_buffer *stage_buffer, > + const struct vkms_frame_info *frame_info, > + int y) > +{ > + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; > + u16 *src_pixels = get_packed_src_addr(frame_info, y); > + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + stage_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, src_pixels += 4) { > + out_pixels[x].a = (u16)0xffff; > + out_pixels[x].r = le16_to_cpu(src_pixels[2]); > + out_pixels[x].g = le16_to_cpu(src_pixels[1]); > + out_pixels[x].b = le16_to_cpu(src_pixels[0]); > + } > +} > + > + > /* > * The following functions take an line of argb_u16 pixels from the > * src_buffer, convert them to a specific format, and store them in the > @@ -130,12 +165,50 @@ static void argb_u16_to_XRGB8888(struct vkms_frame_info *frame_info, > } > } > > +static void argb_u16_to_ARGB16161616(struct vkms_frame_info *frame_info, > + const struct line_buffer *src_buffer, int y) > +{ > + int x, x_dst = frame_info->dst.x1; > + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); > + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; > + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + src_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, dst_pixels += 4) { > + dst_pixels[3] = cpu_to_le16(in_pixels[x].a); > + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); > + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); > + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); > + } > +} > + > +static void argb_u16_to_XRGB16161616(struct vkms_frame_info *frame_info, > + const struct line_buffer *src_buffer, int y) > +{ > + int x, x_dst = frame_info->dst.x1; > + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); > + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; > + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), > + src_buffer->n_pixels); > + > + for (x = 0; x < x_limit; x++, dst_pixels += 4) { > + dst_pixels[3] = (u8)0xffff; > + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); > + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); > + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); > + } > +} > + > plane_format_transform_func get_plane_fmt_transform_function(u32 format) > { > if (format == DRM_FORMAT_ARGB8888) > return &ARGB8888_to_argb_u16; > else if (format == DRM_FORMAT_XRGB8888) > return &XRGB8888_to_argb_u16; > + else if (format == DRM_FORMAT_ARGB16161616) > + return &ARGB16161616_to_argb_u16; > + else if (format == DRM_FORMAT_XRGB16161616) > + return &XRGB16161616_to_argb_u16; > else > return NULL; > } > @@ -146,6 +219,10 @@ wb_format_transform_func get_wb_fmt_transform_function(u32 format) > return &argb_u16_to_ARGB8888; > else if (format == DRM_FORMAT_XRGB8888) > return &argb_u16_to_XRGB8888; > + else if (format == DRM_FORMAT_ARGB16161616) > + return &argb_u16_to_ARGB16161616; > + else if (format == DRM_FORMAT_XRGB16161616) > + return &argb_u16_to_XRGB16161616; > else > return NULL; > } > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c > index 798243837fd0..60054a85204a 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.c > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > @@ -14,11 +14,14 @@ > > static const u32 vkms_formats[] = { > DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XRGB16161616 > }; > > static const u32 vkms_plane_formats[] = { > DRM_FORMAT_ARGB8888, > - DRM_FORMAT_XRGB8888 > + DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XRGB16161616, > + DRM_FORMAT_ARGB16161616 > }; > > static struct drm_plane_state * > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c > index 97f71e784bbf..cb63a5da9af1 100644 > --- a/drivers/gpu/drm/vkms/vkms_writeback.c > +++ b/drivers/gpu/drm/vkms/vkms_writeback.c > @@ -15,6 +15,8 @@ > > static const u32 vkms_wb_formats[] = { > DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XRGB16161616, > + DRM_FORMAT_ARGB16161616 > }; > > static const struct drm_connector_funcs vkms_wb_connector_funcs = {
Hi Thomas On 5/7/22 04:32, Thomas Zimmermann wrote: > Hi > > Am 04.04.22 um 22:45 schrieb Igor Torrente: >> This will be useful to write tests that depends on these formats. >> >> ARGB and XRGB follows the a similar implementation of the former formats. >> Just adjusting for 16 bits per channel. >> >> V3: Adapt the handlers to the new format introduced in patch 7 V3. >> V5: Minor improvements >> Added le16_to_cpu/cpu_to_le16 to the 16 bits color read/writes. > > Is there something we could add to the DRM's format-conversion helpers? I don't believe there's anything reusable. Correct if I'm wrong, but from what I understood, these format-conversion functions don't seem compatible. The Vkms functions are converting to/from an internal format (struct pixel_argb_u16) while the functions from `drm_format_helper.c` are converting between two DRM formats. I don't think these vkms format functions are useful to other drivers. > > Best regards > Thomas > >> >> Signed-off-by: Igor Torrente <igormtorrente@gmail.com> >> --- >> drivers/gpu/drm/vkms/vkms_formats.c | 77 +++++++++++++++++++++++++++ >> drivers/gpu/drm/vkms/vkms_plane.c | 5 +- >> drivers/gpu/drm/vkms/vkms_writeback.c | 2 + >> 3 files changed, 83 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c >> index 931a61405d6a..8d913fa7dbde 100644 >> --- a/drivers/gpu/drm/vkms/vkms_formats.c >> +++ b/drivers/gpu/drm/vkms/vkms_formats.c >> @@ -78,6 +78,41 @@ static void XRGB8888_to_argb_u16(struct line_buffer *stage_buffer, >> } >> } >> >> +static void ARGB16161616_to_argb_u16(struct line_buffer *stage_buffer, >> + const struct vkms_frame_info *frame_info, >> + int y) >> +{ >> + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; >> + u16 *src_pixels = get_packed_src_addr(frame_info, y); >> + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), >> + stage_buffer->n_pixels); >> + >> + for (x = 0; x < x_limit; x++, src_pixels += 4) { >> + out_pixels[x].a = le16_to_cpu(src_pixels[3]); >> + out_pixels[x].r = le16_to_cpu(src_pixels[2]); >> + out_pixels[x].g = le16_to_cpu(src_pixels[1]); >> + out_pixels[x].b = le16_to_cpu(src_pixels[0]); >> + } >> +} >> + >> +static void XRGB16161616_to_argb_u16(struct line_buffer *stage_buffer, >> + const struct vkms_frame_info *frame_info, >> + int y) >> +{ >> + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; >> + u16 *src_pixels = get_packed_src_addr(frame_info, y); >> + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), >> + stage_buffer->n_pixels); >> + >> + for (x = 0; x < x_limit; x++, src_pixels += 4) { >> + out_pixels[x].a = (u16)0xffff; >> + out_pixels[x].r = le16_to_cpu(src_pixels[2]); >> + out_pixels[x].g = le16_to_cpu(src_pixels[1]); >> + out_pixels[x].b = le16_to_cpu(src_pixels[0]); >> + } >> +} >> + >> + >> /* >> * The following functions take an line of argb_u16 pixels from the >> * src_buffer, convert them to a specific format, and store them in the >> @@ -130,12 +165,50 @@ static void argb_u16_to_XRGB8888(struct vkms_frame_info *frame_info, >> } >> } >> >> +static void argb_u16_to_ARGB16161616(struct vkms_frame_info *frame_info, >> + const struct line_buffer *src_buffer, int y) >> +{ >> + int x, x_dst = frame_info->dst.x1; >> + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); >> + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; >> + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), >> + src_buffer->n_pixels); >> + >> + for (x = 0; x < x_limit; x++, dst_pixels += 4) { >> + dst_pixels[3] = cpu_to_le16(in_pixels[x].a); >> + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); >> + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); >> + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); >> + } >> +} >> + >> +static void argb_u16_to_XRGB16161616(struct vkms_frame_info *frame_info, >> + const struct line_buffer *src_buffer, int y) >> +{ >> + int x, x_dst = frame_info->dst.x1; >> + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); >> + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; >> + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), >> + src_buffer->n_pixels); >> + >> + for (x = 0; x < x_limit; x++, dst_pixels += 4) { >> + dst_pixels[3] = (u8)0xffff; >> + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); >> + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); >> + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); >> + } >> +} >> + >> plane_format_transform_func get_plane_fmt_transform_function(u32 format) >> { >> if (format == DRM_FORMAT_ARGB8888) >> return &ARGB8888_to_argb_u16; >> else if (format == DRM_FORMAT_XRGB8888) >> return &XRGB8888_to_argb_u16; >> + else if (format == DRM_FORMAT_ARGB16161616) >> + return &ARGB16161616_to_argb_u16; >> + else if (format == DRM_FORMAT_XRGB16161616) >> + return &XRGB16161616_to_argb_u16; >> else >> return NULL; >> } >> @@ -146,6 +219,10 @@ wb_format_transform_func get_wb_fmt_transform_function(u32 format) >> return &argb_u16_to_ARGB8888; >> else if (format == DRM_FORMAT_XRGB8888) >> return &argb_u16_to_XRGB8888; >> + else if (format == DRM_FORMAT_ARGB16161616) >> + return &argb_u16_to_ARGB16161616; >> + else if (format == DRM_FORMAT_XRGB16161616) >> + return &argb_u16_to_XRGB16161616; >> else >> return NULL; >> } >> diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c >> index 798243837fd0..60054a85204a 100644 >> --- a/drivers/gpu/drm/vkms/vkms_plane.c >> +++ b/drivers/gpu/drm/vkms/vkms_plane.c >> @@ -14,11 +14,14 @@ >> >> static const u32 vkms_formats[] = { >> DRM_FORMAT_XRGB8888, >> + DRM_FORMAT_XRGB16161616 >> }; >> >> static const u32 vkms_plane_formats[] = { >> DRM_FORMAT_ARGB8888, >> - DRM_FORMAT_XRGB8888 >> + DRM_FORMAT_XRGB8888, >> + DRM_FORMAT_XRGB16161616, >> + DRM_FORMAT_ARGB16161616 >> }; >> >> static struct drm_plane_state * >> diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c >> index 97f71e784bbf..cb63a5da9af1 100644 >> --- a/drivers/gpu/drm/vkms/vkms_writeback.c >> +++ b/drivers/gpu/drm/vkms/vkms_writeback.c >> @@ -15,6 +15,8 @@ >> >> static const u32 vkms_wb_formats[] = { >> DRM_FORMAT_XRGB8888, >> + DRM_FORMAT_XRGB16161616, >> + DRM_FORMAT_ARGB16161616 >> }; >> >> static const struct drm_connector_funcs vkms_wb_connector_funcs = { >
diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c index 931a61405d6a..8d913fa7dbde 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -78,6 +78,41 @@ static void XRGB8888_to_argb_u16(struct line_buffer *stage_buffer, } } +static void ARGB16161616_to_argb_u16(struct line_buffer *stage_buffer, + const struct vkms_frame_info *frame_info, + int y) +{ + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; + u16 *src_pixels = get_packed_src_addr(frame_info, y); + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), + stage_buffer->n_pixels); + + for (x = 0; x < x_limit; x++, src_pixels += 4) { + out_pixels[x].a = le16_to_cpu(src_pixels[3]); + out_pixels[x].r = le16_to_cpu(src_pixels[2]); + out_pixels[x].g = le16_to_cpu(src_pixels[1]); + out_pixels[x].b = le16_to_cpu(src_pixels[0]); + } +} + +static void XRGB16161616_to_argb_u16(struct line_buffer *stage_buffer, + const struct vkms_frame_info *frame_info, + int y) +{ + struct pixel_argb_u16 *out_pixels = stage_buffer->pixels; + u16 *src_pixels = get_packed_src_addr(frame_info, y); + int x, x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), + stage_buffer->n_pixels); + + for (x = 0; x < x_limit; x++, src_pixels += 4) { + out_pixels[x].a = (u16)0xffff; + out_pixels[x].r = le16_to_cpu(src_pixels[2]); + out_pixels[x].g = le16_to_cpu(src_pixels[1]); + out_pixels[x].b = le16_to_cpu(src_pixels[0]); + } +} + + /* * The following functions take an line of argb_u16 pixels from the * src_buffer, convert them to a specific format, and store them in the @@ -130,12 +165,50 @@ static void argb_u16_to_XRGB8888(struct vkms_frame_info *frame_info, } } +static void argb_u16_to_ARGB16161616(struct vkms_frame_info *frame_info, + const struct line_buffer *src_buffer, int y) +{ + int x, x_dst = frame_info->dst.x1; + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), + src_buffer->n_pixels); + + for (x = 0; x < x_limit; x++, dst_pixels += 4) { + dst_pixels[3] = cpu_to_le16(in_pixels[x].a); + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); + } +} + +static void argb_u16_to_XRGB16161616(struct vkms_frame_info *frame_info, + const struct line_buffer *src_buffer, int y) +{ + int x, x_dst = frame_info->dst.x1; + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); + struct pixel_argb_u16 *in_pixels = src_buffer->pixels; + int x_limit = min_t(size_t, drm_rect_width(&frame_info->dst), + src_buffer->n_pixels); + + for (x = 0; x < x_limit; x++, dst_pixels += 4) { + dst_pixels[3] = (u8)0xffff; + dst_pixels[2] = cpu_to_le16(in_pixels[x].r); + dst_pixels[1] = cpu_to_le16(in_pixels[x].g); + dst_pixels[0] = cpu_to_le16(in_pixels[x].b); + } +} + plane_format_transform_func get_plane_fmt_transform_function(u32 format) { if (format == DRM_FORMAT_ARGB8888) return &ARGB8888_to_argb_u16; else if (format == DRM_FORMAT_XRGB8888) return &XRGB8888_to_argb_u16; + else if (format == DRM_FORMAT_ARGB16161616) + return &ARGB16161616_to_argb_u16; + else if (format == DRM_FORMAT_XRGB16161616) + return &XRGB16161616_to_argb_u16; else return NULL; } @@ -146,6 +219,10 @@ wb_format_transform_func get_wb_fmt_transform_function(u32 format) return &argb_u16_to_ARGB8888; else if (format == DRM_FORMAT_XRGB8888) return &argb_u16_to_XRGB8888; + else if (format == DRM_FORMAT_ARGB16161616) + return &argb_u16_to_ARGB16161616; + else if (format == DRM_FORMAT_XRGB16161616) + return &argb_u16_to_XRGB16161616; else return NULL; } diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 798243837fd0..60054a85204a 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -14,11 +14,14 @@ static const u32 vkms_formats[] = { DRM_FORMAT_XRGB8888, + DRM_FORMAT_XRGB16161616 }; static const u32 vkms_plane_formats[] = { DRM_FORMAT_ARGB8888, - DRM_FORMAT_XRGB8888 + DRM_FORMAT_XRGB8888, + DRM_FORMAT_XRGB16161616, + DRM_FORMAT_ARGB16161616 }; static struct drm_plane_state * diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 97f71e784bbf..cb63a5da9af1 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -15,6 +15,8 @@ static const u32 vkms_wb_formats[] = { DRM_FORMAT_XRGB8888, + DRM_FORMAT_XRGB16161616, + DRM_FORMAT_ARGB16161616 }; static const struct drm_connector_funcs vkms_wb_connector_funcs = {
This will be useful to write tests that depends on these formats. ARGB and XRGB follows the a similar implementation of the former formats. Just adjusting for 16 bits per channel. V3: Adapt the handlers to the new format introduced in patch 7 V3. V5: Minor improvements Added le16_to_cpu/cpu_to_le16 to the 16 bits color read/writes. Signed-off-by: Igor Torrente <igormtorrente@gmail.com> --- drivers/gpu/drm/vkms/vkms_formats.c | 77 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_plane.c | 5 +- drivers/gpu/drm/vkms/vkms_writeback.c | 2 + 3 files changed, 83 insertions(+), 1 deletion(-)