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@amd.com --- 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"
On Fri, Oct 30, 2020 at 12:13 PM Christian König ckoenig.leichtzumerken@gmail.com wrote:
Hm drm-misc-next compiles fine with swiotlb enabled in config. Am I blind or is this a merge problem with -rc1? If the latter need to give Thomas a heads-up about that for the backmerge of -rc2. -Daniel
-- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Am 30.10.20 um 13:08 schrieb Daniel Vetter:
It's a merge problem with linux-next Stephen pointed out.
And before you ask: Nope, I have no idea why drm-misc-next alone compiles fine either.
Anyway taking over the include is the right thing to-do. Can I please get an rb?
Thanks, Christian.
On Fri, Oct 30, 2020 at 3:27 PM Christian König ckoenig.leichtzumerken@gmail.com wrote:
Ah if we can apply this already to make sure the merge doesn't go boom, then should be good to apply already :-)
Acked-by: Daniel Vetter daniel.vetter@ffwll.ch
Maybe smash your above explanation into the commit message too, for the record. -Daniel
Hi
Am 30.10.20 um 12:13 schrieb Christian König:
The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
s/nouveu/nouveau
here and in the subject line.
Best regards Thomas
On Fri, Oct 30, 2020 at 12:13 PM Christian König ckoenig.leichtzumerken@gmail.com wrote:
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
dri-devel@lists.freedesktop.org
-
Christian König -
Daniel Vetter -
Thomas Zimmermann