Skip to contentSkip to conversation

drm/rockchip: fix build + warning

PATCH In review Sam Ravnborg 3 participants 7 messages Sep 25, 2020 – Sep 29, 2020

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

cover drm/rockchip: fix build + warning

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(-)
#1 lore raw

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

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.

Cc Thomas Zimmermann <[email protected]>
Cc Sandy Huang <[email protected]>
Cc "Heiko Stübner" <[email protected]>
---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +1 -0
index bb3578469b03..6da15faf0192 100644
@@ -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>
 
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 1/2
#2 lore raw

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

Hi Sam

Am 25.09.20 um 23:55 schrieb Sam Ravnborg:

Quoted 11 lines

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.

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

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

and

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

Best regards
Thomas

Quoted 22 lines
Cc Thomas Zimmermann <[email protected]>
Cc Sandy Huang <[email protected]>
Cc "Heiko Stübner" <[email protected]>
---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +1 -0
index bb3578469b03..6da15faf0192 100644
@@ -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>
 
Signature · 6 lines
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
#3 lore raw

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

Quoted 11 lines · Thomas Zimmermann

Hi Sam

Am 25.09.20 um 23:55 schrieb Sam Ravnborg:

Quoted 8 lines

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
Quoted 5 lines
Quoted 3 lines

Fixed by adding missing include file.

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

Yep.

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

and

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
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw

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

Hi Sam

Am 29.09.20 um 09:17 schrieb Sam Ravnborg:

Quoted 22 lines · Thomas Zimmermann
Quoted 11 lines

Hi Sam

Am 25.09.20 um 23:55 schrieb Sam Ravnborg:

Quoted 8 lines

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
Quoted 5 lines
Quoted 3 lines

Fixed by adding missing include file.

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

Yep.

Quoted 3 lines
Fixes 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs")
Quoted 8 lines
Quoted 6 lines

and

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

Quoted 8 lines

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

Signature · 6 lines
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
#5 lore raw

PATCH 2/2 drm/rockchip: fix warning from cdn_dp_resume

In reply to 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

Fixes 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
Cc Enric Balletbo i Serra <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc Sandy Huang <[email protected]>
Cc <[email protected]> # v5.8+
---
 drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-core.c +1 -1
index a4a45daf93f2..1162e321aaed 100644
@@ -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);
 
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#6 lore raw

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

Hi Sam,

Thank you for your patch.

Quoted 17 lines · 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

Fixes 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
Cc Enric Balletbo i Serra <[email protected]>
Cc Heiko Stuebner <[email protected]>
Cc Sandy Huang <[email protected]>
Cc <[email protected]> # v5.8+
Quoted 1 line

---

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 static int cdn_dp_suspend(struct device *dev)

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

Shouldn't cdn_dp_suspend also have a __maybe_unused?

With that,

Quoted 9 lines
drivers/gpu/drm/rockchip/cdn-dp-core.c +1 -1
 	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);