[Intel-gfx] [PATCH 06/12] drm/i915: Constify the drm_i915_private pointer a bit more

Damien Lespiau damien.lespiau at intel.com
Mon Jan 6 20:17:23 CET 2014


A lot of the WM functions are only reading from that structure and are
already using const. While converting the code to use dev_priv instead
of dev, I noticed a few places where we can give that hint.

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 95eb4cc..f018d24 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -1902,7 +1902,7 @@ static unsigned int ilk_cursor_wm_max(const struct drm_i915_private *dev_priv,
 }
 
 /* Calculate the maximum FBC watermark */
-static unsigned int ilk_fbc_wm_max(struct drm_i915_private *dev_priv)
+static unsigned int ilk_fbc_wm_max(const struct drm_i915_private *dev_priv)
 {
 	/* max that registers can hold */
 	if (dev_priv->info->gen >= 8)
@@ -1911,7 +1911,7 @@ static unsigned int ilk_fbc_wm_max(struct drm_i915_private *dev_priv)
 		return 15;
 }
 
-static void ilk_compute_wm_maximums(struct drm_i915_private *dev_priv,
+static void ilk_compute_wm_maximums(const struct drm_i915_private *dev_priv,
 				    int level,
 				    const struct intel_wm_config *config,
 				    enum intel_ddb_partitioning ddb_partitioning,
@@ -1964,7 +1964,7 @@ static bool ilk_validate_wm_level(int level,
 	return ret;
 }
 
-static void ilk_compute_wm_level(struct drm_i915_private *dev_priv,
+static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv,
 				 int level,
 				 const struct ilk_pipe_wm_parameters *p,
 				 struct intel_wm_level *result)
@@ -2161,7 +2161,7 @@ static bool intel_compute_pipe_wm(struct drm_crtc *crtc,
 				  struct intel_pipe_wm *pipe_wm)
 {
 	struct drm_device *dev = crtc->dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
+	const struct drm_i915_private *dev_priv = dev->dev_private;
 	int level, max_level = ilk_wm_max_level(dev);
 	/* LP0 watermark maximums depend on this pipe alone */
 	struct intel_wm_config config = {
-- 
1.8.3.1




More information about the Intel-gfx mailing list