* [PATCH] drm/i915: Drop unneed i915 parameter from intel_ring_pin()
@ 2018-07-27 15:55 Chris Wilson
2018-07-27 16:02 ` Michal Wajdeczko
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2018-07-27 15:55 UTC (permalink / raw)
To: intel-gfx
As we now have a ring->vma available, we can just lookup our i915
pointer from inside the vm, and so not require the unsightly parameter.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_lrc.c | 2 +-
drivers/gpu/drm/i915/intel_ringbuffer.c | 7 ++++---
drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 7879791b263b..fad689efb67a 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1331,7 +1331,7 @@ __execlists_context_pin(struct intel_engine_cs *engine,
goto unpin_vma;
}
- ret = intel_ring_pin(ce->ring, ctx->i915);
+ ret = intel_ring_pin(ce->ring);
if (ret)
goto unpin_map;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index b293e1dedb8e..d1e03b7fbffa 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1003,10 +1003,11 @@ i915_emit_bb_start(struct i915_request *rq,
return 0;
}
-int intel_ring_pin(struct intel_ring *ring, struct drm_i915_private *i915)
+int intel_ring_pin(struct intel_ring *ring)
{
- enum i915_map_type map = HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC;
struct i915_vma *vma = ring->vma;
+ enum i915_map_type map =
+ HAS_LLC(vma->vm->i915) ? I915_MAP_WB : I915_MAP_WC;
unsigned int flags;
void *addr;
int ret;
@@ -1405,7 +1406,7 @@ static int intel_init_ring_buffer(struct intel_engine_cs *engine)
goto err;
}
- err = intel_ring_pin(ring, engine->i915);
+ err = intel_ring_pin(ring);
if (err)
goto err_ring;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 399ec58d1f9d..57f3787ed6ec 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -797,7 +797,7 @@ struct intel_ring *
intel_engine_create_ring(struct intel_engine_cs *engine,
struct i915_timeline *timeline,
int size);
-int intel_ring_pin(struct intel_ring *ring, struct drm_i915_private *i915);
+int intel_ring_pin(struct intel_ring *ring);
void intel_ring_reset(struct intel_ring *ring, u32 tail);
unsigned int intel_ring_update_space(struct intel_ring *ring);
void intel_ring_unpin(struct intel_ring *ring);
--
2.18.0
_______________________________________________
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
* Re: [PATCH] drm/i915: Drop unneed i915 parameter from intel_ring_pin()
2018-07-27 15:55 [PATCH] drm/i915: Drop unneed i915 parameter from intel_ring_pin() Chris Wilson
@ 2018-07-27 16:02 ` Michal Wajdeczko
2018-07-27 18:18 ` Chris Wilson
2018-07-27 17:20 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-07-27 19:45 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Michal Wajdeczko @ 2018-07-27 16:02 UTC (permalink / raw)
To: intel-gfx, Chris Wilson
On Fri, 27 Jul 2018 17:55:01 +0200, Chris Wilson
<chris@chris-wilson.co.uk> wrote:
> As we now have a ring->vma available, we can just lookup our i915
> pointer from inside the vm, and so not require the unsightly parameter.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
_______________________________________________
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: Drop unneed i915 parameter from intel_ring_pin()
2018-07-27 15:55 [PATCH] drm/i915: Drop unneed i915 parameter from intel_ring_pin() Chris Wilson
2018-07-27 16:02 ` Michal Wajdeczko
@ 2018-07-27 17:20 ` Patchwork
2018-07-27 19:45 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-07-27 17:20 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Drop unneed i915 parameter from intel_ring_pin()
URL : https://patchwork.freedesktop.org/series/47358/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4562 -> Patchwork_9793 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9793 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9793, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47358/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9793:
=== IGT changes ===
==== Warnings ====
igt@drv_selftest@live_guc:
fi-skl-6600u: PASS -> SKIP +1
== Known issues ==
Here are the changes found in Patchwork_9793 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_workarounds:
{fi-bsw-kefka}: PASS -> DMESG-FAIL (fdo#107292)
==== Possible fixes ====
igt@drv_selftest@live_hugepages:
fi-ivb-3520m: INCOMPLETE -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-ivb-3520m: FAIL (fdo#103375) -> PASS +2
{fi-bdw-samus}: DMESG-WARN -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
{fi-cfl-8109u}: DMESG-WARN (fdo#107345) -> PASS +1
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
{fi-cfl-8109u}: INCOMPLETE (fdo#106070) -> PASS
==== Warnings ====
igt@drv_selftest@live_workarounds:
fi-cnl-psr: DMESG-WARN (fdo#105395) -> DMESG-FAIL (fdo#107292)
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#105395 https://bugs.freedesktop.org/show_bug.cgi?id=105395
fdo#106070 https://bugs.freedesktop.org/show_bug.cgi?id=106070
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107345 https://bugs.freedesktop.org/show_bug.cgi?id=107345
== Participating hosts (53 -> 47) ==
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper
== Build changes ==
* Linux: CI_DRM_4562 -> Patchwork_9793
CI_DRM_4562: 99bbd80f75cdcf28699ffd3c93a714ca4a89b962 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4579: a21999477545c2aed1e6a80dc93f87368614c7e5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9793: 827770acfb2e2d012c9352d523bd2ca9dcb7c100 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
827770acfb2e drm/i915: Drop unneed i915 parameter from intel_ring_pin()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9793/issues.html
_______________________________________________
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: Drop unneed i915 parameter from intel_ring_pin()
2018-07-27 16:02 ` Michal Wajdeczko
@ 2018-07-27 18:18 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2018-07-27 18:18 UTC (permalink / raw)
To: Michal Wajdeczko, intel-gfx
Quoting Michal Wajdeczko (2018-07-27 17:02:45)
> On Fri, 27 Jul 2018 17:55:01 +0200, Chris Wilson
> <chris@chris-wilson.co.uk> wrote:
>
> > As we now have a ring->vma available, we can just lookup our i915
> > pointer from inside the vm, and so not require the unsightly parameter.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > ---
>
> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Done, thanks.
-Chris
_______________________________________________
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: Drop unneed i915 parameter from intel_ring_pin()
2018-07-27 15:55 [PATCH] drm/i915: Drop unneed i915 parameter from intel_ring_pin() Chris Wilson
2018-07-27 16:02 ` Michal Wajdeczko
2018-07-27 17:20 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-07-27 19:45 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-07-27 19:45 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Drop unneed i915 parameter from intel_ring_pin()
URL : https://patchwork.freedesktop.org/series/47358/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4562_full -> Patchwork_9793_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_9793_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
shard-glk: PASS -> DMESG-FAIL (fdo#106560, fdo#106947)
igt@drv_suspend@shrink:
shard-snb: PASS -> FAIL (fdo#106886)
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-glk: PASS -> FAIL (fdo#100368)
==== Possible fixes ====
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363, fdo#102887) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4562 -> Patchwork_9793
CI_DRM_4562: 99bbd80f75cdcf28699ffd3c93a714ca4a89b962 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4579: a21999477545c2aed1e6a80dc93f87368614c7e5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9793: 827770acfb2e2d012c9352d523bd2ca9dcb7c100 @ 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_9793/shards.html
_______________________________________________
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:[~2018-07-27 19:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-27 15:55 [PATCH] drm/i915: Drop unneed i915 parameter from intel_ring_pin() Chris Wilson
2018-07-27 16:02 ` Michal Wajdeczko
2018-07-27 18:18 ` Chris Wilson
2018-07-27 17:20 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-07-27 19:45 ` ✓ Fi.CI.IGT: " 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.