someOS/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge v5.8-rc6 into drm-next

Browse Source 
I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2020-07-24 08:28:09 +10:00
parent 2067391195 ba47d845d7
commit 41206a073c
1370 changed files with 11800 additions and 6440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/video/fbdev/core/fbcon.c
View File

@@ -2402,7 +2402,8 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
ops->graphics = 1;
if (!blank) {
var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE;
var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE |
FB_ACTIVATE_KD_TEXT;
fb_set_var(info, &var);
ops->graphics = 0;
ops->var = info->var;