drm: vkms: Replace the deprecated drm_mode_config_init
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/8 drm: vkms: Replace the deprecated drm_mode_config_init
The drm_mode_config_init was deprecated since c3b790e commit, and it's being replaced by the drmm_mode_config_init.
---
V2: Change the code style(Thomas Zimmermann).
--- drivers/gpu/drm/vkms/vkms_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_drv.c +5 -1
@@ -140,8 +140,12 @@ static const struct drm_mode_config_helper_funcs vkms_mode_config_helpers = {static int vkms_modeset_init (struct vkms_device *vkmsdev) {struct drm_device *dev = &vkmsdev->drm; +int ret; + + ret =drmm_mode_config_init (dev); +if (ret <0 ) +return ret; -drm_mode_config_init (dev); dev->mode_config.funcs = &vkms_mode_funcs; dev->mode_config.min_width =XRES_MIN ; dev->mode_config.min_height =YRES_MIN ;
Signature · 1 line
2.30.2
PATCH v2 2/8 drm: vkms: Alloc the compose frame using vzalloc
In reply to a message not in the archiveCurrently, the memory to the composition frame is being allocated using the kzmalloc. This comes with the limitation of maximum size of one page size(which in the x86_64 is 4Kb and 4MB for default and hugepage respectively).
Somes test of igt (e.g. kms_plane@pixel-format) uses more than 4MB when testing some pixel formats like ARGB16161616.
This problem is addessed by allocating the memory using kvzalloc that circunvents this limitation.
--- drivers/gpu/drm/vkms/vkms_composer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/vkms/vkms_composer.c +3 -3
@@ -180,7 +180,7 @@ static int compose_active_planes(void **vaddr_out,int i;if (!*vaddr_out) { - *vaddr_out =kzalloc (gem_obj->size,GFP_KERNEL ); + *vaddr_out =kvzalloc (gem_obj->size,GFP_KERNEL );if (!*vaddr_out) {DRM_ERROR ("Cannot allocate memory for output frame." );return -ENOMEM ;
@@ -263,7 +263,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state);if (ret) {if (ret == -EINVAL && !wb_pending) -kfree (vaddr_out); +kvfree (vaddr_out);return ; }
@@ -275,7 +275,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state->wb_pending = false;spin_unlock_irq (&out->composer_lock); }else { -kfree (vaddr_out); +kvfree (vaddr_out); }/*
Signature · 1 line
2.30.2
PATCH v2 3/8 drm: vkms: Replace hardcoded value of `vkms_composer.map` to DRM_FORMAT_MAX_PLANES
In reply to a message not in the archiveThe map vector at vkms_composer uses a hardcoded value to define its size.
If someday the maximum number of planes increases, this hardcoded value can be a problem.
This value is being replaced with the DRM_FORMAT_MAX_PLANES macro.
--- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_drv.h +1 -1
@@ -28,7 +28,7 @@ struct vkms_writeback_job {struct vkms_composer {struct drm_framebuffer fb;struct drm_rect src, dst; -struct dma_buf_map map[4 ]; +struct dma_buf_map map[DRM_FORMAT_MAX_PLANES ];unsigned int offset;unsigned int pitch;unsigned int cpp;
Signature · 1 line
2.30.2
PATCH v2 7/8 drm: vkms: Exposes ARGB_1616161616 and adds XRGB_16161616 formats
In reply to a message not in the archiveThis will be useful to write tests that depends on these formats.
ARGB format is already used as the universal format for internal uses. Here we are just exposing it to the user space.
XRGB follows the a similar implementation of the former format. Just overwriting the alpha channel.
--- drivers/gpu/drm/vkms/vkms_composer.c | 4 ++++ drivers/gpu/drm/vkms/vkms_formats.h | 25 +++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_plane.c | 5 ++++- drivers/gpu/drm/vkms/vkms_writeback.c | 2 ++ 4 files changed, 35 insertions(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_composer.c +4 -0
@@ -164,6 +164,8 @@ static void ((*get_line_fmt_transform_function(u32 format))return &ARGB8888_to_ARGB16161616; else if (format == DRM_FORMAT_ARGB16161616) return &get_ARGB16161616; + else if (format == DRM_FORMAT_XRGB16161616) + return &XRGB16161616_to_ARGB16161616; else return &XRGB8888_to_ARGB16161616; }
@@ -175,6 +177,8 @@ static void ((*get_output_line_function(u32 format))return &convert_to_ARGB8888; else if (format == DRM_FORMAT_ARGB16161616) return &convert_to_ARGB16161616; + else if (format == DRM_FORMAT_XRGB16161616) + return &convert_to_XRGB16161616; else return &convert_to_XRGB8888; }
drivers/gpu/drm/vkms/vkms_formats.h +25 -0
@@ -89,6 +89,19 @@ static void get_ARGB16161616(void *pixels_addr, int length, u64 *line_buffer) } } +static void XRGB16161616_to_ARGB16161616 (void *pixels_addr,int length, +u64 *line_buffer) +{ +__le64 *src_pixels = pixels_addr; +int i; + +for (i =0 ; i < length; i++) { + line_buffer[i] =le64_to_cpu (*src_pixels) | (0xffffllu <<48 ); + + src_pixels++; + } +} +/* * The following functions are used as blend operations. But unlike the * `alpha_blend`, these functions take an ARGB16161616 pixel from the
@@ -152,4 +165,16 @@ static void convert_to_ARGB16161616(void *pixels_addr, int length, } } +static void convert_to_XRGB16161616 (void *pixels_addr,int length, +u64 *line_buffer) +{ +__le64 *dst_pixels = pixels_addr; +int i; + +for (i =0 ; i < length; i++) { + *dst_pixels =cpu_to_le64 (line_buffer[i] | (0xffffllu <<48 )); + dst_pixels++; + } +} +#endif /* _VKMS_FORMATS_H_ */
drivers/gpu/drm/vkms/vkms_plane.c +4 -1
@@ -13,11 +13,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 *
drivers/gpu/drm/vkms/vkms_writeback.c +2 -0
@@ -14,6 +14,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 = {
Signature · 1 line
2.30.2
PATCH v2 8/8 drm: vkms: Add support the RGB565 format
In reply to a message not in the archiveAdds this common format to vkms.
This commit also adds new helper macros to deal with fixed-point arithmetic.
It was done to improve the precision of the conversion to ARGB16161616 since the "conversion ratio" is not an integer.
--- drivers/gpu/drm/vkms/vkms_composer.c | 4 ++ drivers/gpu/drm/vkms/vkms_formats.h | 72 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_plane.c | 6 ++- drivers/gpu/drm/vkms/vkms_writeback.c | 3 +- 4 files changed, 82 insertions(+), 3 deletions(-)
drivers/gpu/drm/vkms/vkms_composer.c +4 -0
@@ -166,6 +166,8 @@ static void ((*get_line_fmt_transform_function(u32 format))return &get_ARGB16161616; else if (format == DRM_FORMAT_XRGB16161616) return &XRGB16161616_to_ARGB16161616; + else if (format == DRM_FORMAT_RGB565) + return &RGB565_to_ARGB16161616; else return &XRGB8888_to_ARGB16161616; }
@@ -179,6 +181,8 @@ static void ((*get_output_line_function(u32 format))return &convert_to_ARGB16161616; else if (format == DRM_FORMAT_XRGB16161616) return &convert_to_XRGB16161616; + else if (format == DRM_FORMAT_RGB565) + return &convert_to_RGB565; else return &convert_to_XRGB8888; }
drivers/gpu/drm/vkms/vkms_formats.h +72 -0
88 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_plane.c +4 -2
@@ -13,14 +13,16 @@static const u32 vkms_formats[] = {DRM_FORMAT_XRGB8888 , -DRM_FORMAT_XRGB16161616 +DRM_FORMAT_XRGB16161616 , +DRM_FORMAT_RGB565 };static const u32 vkms_plane_formats[] = {DRM_FORMAT_ARGB8888 ,DRM_FORMAT_XRGB8888 ,DRM_FORMAT_XRGB16161616 , -DRM_FORMAT_ARGB16161616 +DRM_FORMAT_ARGB16161616 , +DRM_FORMAT_RGB565 }; static struct drm_plane_state *
drivers/gpu/drm/vkms/vkms_writeback.c +2 -1
@@ -15,7 +15,8 @@static const u32 vkms_wb_formats[] = {DRM_FORMAT_XRGB8888 ,DRM_FORMAT_XRGB16161616 , -DRM_FORMAT_ARGB16161616 +DRM_FORMAT_ARGB16161616 , +DRM_FORMAT_RGB565 };static const struct drm_connector_funcs vkms_wb_connector_funcs = {
Signature · 1 line
2.30.2