diff mbox series

[v5,4/4] fbcon: Use fbcon_info_from_console() in fbcon_modechange_possible()

Message ID 20220626085615.53728-5-deller@gmx.de (mailing list archive)
State Superseded
Headers show
Series fbcon: Fixes for screen resolution changes | expand

Commit Message

Helge Deller June 26, 2022, 8:56 a.m. UTC
Use the fbcon_info_from_console() wrapper which was added to kernel
v5.19 with commit 409d6c95f9c6 ("fbcon: Introduce wrapper for console->fb_info lookup").

Signed-off-by: Helge Deller <deller@gmx.de>
---
 drivers/video/fbdev/core/fbcon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.35.3

Comments

Daniel Vetter June 26, 2022, 9:59 a.m. UTC | #1
On Sun, Jun 26, 2022 at 10:56:15AM +0200, Helge Deller wrote:
> Use the fbcon_info_from_console() wrapper which was added to kernel
> v5.19 with commit 409d6c95f9c6 ("fbcon: Introduce wrapper for console->fb_info lookup").
> 
> Signed-off-by: Helge Deller <deller@gmx.de>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/video/fbdev/core/fbcon.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> index 69c7261ac334..2ab7515ac842 100644
> --- a/drivers/video/fbdev/core/fbcon.c
> +++ b/drivers/video/fbdev/core/fbcon.c
> @@ -2751,7 +2751,7 @@ int fbcon_modechange_possible(struct fb_info *info, struct fb_var_screeninfo *va
>  	/* prevent setting a screen size which is smaller than font size */
>  	for (i = first_fb_vc; i <= last_fb_vc; i++) {
>  		vc = vc_cons[i].d;
> -		if (!vc || registered_fb[con2fb_map[i]] != info)
> +		if (!vc || fbcon_info_from_console(i) != info)
>  			continue;
> 
>  		if (vc->vc_font.width  > FBCON_SWAP(var->rotate, var->xres, var->yres) ||
> --
> 2.35.3
>
diff mbox series

Patch

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 69c7261ac334..2ab7515ac842 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -2751,7 +2751,7 @@  int fbcon_modechange_possible(struct fb_info *info, struct fb_var_screeninfo *va
 	/* prevent setting a screen size which is smaller than font size */
 	for (i = first_fb_vc; i <= last_fb_vc; i++) {
 		vc = vc_cons[i].d;
-		if (!vc || registered_fb[con2fb_map[i]] != info)
+		if (!vc || fbcon_info_from_console(i) != info)
 			continue;

 		if (vc->vc_font.width  > FBCON_SWAP(var->rotate, var->xres, var->yres) ||