Skip to contentSkip to conversation

gpu: ipu-v3: add DRM dependency

PATCH RESEND In review Arnd Bergmann 2 participants 7 messages Jul 21, 2017 – Jul 25, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 gpu: ipu-v3: add DRM dependency

The new PRE/PRG driver code causes a link failure when DRM is disabled:

drivers/gpu/ipu-v3/ipu-pre.o: In function `ipu_pre_configure':
ipu-pre.c:(.text.ipu_pre_configure+0x18): undefined reference to drm_format_info' drivers/gpu/ipu-v3/ipu-prg.o: In function ipu_prg_format_supported':
ipu-prg.c:(.text.ipu_prg_format_supported+0x8): undefined reference to `drm_format_info'

Adding a Kconfig dependency on DRM means we don't run into this problem any more. This might not be the best solution though, as the ipu seems to have been intentionally kept separate from DRM in the past.

Fixes ea9c260514c1 ("gpu: ipu-v3: add driver for Prefetch Resolve Gasket")

---
Originally sent on March 21, but got no reply for it. Resending unchanged as it is still needed in v4.13-rc1

---
 drivers/gpu/ipu-v3/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/ipu-v3/Kconfig +1 -0
index 08766c6e7856..f8b200801408 100644
@@ -1,6 +1,7 @@
 config IMX_IPUV3_CORE
 	tristate "IPUv3 core support"
 	depends on SOC_IMX5 || SOC_IMX6Q || ARCH_MULTIPLATFORM
+	depends on DRM
 	select GENERIC_IRQ_CHIP
 	help
 	  Choose this if you have a i.MX5/6 system and want to use the Image
Signature · 6 lines
2.9.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
maintainer
#1 lore raw

Hi Arnd,

Quoted 11 lines · Arnd Bergmann

The new PRE/PRG driver code causes a link failure when DRM is disabled:

drivers/gpu/ipu-v3/ipu-pre.o: In function `ipu_pre_configure':
ipu-pre.c:(.text.ipu_pre_configure+0x18): undefined reference to drm_format_info' drivers/gpu/ipu-v3/ipu-prg.o: In function ipu_prg_format_supported':
ipu-prg.c:(.text.ipu_prg_format_supported+0x8): undefined reference to `drm_format_info'

Adding a Kconfig dependency on DRM means we don't run into this problem any more. This might not be the best solution though, as the ipu seems to have been intentionally kept separate from DRM in the past.

Quoted 6 lines
Fixes ea9c260514c1 ("gpu: ipu-v3: add driver for Prefetch Resolve Gasket")

---
Originally sent on March 21, but got no reply for it. Resending unchanged as it is still needed in v4.13-rc1

thank you for fix and for the resend. I have the original patch in my inbox, I'm sorry I overlooked it.

I would still like to keep the ipu-v3 driver buildable without DRM enabled. For now, I have applied your patch as is.

regards
Philipp

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 19 lines · Philipp Zabel
Quoted 11 lines · Arnd Bergmann

The new PRE/PRG driver code causes a link failure when DRM is disabled:

drivers/gpu/ipu-v3/ipu-pre.o: In function `ipu_pre_configure':
ipu-pre.c:(.text.ipu_pre_configure+0x18): undefined reference to drm_format_info' drivers/gpu/ipu-v3/ipu-prg.o: In function ':
ipu-prg.c:(.text.ipu_prg_format_supported+0x8): undefined reference to `drm_format_info'

Adding a Kconfig dependency on DRM means we don't run into this problem any more. This might not be the best solution though, as the ipu seems to have been intentionally kept separate from DRM in the past.

Quoted 6 lines
Fixes ea9c260514c1 ("gpu: ipu-v3: add driver for Prefetch Resolve Gasket")

---
Originally sent on March 21, but got no reply for it. Resending unchanged as it is still needed in v4.13-rc1

Quoted 5 lines

thank you for fix and for the resend. I have the original patch in my inbox, I'm sorry I overlooked it.

I would still like to keep the ipu-v3 driver buildable without DRM enabled. For now, I have applied your patch as is.

Ok, thanks!

I'm pretty sure we can find a way to solve it so that you don't depend on DRM, but we should discuss what that would look like.

Are you mainly interested in being able to build-test without DRM, or do you actually want the ipu_pre_configure() and ipu_prg_format_supported() functions to work correctly in that case?

If you only need build-testing, you could have a simple wrapper like

const struct drm_format_info *ipu_format_info(u32 format)

{
         static const struct drm_format_info invalid = {};

         if (!IS_REACHABLE(CONFIG_DRM))
                  return &invalid;

         return drm_format_info(format);
}

The more useful way to solve it would be more work, we could for instance move (parts of) drivers/gpu/drm/drm_fourcc.c into lib/fourcc.c and have it built whenever at least DRM or IPU_v3 are enabled.

Arnd

maintainer
#3 lore raw
Quoted 26 lines · Arnd Bergmann
Quoted 19 lines · Philipp Zabel
Quoted 11 lines · Arnd Bergmann

The new PRE/PRG driver code causes a link failure when DRM is disabled:

drivers/gpu/ipu-v3/ipu-pre.o: In function `ipu_pre_configure':
ipu-pre.c:(.text.ipu_pre_configure+0x18): undefined reference to drm_format_info' drivers/gpu/ipu-v3/ipu-prg.o: In function ':
ipu-prg.c:(.text.ipu_prg_format_supported+0x8): undefined reference to `drm_format_info'

