drm/imx: move 'legacyfb_depth' definition out of #ifdef

Message ID 20181002205836.2323084-1-arnd@arndb.de
State New
Headers show
Series
  • drm/imx: move 'legacyfb_depth' definition out of #ifdef
Related show

Commit Message

Arnd Bergmann Oct. 2, 2018, 8:58 p.m.
The variable is now referenced unconditionally, but still
declared in an #ifdef:

drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':
drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'?

Remove the #ifdef so it can always be accessed.

Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/gpu/drm/imx/imx-drm-core.c | 2 --
 1 file changed, 2 deletions(-)

-- 
2.18.0

Comments

Noralf Trønnes Oct. 3, 2018, 3:49 p.m. | #1
Den 02.10.2018 22.58, skrev Arnd Bergmann:
> The variable is now referenced unconditionally, but still

> declared in an #ifdef:

>

> drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':

> drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'?

>

> Remove the #ifdef so it can always be accessed.

>

> Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---


I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6

Not sure when it reaches linux-next now that we are past rc6.

Noralf.

>   drivers/gpu/drm/imx/imx-drm-core.c | 2 --

>   1 file changed, 2 deletions(-)

>

> diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c

> index a70f3131a377..0e6942f21a4e 100644

> --- a/drivers/gpu/drm/imx/imx-drm-core.c

> +++ b/drivers/gpu/drm/imx/imx-drm-core.c

> @@ -35,10 +35,8 @@

>   

>   #define MAX_CRTC	4

>   

> -#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION)

>   static int legacyfb_depth = 16;

>   module_param(legacyfb_depth, int, 0444);

> -#endif

>   

>   DEFINE_DRM_GEM_CMA_FOPS(imx_drm_driver_fops);

>
Daniel Vetter Oct. 3, 2018, 4:13 p.m. | #2
On Wed, Oct 03, 2018 at 05:49:32PM +0200, Noralf Trønnes wrote:
> 

> 

> Den 02.10.2018 22.58, skrev Arnd Bergmann:

> > The variable is now referenced unconditionally, but still

> > declared in an #ifdef:

> > 

> > drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':

> > drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'?

> > 

> > Remove the #ifdef so it can always be accessed.

> > 

> > Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> > ---

> 

> I've already applied the previous one you sent:

> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6

> 

> Not sure when it reaches linux-next now that we are past rc6.


Only once we're past -rc1.
-Daniel

> 

> Noralf.

> 

> >   drivers/gpu/drm/imx/imx-drm-core.c | 2 --

> >   1 file changed, 2 deletions(-)

> > 

> > diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c

> > index a70f3131a377..0e6942f21a4e 100644

> > --- a/drivers/gpu/drm/imx/imx-drm-core.c

> > +++ b/drivers/gpu/drm/imx/imx-drm-core.c

> > @@ -35,10 +35,8 @@

> >   #define MAX_CRTC	4

> > -#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION)

> >   static int legacyfb_depth = 16;

> >   module_param(legacyfb_depth, int, 0444);

> > -#endif

> >   DEFINE_DRM_GEM_CMA_FOPS(imx_drm_driver_fops);

> 


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Arnd Bergmann Oct. 3, 2018, 7:51 p.m. | #3
On Wed, Oct 3, 2018 at 6:13 PM Daniel Vetter <daniel@ffwll.ch> wrote:
>

> On Wed, Oct 03, 2018 at 05:49:32PM +0200, Noralf Trønnes wrote:

> >

> >

> > Den 02.10.2018 22.58, skrev Arnd Bergmann:

> > > The variable is now referenced unconditionally, but still

> > > declared in an #ifdef:

> > >

> > > drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':

> > > drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'?

> > >

> > > Remove the #ifdef so it can always be accessed.

> > >

> > > Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")

> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> > > ---

> >

> > I've already applied the previous one you sent:

> > https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6

> >

> > Not sure when it reaches linux-next now that we are past rc6.

>

> Only once we're past -rc1.


