diff options
author | Jeffrey Hugo <[email protected]> | 2019-06-28 09:28:31 -0700 |
---|---|---|
committer | Rob Clark <[email protected]> | 2019-09-03 16:16:58 -0700 |
commit | 23c259722d0eddf687c9ff5b3c983f4ba61b22f9 (patch) | |
tree | 214098463102ebcfb7bc1f846d972ef468e2b640 | |
parent | a44769b407ecd9df2dd86d8b855412e3aff8b41b (diff) |
drm/msm: Transition console to msm framebuffer
If booting a device using EFI, efifb will likely come up and claim the
console. When the msm display stack finally comes up, we want the
console to move over to the msm fb, so add support to kick out any
firmware based framebuffers to accomplish the console transition.
Suggested-by: Rob Clark <[email protected]>
Signed-off-by: Jeffrey Hugo <[email protected]>
Reviewed-by: Rob Clark <[email protected]>
Tested-by: Rob Clark <[email protected]>
Signed-off-by: Rob Clark <[email protected]>
-rw-r--r-- | drivers/gpu/drm/msm/msm_fbdev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c index da4a4da725e7..cff198b2f470 100644 --- a/drivers/gpu/drm/msm/msm_fbdev.c +++ b/drivers/gpu/drm/msm/msm_fbdev.c @@ -170,6 +170,9 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev) if (ret) goto fini; + /* the fw fb could be anywhere in memory */ + drm_fb_helper_remove_conflicting_framebuffers(NULL, "msm", false); + ret = drm_fb_helper_initial_config(helper, 32); if (ret) goto fini; |