[PATCH 4/4] drm/i915: Rename no_fbc_str to no_fbc_reason

[Damien Lespiau <damien.lespiau@xxxxxxxxx>]

no_fbc_reason was a much better name, and now that we only store the
reason as a string, we can reuse that name.

Signed-off-by: Damien Lespiau <damien.lespiau@xxxxxxxxx>
---
 drivers/gpu/drm/i915/i915_debugfs.c |  2 +-
 drivers/gpu/drm/i915/i915_drv.h     |  2 +-
 drivers/gpu/drm/i915/intel_fbc.c    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 9ceae48..4d892a6 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1525,7 +1525,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
 		seq_puts(m, "FBC enabled\n");
 	else {
 		const char unknown_reason[] = "unknown reason";
-		const char *reason = dev_priv->fbc.no_fbc_str;
+		const char *reason = dev_priv->fbc.no_fbc_reason;
 
 		if (!reason)
 			reason = unknown_reason;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7f44ce2..39d0a32 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -813,7 +813,7 @@ struct i915_fbc {
 		struct drm_framebuffer *fb;
 	} *fbc_work;
 
-	const char *no_fbc_str;
+	const char *no_fbc_reason;
 };
 
 /**
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 0098cdd..0d5364d 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -464,13 +464,13 @@ void intel_fbc_disable(struct drm_device *dev)
 }
 
 static void set_no_fbc_reason(struct drm_i915_private *dev_priv,
-			      const char *reason_str /* a static string */)
+			      const char *reason /* a static string */)
 {
-	if (dev_priv->fbc.no_fbc_str == reason_str)
+	if (dev_priv->fbc.no_fbc_reason == reason)
 		return;
 
-	dev_priv->fbc.no_fbc_str = reason_str;
-	DRM_DEBUG_KMS("Disabling FBC: %s\n", reason_str);
+	dev_priv->fbc.no_fbc_reason = reason;
+	DRM_DEBUG_KMS("Disabling FBC: %s\n", reason);
 }
 
 static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)
@@ -664,7 +664,7 @@ void intel_fbc_update(struct drm_device *dev)
 	}
 
 	intel_fbc_enable(crtc);
-	dev_priv->fbc.no_fbc_str = NULL;
+	dev_priv->fbc.no_fbc_reason = NULL;
 	return;
 
 out_disable:
@@ -686,7 +686,7 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)
 {
 	if (!HAS_FBC(dev_priv)) {
 		dev_priv->fbc.enabled = false;
-		dev_priv->fbc.no_fbc_str = "unsupported";
+		dev_priv->fbc.no_fbc_reason = "unsupported";
 		return;
 	}
 
-- 
1.8.3.1

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