* [PATCH] drm/i915: Move the renderstate setup under gt/ @ 2019-07-04 9:19 Chris Wilson 2019-07-04 9:37 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork ` (3 more replies) 0 siblings, 4 replies; 5+ messages in thread From: Chris Wilson @ 2019-07-04 9:19 UTC (permalink / raw) To: intel-gfx The render state is used to initialise the default RCS context, and only used during early setup from within the gt code. As such, it makes a good candidate for placing within gt/, even if it is not yet entirely clean of our GEM heritage. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/Makefile | 15 ++++----- .../gen6_renderstate.c} | 0 .../gen7_renderstate.c} | 0 .../gen8_renderstate.c} | 0 .../gen9_renderstate.c} | 0 drivers/gpu/drm/i915/gt/intel_lrc.c | 6 ++-- .../intel_renderstate.c} | 9 +++--- .../gpu/drm/i915/{ => gt}/intel_renderstate.h | 10 ++++-- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 7 ++--- drivers/gpu/drm/i915/i915_gem_render_state.h | 31 ------------------- 10 files changed, 25 insertions(+), 53 deletions(-) rename drivers/gpu/drm/i915/{intel_renderstate_gen6.c => gt/gen6_renderstate.c} (100%) rename drivers/gpu/drm/i915/{intel_renderstate_gen7.c => gt/gen7_renderstate.c} (100%) rename drivers/gpu/drm/i915/{intel_renderstate_gen8.c => gt/gen8_renderstate.c} (100%) rename drivers/gpu/drm/i915/{intel_renderstate_gen9.c => gt/gen9_renderstate.c} (100%) rename drivers/gpu/drm/i915/{i915_gem_render_state.c => gt/intel_renderstate.c} (96%) rename drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h (91%) delete mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.h diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 82c49ad16361..d3ada3134328 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -78,14 +78,22 @@ gt-y += \ gt/intel_gt_pm.o \ gt/intel_hangcheck.o \ gt/intel_lrc.o \ + gt/intel_renderstate.o \ gt/intel_reset.o \ gt/intel_ringbuffer.o \ gt/intel_mocs.o \ gt/intel_sseu.o \ gt/intel_timeline.o \ gt/intel_workarounds.o +# autogenerated null render state +gt-y += \ + gt/gen6_renderstate.o \ + gt/gen7_renderstate.o \ + gt/gen8_renderstate.o \ + gt/gen9_renderstate.o gt-$(CONFIG_DRM_I915_SELFTEST) += \ gt/mock_engine.o + i915-y += $(gt-y) # GEM (Graphics Execution Management) code @@ -123,7 +131,6 @@ i915-y += \ i915_gem_fence_reg.o \ i915_gem_gtt.o \ i915_gem.o \ - i915_gem_render_state.o \ i915_globals.o \ i915_query.o \ i915_request.o \ @@ -144,12 +151,6 @@ i915-y += intel_uc.o \ intel_huc.o \ intel_huc_fw.o -# autogenerated null render state -i915-y += intel_renderstate_gen6.o \ - intel_renderstate_gen7.o \ - intel_renderstate_gen8.o \ - intel_renderstate_gen9.o - # modesetting core code obj-y += display/ i915-y += \ diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen6.c b/drivers/gpu/drm/i915/gt/gen6_renderstate.c similarity index 100% rename from drivers/gpu/drm/i915/intel_renderstate_gen6.c rename to drivers/gpu/drm/i915/gt/gen6_renderstate.c diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen7.c b/drivers/gpu/drm/i915/gt/gen7_renderstate.c similarity index 100% rename from drivers/gpu/drm/i915/intel_renderstate_gen7.c rename to drivers/gpu/drm/i915/gt/gen7_renderstate.c diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen8.c b/drivers/gpu/drm/i915/gt/gen8_renderstate.c similarity index 100% rename from drivers/gpu/drm/i915/intel_renderstate_gen8.c rename to drivers/gpu/drm/i915/gt/gen8_renderstate.c diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen9.c b/drivers/gpu/drm/i915/gt/gen9_renderstate.c similarity index 100% rename from drivers/gpu/drm/i915/intel_renderstate_gen9.c rename to drivers/gpu/drm/i915/gt/gen9_renderstate.c diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 1e85e04c58c4..f5b09b29f50e 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -135,13 +135,13 @@ #include "gem/i915_gem_context.h" -#include "gt/intel_gt.h" #include "i915_drv.h" -#include "i915_gem_render_state.h" #include "i915_vgpu.h" #include "intel_engine_pm.h" +#include "intel_gt.h" #include "intel_lrc_reg.h" #include "intel_mocs.h" +#include "intel_renderstate.h" #include "intel_reset.h" #include "intel_workarounds.h" @@ -2677,7 +2677,7 @@ static int gen8_init_rcs_context(struct i915_request *rq) if (ret) DRM_ERROR("MOCS failed to program: expect performance issues.\n"); - return i915_gem_render_state_emit(rq); + return intel_renderstate_emit(rq); } static void execlists_park(struct intel_engine_cs *engine) diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/gt/intel_renderstate.c similarity index 96% rename from drivers/gpu/drm/i915/i915_gem_render_state.c rename to drivers/gpu/drm/i915/gt/intel_renderstate.c index 6bda08c1e8d7..06a8dc40b19f 100644 --- a/drivers/gpu/drm/i915/i915_gem_render_state.c +++ b/drivers/gpu/drm/i915/gt/intel_renderstate.c @@ -26,10 +26,9 @@ */ #include "i915_drv.h" -#include "i915_gem_render_state.h" #include "intel_renderstate.h" -struct intel_render_state { +struct intel_renderstate { const struct intel_renderstate_rodata *rodata; struct drm_i915_gem_object *obj; struct i915_vma *vma; @@ -75,7 +74,7 @@ render_state_get_rodata(const struct intel_engine_cs *engine) (batch)[(i)++] = (val); \ } while(0) -static int render_state_setup(struct intel_render_state *so, +static int render_state_setup(struct intel_renderstate *so, struct drm_i915_private *i915) { const struct intel_renderstate_rodata *rodata = so->rodata; @@ -177,10 +176,10 @@ static int render_state_setup(struct intel_render_state *so, #undef OUT_BATCH -int i915_gem_render_state_emit(struct i915_request *rq) +int intel_renderstate_emit(struct i915_request *rq) { struct intel_engine_cs *engine = rq->engine; - struct intel_render_state so = {}; /* keep the compiler happy */ + struct intel_renderstate so = {}; /* keep the compiler happy */ int err; so.rodata = render_state_get_rodata(engine); diff --git a/drivers/gpu/drm/i915/intel_renderstate.h b/drivers/gpu/drm/i915/gt/intel_renderstate.h similarity index 91% rename from drivers/gpu/drm/i915/intel_renderstate.h rename to drivers/gpu/drm/i915/gt/intel_renderstate.h index 08f6fea05a2c..8d5079145054 100644 --- a/drivers/gpu/drm/i915/intel_renderstate.h +++ b/drivers/gpu/drm/i915/gt/intel_renderstate.h @@ -21,11 +21,13 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef _INTEL_RENDERSTATE_H -#define _INTEL_RENDERSTATE_H +#ifndef _INTEL_RENDERSTATE_H_ +#define _INTEL_RENDERSTATE_H_ #include <linux/types.h> +struct i915_request; + struct intel_renderstate_rodata { const u32 *reloc; const u32 *batch; @@ -44,4 +46,6 @@ extern const struct intel_renderstate_rodata gen7_null_state; extern const struct intel_renderstate_rodata gen8_null_state; extern const struct intel_renderstate_rodata gen9_null_state; -#endif /* INTEL_RENDERSTATE_H */ +int intel_renderstate_emit(struct i915_request *rq); + +#endif /* _INTEL_RENDERSTATE_H_ */ diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index 81f9b0422e6a..f804ec35037d 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c @@ -33,12 +33,11 @@ #include "gem/i915_gem_context.h" -#include "gt/intel_gt.h" - #include "i915_drv.h" -#include "i915_gem_render_state.h" #include "i915_trace.h" #include "intel_context.h" +#include "intel_gt.h" +#include "intel_renderstate.h" #include "intel_reset.h" #include "intel_workarounds.h" @@ -813,7 +812,7 @@ static int intel_rcs_ctx_init(struct i915_request *rq) if (ret != 0) return ret; - ret = i915_gem_render_state_emit(rq); + ret = intel_renderstate_emit(rq); if (ret) return ret; diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.h b/drivers/gpu/drm/i915/i915_gem_render_state.h deleted file mode 100644 index 112cda8fa1a8..000000000000 --- a/drivers/gpu/drm/i915/i915_gem_render_state.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright © 2014 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef _I915_GEM_RENDER_STATE_H_ -#define _I915_GEM_RENDER_STATE_H_ - -struct i915_request; - -int i915_gem_render_state_emit(struct i915_request *rq); - -#endif /* _I915_GEM_RENDER_STATE_H_ */ -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Move the renderstate setup under gt/ 2019-07-04 9:19 [PATCH] drm/i915: Move the renderstate setup under gt/ Chris Wilson @ 2019-07-04 9:37 ` Patchwork 2019-07-04 9:56 ` ✓ Fi.CI.BAT: success " Patchwork ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-07-04 9:37 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915: Move the renderstate setup under gt/ URL : https://patchwork.freedesktop.org/series/63214/ State : warning == Summary == $ dim checkpatch origin/drm-tip 98010f1b2e0c drm/i915: Move the renderstate setup under gt/ -:64: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #64: rename from drivers/gpu/drm/i915/intel_renderstate_gen6.c total: 0 errors, 1 warnings, 0 checks, 139 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Move the renderstate setup under gt/ 2019-07-04 9:19 [PATCH] drm/i915: Move the renderstate setup under gt/ Chris Wilson 2019-07-04 9:37 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork @ 2019-07-04 9:56 ` Patchwork 2019-07-04 10:29 ` [PATCH] " Mika Kuoppala 2019-07-05 11:09 ` ✓ Fi.CI.IGT: success for " Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-07-04 9:56 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915: Move the renderstate setup under gt/ URL : https://patchwork.freedesktop.org/series/63214/ State : success == Summary == CI Bug Log - changes from CI_DRM_6408 -> Patchwork_13525 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/ Known issues ------------ Here are the changes found in Patchwork_13525 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_flink_basic@flink-lifetime: - fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) +1 similar issue [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/fi-icl-u3/igt@gem_flink_basic@flink-lifetime.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/fi-icl-u3/igt@gem_flink_basic@flink-lifetime.html #### Possible fixes #### * igt@kms_frontbuffer_tracking@basic: - fi-icl-dsi: [FAIL][3] ([fdo#103167]) -> [PASS][4] [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/fi-icl-dsi/igt@kms_frontbuffer_tracking@basic.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 [fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485 [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045 Participating hosts (53 -> 47) ------------------------------ Additional (2): fi-kbl-r fi-cml-u Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus Build changes ------------- * Linux: CI_DRM_6408 -> Patchwork_13525 CI_DRM_6408: ee60427a5d560ee44370d88f70db1497df9df979 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5082: f7c51e6fbf8da0784b64a1edaee5266aa9b9f829 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13525: 98010f1b2e0c91aab40421e99db7f5ed38d2d4de @ git://anongit.freedesktop.org/gfx-ci/linux == Kernel 32bit build == Warning: Kernel 32bit buildtest failed: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/build_32bit.log CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h Kernel: arch/x86/boot/bzImage is ready (#1) Building modules, stage 2. MODPOST 112 modules ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:91: recipe for target '__modpost' failed make[1]: *** [__modpost] Error 1 Makefile:1287: recipe for target 'modules' failed make: *** [modules] Error 2 == Linux commits == 98010f1b2e0c drm/i915: Move the renderstate setup under gt/ == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Move the renderstate setup under gt/ 2019-07-04 9:19 [PATCH] drm/i915: Move the renderstate setup under gt/ Chris Wilson 2019-07-04 9:37 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2019-07-04 9:56 ` ✓ Fi.CI.BAT: success " Patchwork @ 2019-07-04 10:29 ` Mika Kuoppala 2019-07-05 11:09 ` ✓ Fi.CI.IGT: success for " Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Mika Kuoppala @ 2019-07-04 10:29 UTC (permalink / raw) To: Chris Wilson, intel-gfx Chris Wilson <chris@chris-wilson.co.uk> writes: > The render state is used to initialise the default RCS context, and only > used during early setup from within the gt code. As such, it makes a > good candidate for placing within gt/, even if it is not yet entirely > clean of our GEM heritage. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/Makefile | 15 ++++----- > .../gen6_renderstate.c} | 0 > .../gen7_renderstate.c} | 0 Mistakes were made in past. Painful reminder. > .../gen8_renderstate.c} | 0 > .../gen9_renderstate.c} | 0 I seek atonement on playing my part that gen10 did not materialize. Patch is, Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > drivers/gpu/drm/i915/gt/intel_lrc.c | 6 ++-- > .../intel_renderstate.c} | 9 +++--- > .../gpu/drm/i915/{ => gt}/intel_renderstate.h | 10 ++++-- > drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 7 ++--- > drivers/gpu/drm/i915/i915_gem_render_state.h | 31 ------------------- > 10 files changed, 25 insertions(+), 53 deletions(-) > rename drivers/gpu/drm/i915/{intel_renderstate_gen6.c => gt/gen6_renderstate.c} (100%) > rename drivers/gpu/drm/i915/{intel_renderstate_gen7.c => gt/gen7_renderstate.c} (100%) > rename drivers/gpu/drm/i915/{intel_renderstate_gen8.c => gt/gen8_renderstate.c} (100%) > rename drivers/gpu/drm/i915/{intel_renderstate_gen9.c => gt/gen9_renderstate.c} (100%) > rename drivers/gpu/drm/i915/{i915_gem_render_state.c => gt/intel_renderstate.c} (96%) > rename drivers/gpu/drm/i915/{ => gt}/intel_renderstate.h (91%) > delete mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.h > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index 82c49ad16361..d3ada3134328 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -78,14 +78,22 @@ gt-y += \ > gt/intel_gt_pm.o \ > gt/intel_hangcheck.o \ > gt/intel_lrc.o \ > + gt/intel_renderstate.o \ > gt/intel_reset.o \ > gt/intel_ringbuffer.o \ > gt/intel_mocs.o \ > gt/intel_sseu.o \ > gt/intel_timeline.o \ > gt/intel_workarounds.o > +# autogenerated null render state > +gt-y += \ > + gt/gen6_renderstate.o \ > + gt/gen7_renderstate.o \ > + gt/gen8_renderstate.o \ > + gt/gen9_renderstate.o > gt-$(CONFIG_DRM_I915_SELFTEST) += \ > gt/mock_engine.o > + > i915-y += $(gt-y) > > # GEM (Graphics Execution Management) code > @@ -123,7 +131,6 @@ i915-y += \ > i915_gem_fence_reg.o \ > i915_gem_gtt.o \ > i915_gem.o \ > - i915_gem_render_state.o \ > i915_globals.o \ > i915_query.o \ > i915_request.o \ > @@ -144,12 +151,6 @@ i915-y += intel_uc.o \ > intel_huc.o \ > intel_huc_fw.o > > -# autogenerated null render state > -i915-y += intel_renderstate_gen6.o \ > - intel_renderstate_gen7.o \ > - intel_renderstate_gen8.o \ > - intel_renderstate_gen9.o > - > # modesetting core code > obj-y += display/ > i915-y += \ > diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen6.c b/drivers/gpu/drm/i915/gt/gen6_renderstate.c > similarity index 100% > rename from drivers/gpu/drm/i915/intel_renderstate_gen6.c > rename to drivers/gpu/drm/i915/gt/gen6_renderstate.c > diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen7.c b/drivers/gpu/drm/i915/gt/gen7_renderstate.c > similarity index 100% > rename from drivers/gpu/drm/i915/intel_renderstate_gen7.c > rename to drivers/gpu/drm/i915/gt/gen7_renderstate.c > diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen8.c b/drivers/gpu/drm/i915/gt/gen8_renderstate.c > similarity index 100% > rename from drivers/gpu/drm/i915/intel_renderstate_gen8.c > rename to drivers/gpu/drm/i915/gt/gen8_renderstate.c > diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen9.c b/drivers/gpu/drm/i915/gt/gen9_renderstate.c > similarity index 100% > rename from drivers/gpu/drm/i915/intel_renderstate_gen9.c > rename to drivers/gpu/drm/i915/gt/gen9_renderstate.c > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index 1e85e04c58c4..f5b09b29f50e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -135,13 +135,13 @@ > > #include "gem/i915_gem_context.h" > > -#include "gt/intel_gt.h" > #include "i915_drv.h" > -#include "i915_gem_render_state.h" > #include "i915_vgpu.h" > #include "intel_engine_pm.h" > +#include "intel_gt.h" > #include "intel_lrc_reg.h" > #include "intel_mocs.h" > +#include "intel_renderstate.h" > #include "intel_reset.h" > #include "intel_workarounds.h" > > @@ -2677,7 +2677,7 @@ static int gen8_init_rcs_context(struct i915_request *rq) > if (ret) > DRM_ERROR("MOCS failed to program: expect performance issues.\n"); > > - return i915_gem_render_state_emit(rq); > + return intel_renderstate_emit(rq); > } > > static void execlists_park(struct intel_engine_cs *engine) > diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/gt/intel_renderstate.c > similarity index 96% > rename from drivers/gpu/drm/i915/i915_gem_render_state.c > rename to drivers/gpu/drm/i915/gt/intel_renderstate.c > index 6bda08c1e8d7..06a8dc40b19f 100644 > --- a/drivers/gpu/drm/i915/i915_gem_render_state.c > +++ b/drivers/gpu/drm/i915/gt/intel_renderstate.c > @@ -26,10 +26,9 @@ > */ > > #include "i915_drv.h" > -#include "i915_gem_render_state.h" > #include "intel_renderstate.h" > > -struct intel_render_state { > +struct intel_renderstate { > const struct intel_renderstate_rodata *rodata; > struct drm_i915_gem_object *obj; > struct i915_vma *vma; > @@ -75,7 +74,7 @@ render_state_get_rodata(const struct intel_engine_cs *engine) > (batch)[(i)++] = (val); \ > } while(0) > > -static int render_state_setup(struct intel_render_state *so, > +static int render_state_setup(struct intel_renderstate *so, > struct drm_i915_private *i915) > { > const struct intel_renderstate_rodata *rodata = so->rodata; > @@ -177,10 +176,10 @@ static int render_state_setup(struct intel_render_state *so, > > #undef OUT_BATCH > > -int i915_gem_render_state_emit(struct i915_request *rq) > +int intel_renderstate_emit(struct i915_request *rq) > { > struct intel_engine_cs *engine = rq->engine; > - struct intel_render_state so = {}; /* keep the compiler happy */ > + struct intel_renderstate so = {}; /* keep the compiler happy */ > int err; > > so.rodata = render_state_get_rodata(engine); > diff --git a/drivers/gpu/drm/i915/intel_renderstate.h b/drivers/gpu/drm/i915/gt/intel_renderstate.h > similarity index 91% > rename from drivers/gpu/drm/i915/intel_renderstate.h > rename to drivers/gpu/drm/i915/gt/intel_renderstate.h > index 08f6fea05a2c..8d5079145054 100644 > --- a/drivers/gpu/drm/i915/intel_renderstate.h > +++ b/drivers/gpu/drm/i915/gt/intel_renderstate.h > @@ -21,11 +21,13 @@ > * DEALINGS IN THE SOFTWARE. > */ > > -#ifndef _INTEL_RENDERSTATE_H > -#define _INTEL_RENDERSTATE_H > +#ifndef _INTEL_RENDERSTATE_H_ > +#define _INTEL_RENDERSTATE_H_ > > #include <linux/types.h> > > +struct i915_request; > + > struct intel_renderstate_rodata { > const u32 *reloc; > const u32 *batch; > @@ -44,4 +46,6 @@ extern const struct intel_renderstate_rodata gen7_null_state; > extern const struct intel_renderstate_rodata gen8_null_state; > extern const struct intel_renderstate_rodata gen9_null_state; > > -#endif /* INTEL_RENDERSTATE_H */ > +int intel_renderstate_emit(struct i915_request *rq); > + > +#endif /* _INTEL_RENDERSTATE_H_ */ > diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c > index 81f9b0422e6a..f804ec35037d 100644 > --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c > @@ -33,12 +33,11 @@ > > #include "gem/i915_gem_context.h" > > -#include "gt/intel_gt.h" > - > #include "i915_drv.h" > -#include "i915_gem_render_state.h" > #include "i915_trace.h" > #include "intel_context.h" > +#include "intel_gt.h" > +#include "intel_renderstate.h" > #include "intel_reset.h" > #include "intel_workarounds.h" > > @@ -813,7 +812,7 @@ static int intel_rcs_ctx_init(struct i915_request *rq) > if (ret != 0) > return ret; > > - ret = i915_gem_render_state_emit(rq); > + ret = intel_renderstate_emit(rq); > if (ret) > return ret; > > diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.h b/drivers/gpu/drm/i915/i915_gem_render_state.h > deleted file mode 100644 > index 112cda8fa1a8..000000000000 > --- a/drivers/gpu/drm/i915/i915_gem_render_state.h > +++ /dev/null > @@ -1,31 +0,0 @@ > -/* > - * Copyright © 2014 Intel Corporation > - * > - * Permission is hereby granted, free of charge, to any person obtaining a > - * copy of this software and associated documentation files (the "Software"), > - * to deal in the Software without restriction, including without limitation > - * the rights to use, copy, modify, merge, publish, distribute, sublicense, > - * and/or sell copies of the Software, and to permit persons to whom the > - * Software is furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice (including the next > - * paragraph) shall be included in all copies or substantial portions of the > - * Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > - * DEALINGS IN THE SOFTWARE. > - */ > - > -#ifndef _I915_GEM_RENDER_STATE_H_ > -#define _I915_GEM_RENDER_STATE_H_ > - > -struct i915_request; > - > -int i915_gem_render_state_emit(struct i915_request *rq); > - > -#endif /* _I915_GEM_RENDER_STATE_H_ */ > -- > 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: Move the renderstate setup under gt/ 2019-07-04 9:19 [PATCH] drm/i915: Move the renderstate setup under gt/ Chris Wilson ` (2 preceding siblings ...) 2019-07-04 10:29 ` [PATCH] " Mika Kuoppala @ 2019-07-05 11:09 ` Patchwork 3 siblings, 0 replies; 5+ messages in thread From: Patchwork @ 2019-07-05 11:09 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915: Move the renderstate setup under gt/ URL : https://patchwork.freedesktop.org/series/63214/ State : success == Summary == CI Bug Log - changes from CI_DRM_6408_full -> Patchwork_13525_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_13525_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_busy@close-race: - shard-hsw: [PASS][1] -> [DMESG-FAIL][2] ([fdo#111063]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-hsw8/igt@gem_busy@close-race.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-hsw5/igt@gem_busy@close-race.html - shard-kbl: [PASS][3] -> [DMESG-FAIL][4] ([fdo#111063]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-kbl3/igt@gem_busy@close-race.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-kbl2/igt@gem_busy@close-race.html * igt@gem_cpu_reloc@forked: - shard-apl: [PASS][5] -> [INCOMPLETE][6] ([fdo#103927]) [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-apl5/igt@gem_cpu_reloc@forked.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-apl3/igt@gem_cpu_reloc@forked.html * igt@gem_exec_balancer@smoke: - shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#110854]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-iclb1/igt@gem_exec_balancer@smoke.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-iclb5/igt@gem_exec_balancer@smoke.html * igt@kms_busy@basic-modeset-a: - shard-snb: [PASS][9] -> [SKIP][10] ([fdo#109271] / [fdo#109278]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-snb6/igt@kms_busy@basic-modeset-a.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-snb2/igt@kms_busy@basic-modeset-a.html * igt@kms_cursor_crc@pipe-b-cursor-suspend: - shard-apl: [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +2 similar issues [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-apl8/igt@kms_cursor_crc@pipe-b-cursor-suspend.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-apl7/igt@kms_cursor_crc@pipe-b-cursor-suspend.html * igt@kms_flip@flip-vs-expired-vblank: - shard-glk: [PASS][13] -> [FAIL][14] ([fdo#105363]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-glk7/igt@kms_flip@flip-vs-expired-vblank.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-glk3/igt@kms_flip@flip-vs-expired-vblank.html * igt@kms_flip@plain-flip-ts-check-interruptible: - shard-iclb: [PASS][15] -> [INCOMPLETE][16] ([fdo#107713]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-iclb5/igt@kms_flip@plain-flip-ts-check-interruptible.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-iclb7/igt@kms_flip@plain-flip-ts-check-interruptible.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu: - shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +5 similar issues [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu.html * igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-gtt: - shard-skl: [PASS][19] -> [FAIL][20] ([fdo#103167]) +1 similar issue [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-gtt.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-mmap-gtt.html * igt@kms_plane@plane-panning-top-left-pipe-b-planes: - shard-snb: [PASS][21] -> [SKIP][22] ([fdo#109271]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-snb6/igt@kms_plane@plane-panning-top-left-pipe-b-planes.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-snb2/igt@kms_plane@plane-panning-top-left-pipe-b-planes.html * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc: - shard-skl: [PASS][23] -> [FAIL][24] ([fdo#108145]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: [PASS][25] -> [FAIL][26] ([fdo#108145] / [fdo#110403]) +1 similar issue [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl10/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html * igt@kms_psr2_su@frontbuffer: - shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109642] / [fdo#111068]) [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-iclb2/igt@kms_psr2_su@frontbuffer.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-iclb8/igt@kms_psr2_su@frontbuffer.html * igt@kms_setmode@basic: - shard-kbl: [PASS][29] -> [FAIL][30] ([fdo#99912]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-kbl1/igt@kms_setmode@basic.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-kbl4/igt@kms_setmode@basic.html * igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend: - shard-skl: [PASS][31] -> [INCOMPLETE][32] ([fdo#104108]) +1 similar issue [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl3/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl8/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html * igt@perf@polling: - shard-skl: [PASS][33] -> [FAIL][34] ([fdo#110728]) [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl1/igt@perf@polling.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl3/igt@perf@polling.html #### Possible fixes #### * igt@gem_softpin@noreloc-s3: - shard-skl: [INCOMPLETE][35] ([fdo#104108]) -> [PASS][36] +1 similar issue [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl9/igt@gem_softpin@noreloc-s3.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl4/igt@gem_softpin@noreloc-s3.html * igt@gem_tiled_fence_blits@normal: - shard-apl: [INCOMPLETE][37] ([fdo#103927]) -> [PASS][38] [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-apl8/igt@gem_tiled_fence_blits@normal.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-apl3/igt@gem_tiled_fence_blits@normal.html - shard-iclb: [INCOMPLETE][39] ([fdo#107713]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-iclb7/igt@gem_tiled_fence_blits@normal.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-iclb4/igt@gem_tiled_fence_blits@normal.html * igt@i915_suspend@fence-restore-tiled2untiled: - shard-apl: [DMESG-WARN][41] ([fdo#108566]) -> [PASS][42] +5 similar issues [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-apl7/igt@i915_suspend@fence-restore-tiled2untiled.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-apl5/igt@i915_suspend@fence-restore-tiled2untiled.html * igt@kms_cursor_crc@pipe-c-cursor-suspend: - shard-skl: [INCOMPLETE][43] ([fdo#110741]) -> [PASS][44] [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl1/igt@kms_cursor_crc@pipe-c-cursor-suspend.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl6/igt@kms_cursor_crc@pipe-c-cursor-suspend.html * igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic: - shard-glk: [FAIL][45] ([fdo#104873]) -> [PASS][46] [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-glk5/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-glk1/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic.html * igt@kms_frontbuffer_tracking@fbc-badstride: - shard-iclb: [FAIL][47] ([fdo#103167]) -> [PASS][48] +7 similar issues [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-badstride.html [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-badstride.html * igt@kms_psr@psr2_cursor_mmap_cpu: - shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50] +2 similar issues [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-iclb3/igt@kms_psr@psr2_cursor_mmap_cpu.html [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html #### Warnings #### * igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-blt: - shard-skl: [FAIL][51] ([fdo#108040]) -> [FAIL][52] ([fdo#103167]) [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6408/shard-skl8/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-blt.html [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/shard-skl4/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-blt.html [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108 [fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873 [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 [fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403 [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728 [fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741 [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854 [fdo#111063]: https://bugs.freedesktop.org/show_bug.cgi?id=111063 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 Participating hosts (10 -> 10) ------------------------------ No changes in participating hosts Build changes ------------- * Linux: CI_DRM_6408 -> Patchwork_13525 CI_DRM_6408: ee60427a5d560ee44370d88f70db1497df9df979 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5082: f7c51e6fbf8da0784b64a1edaee5266aa9b9f829 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13525: 98010f1b2e0c91aab40421e99db7f5ed38d2d4de @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13525/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-05 11:09 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-07-04 9:19 [PATCH] drm/i915: Move the renderstate setup under gt/ Chris Wilson 2019-07-04 9:37 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2019-07-04 9:56 ` ✓ Fi.CI.BAT: success " Patchwork 2019-07-04 10:29 ` [PATCH] " Mika Kuoppala 2019-07-05 11:09 ` ✓ Fi.CI.IGT: success for " Patchwork
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.