| Message ID | 20200925215524.2899527-2-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/rockchip: fix build + warning | expand |
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> > >
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
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 >
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>
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(+)