| Message ID | 20210424034632.5531-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | [v3] drm: rcar: unbreak the R-Car menu items | expand |
ping? thanks. On 4/23/21 8:46 PM, Randy Dunlap wrote: > DRM_RCAR_CMM depends on DRM_RCAR_DU. Since the following Kconfig > symbols do not depend on DRM_RCAR_DU, the menu presentation is > broken for the following R-Car Kconfig symbols. > > Use an if/endif block to make all of these symbols depend on > DRM_RCAR_DU (and remove the separate "depends on DRM_RCAR_DU"). > This makes the kconfig menu presentation much cleaner. > > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > Cc: dri-devel@lists.freedesktop.org > Cc: linux-renesas-soc@vger.kernel.org > Cc: Koji Matsuoka <koji.matsuoka.xm@renesas.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > --- > v2: use an if/endif block for the dependencies (thanks, Geert) > v3: still applicable -- update/rebase > > Applies after today's earlier patch to fix undefined reference > build errors for R-Car (probably won't matter). > > I did this patch one year ago and then forgot about it somehow. > Rediscovered & updated it today. > > drivers/gpu/drm/rcar-du/Kconfig | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > --- linux-next-20210423.orig/drivers/gpu/drm/rcar-du/Kconfig > +++ linux-next-20210423/drivers/gpu/drm/rcar-du/Kconfig > @@ -14,10 +14,11 @@ config DRM_RCAR_DU > Choose this option if you have an R-Car chipset. > If M is selected the module will be called rcar-du-drm. > > +if DRM_RCAR_DU > + > config DRM_RCAR_CMM > tristate "R-Car DU Color Management Module (CMM) Support" > depends on DRM && OF > - depends on DRM_RCAR_DU > help > Enable support for R-Car Color Management Module (CMM). > > @@ -41,7 +42,6 @@ config DRM_RCAR_LVDS > config DRM_RCAR_VSP > bool "R-Car DU VSP Compositor Support" if ARM > default y if ARM64 > - depends on DRM_RCAR_DU > depends on VIDEO_RENESAS_VSP1=y || (VIDEO_RENESAS_VSP1 && DRM_RCAR_DU=m) > help > Enable support to expose the R-Car VSP Compositor as KMS planes. > @@ -49,4 +49,5 @@ config DRM_RCAR_VSP > config DRM_RCAR_WRITEBACK > bool > default y if ARM64 > - depends on DRM_RCAR_DU > + > +endif # DRM_RCAR_DU >
--- linux-next-20210423.orig/drivers/gpu/drm/rcar-du/Kconfig +++ linux-next-20210423/drivers/gpu/drm/rcar-du/Kconfig @@ -14,10 +14,11 @@ config DRM_RCAR_DU Choose this option if you have an R-Car chipset. If M is selected the module will be called rcar-du-drm. +if DRM_RCAR_DU + config DRM_RCAR_CMM tristate "R-Car DU Color Management Module (CMM) Support" depends on DRM && OF - depends on DRM_RCAR_DU help Enable support for R-Car Color Management Module (CMM). @@ -41,7 +42,6 @@ config DRM_RCAR_LVDS config DRM_RCAR_VSP bool "R-Car DU VSP Compositor Support" if ARM default y if ARM64 - depends on DRM_RCAR_DU depends on VIDEO_RENESAS_VSP1=y || (VIDEO_RENESAS_VSP1 && DRM_RCAR_DU=m) help Enable support to expose the R-Car VSP Compositor as KMS planes. @@ -49,4 +49,5 @@ config DRM_RCAR_VSP config DRM_RCAR_WRITEBACK bool default y if ARM64 - depends on DRM_RCAR_DU + +endif # DRM_RCAR_DU
DRM_RCAR_CMM depends on DRM_RCAR_DU. Since the following Kconfig symbols do not depend on DRM_RCAR_DU, the menu presentation is broken for the following R-Car Kconfig symbols. Use an if/endif block to make all of these symbols depend on DRM_RCAR_DU (and remove the separate "depends on DRM_RCAR_DU"). This makes the kconfig menu presentation much cleaner. Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Cc: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org Cc: Koji Matsuoka <koji.matsuoka.xm@renesas.com> Cc: David Airlie <airlied@linux.ie> Cc: Geert Uytterhoeven <geert@linux-m68k.org> --- v2: use an if/endif block for the dependencies (thanks, Geert) v3: still applicable -- update/rebase Applies after today's earlier patch to fix undefined reference build errors for R-Car (probably won't matter). I did this patch one year ago and then forgot about it somehow. Rediscovered & updated it today. drivers/gpu/drm/rcar-du/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)