On Fri, Sep 27, 2019 at 06:31:24PM -0700, Jeykumar Sankaran wrote:
> 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.
>
> Signed-off-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
> Signed-off-by: Jeykumar Sankaran <jsanka@xxxxxxxxxxxxxx>
Hi Jeykumar:
Komeda driver also meets this problem, thank for the fix.
Reviewed-by: James Qian Wang (Arm Technology China) <james.qian.wang@xxxxxxx>
Thanks
James
> ---
> drivers/gpu/drm/drm_framebuffer.c | 15 +++++++++++----
> include/drm/drm_mode_config.h | 3 +++
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
> index 5756431..2083168 100644
> --- a/drivers/gpu/drm/drm_framebuffer.c
> +++ b/drivers/gpu/drm/drm_framebuffer.c
> @@ -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);
> }
>
> diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
> index 3bcbe30..c6394ed 100644
> --- a/include/drm/drm_mode_config.h
> +++ b/include/drm/drm_mode_config.h
> @@ -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;
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
