| Message ID | cf1b5819d652577250d1d6dffcdb7788eba56e76.1641411696.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: clean up i915_drv.h | expand |
On 05/01/2022 19:56, Jani Nikula wrote: > We already have the i915_gem_evicti915.c file. There's a stray paste here and a few new headers got the 2021 copyright, but other than that it all looks fine to me. For the series: Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (I actually scrolled through it all so perhaps it can even be an r-b if you want.) Regards, Tvrtko > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + > drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + > drivers/gpu/drm/i915/i915_drv.h | 11 --------- > drivers/gpu/drm/i915/i915_gem_evict.c | 1 + > drivers/gpu/drm/i915/i915_gem_evict.h | 24 +++++++++++++++++++ > drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + > drivers/gpu/drm/i915/i915_vma.c | 1 + > 7 files changed, 29 insertions(+), 11 deletions(-) > create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index 62387218d9a6..377aada6269d 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -27,6 +27,7 @@ > #include "i915_drv.h" > #include "i915_gem_clflush.h" > #include "i915_gem_context.h" > +#include "i915_gem_evict.h" > #include "i915_gem_ioctls.h" > #include "i915_trace.h" > #include "i915_user_extensions.h" > diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > index 15d63435ec4d..4a20ba63446c 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > @@ -7,6 +7,7 @@ > > #include "gem/i915_gem_context.h" > > +#include "i915_gem_evict.h" > #include "intel_gt.h" > #include "intel_engine_heartbeat.h" > #include "intel_engine_pm.h" > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 5c3a78aa0a7b..ceecccfd9ccd 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1718,17 +1718,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id) > return vm; > } > > -/* i915_gem_evict.c */ > -int __must_check i915_gem_evict_something(struct i915_address_space *vm, > - u64 min_size, u64 alignment, > - unsigned long color, > - u64 start, u64 end, > - unsigned flags); > -int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, > - struct drm_mm_node *node, > - unsigned int flags); > -int i915_gem_evict_vm(struct i915_address_space *vm); > - > /* i915_gem_internal.c */ > struct drm_i915_gem_object * > i915_gem_object_create_internal(struct drm_i915_private *dev_priv, > diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c > index 2b73ddb11c66..24eee0c2055f 100644 > --- a/drivers/gpu/drm/i915/i915_gem_evict.c > +++ b/drivers/gpu/drm/i915/i915_gem_evict.c > @@ -31,6 +31,7 @@ > #include "gt/intel_gt_requests.h" > > #include "i915_drv.h" > +#include "i915_gem_evict.h" > #include "i915_trace.h" > > I915_SELFTEST_DECLARE(static struct igt_evict_ctl { > diff --git a/drivers/gpu/drm/i915/i915_gem_evict.h b/drivers/gpu/drm/i915/i915_gem_evict.h > new file mode 100644 > index 000000000000..d4478b6ad11b > --- /dev/null > +++ b/drivers/gpu/drm/i915/i915_gem_evict.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: MIT */ > +/* > + * Copyright © 2021 Intel Corporation > + */ > + > +#ifndef __I915_GEM_EVICT_H__ > +#define __I915_GEM_EVICT_H__ > + > +#include <linux/types.h> > + > +struct drm_mm_node; > +struct i915_address_space; > + > +int __must_check i915_gem_evict_something(struct i915_address_space *vm, > + u64 min_size, u64 alignment, > + unsigned long color, > + u64 start, u64 end, > + unsigned flags); > +int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, > + struct drm_mm_node *node, > + unsigned int flags); > +int i915_gem_evict_vm(struct i915_address_space *vm); > + > +#endif /* __I915_GEM_EVICT_H__ */ > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index cd5f2348a187..8a7f0d92b56f 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -20,6 +20,7 @@ > #include "gt/intel_gt_requests.h" > > #include "i915_drv.h" > +#include "i915_gem_evict.h" > #include "i915_scatterlist.h" > #include "i915_trace.h" > #include "i915_vgpu.h" > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c > index be208a8f1ed0..09d3424c9270 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -34,6 +34,7 @@ > #include "gt/intel_gt_requests.h" > > #include "i915_drv.h" > +#include "i915_gem_evict.h" > #include "i915_sw_fence_work.h" > #include "i915_trace.h" > #include "i915_vma.h" >
On Thu, 06 Jan 2022, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> wrote: > On 05/01/2022 19:56, Jani Nikula wrote: >> We already have the i915_gem_evicti915.c file. > > There's a stray paste here and a few new headers got the 2021 copyright, > but other than that it all looks fine to me. For the series: Thanks, fixed. Some of them have the 2021 copyright, because that's when they've been written. > Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Thanks. I'm sending the first five separately for CI and merging, chopping it up a bit. I wonder if we can just merge this via drm-intel-next. It's not that far away that we can merge to drm-next and backmerge again. BR, Jani. > > (I actually scrolled through it all so perhaps it can even be an r-b if > you want.) > > Regards, > > Tvrtko > >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + >> drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + >> drivers/gpu/drm/i915/i915_drv.h | 11 --------- >> drivers/gpu/drm/i915/i915_gem_evict.c | 1 + >> drivers/gpu/drm/i915/i915_gem_evict.h | 24 +++++++++++++++++++ >> drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + >> drivers/gpu/drm/i915/i915_vma.c | 1 + >> 7 files changed, 29 insertions(+), 11 deletions(-) >> create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h >> >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c >> index 62387218d9a6..377aada6269d 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c >> @@ -27,6 +27,7 @@ >> #include "i915_drv.h" >> #include "i915_gem_clflush.h" >> #include "i915_gem_context.h" >> +#include "i915_gem_evict.h" >> #include "i915_gem_ioctls.h" >> #include "i915_trace.h" >> #include "i915_user_extensions.h" >> diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c >> index 15d63435ec4d..4a20ba63446c 100644 >> --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c >> +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c >> @@ -7,6 +7,7 @@ >> >> #include "gem/i915_gem_context.h" >> >> +#include "i915_gem_evict.h" >> #include "intel_gt.h" >> #include "intel_engine_heartbeat.h" >> #include "intel_engine_pm.h" >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 5c3a78aa0a7b..ceecccfd9ccd 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -1718,17 +1718,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id) >> return vm; >> } >> >> -/* i915_gem_evict.c */ >> -int __must_check i915_gem_evict_something(struct i915_address_space *vm, >> - u64 min_size, u64 alignment, >> - unsigned long color, >> - u64 start, u64 end, >> - unsigned flags); >> -int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, >> - struct drm_mm_node *node, >> - unsigned int flags); >> -int i915_gem_evict_vm(struct i915_address_space *vm); >> - >> /* i915_gem_internal.c */ >> struct drm_i915_gem_object * >> i915_gem_object_create_internal(struct drm_i915_private *dev_priv, >> diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c >> index 2b73ddb11c66..24eee0c2055f 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_evict.c >> +++ b/drivers/gpu/drm/i915/i915_gem_evict.c >> @@ -31,6 +31,7 @@ >> #include "gt/intel_gt_requests.h" >> >> #include "i915_drv.h" >> +#include "i915_gem_evict.h" >> #include "i915_trace.h" >> >> I915_SELFTEST_DECLARE(static struct igt_evict_ctl { >> diff --git a/drivers/gpu/drm/i915/i915_gem_evict.h b/drivers/gpu/drm/i915/i915_gem_evict.h >> new file mode 100644 >> index 000000000000..d4478b6ad11b >> --- /dev/null >> +++ b/drivers/gpu/drm/i915/i915_gem_evict.h >> @@ -0,0 +1,24 @@ >> +/* SPDX-License-Identifier: MIT */ >> +/* >> + * Copyright © 2021 Intel Corporation >> + */ >> + >> +#ifndef __I915_GEM_EVICT_H__ >> +#define __I915_GEM_EVICT_H__ >> + >> +#include <linux/types.h> >> + >> +struct drm_mm_node; >> +struct i915_address_space; >> + >> +int __must_check i915_gem_evict_something(struct i915_address_space *vm, >> + u64 min_size, u64 alignment, >> + unsigned long color, >> + u64 start, u64 end, >> + unsigned flags); >> +int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, >> + struct drm_mm_node *node, >> + unsigned int flags); >> +int i915_gem_evict_vm(struct i915_address_space *vm); >> + >> +#endif /* __I915_GEM_EVICT_H__ */ >> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c >> index cd5f2348a187..8a7f0d92b56f 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c >> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c >> @@ -20,6 +20,7 @@ >> #include "gt/intel_gt_requests.h" >> >> #include "i915_drv.h" >> +#include "i915_gem_evict.h" >> #include "i915_scatterlist.h" >> #include "i915_trace.h" >> #include "i915_vgpu.h" >> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c >> index be208a8f1ed0..09d3424c9270 100644 >> --- a/drivers/gpu/drm/i915/i915_vma.c >> +++ b/drivers/gpu/drm/i915/i915_vma.c >> @@ -34,6 +34,7 @@ >> #include "gt/intel_gt_requests.h" >> >> #include "i915_drv.h" >> +#include "i915_gem_evict.h" >> #include "i915_sw_fence_work.h" >> #include "i915_trace.h" >> #include "i915_vma.h" >>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 62387218d9a6..377aada6269d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -27,6 +27,7 @@ #include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" +#include "i915_gem_evict.h" #include "i915_gem_ioctls.h" #include "i915_trace.h" #include "i915_user_extensions.h" diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c index 15d63435ec4d..4a20ba63446c 100644 --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c @@ -7,6 +7,7 @@ #include "gem/i915_gem_context.h" +#include "i915_gem_evict.h" #include "intel_gt.h" #include "intel_engine_heartbeat.h" #include "intel_engine_pm.h" diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 5c3a78aa0a7b..ceecccfd9ccd 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1718,17 +1718,6 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id) return vm; } -/* i915_gem_evict.c */ -int __must_check i915_gem_evict_something(struct i915_address_space *vm, - u64 min_size, u64 alignment, - unsigned long color, - u64 start, u64 end, - unsigned flags); -int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, - struct drm_mm_node *node, - unsigned int flags); -int i915_gem_evict_vm(struct i915_address_space *vm); - /* i915_gem_internal.c */ struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv, diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index 2b73ddb11c66..24eee0c2055f 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c @@ -31,6 +31,7 @@ #include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_trace.h" I915_SELFTEST_DECLARE(static struct igt_evict_ctl { diff --git a/drivers/gpu/drm/i915/i915_gem_evict.h b/drivers/gpu/drm/i915/i915_gem_evict.h new file mode 100644 index 000000000000..d4478b6ad11b --- /dev/null +++ b/drivers/gpu/drm/i915/i915_gem_evict.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2021 Intel Corporation + */ + +#ifndef __I915_GEM_EVICT_H__ +#define __I915_GEM_EVICT_H__ + +#include <linux/types.h> + +struct drm_mm_node; +struct i915_address_space; + +int __must_check i915_gem_evict_something(struct i915_address_space *vm, + u64 min_size, u64 alignment, + unsigned long color, + u64 start, u64 end, + unsigned flags); +int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, + struct drm_mm_node *node, + unsigned int flags); +int i915_gem_evict_vm(struct i915_address_space *vm); + +#endif /* __I915_GEM_EVICT_H__ */ diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index cd5f2348a187..8a7f0d92b56f 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -20,6 +20,7 @@ #include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_scatterlist.h" #include "i915_trace.h" #include "i915_vgpu.h" diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index be208a8f1ed0..09d3424c9270 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -34,6 +34,7 @@ #include "gt/intel_gt_requests.h" #include "i915_drv.h" +#include "i915_gem_evict.h" #include "i915_sw_fence_work.h" #include "i915_trace.h" #include "i915_vma.h"
We already have the i915_gem_evicti915.c file. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 11 --------- drivers/gpu/drm/i915/i915_gem_evict.c | 1 + drivers/gpu/drm/i915/i915_gem_evict.h | 24 +++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 1 + drivers/gpu/drm/i915/i915_vma.c | 1 + 7 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h