drm/i915/guc: Don't open log relay if GuC is not running

As we plan to continue driver load after GuC initialization
failure, we can't assume that GuC log data will be available
just because GuC was initially enabled. We must check that
GuC is still running instead.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190818095204.31568-2-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
index 59702ebc68f6bb6098fe18cbf1d9cd7fc78b64da..36332064de9ce277f5f2a60197fb09121b4f87a0 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
@@ -372,6 +372,7 @@ static int guc_log_relay_create(struct intel_guc_log *log)
        int ret;
 
        lockdep_assert_held(&log->relay.lock);
+       GEM_BUG_ON(!log->vma);
 
         /* Keep the size of sub buffers same as shared log buffer */
        subbuf_size = log->vma->size;
@@ -554,6 +555,9 @@ int intel_guc_log_relay_open(struct intel_guc_log *log)
 {
        int ret;
 
+       if (!log->vma)
+               return -ENODEV;
+
        mutex_lock(&log->relay.lock);
 
        if (intel_guc_log_relay_enabled(log)) {

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index e7ce739fe5455ffe5006ae4a0fb99665e27469fe..b39226d7f8d205b3a89fe4a27ca0ba056914afe3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2028,14 +2028,16 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_guc_log_level_fops,
 
 static int i915_guc_log_relay_open(struct inode *inode, struct file *file)
 {
-       struct drm_i915_private *dev_priv = inode->i_private;
+       struct drm_i915_private *i915 = inode->i_private;
+       struct intel_guc *guc = &i915->gt.uc.guc;
+       struct intel_guc_log *log = &guc->log;
 
-       if (!USES_GUC(dev_priv))
+       if (!intel_guc_is_running(guc))
                return -ENODEV;
 
-       file->private_data = &dev_priv->gt.uc.guc.log;
+       file->private_data = log;
 
-       return intel_guc_log_relay_open(&dev_priv->gt.uc.guc.log);
+       return intel_guc_log_relay_open(log);
 }
 
 static ssize_t
@@ -2047,16 +2049,15 @@ i915_guc_log_relay_write(struct file *filp,
        struct intel_guc_log *log = filp->private_data;
 
        intel_guc_log_relay_flush(log);
-
        return cnt;
 }
 
 static int i915_guc_log_relay_release(struct inode *inode, struct file *file)
 {
-       struct drm_i915_private *dev_priv = inode->i_private;
-
-       intel_guc_log_relay_close(&dev_priv->gt.uc.guc.log);
+       struct drm_i915_private *i915 = inode->i_private;
+       struct intel_guc *guc = &i915->gt.uc.guc;
 
+       intel_guc_log_relay_close(&guc->log);
        return 0;
 }