[PATCH] drm/msm: Fix link error with !MSM_IOMMU

[PATCH] drm/msm: Fix link error with !MSM_IOMMU

[Joerg Roedel]

The DRM driver for MSM depends on symbols from the MSM
IOMMU driver. Add this dependency to the Kconfig file.

Fixes this comile error:

  Kernel: arch/arm/boot/zImage is ready
  ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko]
  undefined!
  make[2]: *** [__modpost] Error 1

Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
---
 drivers/gpu/drm/msm/Kconfig |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index f39ab75..d3de8e1 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -4,6 +4,7 @@ config DRM_MSM
 	depends on DRM
 	depends on ARCH_MSM
 	depends on ARCH_MSM8960
+	depends on MSM_IOMMU
 	select DRM_KMS_HELPER
 	select SHMEM
 	select TMPFS
-- 
1.7.9.5

Re: [PATCH] drm/msm: Fix link error with !MSM_IOMMU

[Joerg Roedel]

On Tue, Jan 07, 2014 at 11:47:26PM +0100, Joerg Roedel wrote:
> The DRM driver for MSM depends on symbols from the MSM
> IOMMU driver. Add this dependency to the Kconfig file.
> 
> Fixes this comile error:
> 
>   Kernel: arch/arm/boot/zImage is ready
>   ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko]
>   undefined!
>   make[2]: *** [__modpost] Error 1
> 
> Cc: Rob Clark <robdclark@gmail.com>
> Signed-off-by: Joerg Roedel <joro@8bytes.org>
> ---
>  drivers/gpu/drm/msm/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
> index f39ab75..d3de8e1 100644
> --- a/drivers/gpu/drm/msm/Kconfig
> +++ b/drivers/gpu/drm/msm/Kconfig
> @@ -4,6 +4,7 @@ config DRM_MSM
>  	depends on DRM
>  	depends on ARCH_MSM
>  	depends on ARCH_MSM8960
> +	depends on MSM_IOMMU
>  	select DRM_KMS_HELPER
>  	select SHMEM
>  	select TMPFS

FYI, I put the patch to my arm/msm branch meanwhile to get the build
error fixed. Please let me know when there is another solution merged
and I will drop it.


	Joerg

Re: [PATCH] drm/msm: Fix link error with !MSM_IOMMU

[Rob Clark]

On Tue, Jan 7, 2014 at 5:53 PM, Joerg Roedel <joro@8bytes.org> wrote:
> On Tue, Jan 07, 2014 at 11:47:26PM +0100, Joerg Roedel wrote:
>> The DRM driver for MSM depends on symbols from the MSM
>> IOMMU driver. Add this dependency to the Kconfig file.
>>
>> Fixes this comile error:
>>
>>   Kernel: arch/arm/boot/zImage is ready
>>   ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko]
>>   undefined!
>>   make[2]: *** [__modpost] Error 1

Thanks, I'll pull this into my pull req for 3.14 drm-next.. although,
after chatting with Stephen Boyd, I think we should eventually be able
to get rid of this (seems msm_iommu_get_ctx() was mainly for dealing
with secure playback (?))

BR,
-R

>>
>> Cc: Rob Clark <robdclark@gmail.com>
>> Signed-off-by: Joerg Roedel <joro@8bytes.org>
>> ---
>>  drivers/gpu/drm/msm/Kconfig |    1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
>> index f39ab75..d3de8e1 100644
>> --- a/drivers/gpu/drm/msm/Kconfig
>> +++ b/drivers/gpu/drm/msm/Kconfig
>> @@ -4,6 +4,7 @@ config DRM_MSM
>>       depends on DRM
>>       depends on ARCH_MSM
>>       depends on ARCH_MSM8960
>> +     depends on MSM_IOMMU
>>       select DRM_KMS_HELPER
>>       select SHMEM
>>       select TMPFS
>
> FYI, I put the patch to my arm/msm branch meanwhile to get the build
> error fixed. Please let me know when there is another solution merged
> and I will drop it.
>
>
>         Joerg
>
>

Re: [PATCH] drm/msm: Fix link error with !MSM_IOMMU

[Joerg Roedel]

On Wed, Jan 08, 2014 at 08:23:49AM -0500, Rob Clark wrote:
> On Tue, Jan 7, 2014 at 5:53 PM, Joerg Roedel <joro@8bytes.org> wrote:
> > On Tue, Jan 07, 2014 at 11:47:26PM +0100, Joerg Roedel wrote:
> >> The DRM driver for MSM depends on symbols from the MSM
> >> IOMMU driver. Add this dependency to the Kconfig file.
> >>
> >> Fixes this comile error:
> >>
> >>   Kernel: arch/arm/boot/zImage is ready
> >>   ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko]
> >>   undefined!
> >>   make[2]: *** [__modpost] Error 1
> 
> Thanks, I'll pull this into my pull req for 3.14 drm-next.. although,
> after chatting with Stephen Boyd, I think we should eventually be able
> to get rid of this (seems msm_iommu_get_ctx() was mainly for dealing
> with secure playback (?))

It is already in my next-branch. So if you are ok with the approach for
now there is no need for action. If you want it to go through your tree
anyway please let me know and I will drop it from mine.


	Joerg

Re: [PATCH] drm/msm: Fix link error with !MSM_IOMMU

[Rob Clark]

On Wed, Jan 8, 2014 at 8:35 AM, Joerg Roedel <joro@8bytes.org> wrote:
> On Wed, Jan 08, 2014 at 08:23:49AM -0500, Rob Clark wrote:
>> On Tue, Jan 7, 2014 at 5:53 PM, Joerg Roedel <joro@8bytes.org> wrote:
>> > On Tue, Jan 07, 2014 at 11:47:26PM +0100, Joerg Roedel wrote:
>> >> The DRM driver for MSM depends on symbols from the MSM
>> >> IOMMU driver. Add this dependency to the Kconfig file.
>> >>
>> >> Fixes this comile error:
>> >>
>> >>   Kernel: arch/arm/boot/zImage is ready
>> >>   ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko]
>> >>   undefined!
>> >>   make[2]: *** [__modpost] Error 1
>>
>> Thanks, I'll pull this into my pull req for 3.14 drm-next.. although,
>> after chatting with Stephen Boyd, I think we should eventually be able
>> to get rid of this (seems msm_iommu_get_ctx() was mainly for dealing
>> with secure playback (?))
>
> It is already in my next-branch. So if you are ok with the approach for
> now there is no need for action. If you want it to go through your tree
> anyway please let me know and I will drop it from mine.

probably will be a slight merge conflict if it goes through your
branch.. although should be easy enough to resolve, basically the
result should look something like:

  depends on (ARCH_MSM && ARCH_MSM8960 && MSM_IOMMU) || (ARM && COMPILE_TEST)

BR,
-R

>
>         Joerg
>
>