drm/i915/stolen: Checkpatch cleansing

In the next patch, we will introduce a new vlv_get_stolen_reserved, so
before we do, make sure checkpatch is happy with the surrounding code.
Sneak in some debug output while we are here.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180312165206.31772-2-chris@chris-wilson.co.uk
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index f11a4b908aaf3d3fc4e9c2e9511ca63136cfa064..5a57a1773fa7ec6a51c94ec7de72660941d515c0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -174,13 +174,17 @@ void i915_gem_cleanup_stolen(struct drm_device *dev)
 }
 
 static void g4x_get_stolen_reserved(struct drm_i915_private *dev_priv,
-                                   resource_size_t *base, resource_size_t *size)
+                                   resource_size_t *base,
+                                   resource_size_t *size)
 {
-       uint32_t reg_val = I915_READ(IS_GM45(dev_priv) ?
-                                    CTG_STOLEN_RESERVED :
-                                    ELK_STOLEN_RESERVED);
+       u32 reg_val = I915_READ(IS_GM45(dev_priv) ?
+                               CTG_STOLEN_RESERVED :
+                               ELK_STOLEN_RESERVED);
        resource_size_t stolen_top = dev_priv->dsm.end + 1;
 
+       DRM_DEBUG_DRIVER("%s_STOLEN_RESERVED = %08x\n",
+                        IS_GM45(dev_priv) ? "CTG" : "ELK", reg_val);
+
        if ((reg_val & G4X_STOLEN_RESERVED_ENABLE) == 0) {
                *base = 0;
                *size = 0;
@@ -208,9 +212,12 @@ static void g4x_get_stolen_reserved(struct drm_i915_private *dev_priv,
 }
 
 static void gen6_get_stolen_reserved(struct drm_i915_private *dev_priv,
-                                    resource_size_t *base, resource_size_t *size)
+                                    resource_size_t *base,
+                                    resource_size_t *size)
 {
-       uint32_t reg_val = I915_READ(GEN6_STOLEN_RESERVED);
+       u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
+
+       DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
 
        if ((reg_val & GEN6_STOLEN_RESERVED_ENABLE) == 0) {
                *base = 0;
@@ -240,9 +247,12 @@ static void gen6_get_stolen_reserved(struct drm_i915_private *dev_priv,
 }
 
 static void gen7_get_stolen_reserved(struct drm_i915_private *dev_priv,
-                                    resource_size_t *base, resource_size_t *size)
+                                    resource_size_t *base,
+                                    resource_size_t *size)
 {
-       uint32_t reg_val = I915_READ(GEN6_STOLEN_RESERVED);
+       u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
+
+       DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
 
        if ((reg_val & GEN6_STOLEN_RESERVED_ENABLE) == 0) {
                *base = 0;
@@ -266,9 +276,12 @@ static void gen7_get_stolen_reserved(struct drm_i915_private *dev_priv,
 }
 
 static void chv_get_stolen_reserved(struct drm_i915_private *dev_priv,
-                                   resource_size_t *base, resource_size_t *size)
+                                   resource_size_t *base,
+                                   resource_size_t *size)
 {
-       uint32_t reg_val = I915_READ(GEN6_STOLEN_RESERVED);
+       u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
+
+       DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
 
        if ((reg_val & GEN6_STOLEN_RESERVED_ENABLE) == 0) {
                *base = 0;
@@ -298,11 +311,14 @@ static void chv_get_stolen_reserved(struct drm_i915_private *dev_priv,
 }
 
 static void bdw_get_stolen_reserved(struct drm_i915_private *dev_priv,
-                                   resource_size_t *base, resource_size_t *size)
+                                   resource_size_t *base,
+                                   resource_size_t *size)
 {
-       uint32_t reg_val = I915_READ(GEN6_STOLEN_RESERVED);
+       u32 reg_val = I915_READ(GEN6_STOLEN_RESERVED);
        resource_size_t stolen_top;
 
+       DRM_DEBUG_DRIVER("GEN6_STOLEN_RESERVED = %08x\n", reg_val);
+
        if ((reg_val & GEN6_STOLEN_RESERVED_ENABLE) == 0) {
                *base = 0;
                *size = 0;