diff mbox series

drm/msm: Transition console to msm framebuffer

Message ID 20190628162831.20645-1-jeffrey.l.hugo@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show
Series drm/msm: Transition console to msm framebuffer | expand

Commit Message

Jeffrey Hugo June 28, 2019, 4:28 p.m. UTC
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 <robdclark@gmail.com>
Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
---
 drivers/gpu/drm/msm/msm_fbdev.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Rob Clark June 29, 2019, 5:46 p.m. UTC | #1
On Fri, Jun 28, 2019 at 9:28 AM Jeffrey Hugo <jeffrey.l.hugo@gmail.com> 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 <robdclark@gmail.com>
> Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>

lgtm,

Reviewed-by: Rob Clark <robdclark@gmail.com>


> ---
>  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
>
Rob Clark June 29, 2019, 7:55 p.m. UTC | #2
On Sat, Jun 29, 2019 at 10:46 AM Rob Clark <robdclark@gmail.com> wrote:
>
> On Fri, Jun 28, 2019 at 9:28 AM Jeffrey Hugo <jeffrey.l.hugo@gmail.com> 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 <robdclark@gmail.com>
> > Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
>
> lgtm,
>
> Reviewed-by: Rob Clark <robdclark@gmail.com>

and I'll also add, on yoga c630,

Tested-by: Rob Clark <robdclark@gmail.com>


>
>
> > ---
> >  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
> >
diff mbox series

Patch

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;