| Message ID | 20181001194447.29910-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] drm/i915: Replace some open-coded i915_map_coherent_type() | expand |
On 01/10/2018 20:44, Chris Wilson wrote: > A few callsites where deciding on using WC or WB maps based on > HAS_LLC(), so replace them with the equivalent helper function > i915_map_coherent_type(). > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +-- > drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 4 ++-- > drivers/gpu/drm/i915/selftests/intel_lrc.c | 2 +- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index c092d5099ebf..b8a7a014d46d 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -1023,8 +1023,7 @@ i915_emit_bb_start(struct i915_request *rq, > int intel_ring_pin(struct intel_ring *ring) > { > struct i915_vma *vma = ring->vma; > - enum i915_map_type map = > - HAS_LLC(vma->vm->i915) ? I915_MAP_WB : I915_MAP_WC; > + enum i915_map_type map = i915_coherent_map_type(vma->vm->i915); > unsigned int flags; > void *addr; > int ret; > diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > index db378226ac10..51d0e2bed9e1 100644 > --- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > +++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c > @@ -76,7 +76,7 @@ static int hang_init(struct hang *h, struct drm_i915_private *i915) > h->seqno = memset(vaddr, 0xff, PAGE_SIZE); > > vaddr = i915_gem_object_pin_map(h->obj, > - HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC); > + i915_coherent_map_type(i915)); > if (IS_ERR(vaddr)) { > err = PTR_ERR(vaddr); > goto err_unpin_hws; > @@ -234,7 +234,7 @@ hang_create_request(struct hang *h, struct intel_engine_cs *engine) > return ERR_CAST(obj); > > vaddr = i915_gem_object_pin_map(obj, > - HAS_LLC(h->i915) ? I915_MAP_WB : I915_MAP_WC); > + i915_coherent_map_type(h->i915)); > if (IS_ERR(vaddr)) { > i915_gem_object_put(obj); > return ERR_CAST(vaddr); > diff --git a/drivers/gpu/drm/i915/selftests/intel_lrc.c b/drivers/gpu/drm/i915/selftests/intel_lrc.c > index c8b7f03c35bd..9f241d1c72db 100644 > --- a/drivers/gpu/drm/i915/selftests/intel_lrc.c > +++ b/drivers/gpu/drm/i915/selftests/intel_lrc.c > @@ -49,7 +49,7 @@ static int spinner_init(struct spinner *spin, struct drm_i915_private *i915) > } > spin->seqno = memset(vaddr, 0xff, PAGE_SIZE); > > - mode = HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC; > + mode = i915_coherent_map_type(i915); > vaddr = i915_gem_object_pin_map(spin->obj, mode); > if (IS_ERR(vaddr)) { > err = PTR_ERR(vaddr); > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
On 03/10/2018 05:47, Patchwork wrote: > == Series Details == > > Series: series starting with [1/4] drm/i915: Replace some open-coded i915_map_coherent_type() (rev2) > URL : https://patchwork.freedesktop.org/series/50408/ > State : failure > > == Summary == > > = CI Bug Log - changes from CI_DRM_4915_full -> Patchwork_10324_full = > > == Summary - FAILURE == > > Serious unknown changes coming with Patchwork_10324_full absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_10324_full, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > > > == Possible new issues == > > Here are the unknown changes that may have been introduced in Patchwork_10324_full: > > === IGT changes === > > ==== Possible regressions ==== > > igt@kms_draw_crc@draw-method-xrgb8888-mmap-cpu-xtiled: > shard-skl: PASS -> FAIL +1 > > igt@kms_plane_alpha_blend@pipe-b-alpha-basic: > shard-skl: NOTRUN -> FAIL Known issue: https://bugs.freedesktop.org/show_bug.cgi?id=108145 Martin > > > ==== Warnings ==== > > igt@pm_rc6_residency@rc6-accuracy: > shard-snb: SKIP -> PASS > > > == Known issues == > > Here are the changes found in Patchwork_10324_full that come from known issues: > > === IGT changes === > > ==== Issues hit ==== > > igt@gem_exec_suspend@basic-s3: > shard-snb: PASS -> INCOMPLETE (fdo#105411) > > igt@gem_workarounds@suspend-resume-context: > shard-skl: PASS -> INCOMPLETE (fdo#104108, fdo#107773) > > igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c: > shard-kbl: PASS -> DMESG-WARN (fdo#107956) > > igt@kms_chv_cursor_fail@pipe-a-256x256-left-edge: > shard-skl: PASS -> FAIL (fdo#104671) > > igt@kms_cursor_crc@cursor-256x256-random: > shard-skl: NOTRUN -> FAIL (fdo#103232) > > igt@kms_cursor_crc@cursor-256x85-sliding: > shard-glk: PASS -> FAIL (fdo#103232) +3 > > igt@kms_cursor_crc@cursor-64x21-random: > shard-apl: PASS -> FAIL (fdo#103232) +5 > > igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-xtiled: > shard-skl: PASS -> FAIL (fdo#103184) > > igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled: > shard-glk: PASS -> FAIL (fdo#107589) > > igt@kms_flip@plain-flip-fb-recreate-interruptible: > shard-kbl: PASS -> FAIL (fdo#100368) > > igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite: > shard-apl: PASS -> FAIL (fdo#103167) +2 > > igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc: > shard-glk: PASS -> FAIL (fdo#103167) +3 > > igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-mmap-gtt: > shard-skl: PASS -> FAIL (fdo#105682) > > igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-pwrite: > shard-skl: PASS -> FAIL (fdo#103167) +2 > > igt@kms_plane@pixel-format-pipe-a-planes: > shard-apl: PASS -> FAIL (fdo#103166) > > igt@kms_plane@pixel-format-pipe-b-planes: > shard-skl: NOTRUN -> DMESG-WARN (fdo#106885) > > igt@kms_plane_multiple@atomic-pipe-a-tiling-x: > shard-glk: PASS -> FAIL (fdo#103166) +1 > > igt@kms_setmode@basic: > shard-snb: NOTRUN -> FAIL (fdo#99912) > > igt@perf@polling: > shard-hsw: PASS -> FAIL (fdo#102252) > > > ==== Possible fixes ==== > > igt@kms_ccs@pipe-b-missing-ccs-buffer: > shard-kbl: DMESG-WARN (fdo#105602, fdo#103558) -> PASS +14 > > igt@kms_chv_cursor_fail@pipe-a-256x256-top-edge: > shard-skl: FAIL (fdo#104671) -> PASS > > igt@kms_color@pipe-b-ctm-max: > shard-apl: FAIL -> PASS > > igt@kms_cursor_crc@cursor-128x128-suspend: > shard-glk: FAIL (fdo#103232) -> PASS > shard-apl: FAIL (fdo#103232, fdo#103191) -> PASS > > igt@kms_cursor_crc@cursor-64x21-onscreen: > shard-apl: FAIL (fdo#103232) -> PASS > > igt@kms_flip@2x-flip-vs-expired-vblank-interruptible: > shard-glk: FAIL (fdo#105363) -> PASS > > igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite: > shard-apl: FAIL (fdo#103167) -> PASS +1 > > igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move: > shard-glk: FAIL (fdo#103167) -> PASS +2 > > igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite: > shard-skl: FAIL (fdo#103167) -> PASS +2 > > igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-msflip-blt: > shard-skl: FAIL (fdo#105682) -> PASS > > igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-render: > shard-skl: FAIL (fdo#103167) -> SKIP > > igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence: > shard-skl: FAIL (fdo#103191) -> PASS > > igt@kms_plane@plane-panning-top-left-pipe-a-planes: > shard-skl: FAIL (fdo#103166) -> PASS > > igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max: > shard-glk: FAIL -> PASS > > igt@kms_plane_alpha_blend@pipe-a-coverage-7efc: > shard-skl: FAIL -> PASS > > igt@kms_plane_multiple@atomic-pipe-a-tiling-x: > shard-apl: FAIL (fdo#103166) -> PASS +1 > > igt@kms_plane_multiple@atomic-pipe-a-tiling-y: > shard-glk: FAIL (fdo#103166) -> PASS > > igt@kms_setmode@basic: > shard-apl: FAIL (fdo#99912) -> PASS > shard-hsw: FAIL (fdo#99912) -> PASS > > > fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368 > fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252 > fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166 > fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167 > fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184 > fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191 > fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232 > fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558 > fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108 > fdo#104671 https://bugs.freedesktop.org/show_bug.cgi?id=104671 > fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363 > fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411 > fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602 > fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682 > fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885 > fdo#107589 https://bugs.freedesktop.org/show_bug.cgi?id=107589 > fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773 > fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956 > fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912 > > > == Participating hosts (6 -> 6) == > > No changes in participating hosts > > > == Build changes == > > * Linux: CI_DRM_4915 -> Patchwork_10324 > > CI_DRM_4915: 26e7a7d954a9c28b97af8ca7813f430fd9117232 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_4660: d0975646c50568e66e65b44b81d28232d059b94e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_10324: b693af3ecd245d4c8abc93a21863a3d42398907c @ 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_10324/shards.html > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index c092d5099ebf..b8a7a014d46d 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1023,8 +1023,7 @@ i915_emit_bb_start(struct i915_request *rq, int intel_ring_pin(struct intel_ring *ring) { struct i915_vma *vma = ring->vma; - enum i915_map_type map = - HAS_LLC(vma->vm->i915) ? I915_MAP_WB : I915_MAP_WC; + enum i915_map_type map = i915_coherent_map_type(vma->vm->i915); unsigned int flags; void *addr; int ret; diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c index db378226ac10..51d0e2bed9e1 100644 --- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c +++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c @@ -76,7 +76,7 @@ static int hang_init(struct hang *h, struct drm_i915_private *i915) h->seqno = memset(vaddr, 0xff, PAGE_SIZE); vaddr = i915_gem_object_pin_map(h->obj, - HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC); + i915_coherent_map_type(i915)); if (IS_ERR(vaddr)) { err = PTR_ERR(vaddr); goto err_unpin_hws; @@ -234,7 +234,7 @@ hang_create_request(struct hang *h, struct intel_engine_cs *engine) return ERR_CAST(obj); vaddr = i915_gem_object_pin_map(obj, - HAS_LLC(h->i915) ? I915_MAP_WB : I915_MAP_WC); + i915_coherent_map_type(h->i915)); if (IS_ERR(vaddr)) { i915_gem_object_put(obj); return ERR_CAST(vaddr); diff --git a/drivers/gpu/drm/i915/selftests/intel_lrc.c b/drivers/gpu/drm/i915/selftests/intel_lrc.c index c8b7f03c35bd..9f241d1c72db 100644 --- a/drivers/gpu/drm/i915/selftests/intel_lrc.c +++ b/drivers/gpu/drm/i915/selftests/intel_lrc.c @@ -49,7 +49,7 @@ static int spinner_init(struct spinner *spin, struct drm_i915_private *i915) } spin->seqno = memset(vaddr, 0xff, PAGE_SIZE); - mode = HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC; + mode = i915_coherent_map_type(i915); vaddr = i915_gem_object_pin_map(spin->obj, mode); if (IS_ERR(vaddr)) { err = PTR_ERR(vaddr);
A few callsites where deciding on using WC or WB maps based on HAS_LLC(), so replace them with the equivalent helper function i915_map_coherent_type(). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_ringbuffer.c | 3 +-- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 4 ++-- drivers/gpu/drm/i915/selftests/intel_lrc.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)