[PATCH] drm/nouveau/ttm: Add limits.h

[PATCH] drm/nouveau/ttm: Add limits.h

[Maxime Ripard]

It seems that a recent commit broke the nouveau compilation when swiotlb is
disabled (which is the case on our ARM defconfig for example).

Daniel says

"""
Since the proper fix is maybe stuck in the usual "drm abuses swiotlb
internals" bikeshed, maybe best if we push a fix to including limits.h
in nouveau and call it done?
"""

So let's go down the simplest path to fix our build, and goes back to it
later if needed.

Link: https://patchwork.freedesktop.org/patch/397835/
Fixes: 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 2bf36229dd57..a37bc3d7b38b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -23,6 +23,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <linux/limits.h>
 #include <linux/swiotlb.h>
 
 #include "nouveau_drv.h"
-- 
2.28.0

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

Re: [PATCH] drm/nouveau/ttm: Add limits.h

[Maxime Ripard]

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

On Mon, Nov 02, 2020 at 12:08:06PM +0100, Maxime Ripard wrote:
> It seems that a recent commit broke the nouveau compilation when swiotlb is
> disabled (which is the case on our ARM defconfig for example).
> 
> Daniel says
> 
> """
> Since the proper fix is maybe stuck in the usual "drm abuses swiotlb
> internals" bikeshed, maybe best if we push a fix to including limits.h
> in nouveau and call it done?
> """
> 
> So let's go down the simplest path to fix our build, and goes back to it
> later if needed.
> 
> Link: https://patchwork.freedesktop.org/patch/397835/
> Fixes: 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> Acked-by: Daniel Vetter <daniel@ffwll.ch>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Note that I misunderstood what Daniel was saying on IRC and ended up
pushing that patch in drm-misc-next. We can revert it if needed.

Maxime

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

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

Re: [PATCH] drm/nouveau/ttm: Add limits.h

[Daniel Vetter]

On Mon, Nov 2, 2020 at 12:18 PM Maxime Ripard <maxime@cerno.tech> wrote:
>
> On Mon, Nov 02, 2020 at 12:08:06PM +0100, Maxime Ripard wrote:
> > It seems that a recent commit broke the nouveau compilation when swiotlb is
> > disabled (which is the case on our ARM defconfig for example).
> >
> > Daniel says
> >
> > """
> > Since the proper fix is maybe stuck in the usual "drm abuses swiotlb
> > internals" bikeshed, maybe best if we push a fix to including limits.h
> > in nouveau and call it done?
> > """
> >
> > So let's go down the simplest path to fix our build, and goes back to it
> > later if needed.
> >
> > Link: https://patchwork.freedesktop.org/patch/397835/
> > Fixes: 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > Acked-by: Daniel Vetter <daniel@ffwll.ch>
> > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
>
> Note that I misunderstood what Daniel was saying on IRC and ended up
> pushing that patch in drm-misc-next. We can revert it if needed.

Yeah I guess I shouldn't ack patches without seeing the commit message
first  and all that :-) Code imo still fine, other bits maybe
suboptimal:
- Even in emergency for reverts or so, patch should still go to the
m-l, as fyi. That's why dim checks for the Link: tag, which should
point at that submission, not something else.
- The Link: tag here should have been a References: or so, since
that's for related discussions and other material.
- sfr's mail would have been good as a References: too, plus including
his explanation for what's going on
- Also maybe some notes why we're rushing here, since there's a few
patches stuck behind the backmerge.
- Reported-by: credits for sfr would have been nice.

Anyway, it's done, so that's all for next time around.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel