[PATCH] drm/nouveu: fix swiotlb include

[Daniel Vetter]

On Fri, Oct 30, 2020 at 3:27 PM Christian König
<ckoenig.leichtzumerken at gmail.com> wrote:
>
> Am 30.10.20 um 13:08 schrieb Daniel Vetter:
> > On Fri, Oct 30, 2020 at 12:13 PM Christian König
> > <ckoenig.leichtzumerken at gmail.com> 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 at amd.com>
> > 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.
>
> 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?

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 at ffwll.ch>

Maybe smash your above explanation into the commit message too, for the record.
-Daniel

>
> Thanks,
> Christian.
>
> > -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 at lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
>


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch