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]>
---
drivers/gpu/drm/msm/msm_fbdev.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 2429d5e6ce9f..e3836c7725a6 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -169,6 +169,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;
--
2.17.1
On Fri, Jun 28, 2019 at 9:28 AM Jeffrey Hugo <[email protected]> wrote:
>
> 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]>
lgtm,
Reviewed-by: Rob Clark <[email protected]>
> ---
> drivers/gpu/drm/msm/msm_fbdev.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
> index 2429d5e6ce9f..e3836c7725a6 100644
> --- a/drivers/gpu/drm/msm/msm_fbdev.c
> +++ b/drivers/gpu/drm/msm/msm_fbdev.c
> @@ -169,6 +169,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;
> --
> 2.17.1
>
On Sat, Jun 29, 2019 at 10:46 AM Rob Clark <[email protected]> wrote:
>
> On Fri, Jun 28, 2019 at 9:28 AM Jeffrey Hugo <[email protected]> wrote:
> >
> > 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]>
>
> lgtm,
>
> Reviewed-by: Rob Clark <[email protected]>
and I'll also add, on yoga c630,
Tested-by: Rob Clark <[email protected]>
>
>
> > ---
> > drivers/gpu/drm/msm/msm_fbdev.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
> > index 2429d5e6ce9f..e3836c7725a6 100644
> > --- a/drivers/gpu/drm/msm/msm_fbdev.c
> > +++ b/drivers/gpu/drm/msm/msm_fbdev.c
> > @@ -169,6 +169,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;
> > --
> > 2.17.1
> >