| Message ID | 2b6073d9c2d869c6a4eac6edebd616e0568dec91.1681843245.git.geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
| Series | drm/fb-helper: Fix height, width, and accel_flags in fb_var | expand |
On Tue, Apr 18, 2023 at 08:42:46PM +0200, Geert Uytterhoeven wrote: > Fbtest contains some very simple validation of the fbdev userspace API > contract. When used with shmob-drm, it reports the following warnings > and errors: > > height changed from 68 to 0 > height was rounded down > width changed from 111 to 0 > width was rounded down > accel_flags changed from 0 to 1 > > The first part happens because __fill_var() resets the physical > dimensions of the first connector, as filled in by drm_setup_crtcs_fb(). > Fix this by retaining the original values. > > The last part happens because __fill_var() forces the FB_ACCELF_TEXT > flag on, while fbtest disables all acceleration on purpose, so it can > draw safely to the frame buffer. Fix this by setting accel_flags to > zero, as DRM does not implement any text console acceleration. > Note that this issue can also be seen in the output of fbset, which > reports "accel true". > > Fixes: ee4cce0a8f03a333 ("drm/fb-helper: fix input validation gaps in check_var") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/gpu/drm/drm_fb_helper.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 64458982be40c468..ed6ad787915f0b8f 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -1537,17 +1537,19 @@ static void drm_fb_helper_fill_pixel_fmt(struct fb_var_screeninfo *var, > } > } > > -static void __fill_var(struct fb_var_screeninfo *var, > +static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, > struct drm_framebuffer *fb) > { > int i; > > var->xres_virtual = fb->width; > var->yres_virtual = fb->height; > - var->accel_flags = FB_ACCELF_TEXT; > + var->accel_flags = 0; > var->bits_per_pixel = drm_format_info_bpp(fb->format, 0); > > - var->height = var->width = 0; > + var->height = info->var.height; > + var->width = info->var.width; > + > var->left_margin = var->right_margin = 0; > var->upper_margin = var->lower_margin = 0; > var->hsync_len = var->vsync_len = 0; > @@ -1610,7 +1612,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, > return -EINVAL; > } > > - __fill_var(var, fb); > + __fill_var(var, info, fb); > > /* > * fb_pan_display() validates this, but fb_set_par() doesn't and just > @@ -2066,7 +2068,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, > info->pseudo_palette = fb_helper->pseudo_palette; > info->var.xoffset = 0; > info->var.yoffset = 0; > - __fill_var(&info->var, fb); > + __fill_var(&info->var, info, fb); Bit a bikeshed since it zeroed-allocated anyway, but I'd pass NULL here for info and catch that in __fill_var and then keep the explicit = 0; Either way Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > info->var.activate = FB_ACTIVATE_NOW; > > drm_fb_helper_fill_pixel_fmt(&info->var, format); > -- > 2.34.1 >
Hi Daniel, On Wed, Apr 19, 2023 at 6:38 PM Daniel Vetter <daniel@ffwll.ch> wrote: > On Tue, Apr 18, 2023 at 08:42:46PM +0200, Geert Uytterhoeven wrote: > > Fbtest contains some very simple validation of the fbdev userspace API > > contract. When used with shmob-drm, it reports the following warnings > > and errors: > > > > height changed from 68 to 0 > > height was rounded down > > width changed from 111 to 0 > > width was rounded down > > accel_flags changed from 0 to 1 > > > > The first part happens because __fill_var() resets the physical > > dimensions of the first connector, as filled in by drm_setup_crtcs_fb(). > > Fix this by retaining the original values. > > > > The last part happens because __fill_var() forces the FB_ACCELF_TEXT > > flag on, while fbtest disables all acceleration on purpose, so it can > > draw safely to the frame buffer. Fix this by setting accel_flags to > > zero, as DRM does not implement any text console acceleration. > > Note that this issue can also be seen in the output of fbset, which > > reports "accel true". > > > > Fixes: ee4cce0a8f03a333 ("drm/fb-helper: fix input validation gaps in check_var") > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > --- a/drivers/gpu/drm/drm_fb_helper.c > > +++ b/drivers/gpu/drm/drm_fb_helper.c > > @@ -2066,7 +2068,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, > > info->pseudo_palette = fb_helper->pseudo_palette; > > info->var.xoffset = 0; > > info->var.yoffset = 0; > > - __fill_var(&info->var, fb); > > + __fill_var(&info->var, info, fb); > > Bit a bikeshed since it zeroed-allocated anyway, but I'd pass NULL here > for info and catch that in __fill_var and then keep the explicit = 0; Yeah, it's a bit unfortunate this is done in two places, and info->var.{height,width} are initialized by drm_setup_crtcs_fb() only later. Most of the var contents cannot change as mode changes are not supported, so drm_fb_helper_check_var() should just do if (var->foo > info->var.foo) return -EINVAL; var->foo = info->var.foo; For the parts that can change, based on earlier discussions I saw pass by, I believe there should be a call into atomic try-modesetting at the end of drm_fb_helper_check_var()? > Either way Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Thanks! Gr{oetje,eeting}s, Geert
On Thu, Apr 20, 2023 at 11:15:24AM +0200, Geert Uytterhoeven wrote: > Hi Daniel, > > On Wed, Apr 19, 2023 at 6:38 PM Daniel Vetter <daniel@ffwll.ch> wrote: > > On Tue, Apr 18, 2023 at 08:42:46PM +0200, Geert Uytterhoeven wrote: > > > Fbtest contains some very simple validation of the fbdev userspace API > > > contract. When used with shmob-drm, it reports the following warnings > > > and errors: > > > > > > height changed from 68 to 0 > > > height was rounded down > > > width changed from 111 to 0 > > > width was rounded down > > > accel_flags changed from 0 to 1 > > > > > > The first part happens because __fill_var() resets the physical > > > dimensions of the first connector, as filled in by drm_setup_crtcs_fb(). > > > Fix this by retaining the original values. > > > > > > The last part happens because __fill_var() forces the FB_ACCELF_TEXT > > > flag on, while fbtest disables all acceleration on purpose, so it can > > > draw safely to the frame buffer. Fix this by setting accel_flags to > > > zero, as DRM does not implement any text console acceleration. > > > Note that this issue can also be seen in the output of fbset, which > > > reports "accel true". > > > > > > Fixes: ee4cce0a8f03a333 ("drm/fb-helper: fix input validation gaps in check_var") > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > > --- a/drivers/gpu/drm/drm_fb_helper.c > > > +++ b/drivers/gpu/drm/drm_fb_helper.c > > > @@ -2066,7 +2068,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, > > > info->pseudo_palette = fb_helper->pseudo_palette; > > > info->var.xoffset = 0; > > > info->var.yoffset = 0; > > > - __fill_var(&info->var, fb); > > > + __fill_var(&info->var, info, fb); > > > > Bit a bikeshed since it zeroed-allocated anyway, but I'd pass NULL here > > for info and catch that in __fill_var and then keep the explicit = 0; > > Yeah, it's a bit unfortunate this is done in two places, and > info->var.{height,width} are initialized by drm_setup_crtcs_fb() > only later. > > Most of the var contents cannot change as mode changes are not > supported, so drm_fb_helper_check_var() should just do > > if (var->foo > info->var.foo) > return -EINVAL; > var->foo = info->var.foo; > > For the parts that can change, based on earlier discussions I saw pass > by, I believe there should be a call into atomic try-modesetting at > the end of drm_fb_helper_check_var()? Yeah ideally that's what we do. And I guess we could limit that to atomic-only drivers since with legacy kms there's really no way to correctly implement any fbdev mode changes (because there's just no check/commit split there and fbdev wants that). I guess the trickier part is reworking the drm fbdev code so that it won't tamper with it's internal structures (or roll them back) when only doing a TEST_ONLY commit. And in theory we could then actually support proper mode changes through fbdev, as long as it fits into the fb we allocated at least. Reallocating fbs would be a lot more intrusive but also not impossible. -Daniel > > Either way Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > Thanks! > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
Hi, I have just tested this patch on a LoongArch(3a5000+ls7a2000 evb) machine, both fbtest and the fbdev test of IGT finished. fbtest say test001: ~ test013: PASSED, After apply your patch, the warn log `accel_flags changed from 0 to 1` disappeared while running it. So, Tested-by: Sui Jingfeng <suijingfeng@loongson.cn> On 2023/4/19 02:42, Geert Uytterhoeven wrote: > Fbtest contains some very simple validation of the fbdev userspace API > contract. When used with shmob-drm, it reports the following warnings > and errors: > > height changed from 68 to 0 > height was rounded down > width changed from 111 to 0 > width was rounded down > accel_flags changed from 0 to 1 > > The first part happens because __fill_var() resets the physical > dimensions of the first connector, as filled in by drm_setup_crtcs_fb(). > Fix this by retaining the original values. > > The last part happens because __fill_var() forces the FB_ACCELF_TEXT > flag on, while fbtest disables all acceleration on purpose, so it can > draw safely to the frame buffer. Fix this by setting accel_flags to > zero, as DRM does not implement any text console acceleration. > Note that this issue can also be seen in the output of fbset, which > reports "accel true". > > Fixes: ee4cce0a8f03a333 ("drm/fb-helper: fix input validation gaps in check_var") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/gpu/drm/drm_fb_helper.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 64458982be40c468..ed6ad787915f0b8f 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -1537,17 +1537,19 @@ static void drm_fb_helper_fill_pixel_fmt(struct fb_var_screeninfo *var, > } > } > > -static void __fill_var(struct fb_var_screeninfo *var, > +static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, > struct drm_framebuffer *fb) > { > int i; > > var->xres_virtual = fb->width; > var->yres_virtual = fb->height; > - var->accel_flags = FB_ACCELF_TEXT; > + var->accel_flags = 0; > var->bits_per_pixel = drm_format_info_bpp(fb->format, 0); > > - var->height = var->width = 0; > + var->height = info->var.height; > + var->width = info->var.width; > + > var->left_margin = var->right_margin = 0; > var->upper_margin = var->lower_margin = 0; > var->hsync_len = var->vsync_len = 0; > @@ -1610,7 +1612,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, > return -EINVAL; > } > > - __fill_var(var, fb); > + __fill_var(var, info, fb); > > /* > * fb_pan_display() validates this, but fb_set_par() doesn't and just > @@ -2066,7 +2068,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, > info->pseudo_palette = fb_helper->pseudo_palette; > info->var.xoffset = 0; > info->var.yoffset = 0; > - __fill_var(&info->var, fb); > + __fill_var(&info->var, info, fb); > info->var.activate = FB_ACTIVATE_NOW; > > drm_fb_helper_fill_pixel_fmt(&info->var, format);
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 64458982be40c468..ed6ad787915f0b8f 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1537,17 +1537,19 @@ static void drm_fb_helper_fill_pixel_fmt(struct fb_var_screeninfo *var, } } -static void __fill_var(struct fb_var_screeninfo *var, +static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, struct drm_framebuffer *fb) { int i; var->xres_virtual = fb->width; var->yres_virtual = fb->height; - var->accel_flags = FB_ACCELF_TEXT; + var->accel_flags = 0; var->bits_per_pixel = drm_format_info_bpp(fb->format, 0); - var->height = var->width = 0; + var->height = info->var.height; + var->width = info->var.width; + var->left_margin = var->right_margin = 0; var->upper_margin = var->lower_margin = 0; var->hsync_len = var->vsync_len = 0; @@ -1610,7 +1612,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, return -EINVAL; } - __fill_var(var, fb); + __fill_var(var, info, fb); /* * fb_pan_display() validates this, but fb_set_par() doesn't and just @@ -2066,7 +2068,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, info->pseudo_palette = fb_helper->pseudo_palette; info->var.xoffset = 0; info->var.yoffset = 0; - __fill_var(&info->var, fb); + __fill_var(&info->var, info, fb); info->var.activate = FB_ACTIVATE_NOW; drm_fb_helper_fill_pixel_fmt(&info->var, format);
Fbtest contains some very simple validation of the fbdev userspace API contract. When used with shmob-drm, it reports the following warnings and errors: height changed from 68 to 0 height was rounded down width changed from 111 to 0 width was rounded down accel_flags changed from 0 to 1 The first part happens because __fill_var() resets the physical dimensions of the first connector, as filled in by drm_setup_crtcs_fb(). Fix this by retaining the original values. The last part happens because __fill_var() forces the FB_ACCELF_TEXT flag on, while fbtest disables all acceleration on purpose, so it can draw safely to the frame buffer. Fix this by setting accel_flags to zero, as DRM does not implement any text console acceleration. Note that this issue can also be seen in the output of fbset, which reports "accel true". Fixes: ee4cce0a8f03a333 ("drm/fb-helper: fix input validation gaps in check_var") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/gpu/drm/drm_fb_helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)