33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
Revert "fbcon: Fix accelerated fbdev scrolling while logo is still shown"
|
|
|
|
This reverts commit 3866cba87dcd0162fb41e9b3b653d0af68fad5ec.
|
|
---
|
|
drivers/video/fbdev/core/fbcon.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
|
|
index cf9ac4da0a82..0636d05c519c 100644
|
|
--- a/drivers/video/fbdev/core/fbcon.c
|
|
+++ b/drivers/video/fbdev/core/fbcon.c
|
|
@@ -1760,6 +1760,8 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
|
|
case SM_UP:
|
|
if (count > vc->vc_rows) /* Maximum realistic size */
|
|
count = vc->vc_rows;
|
|
+ if (logo_shown >= 0)
|
|
+ goto redraw_up;
|
|
switch (fb_scrollmode(p)) {
|
|
case SCROLL_MOVE:
|
|
fbcon_redraw_blit(vc, info, p, t, b - t - count,
|
|
@@ -1848,6 +1850,8 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
|
|
case SM_DOWN:
|
|
if (count > vc->vc_rows) /* Maximum realistic size */
|
|
count = vc->vc_rows;
|
|
+ if (logo_shown >= 0)
|
|
+ goto redraw_down;
|
|
switch (fb_scrollmode(p)) {
|
|
case SCROLL_MOVE:
|
|
fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
|
|
--
|
|
2.25.1
|
|
|