Can we revert f53705fd9803 in linux-next then to prevent the regression from
making it into 4.20?

       Arnd
Noralf Trønnes Oct. 4, 2018, 2:43 p.m. | #4
Den 04.10.2018 09.48, skrev Daniel Vetter:
> On Wed, Oct 3, 2018 at 9:51 PM Arnd Bergmann <arnd@arndb.de> wrote:

>> On Wed, Oct 3, 2018 at 6:13 PM Daniel Vetter <daniel@ffwll.ch> wrote:

>>> On Wed, Oct 03, 2018 at 05:49:32PM +0200, Noralf Trønnes wrote:

>>>>

>>>> Den 02.10.2018 22.58, skrev Arnd Bergmann:

>>>>> The variable is now referenced unconditionally, but still

>>>>> declared in an #ifdef:

>>>>>

>>>>> drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':

>>>>> drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'?

>>>>>

>>>>> Remove the #ifdef so it can always be accessed.

>>>>>

>>>>> Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")

>>>>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

>>>>> ---

>>>> I've already applied the previous one you sent:

>>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6

>>>>

>>>> Not sure when it reaches linux-next now that we are past rc6.

>>> Only once we're past -rc1.

>> Can we revert f53705fd9803 in linux-next then to prevent the regression from

>> making it into 4.20?

> Probably simpler to cherry pick the fix from drm-misc-next to

> drm-misc-next-fixes. Noralf, can you pls do that?


Would this be the correct procudure:

     dim update-branches
     dim create-workdir drm-misc-next-fixes
     <build>
     CONFIG_DRM_FBDEV_EMULATION=n
     <build will break>
     git cherry-pick 064b06bbf117f8b5e64a5143e970d5a1cf602fd6
     <build passes>
     dim push-branch drm-misc-next-fixes

I read that cherry picking creates a new commit with a new hash.
But since you ask me to do this, I assume git will handle this when
branches are merged?

Noralf.
Daniel Vetter Oct. 4, 2018, 7:35 p.m. | #5
On Thu, Oct 04, 2018 at 05:04:21PM +0200, Arnd Bergmann wrote:
> On Thu, Oct 4, 2018 at 4:43 PM Noralf Trønnes <noralf@tronnes.org> wrote:

> > Den 04.10.2018 09.48, skrev Daniel Vetter:

> > > On Wed, Oct 3, 2018 at 9:51 PM Arnd Bergmann <arnd@arndb.de> wrote:

> > >> On Wed, Oct 3, 2018 at 6:13 PM Daniel Vetter <daniel@ffwll.ch> wrote:

> > >>> On Wed, Oct 03, 2018 at 05:49:32PM +0200, Noralf Trønnes wrote:

> > >>>>

> > >>>> Den 02.10.2018 22.58, skrev Arnd Bergmann:

> > >>>>> The variable is now referenced unconditionally, but still

> > >>>>> declared in an #ifdef:

> > >>>>>

> > >>>>> drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':

> > >>>>> drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'?

> > >>>>>

> > >>>>> Remove the #ifdef so it can always be accessed.

> > >>>>>

> > >>>>> Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")

> > >>>>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> > >>>>> ---

> > >>>> I've already applied the previous one you sent:

> > >>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6

> > >>>>

> > >>>> Not sure when it reaches linux-next now that we are past rc6.

> > >>> Only once we're past -rc1.

> > >> Can we revert f53705fd9803 in linux-next then to prevent the regression from

> > >> making it into 4.20?

> > > Probably simpler to cherry pick the fix from drm-misc-next to

> > > drm-misc-next-fixes. Noralf, can you pls do that?

> >

> > Would this be the correct procudure:

> >

> >      dim update-branches

> >      dim create-workdir drm-misc-next-fixes

> >      <build>

> >      CONFIG_DRM_FBDEV_EMULATION=n

> >      <build will break>

> >      git cherry-pick 064b06bbf117f8b5e64a5143e970d5a1cf602fd6

> >      <build passes>

> >      dim push-branch drm-misc-next-fixes

