xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions 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/gpu/drm/aspeed/aspeed_gfx_drv.c
View File

@@ -173,8 +173,6 @@ static int aspeed_gfx_load(struct drm_device *drm)
drm_mode_config_reset(drm);
drm_fbdev_generic_setup(drm, 32);
return 0;
}
@@ -225,6 +223,7 @@ static int aspeed_gfx_probe(struct platform_device *pdev)
if (ret)
goto err_unload;
drm_fbdev_generic_setup(&priv->drm, 32);
return 0;
err_unload: