On Fri, Oct 30, 2020 at 12:13 PM Christian König <ckoenig.leichtzumerken@xxxxxxxxx> wrote: > > The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move > the include as well. > > Signed-off-by: Christian König <christian.koenig@xxxxxxx> So this now broke drm-misc-next compilation on arm, which isn't great. Please make sure you compile test stuff before pushing. 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? Also adding Maxime, who's trying to get the backmerge through right now. -Daniel > --- > drivers/gpu/drm/nouveau/nouveau_bo.c | 1 - > drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 +++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c > index 746c06ed195b..8133377d865d 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -28,7 +28,6 @@ > */ > > #include <linux/dma-mapping.h> > -#include <linux/swiotlb.h> > > #include "nouveau_drv.h" > #include "nouveau_chan.h" > diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c > index d696d882c9eb..2bf36229dd57 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c > @@ -22,6 +22,9 @@ > * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE > * USE OR OTHER DEALINGS IN THE SOFTWARE. > */ > + > +#include <linux/swiotlb.h> > + > #include "nouveau_drv.h" > #include "nouveau_gem.h" > #include "nouveau_mem.h" > -- > 2.17.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