> >

> > I read that cherry picking creates a new commit with a new hash.

> > But since you ask me to do this, I assume git will handle this when

> > branches are merged?

> 

> The git history will show both commit IDs, which is a bit ugly but

> ok if it's rare enough. There is a chance for creating a conflict if the

> backport changes context, or one branch contains extra changes

> that touch the same lines, but usually this is not a problem.


+1, and your recipe looks good too. drm-intel works entirely on these
cherry-picks, and we've done it a few times in drm-misc too. Having to
cherry-pick is one of the downsides of group maintainership, since you
really can't rebase trees at will. Definitely not the -next queue.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Noralf Trønnes Oct. 5, 2018, 10:22 a.m. | #6
Den 04.10.2018 21.35, skrev Daniel Vetter:
> On Thu, Oct 04, 2018 at 05:04:21PM +0200, Arnd Bergmann wrote:

>> On Thu, Oct 4, 2018 at 4:43 PM Noralf Trønnes <noralf@tronnes.org> wrote:

>>> Den 04.10.2018 09.48, skrev Daniel Vetter:

>>>> On Wed, Oct 3, 2018 at 9:51 PM Arnd Bergmann <arnd@arndb.de> wrote:

>>>>> On Wed, Oct 3, 2018 at 6:13 PM Daniel Vetter <daniel@ffwll.ch> wrote:

>>>>>> On Wed, Oct 03, 2018 at 05:49:32PM +0200, Noralf Trønnes wrote:

>>>>>>> Den 02.10.2018 22.58, skrev Arnd Bergmann:

>>>>>>>> The variable is now referenced unconditionally, but still

>>>>>>>> declared in an #ifdef:

>>>>>>>>

>>>>>>>> drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':

>>>>>>>> drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'?

>>>>>>>>

>>>>>>>> Remove the #ifdef so it can always be accessed.

>>>>>>>>

>>>>>>>> Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")

>>>>>>>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

>>>>>>>> ---

>>>>>>> I've already applied the previous one you sent:

>>>>>>> https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6

>>>>>>>

>>>>>>> Not sure when it reaches linux-next now that we are past rc6.

>>>>>> Only once we're past -rc1.

>>>>> Can we revert f53705fd9803 in linux-next then to prevent the regression from

>>>>> making it into 4.20?

>>>> Probably simpler to cherry pick the fix from drm-misc-next to

>>>> drm-misc-next-fixes. Noralf, can you pls do that?

>>> Would this be the correct procudure:

>>>

>>>       dim update-branches

>>>       dim create-workdir drm-misc-next-fixes

>>>       <build>

>>>       CONFIG_DRM_FBDEV_EMULATION=n

>>>       <build will break>

>>>       git cherry-pick 064b06bbf117f8b5e64a5143e970d5a1cf602fd6

>>>       <build passes>

>>>       dim push-branch drm-misc-next-fixes

>>>

>>> I read that cherry picking creates a new commit with a new hash.

>>> But since you ask me to do this, I assume git will handle this when

>>> branches are merged?

>> The git history will show both commit IDs, which is a bit ugly but

>> ok if it's rare enough. There is a chance for creating a conflict if the

>> backport changes context, or one branch contains extra changes

>> that touch the same lines, but usually this is not a problem.

> +1, and your recipe looks good too. drm-intel works entirely on these

> cherry-picks, and we've done it a few times in drm-misc too. Having to

> cherry-pick is one of the downsides of group maintainership, since you

> really can't rebase trees at will. Definitely not the -next queue.


The patch is now in drm-misc-next-fixes.
Thanks for helping me fix this fallout.

Noralf.

Patch

diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
index a70f3131a377..0e6942f21a4e 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -35,10 +35,8 @@ 
 
 #define MAX_CRTC	4
 
-#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION)
 static int legacyfb_depth = 16;
 module_param(legacyfb_depth, int, 0444);
-#endif
 
 DEFINE_DRM_GEM_CMA_FOPS(imx_drm_driver_fops);