Skip to contentSkip to conversation

drm/nouveau/ttm: Add limits.h

PATCH In review Maxime Ripard 2 participants 3 messages Nov 2, 2020

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

PATCH 1/1 drm/nouveau/ttm: Add limits.h

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.

Fixes 4dbafbd30aef ("drm/nouveu: fix swiotlb include")
---
 drivers/gpu/drm/nouveau/nouveau_ttm.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/nouveau/nouveau_ttm.c +1 -0
index 2bf36229dd57..a37bc3d7b38b 100644
@@ -23,6 +23,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <linux/limits.h>
 #include <linux/swiotlb.h>
 
 #include "nouveau_drv.h"
Signature · 6 lines
2.28.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw
Quoted 11 lines · 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?
"""

Quoted 7 lines

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

Fixes 4dbafbd30aef ("drm/nouveu: fix swiotlb include")

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

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

#2 lore raw
Quoted 16 lines · Maxime Ripard
Quoted 14 lines · 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.

Quoted 7 lines
Quoted 4 lines
Fixes 4dbafbd30aef ("drm/nouveu: fix swiotlb include")

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

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel