[PATCH] horror

[PATCH] horror

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_drv.c     |  8 ++++++++
 drivers/gpu/drm/i915/i915_drv.h     | 12 ++++++++++++
 drivers/gpu/drm/i915/i915_request.c |  7 +++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 5ba785387c2b..3c2625b50448 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1479,6 +1479,14 @@ static void i915_driver_release(struct drm_device *dev)
 	kfree(dev_priv);
 }
 
+void i915_release(struct kref *kref)
+{
+	struct drm_i915_private *i915 = 
+		container_of(kref, struct drm_i915_private, drm.ref);
+
+	i915_driver_release(&i915->drm);
+}
+
 static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
 {
 	struct drm_i915_private *i915 = to_i915(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 397e587a8688..052e4952e370 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3552,4 +3552,16 @@ static inline int intel_hws_csb_write_index(struct drm_i915_private *i915)
 		return I915_HWS_CSB_WRITE_INDEX;
 }
 
+static inline struct drm_i915_private *i915_get(struct drm_i915_private *i915)
+{
+	kref_get(&i915->drm.ref);
+	return i915;
+}
+
+void i915_release(struct kref *kref);
+static inline void i915_put(struct drm_i915_private *i915)
+{
+	kref_put(&i915->drm.ref, i915_release);
+}
+
 #endif
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index e808087928f7..6753fe8e6400 100644
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -74,6 +74,7 @@ static signed long i915_fence_wait(struct dma_fence *fence,
 static void i915_fence_release(struct dma_fence *fence)
 {
 	struct i915_request *rq = to_request(fence);
+	struct drm_i915_private *i915 = rq->i915;
 
 	/*
 	 * The request is put onto a RCU freelist (i.e. the address
@@ -84,7 +85,8 @@ static void i915_fence_release(struct dma_fence *fence)
 	 */
 	i915_sw_fence_fini(&rq->submit);
 
-	kmem_cache_free(rq->i915->requests, rq);
+	kmem_cache_free(i915->requests, rq);
+	i915_put(i915);
 }
 
 const struct dma_fence_ops i915_fence_ops = {
@@ -717,7 +719,7 @@ i915_request_alloc(struct intel_engine_cs *engine, struct i915_gem_context *ctx)
 	}
 
 	INIT_LIST_HEAD(&rq->active_list);
-	rq->i915 = i915;
+	rq->i915 = i915_get(i915);
 	rq->engine = engine;
 	rq->gem_context = ctx;
 	rq->hw_context = ce;
@@ -795,6 +797,7 @@ i915_request_alloc(struct intel_engine_cs *engine, struct i915_gem_context *ctx)
 	GEM_BUG_ON(!list_empty(&rq->sched.waiters_list));
 
 	kmem_cache_free(i915->requests, rq);
+	i915_put(i915);
 err_unreserve:
 	unreserve_gt(i915);
 err_unpin:
-- 
2.18.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] horror

[Chris Wilson]

I really must remember to proof read git send-email.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.CHECKPATCH: warning for horror

[Patchwork]

== Series Details ==

Series: horror
URL   : https://patchwork.freedesktop.org/series/45480/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
c0c89f80325f horror
-:17: ERROR:TRAILING_WHITESPACE: trailing whitespace
#17: FILE: drivers/gpu/drm/i915/i915_drv.c:1473:
+^Istruct drm_i915_private *i915 = $

-:85: ERROR:MISSING_SIGN_OFF: Missing Signed-off-by: line(s)

total: 2 errors, 0 warnings, 0 checks, 61 lines checked

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for horror

[Patchwork]

== Series Details ==

Series: horror
URL   : https://patchwork.freedesktop.org/series/45480/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4383 -> Patchwork_9440 =

== Summary - FAILURE ==

  Serious unknown changes coming with Patchwork_9440 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_9440, 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/45480/revisions/1/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_9440:

  === IGT changes ===

    ==== Possible regressions ====

    igt@gem_mmap@basic-small-bo:
      fi-glk-dsi:         PASS -> INCOMPLETE

    
== Known issues ==

  Here are the changes found in Patchwork_9440 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_module_reload@basic-no-display:
      fi-cnl-psr:         NOTRUN -> DMESG-WARN (fdo#105395) +2

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      fi-bxt-dsi:         PASS -> INCOMPLETE (fdo#103927)

    
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#105395 https://bugs.freedesktop.org/show_bug.cgi?id=105395


== Participating hosts (44 -> 40) ==

  Additional (1): fi-cnl-psr 
  Missing    (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u 


== Build changes ==

    * Linux: CI_DRM_4383 -> Patchwork_9440

  CI_DRM_4383: bdbdbb788dc43f68c57cd3b793f123901358c331 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4530: 0e98bf69f146eb72fe3a7c3b19a049b5786f0ca3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9440: c0c89f80325f48aa97090292117f63cb5c031bb0 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

c0c89f80325f horror

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9440/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] horror

[Jani Nikula]

On Wed, 27 Jun 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> I really must remember to proof read git send-email.

I did like the subsequent "warning for horror" and "failure for horror"
messages from CI though.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx