APPLIED: [SRU][Bionic][PATCH] UBUNTU: SAUCE: (no-up) rename the adv7511 drm driver to adv7511_drm

[Seth Forshee]

On Tue, Apr 17, 2018 at 04:06:56PM -0300, Thadeu Lima de Souza Cascardo wrote:
> On Tue, Apr 17, 2018 at 07:10:45PM +0100, Colin Ian King wrote:
> > On 17/04/18 19:06, Seth Forshee wrote:
> > > BugLink: http://bugs.launchpad.net/bugs/1764816
> > > 
> > > This has the same name as another module, and due to some quirk
> > > only one of them will get installed. Which one it is seems to be
> > > nondeterministic, but if the drm module is missing in our
> > > snapdragon flavor then the display and audio will fail to work.
> > > Rename the module to avoid the duplication.
> > > 
> > > Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> > > ---
> > >  drivers/gpu/drm/bridge/adv7511/Makefile | 10 +++++-----
> > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile b/drivers/gpu/drm/bridge/adv7511/Makefile
> > > index 5bb384938a71..559e4e96a83a 100644
> > > --- a/drivers/gpu/drm/bridge/adv7511/Makefile
> > > +++ b/drivers/gpu/drm/bridge/adv7511/Makefile
> > > @@ -1,5 +1,5 @@
> > > -adv7511-y := adv7511_drv.o
> > > -adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o
> > > -adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o
> > > -adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o
> > > -obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o
> > > +adv7511_drm-y := adv7511_drv.o
> > > +adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o
> > > +adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o
> > > +adv7511_drm-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o
> > > +obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511_drm.o
> > > 
> > Makes sense. Is this upstream-able?
> 
> Seems to be, as this happens upstream, and it makes more sense to me that we
> prevent such things from building and being installed, rather than making the
> system build them. Otherwise, we will hit problems down the road, like
> modinfo/modprobe failing to find either module, and the module not being able
> to properly register, when /sys/module/<modulename>/ is created.
> 
> Cascardo.
> 
> Acked-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>

Applied to bionic/master-next and unstable/master.

I will certainly follow up upstream, not sure yet if it will be what
we've done here or something else which is why I marked it no-up. But we
need something now. I'll send an update later to make bionic match
whatever ends up upstream.

Thanks,
Seth