Re: [PATCH 8/8] drm: move ttm_execbuf_util into vmwgfx

[Christian König <christian.koenig@xxxxxxx>]

Am 09.05.22 um 16:33 schrieb Daniel Vetter:
> On Wed, May 04, 2022 at 09:47:39AM +0200, Christian König wrote:
> > VMWGFX is the only remaining user of this and should probably moved over
> > to drm_exec when it starts using GEM as well.
> >
> > Signed-off-by: Christian König <christian.koenig@xxxxxxx>
> I guess this is a bit annoying since it means we can't require drm_exec in
> ttm eviction, but we can make it an optional pointer in the ttm ctx. Needs
> to be optional anyway since we won't roll this out to all drivers, and
> then we can optionally use it to handle the locking in eviction instead of
> the current lock dropping tricks.
>
> I'm assuming at least that's your goal here, or is there a different one?

Yes, exactly that's the long term plan.

Christian.

> -Daniel
>
> > ---
> >   drivers/gpu/drm/ttm/Makefile                                  | 4 ++--
> >   drivers/gpu/drm/vmwgfx/Makefile                               | 2 +-
> >   drivers/gpu/drm/{ttm => vmwgfx}/ttm_execbuf_util.c            | 3 ++-
> >   .../drm/ttm => drivers/gpu/drm/vmwgfx}/ttm_execbuf_util.h     | 2 +-
> >   drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                           | 2 +-
> >   drivers/gpu/drm/vmwgfx/vmwgfx_validation.h                    | 2 +-
> >   6 files changed, 8 insertions(+), 7 deletions(-)
> >   rename drivers/gpu/drm/{ttm => vmwgfx}/ttm_execbuf_util.c (99%)
> >   rename {include/drm/ttm => drivers/gpu/drm/vmwgfx}/ttm_execbuf_util.h (99%)
> >
> > diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile
> > index f906b22959cf..b05a8477d0d0 100644
> > --- a/drivers/gpu/drm/ttm/Makefile
> > +++ b/drivers/gpu/drm/ttm/Makefile
> > @@ -3,8 +3,8 @@
> >   # Makefile for the drm device driver.  This driver provides support for the
> >   
> >   ttm-y := ttm_tt.o ttm_bo.o ttm_bo_util.o ttm_bo_vm.o ttm_module.o \
> > -	ttm_execbuf_util.o ttm_range_manager.o ttm_resource.o ttm_pool.o \
> > -	ttm_device.o ttm_sys_manager.o
> > +	ttm_range_manager.o ttm_resource.o ttm_pool.o ttm_device.o \
> > +	ttm_sys_manager.o
> >   ttm-$(CONFIG_AGP) += ttm_agp_backend.o
> >   
> >   obj-$(CONFIG_DRM_TTM) += ttm.o
> > diff --git a/drivers/gpu/drm/vmwgfx/Makefile b/drivers/gpu/drm/vmwgfx/Makefile
> > index eee73b9aa404..c2c836103b23 100644
> > --- a/drivers/gpu/drm/vmwgfx/Makefile
> > +++ b/drivers/gpu/drm/vmwgfx/Makefile
> > @@ -1,6 +1,6 @@
> >   # SPDX-License-Identifier: GPL-2.0
> >   vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_hashtab.o vmwgfx_kms.o vmwgfx_drv.o \
> > -	    vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_ttm_buffer.o \
> > +	    vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_ttm_buffer.o ttm_execbuf_util.o \
> >   	    vmwgfx_cmd.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \
> >   	    vmwgfx_overlay.o vmwgfx_gmrid_manager.o vmwgfx_fence.o \
> >   	    vmwgfx_bo.o vmwgfx_scrn.o vmwgfx_context.o \
> > diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/vmwgfx/ttm_execbuf_util.c
> > similarity index 99%
> > rename from drivers/gpu/drm/ttm/ttm_execbuf_util.c
> > rename to drivers/gpu/drm/vmwgfx/ttm_execbuf_util.c
> > index dbee34a058df..1030f263ba07 100644
> > --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c
> > +++ b/drivers/gpu/drm/vmwgfx/ttm_execbuf_util.c
> > @@ -26,13 +26,14 @@
> >    *
> >    **************************************************************************/
> >   
> > -#include <drm/ttm/ttm_execbuf_util.h>
> >   #include <drm/ttm/ttm_bo_driver.h>
> >   #include <drm/ttm/ttm_placement.h>
> >   #include <linux/wait.h>
> >   #include <linux/sched.h>
> >   #include <linux/module.h>
> >   
> > +#include "ttm_execbuf_util.h"
> > +
> >   static void ttm_eu_backoff_reservation_reverse(struct list_head *list,
> >   					      struct ttm_validate_buffer *entry)
> >   {
> > diff --git a/include/drm/ttm/ttm_execbuf_util.h b/drivers/gpu/drm/vmwgfx/ttm_execbuf_util.h
> > similarity index 99%
> > rename from include/drm/ttm/ttm_execbuf_util.h
> > rename to drivers/gpu/drm/vmwgfx/ttm_execbuf_util.h
> > index a99d7fdf2964..47553bf31c73 100644
> > --- a/include/drm/ttm/ttm_execbuf_util.h
> > +++ b/drivers/gpu/drm/vmwgfx/ttm_execbuf_util.h
> > @@ -33,7 +33,7 @@
> >   
> >   #include <linux/list.h>
> >   
> > -#include "ttm_bo_api.h"
> > +#include <drm/ttm/ttm_bo_api.h>
> >   
> >   /**
> >    * struct ttm_validate_buffer
> > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> > index be19aa6e1f13..cae306c60af9 100644
> > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
> > @@ -37,8 +37,8 @@
> >   #include <drm/drm_rect.h>
> >   
> >   #include <drm/ttm/ttm_bo_driver.h>
> > -#include <drm/ttm/ttm_execbuf_util.h>
> >   
> > +#include "ttm_execbuf_util.h"
> >   #include "ttm_object.h"
> >   
> >   #include "vmwgfx_fence.h"
> > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h
> > index f21df053882b..3613a3d52528 100644
> > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h
> > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h
> > @@ -31,7 +31,7 @@
> >   #include <linux/list.h>
> >   #include <linux/ww_mutex.h>
> >   
> > -#include <drm/ttm/ttm_execbuf_util.h>
> > +#include "ttm_execbuf_util.h"
> >   
> >   #include "vmwgfx_hashtab.h"
> >   
> > --
> > 2.25.1