Add framebuffer max width/height fields to drm_mode_config
Subsystems (2)
PATCH 1/1 Add framebuffer max width/height fields to drm_mode_config
Below two discussion threads will provide the context behind this patch.
https://www.spinics.net/lists/dri-devel/msg229070.html
https://lore.kernel.org/linux-arm-msm/[email protected]/T/
Seperating out the core framework patch from vendor implementation.
Jeykumar Sankaran (1):
drm: add fb max width/height fields to drm_mode_config
drivers/gpu/drm/drm_framebuffer.c | 17 +++++++++++++---- include/drm/drm_mode_config.h | 3 +++ 2 files changed, 16 insertions(+), 4 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/1 drm: add fb max width/height fields to drm_mode_config
The mode_config max width/height values determine the maximum resolution the pixel reader can handle. But the same values are used to restrict the size of the framebuffer creation. Hardware's with scaling blocks can operate on framebuffers larger/smaller than that of the pixel reader resolutions by scaling them down/up before rendering.
This changes adds a separate framebuffer max width/height fields in drm_mode_config to allow vendors to set if they are different than that of the default max resolution values.
Vendors setting these fields should fix their mode_set paths too by filtering and validating the modes against the appropriate max fields in their mode_valid() implementations.
--- drivers/gpu/drm/drm_framebuffer.c | 15 +++++++++++---- include/drm/drm_mode_config.h | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_framebuffer.c +11 -4
@@ -300,14 +300,21 @@ struct drm_framebuffer *return ERR_PTR (-EINVAL ); } -if ((config->min_width > r->width) || (r->width > config->max_width)) { +if ((config->min_width > r->width) || + (!config->max_fb_width && r->width > config->max_width) || + (config->max_fb_width && r->width > config->max_fb_width)) {DRM_DEBUG_KMS ("bad framebuffer width %d, should be >= %d && <= %d\n" , - r->width, config->min_width, config->max_width); + r->width, config->min_width, config->max_fb_width ? + config->max_fb_width : config->max_width);return ERR_PTR (-EINVAL ); } -if ((config->min_height > r->height) || (r->height > config->max_height)) { + +if ((config->min_height > r->height) || + (!config->max_fb_height && r->height > config->max_height) || + (config->max_fb_height && r->height > config->max_fb_height)) {DRM_DEBUG_KMS ("bad framebuffer height %d, should be >= %d && <= %d\n" , - r->height, config->min_height, config->max_height); + r->height, config->min_height, config->max_fb_width ? + config->max_fb_height : config->max_height);return ERR_PTR (-EINVAL ); }
include/drm/drm_mode_config.h +3 -0
@@ -339,6 +339,8 @@ struct drm_mode_config_funcs {* @min_height: minimum fb pixel height on this device * @max_width: maximum fb pixel width on this device * @max_height: maximum fb pixel height on this device +* @max_fb_width: maximum fb buffer width if differs from max_width +* @max_fb_height: maximum fb buffer height if differs from max_height * @funcs: core driver provided mode setting functions * @fb_base: base address of the framebuffer * @poll_enabled: track polling support for this device
@@ -523,6 +525,7 @@ struct drm_mode_config {int min_width, min_height;int max_width, max_height; +int max_fb_width, max_fb_height;const struct drm_mode_config_funcs *funcs;resource_size_t fb_base;
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: drm: add fb max width/height fields to drm_mode_config
Quoted 11 lines · Jeykumar Sankaran
The
mode_configmax width/height values determine the maximum resolution the pixel reader can handle. But the same values are used to restrict the size of the framebuffer creation. Hardware's with scaling blocks can operate on framebuffers larger/smaller than that of the pixel reader resolutions by scaling them down/up before rendering.This changes adds a separate framebuffer max width/height fields in
drm_mode_configto allow vendors to set if they are different than that of the default max resolution values.
Quoted 6 lines
Vendors setting these fields should fix their
mode_setpaths too by filtering and validating the modes against the appropriate max fields in theirmode_valid()implementations.Signed-off-by Neil Armstrong <[email protected]>Signed-off-by Jeykumar Sankaran <[email protected]>
Hi Jeykumar:
Komeda driver also meets this problem, thank for the fix.
Thanks
James
Quoted 49 lines
--- drivers/gpu/drm/drm_framebuffer.c | 15 +++++++++++---- include/drm/drm_mode_config.h | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-)drivers/gpu/drm/drm_framebuffer.c +11
-4@@ -300,14 +300,21 @@ struct drm_framebuffer *return ERR_PTR (-EINVAL ); } -if ((config->min_width > r->width) || (r->width > config->max_width)) { +if ((config->min_width > r->width) || + (!config->max_fb_width && r->width > config->max_width) || + (config->max_fb_width && r->width > config->max_fb_width)) {DRM_DEBUG_KMS ("bad framebuffer width %d, should be >= %d && <= %d\n" , - r->width, config->min_width, config->max_width); + r->width, config->min_width, config->max_fb_width ? + config->max_fb_width : config->max_width);return ERR_PTR (-EINVAL ); } -if ((config->min_height > r->height) || (r->height > config->max_height)) { + +if ((config->min_height > r->height) || + (!config->max_fb_height && r->height > config->max_height) || + (config->max_fb_height && r->height > config->max_fb_height)) {DRM_DEBUG_KMS ("bad framebuffer height %d, should be >= %d && <= %d\n" , - r->height, config->min_height, config->max_height); + r->height, config->min_height, config->max_fb_width ? + config->max_fb_height : config->max_height);return ERR_PTR (-EINVAL ); }include/drm/drm_mode_config.h +2
-0@@ -339,6 +339,8 @@ struct drm_mode_config_funcs {* @min_height: minimum fb pixel height on this device * @max_width: maximum fb pixel width on this device * @max_height: maximum fb pixel height on this device +* @max_fb_width: maximum fb buffer width if differs from max_width +* @max_fb_height: maximum fb buffer height if differs from max_height * @funcs: core driver provided mode setting functions * @fb_base: base address of the framebuffer * @poll_enabled: track polling support for this device
include/drm/drm_mode_config.h struct drm_mode_config { · line 531
Quoted 7 lines
include/drm/drm_mode_config.h +1
-0@@ -523,6 +525,7 @@ struct drm_mode_config {int min_width, min_height;int max_width, max_height; +int max_fb_width, max_fb_height;const struct drm_mode_config_funcs *funcs;resource_size_t fb_base;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel