[PATCH v1 0/2] drm/rockchip: fix build + warning

[PATCH v1 0/2] drm/rockchip: fix build + warning

[Sam Ravnborg]

Fix a newly introduced build breakge in drm-misc-next
Patch 1/2 should be applied to drm-misc-next

Also fix a warning in the same driver - the warning is present in v5.8
Patch 2/2 is a drm-misc-fixes candidate

	Sam

Sam Ravnborg (2):
      drm/rockchip: fix build due to undefined drm_gem_cma_vm_ops
      drm/rockchip: fix warning from cdn_dp_resume

 drivers/gpu/drm/rockchip/cdn-dp-core.c      | 2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

[PATCH v1 1/2] drm/rockchip: fix build due to undefined drm_gem_cma_vm_ops

[Sam Ravnborg]

Commit 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")
introduced the following build error:

rockchip_drm_gem.c:304:13: error: ‘drm_gem_cma_vm_ops’ undeclared here
  304 |  .vm_ops = &drm_gem_cma_vm_ops,
      |             ^~~~~~~~~~~~~~~~~~
      |             drm_gem_mmap_obj

Fixed by adding missing include file.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index bb3578469b03..6da15faf0192 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -10,6 +10,7 @@
 
 #include <drm/drm.h>
 #include <drm/drm_gem.h>
+#include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_prime.h>
 #include <drm/drm_vma_manager.h>
 
-- 
2.25.1

Re: [PATCH v1 1/2] drm/rockchip: fix build due to undefined drm_gem_cma_vm_ops

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1765 bytes --]

Hi Sam

Am 25.09.20 um 23:55 schrieb Sam Ravnborg:
> Commit 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")
> introduced the following build error:
> 
> rockchip_drm_gem.c:304:13: error: ‘drm_gem_cma_vm_ops’ undeclared here
>   304 |  .vm_ops = &drm_gem_cma_vm_ops,
>       |             ^~~~~~~~~~~~~~~~~~
>       |             drm_gem_mmap_obj
> 
> Fixed by adding missing include file.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Didn't you review exactly this change yesterday? Anyway, you should add

Fixes: 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")

and

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

It might happen that I land my patch first, depending on the urgency of
the issue.

Best regards
Thomas

> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: Sandy Huang <hjc@rock-chips.com>
> Cc: "Heiko Stübner" <heiko@sntech.de>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-rockchip@lists.infradead.org
> ---
>  drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> index bb3578469b03..6da15faf0192 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> @@ -10,6 +10,7 @@
>  
>  #include <drm/drm.h>
>  #include <drm/drm_gem.h>
> +#include <drm/drm_gem_cma_helper.h>
>  #include <drm/drm_prime.h>
>  #include <drm/drm_vma_manager.h>
>  
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]

Re: [PATCH v1 1/2] drm/rockchip: fix build due to undefined drm_gem_cma_vm_ops

[Sam Ravnborg]

On Tue, Sep 29, 2020 at 08:53:06AM +0200, Thomas Zimmermann wrote:
> Hi Sam
> 
> Am 25.09.20 um 23:55 schrieb Sam Ravnborg:
> > Commit 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")
> > introduced the following build error:
> > 
> > rockchip_drm_gem.c:304:13: error: ‘drm_gem_cma_vm_ops’ undeclared here
> >   304 |  .vm_ops = &drm_gem_cma_vm_ops,
> >       |             ^~~~~~~~~~~~~~~~~~
> >       |             drm_gem_mmap_obj
> > 
> > Fixed by adding missing include file.
> > 
> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> 
> Didn't you review exactly this change yesterday? Anyway, you should add
Yep.

> 
> Fixes: 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")
> 
> and
> 
> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
> 
> It might happen that I land my patch first, depending on the urgency of
> the issue.
I expect you to land the patch you made asap so we can have the build
fixed again.


	Sam

Re: [PATCH v1 1/2] drm/rockchip: fix build due to undefined drm_gem_cma_vm_ops

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1593 bytes --]

