drm/imx: move 'legacyfb_depth' definition out of #ifdef
Subsystems (3)
PATCH 1/1 drm/imx: move 'legacyfb_depth' definition out of #ifdef
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.
--- drivers/gpu/drm/imx/imx-drm-core.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/imx/imx-drm-core.c +0 -2
@@ -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);
Signature · 1 line
2.18.0
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 11 lines
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 <[email protected]>---
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.
Quoted 8 lines
drivers/gpu/drm/imx/imx-drm-core.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/imx/imx-drm-core.c +0
-0
drivers/gpu/drm/imx/imx-drm-core.c line 42
Quoted 10 lines
drivers/gpu/drm/imx/imx-drm-core.c +0
-2@@ -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);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · Noralf Trønnes
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 8 lines
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.
Quoted 8 lines
Quoted 3 lines
Fixes f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()")Signed-off-by Arnd Bergmann <[email protected]>---
I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6Not sure when it reaches linux-next now that we are past rc6.
Only once we're past -rc1.
-Daniel
Quoted 18 lines
Noralf.
Quoted 14 lines
drivers/gpu/drm/imx/imx-drm-core.c | 2 -- 1 file changed, 2 deletions(-)drivers/gpu/drm/imx/imx-drm-core.c +0
-2@@ -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);
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 17 lines · Daniel Vetter
Quoted 15 lines · Noralf Trønnes
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 11 lines
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 <[email protected]>---
Quoted 6 lines
Quoted 4 lines
I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6Not 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
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 22 lines · Arnd Bergmann
Quoted 20 lines · Daniel Vetter
Quoted 18 lines · Noralf Trønnes
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 11 lines
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 <[email protected]>---
I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Not sure when it reaches linux-next now that we are past rc6.
Only once we're past -rc1.
Can we revert
f53705fd9803in 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?
Thanks, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Den 04.10.2018 09.48, skrev Daniel Vetter:
Quoted 19 lines · Arnd Bergmann
Quoted 18 lines · Daniel Vetter
Quoted 17 lines · Noralf Trønnes
Quoted 16 lines
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 11 lines
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 <[email protected]>---
I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Not sure when it reaches linux-next now that we are past rc6.
Only once we're past -rc1.
Can we revert
f53705fd9803in 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.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 38 lines · Noralf Trønnes
Den 04.10.2018 09.48, skrev Daniel Vetter:
Quoted 19 lines · Arnd Bergmann
Quoted 18 lines · Daniel Vetter
Quoted 17 lines · Noralf Trønnes
Quoted 16 lines
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 11 lines
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 <[email protected]>---
I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Not sure when it reaches linux-next now that we are past rc6.
Only once we're past -rc1.
Can we revert
f53705fd9803in 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-pick064b06bbf117f8b5e64a5143e970d5a1cf602fd6<build passes>
dim push-branch drm-misc-next-fixes
Quoted 3 lines
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.
Arnd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 39 lines · Arnd Bergmann
Quoted 38 lines · Noralf Trønnes
Den 04.10.2018 09.48, skrev Daniel Vetter:
Quoted 19 lines · Arnd Bergmann
Quoted 18 lines · Daniel Vetter
Quoted 17 lines · Noralf Trønnes
Quoted 16 lines
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 11 lines
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 <[email protected]>---
I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Not sure when it reaches linux-next now that we are past rc6.
Only once we're past -rc1.
Can we revert
f53705fd9803in 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-pick064b06bbf117f8b5e64a5143e970d5a1cf602fd6<build passes>
dim push-branch drm-misc-next-fixes
Quoted 8 lines
Quoted 3 lines
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
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Den 04.10.2018 21.35, skrev Daniel Vetter:
Quoted 41 lines · Arnd Bergmann
Quoted 40 lines · Noralf Trønnes
Quoted 39 lines
Den 04.10.2018 09.48, skrev Daniel Vetter:
Quoted 18 lines · Arnd Bergmann
Quoted 17 lines · Daniel Vetter
Quoted 16 lines · Noralf Trønnes
Quoted 15 lines
Den 02.10.2018 22.58, skrev Arnd Bergmann:
Quoted 11 lines
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 <[email protected]>---
I've already applied the previous one you sent:
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=064b06bbf117f8b5e64a5143e970d5a1cf602fd6Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Not sure when it reaches linux-next now that we are past rc6.
Only once we're past -rc1.
Can we revert
f53705fd9803in 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-pick064b06bbf117f8b5e64a5143e970d5a1cf602fd6<build passes>
dim push-branch drm-misc-next-fixesI 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?
Quoted 8 lines
Quoted 4 lines
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.