[PATCH 54/54] no-guc-log

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
 drivers/gpu/drm/i915/intel_uc.c     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index c6efb5ca7557..49c854a3a401 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2421,7 +2421,7 @@ static int i915_guc_log_relay_open(struct inode *inode, struct file *file)
 {
 	struct drm_i915_private *dev_priv = inode->i_private;
 
-	if (!USES_GUC(dev_priv))
+	if (!USES_GUC_SUBMISSION(dev_priv))
 		return -ENODEV;
 
 	file->private_data = &dev_priv->guc.log;
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 4b6dc81486c0..23143ce84702 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -350,6 +350,7 @@ int intel_uc_init_hw(struct drm_i915_private *i915)
 		return 0;
 
 	GEM_BUG_ON(!HAS_GUC(i915));
+	return -ENODEV;
 
 	gen9_reset_guc_interrupts(i915);
 
-- 
2.19.0