Hi Sam

Am 29.09.20 um 09:17 schrieb Sam Ravnborg:
> On Tue, Sep 29, 2020 at 08:53:06AM +0200, Thomas Zimmermann wrote:
>> Hi Sam
>>
>> Am 25.09.20 um 23:55 schrieb Sam Ravnborg:
>>> Commit 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")
>>> introduced the following build error:
>>>
>>> rockchip_drm_gem.c:304:13: error: ‘drm_gem_cma_vm_ops’ undeclared here
>>>   304 |  .vm_ops = &drm_gem_cma_vm_ops,
>>>       |             ^~~~~~~~~~~~~~~~~~
>>>       |             drm_gem_mmap_obj
>>>
>>> Fixed by adding missing include file.
>>>
>>> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
>>
>> Didn't you review exactly this change yesterday? Anyway, you should add
> Yep.
> 
>>
>> Fixes: 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")
>>
>> and
>>
>> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
>>
>> It might happen that I land my patch first, depending on the urgency of
>> the issue.
> I expect you to land the patch you made asap so we can have the build
> fixed again.

Oh, I just looked at the dates and your patch was actually first. Sorry
for the confusion. I've now merged what I had.

Best regards
Thomas

> 
> 
> 	Sam
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 516 bytes --]

[PATCH v1 2/2] drm/rockchip: fix warning from cdn_dp_resume

[Sam Ravnborg]

Commit 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
introduced the following warning in some builds:

cdn-dp-core.c:1124:12: warning: ‘cdn_dp_resume’ defined but not used
 1124 | static int cdn_dp_resume(struct device *dev)
      |            ^~~~~~~~~~~~~

Fix this by defining cdn_dp_resume __maybe_unused

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Fixes: 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
Cc: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: <stable@vger.kernel.org> # v5.8+
---
 drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index a4a45daf93f2..1162e321aaed 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1121,7 +1121,7 @@ static int cdn_dp_suspend(struct device *dev)
 	return ret;
 }
 
-static int cdn_dp_resume(struct device *dev)
+static int __maybe_unused cdn_dp_resume(struct device *dev)
 {
 	struct cdn_dp_device *dp = dev_get_drvdata(dev);
 
-- 
2.25.1

Re: [PATCH v1 2/2] drm/rockchip: fix warning from cdn_dp_resume

[Enric Balletbo i Serra]

Hi Sam,

Thank you for your patch.

On 25/9/20 23:55, Sam Ravnborg wrote:
> Commit 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
> introduced the following warning in some builds:
> 
> cdn-dp-core.c:1124:12: warning: ‘cdn_dp_resume’ defined but not used
>  1124 | static int cdn_dp_resume(struct device *dev)
>       |            ^~~~~~~~~~~~~
> 
> Fix this by defining cdn_dp_resume __maybe_unused
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Fixes: 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
> Cc: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> Cc: Heiko Stuebner <heiko@sntech.de>
> Cc: Sandy Huang <hjc@rock-chips.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-rockchip@lists.infradead.org
> Cc: <stable@vger.kernel.org> # v5.8+
> ---

Hopefully this time this change lands ;-) Similar patches [1], [2], [3], were
sent in the past by different authors but for some reason never reached upstream.

[1] https://lkml.org/lkml/2020/4/28/1703
[2] https://www.spinics.net/lists/dri-devel/msg268818.html
[3] https://lkml.org/lkml/2020/8/10/1412

>  drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index a4a45daf93f2..1162e321aaed 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -1121,7 +1121,7 @@ static int cdn_dp_suspend(struct device *dev)

Shouldn't cdn_dp_suspend also have a __maybe_unused?

With that,

Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>

>  	return ret;
>  }
>  
> -static int cdn_dp_resume(struct device *dev)
> +static int __maybe_unused cdn_dp_resume(struct device *dev)
>  {
>  	struct cdn_dp_device *dp = dev_get_drvdata(dev);
>  
>