| Message ID | 20181210092853.13050-1-mjourdan@baylibre.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | e3de0aa6c9afdca053389a4721d6a7d65126dfb8 |
| Headers | show |
| Series | [RESEND] drm/meson: remove firmware framebuffers | expand |
Hi Maxime, On 10/12/2018 10:28, Maxime Jourdan wrote: > In case we are using simplefb or another conflicting framebuffer, make > the call to drm_fb_helper_remove_conflicting_framebuffers() > > Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> > --- > drivers/gpu/drm/meson/meson_drv.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c > index d3443125e661..afbb3d707d15 100644 > --- a/drivers/gpu/drm/meson/meson_drv.c > +++ b/drivers/gpu/drm/meson/meson_drv.c > @@ -159,6 +159,23 @@ static void meson_vpu_init(struct meson_drm *priv) > writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1)); > } > > +static void meson_remove_framebuffers(void) > +{ > + struct apertures_struct *ap; > + > + ap = alloc_apertures(1); > + if (!ap) > + return; > + > + /* The framebuffer can be located anywhere in RAM */ > + ap->ranges[0].base = 0; > + ap->ranges[0].size = ~0; > + > + drm_fb_helper_remove_conflicting_framebuffers(ap, "meson-drm-fb", > + false); I always wondered, where does the "meson-drm-fb" comes from ??? Neil > + kfree(ap); > +} > + > static int meson_drv_bind_master(struct device *dev, bool has_components) > { > struct platform_device *pdev = to_platform_device(dev); > @@ -242,6 +259,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) > if (ret) > goto free_drm; > > + /* Remove early framebuffers (ie. simplefb) */ > + meson_remove_framebuffers(); > + > drm_mode_config_init(drm); > drm->mode_config.max_width = 3840; > drm->mode_config.max_height = 2160; >
Hi Neil, On Wed, Dec 12, 2018 at 10:55 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Hi Maxime, > > On 10/12/2018 10:28, Maxime Jourdan wrote: > > In case we are using simplefb or another conflicting framebuffer, make > > the call to drm_fb_helper_remove_conflicting_framebuffers() > > > > Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> > > --- > > drivers/gpu/drm/meson/meson_drv.c | 20 ++++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c > > index d3443125e661..afbb3d707d15 100644 > > --- a/drivers/gpu/drm/meson/meson_drv.c > > +++ b/drivers/gpu/drm/meson/meson_drv.c > > @@ -159,6 +159,23 @@ static void meson_vpu_init(struct meson_drm *priv) > > writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1)); > > } > > > > +static void meson_remove_framebuffers(void) > > +{ > > + struct apertures_struct *ap; > > + > > + ap = alloc_apertures(1); > > + if (!ap) > > + return; > > + > > + /* The framebuffer can be located anywhere in RAM */ > > + ap->ranges[0].base = 0; > > + ap->ranges[0].size = ~0; > > + > > + drm_fb_helper_remove_conflicting_framebuffers(ap, "meson-drm-fb", > > + false); > > I always wondered, where does the "meson-drm-fb" comes from ??? > > Neil > This name ultimately ends up in a printk and has no functional impact. See drivers/video/fbdev/core/fbmem.c:1613 : printk(KERN_INFO "fb%d: switching to %s from %s\n", i, name, registered_fb[i]->fix.id); I just picked one that was similar to the names of other drm drivers calling drm_fb_helper_remove_conflicting_framebuffers(). Maxime
On 12/12/2018 13:22, Maxime Jourdan wrote: > Hi Neil, > On Wed, Dec 12, 2018 at 10:55 AM Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> Hi Maxime, >> >> On 10/12/2018 10:28, Maxime Jourdan wrote: >>> In case we are using simplefb or another conflicting framebuffer, make >>> the call to drm_fb_helper_remove_conflicting_framebuffers() >>> >>> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> >>> --- >>> drivers/gpu/drm/meson/meson_drv.c | 20 ++++++++++++++++++++ >>> 1 file changed, 20 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c >>> index d3443125e661..afbb3d707d15 100644 >>> --- a/drivers/gpu/drm/meson/meson_drv.c >>> +++ b/drivers/gpu/drm/meson/meson_drv.c >>> @@ -159,6 +159,23 @@ static void meson_vpu_init(struct meson_drm *priv) >>> writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1)); >>> } >>> >>> +static void meson_remove_framebuffers(void) >>> +{ >>> + struct apertures_struct *ap; >>> + >>> + ap = alloc_apertures(1); >>> + if (!ap) >>> + return; >>> + >>> + /* The framebuffer can be located anywhere in RAM */ >>> + ap->ranges[0].base = 0; >>> + ap->ranges[0].size = ~0; >>> + >>> + drm_fb_helper_remove_conflicting_framebuffers(ap, "meson-drm-fb", >>> + false); >> >> I always wondered, where does the "meson-drm-fb" comes from ??? >> >> Neil >> > > This name ultimately ends up in a printk and has no functional impact. > See drivers/video/fbdev/core/fbmem.c:1613 : > > printk(KERN_INFO "fb%d: switching to %s from %s\n", i, name, > registered_fb[i]->fix.id); > > I just picked one that was similar to the names of other drm drivers > calling drm_fb_helper_remove_conflicting_framebuffers(). Ok Cool ! > > Maxime > Acked-by: Neil Armstrong <narmstrong@baylibre.com> I'll push it when the bindings are acked and when v4.21-rc1 is tagged ! Neil
On 12/12/2018 13:39, Neil Armstrong wrote: > On 12/12/2018 13:22, Maxime Jourdan wrote: >> Hi Neil, >> On Wed, Dec 12, 2018 at 10:55 AM Neil Armstrong <narmstrong@baylibre.com> wrote: >>> >>> Hi Maxime, >>> >>> On 10/12/2018 10:28, Maxime Jourdan wrote: >>>> In case we are using simplefb or another conflicting framebuffer, make >>>> the call to drm_fb_helper_remove_conflicting_framebuffers() >>>> >>>> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> >>>> --- >>>> drivers/gpu/drm/meson/meson_drv.c | 20 ++++++++++++++++++++ >>>> 1 file changed, 20 insertions(+) >>>> >>>> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c >>>> index d3443125e661..afbb3d707d15 100644 >>>> --- a/drivers/gpu/drm/meson/meson_drv.c >>>> +++ b/drivers/gpu/drm/meson/meson_drv.c >>>> @@ -159,6 +159,23 @@ static void meson_vpu_init(struct meson_drm *priv) >>>> writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1)); >>>> } >>>> >>>> +static void meson_remove_framebuffers(void) >>>> +{ >>>> + struct apertures_struct *ap; >>>> + >>>> + ap = alloc_apertures(1); >>>> + if (!ap) >>>> + return; >>>> + >>>> + /* The framebuffer can be located anywhere in RAM */ >>>> + ap->ranges[0].base = 0; >>>> + ap->ranges[0].size = ~0; >>>> + >>>> + drm_fb_helper_remove_conflicting_framebuffers(ap, "meson-drm-fb", >>>> + false); >>> >>> I always wondered, where does the "meson-drm-fb" comes from ??? >>> >>> Neil >>> >> >> This name ultimately ends up in a printk and has no functional impact. >> See drivers/video/fbdev/core/fbmem.c:1613 : >> >> printk(KERN_INFO "fb%d: switching to %s from %s\n", i, name, >> registered_fb[i]->fix.id); >> >> I just picked one that was similar to the names of other drm drivers >> calling drm_fb_helper_remove_conflicting_framebuffers(). > > Ok Cool ! > >> >> Maxime >> > > Acked-by: Neil Armstrong <narmstrong@baylibre.com> > > I'll push it when the bindings are acked and when v4.21-rc1 is tagged ! > > Neil > Applied to drm-misc-next. Thanks, Neil
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index d3443125e661..afbb3d707d15 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -159,6 +159,23 @@ static void meson_vpu_init(struct meson_drm *priv) writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1)); } +static void meson_remove_framebuffers(void) +{ + struct apertures_struct *ap; + + ap = alloc_apertures(1); + if (!ap) + return; + + /* The framebuffer can be located anywhere in RAM */ + ap->ranges[0].base = 0; + ap->ranges[0].size = ~0; + + drm_fb_helper_remove_conflicting_framebuffers(ap, "meson-drm-fb", + false); + kfree(ap); +} + static int meson_drv_bind_master(struct device *dev, bool has_components) { struct platform_device *pdev = to_platform_device(dev); @@ -242,6 +259,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) if (ret) goto free_drm; + /* Remove early framebuffers (ie. simplefb) */ + meson_remove_framebuffers(); + drm_mode_config_init(drm); drm->mode_config.max_width = 3840; drm->mode_config.max_height = 2160;
In case we are using simplefb or another conflicting framebuffer, make the call to drm_fb_helper_remove_conflicting_framebuffers() Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> --- drivers/gpu/drm/meson/meson_drv.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)