diff mbox series

[v2] drm: aspeed: Clean up Kconfig options

Message ID 20190405081117.27339-1-joel@jms.id.au
State Accepted
Commit 76356a966e332fa0f70d10fd74a66d518af8ce0a
Headers show
Series [v2] drm: aspeed: Clean up Kconfig options | expand

Commit Message

Joel Stanley April 5, 2019, 8:11 a.m. UTC
The GFX IP is inside of the ASPEED BMC SoC so there is little use
enabling it on a kernel that does not support ASPEED.

When building with COMPILE_TEST the architecture many not have CMA
support, so to avoid breaking the build we only select these options if
the architecture supports the contiguous allocator.

I suspect the DRM_PANEL came from a cut/paste error.

Fixes: 4f2a8f5898ec ("drm: Add ASPEED GFX driver")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
This fixes the powerpc next-20190405 build. Sorry Stephen!

v2: Clean up as well as fix the build
v1: https://lore.kernel.org/lkml/20190405052830.27899-1-joel@jms.id.au/

 drivers/gpu/drm/aspeed/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Joel Stanley April 15, 2019, 10:41 a.m. UTC | #1
On Mon., 15 Apr. 2019, 17:32 Daniel Vetter, <daniel@ffwll.ch> wrote:

> On Fri, Apr 05, 2019 at 06:41:17PM +1030, Joel Stanley wrote:

> > The GFX IP is inside of the ASPEED BMC SoC so there is little use

> > enabling it on a kernel that does not support ASPEED.

> >

> > When building with COMPILE_TEST the architecture many not have CMA

> > support, so to avoid breaking the build we only select these options if

> > the architecture supports the contiguous allocator.

> >

> > I suspect the DRM_PANEL came from a cut/paste error.

> >

> > Fixes: 4f2a8f5898ec ("drm: Add ASPEED GFX driver")

> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

> > Reported-by: kernel test robot <lkp@intel.com>

> > Signed-off-by: Joel Stanley <joel@jms.id.au>

>

> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>

>

> Iirc you have commit rights, right?

>


Can you please apply this one for me? I'm traveling and don't have my keys
with me.

Cheers,

Joel
<div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon., 15 Apr. 2019, 17:32 Daniel Vetter, &lt;<a href="mailto:daniel@ffwll.ch">daniel@ffwll.ch</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Fri, Apr 05, 2019 at 06:41:17PM +1030, Joel Stanley wrote:<br>
&gt; The GFX IP is inside of the ASPEED BMC SoC so there is little use<br>
&gt; enabling it on a kernel that does not support ASPEED.<br>
&gt; <br>
&gt; When building with COMPILE_TEST the architecture many not have CMA<br>
&gt; support, so to avoid breaking the build we only select these options if<br>
&gt; the architecture supports the contiguous allocator.<br>
&gt; <br>
&gt; I suspect the DRM_PANEL came from a cut/paste error.<br>
&gt; <br>
&gt; Fixes: 4f2a8f5898ec (&quot;drm: Add ASPEED GFX driver&quot;)<br>
&gt; Reported-by: Stephen Rothwell &lt;<a href="mailto:sfr@canb.auug.org.au" target="_blank" rel="noreferrer">sfr@canb.auug.org.au</a>&gt;<br>
&gt; Reported-by: kernel test robot &lt;<a href="mailto:lkp@intel.com" target="_blank" rel="noreferrer">lkp@intel.com</a>&gt;<br>
&gt; Signed-off-by: Joel Stanley &lt;<a href="mailto:joel@jms.id.au" target="_blank" rel="noreferrer">joel@jms.id.au</a>&gt;<br>
<br>
Acked-by: Daniel Vetter &lt;<a href="mailto:daniel.vetter@ffwll.ch" target="_blank" rel="noreferrer">daniel.vetter@ffwll.ch</a>&gt;<br>

<br>
Iirc you have commit rights, right?<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Can you please apply this one for me? I&#39;m traveling and don&#39;t have my keys with me.</div><div dir="auto"><br></div><div dir="auto">Cheers,</div><div dir="auto"><br></div><div dir="auto">Joel</div></div>
Daniel Vetter April 15, 2019, 3:43 p.m. UTC | #2
On Mon, Apr 15, 2019 at 06:41:48PM +0800, Joel Stanley wrote:
> On Mon., 15 Apr. 2019, 17:32 Daniel Vetter, <daniel@ffwll.ch> wrote:
> 
> > On Fri, Apr 05, 2019 at 06:41:17PM +1030, Joel Stanley wrote:
> > > The GFX IP is inside of the ASPEED BMC SoC so there is little use
> > > enabling it on a kernel that does not support ASPEED.
> > >
> > > When building with COMPILE_TEST the architecture many not have CMA
> > > support, so to avoid breaking the build we only select these options if
> > > the architecture supports the contiguous allocator.
> > >
> > > I suspect the DRM_PANEL came from a cut/paste error.
> > >
> > > Fixes: 4f2a8f5898ec ("drm: Add ASPEED GFX driver")
> > > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Reported-by: kernel test robot <lkp@intel.com>
> > > Signed-off-by: Joel Stanley <joel@jms.id.au>
> >
> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> >
> > Iirc you have commit rights, right?
> >
> 
> Can you please apply this one for me? I'm traveling and don't have my keys
> with me.

Ok, since it's holding up linux-next testing I've applied, in general it's
ok to just wait until you're back I think.
-Daniel
diff mbox series

Patch

diff --git a/drivers/gpu/drm/aspeed/Kconfig b/drivers/gpu/drm/aspeed/Kconfig
index 42b74d18a41b..cccab520e02f 100644
--- a/drivers/gpu/drm/aspeed/Kconfig
+++ b/drivers/gpu/drm/aspeed/Kconfig
@@ -1,11 +1,11 @@ 
 config DRM_ASPEED_GFX
 	tristate "ASPEED BMC Display Controller"
 	depends on DRM && OF
+	depends on (COMPILE_TEST || ARCH_ASPEED)
 	select DRM_KMS_HELPER
 	select DRM_KMS_CMA_HELPER
-	select DRM_PANEL
-	select DMA_CMA
-	select CMA
+	select DMA_CMA if HAVE_DMA_CONTIGUOUS
+	select CMA if HAVE_DMA_CONTIGUOUS
 	select MFD_SYSCON
 	help
 	  Chose this option if you have an ASPEED AST2500 SOC Display