Adding a Kconfig dependency on DRM means we don't run into this problem any more. This might not be the best solution though, as the ipu seems to have been intentionally kept separate from DRM in the past.

Quoted 6 lines
Fixes ea9c260514c1 ("gpu: ipu-v3: add driver for Prefetch Resolve Gasket")

---
Originally sent on March 21, but got no reply for it. Resending unchanged as it is still needed in v4.13-rc1

Quoted 5 lines

thank you for fix and for the resend. I have the original patch in my inbox, I'm sorry I overlooked it.

I would still like to keep the ipu-v3 driver buildable without DRM enabled. For now, I have applied your patch as is.

Quoted 6 lines

Ok, thanks!

I'm pretty sure we can find a way to solve it so that you don't depend on DRM, but we should discuss what that would look like.

Are you mainly interested in being able to build-test without DRM,

Both that, and I'd like to keep the ability to disable DRM for devices that only need the video capture parts of the IPUv3 to work. An example would be a network connected camera without display or need for GPU processing.

Quoted 2 lines

or do you actually want the ipu_pre_configure() and ipu_prg_format_supported() functions to work correctly in that case?

In both cases the PRE and PRG don't have to be usable, as their only function is pixel data prefetching for the display path.

Quoted 11 lines

If you only need build-testing, you could have a simple wrapper like

const struct drm_format_info *ipu_format_info(u32 format)

{
         static const struct drm_format_info invalid = {};

         if (!IS_REACHABLE(CONFIG_DRM))
                  return &invalid;

         return drm_format_info(format);
}

That should work fine. Both ipu_prg_format_supported and ipu_prg_channel_configure are only ever called by DRM code.

Quoted 4 lines

The more useful way to solve it would be more work, we could for instance move (parts of) drivers/gpu/drm/drm_fourcc.c into lib/fourcc.c and have it built whenever at least DRM or IPU_v3 are enabled.

I don't think this is necessary, at least for this case.

regards
Philipp

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw
Quoted 10 lines · Philipp Zabel
Quoted 9 lines · Arnd Bergmann
Quoted 1 line · Philipp Zabel

On Fri, 2017-07-21 at 22:56 +0200, Arnd Bergmann wrote:

If you only need build-testing, you could have a simple wrapper like

const struct drm_format_info *ipu_format_info(u32 format)

{
         static const struct drm_format_info invalid = {};
Quoted 8 lines
Quoted 5 lines
         if (!IS_REACHABLE(CONFIG_DRM))
                  return &invalid;

         return drm_format_info(format);
}

That should work fine. Both ipu_prg_format_supported and ipu_prg_channel_configure are only ever called by DRM code.

Ok, in that case, I think we should just make the compilation of PRE and PRG conditional and leave them out when DRM is not built-in (be aware of the case of DRM=m, IPU=y).

Arnd

maintainer
#5 lore raw
Quoted 17 lines · Arnd Bergmann
Quoted 16 lines · Philipp Zabel
Quoted 14 lines · Arnd Bergmann
Quoted 1 line · Philipp Zabel

On Fri, 2017-07-21 at 22:56 +0200, Arnd Bergmann wrote:

If you only need build-testing, you could have a simple wrapper like

const struct drm_format_info *ipu_format_info(u32 format)

{
         static const struct drm_format_info invalid = {};

         if (!IS_REACHABLE(CONFIG_DRM))
                  return &invalid;

         return drm_format_info(format);
}
Quoted 6 lines
Quoted 2 lines

That should work fine. Both ipu_prg_format_supported and ipu_prg_channel_configure are only ever called by DRM code.

Ok, in that case, I think we should just make the compilation of PRE and PRG conditional and leave them out when DRM is not built-in (be aware of the case of DRM=m, IPU=y).

Maybe we should just:

config IMX_IPUV3_CORE

	depends on DRM || !DRM # if DRM=m, this can't be 'y'

regards
Philipp

#6 lore raw
Quoted 21 lines · Philipp Zabel
Quoted 20 lines · Arnd Bergmann
Quoted 18 lines · Philipp Zabel
Quoted 6 lines · Arnd Bergmann
Quoted 1 line · Philipp Zabel

On Fri, 2017-07-21 at 22:56 +0200, Arnd Bergmann wrote:

If you only need build-testing, you could have a simple wrapper like

const struct drm_format_info *ipu_format_info(u32 format)

Quoted 8 lines
{
         static const struct drm_format_info invalid = {};

         if (!IS_REACHABLE(CONFIG_DRM))
                  return &invalid;

         return drm_format_info(format);
}

That should work fine. Both ipu_prg_format_supported and ipu_prg_channel_configure are only ever called by DRM code.

Quoted 8 lines
Quoted 3 lines

Ok, in that case, I think we should just make the compilation of PRE and PRG conditional and leave them out when DRM is not built-in (be aware of the case of DRM=m, IPU=y).

Maybe we should just:

config IMX_IPUV3_CORE

        depends on DRM || !DRM # if DRM=m, this can't be 'y'

Yes, that would solve that case. I see now that the DRM=n case is already handled by 30310c835f3e ("gpu: ipu-v3: don't depend on DRM being enabled"), so that is probably sufficient.

I've added that change to my randconfig tree now and will give it some more testing. If you don't hear back from me, please assume that it works, and send that version upstream.

Arnd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel