drm/i915: Introduce enableddisabled helper

Similar to existing yesno and onoff and use it throughout the code.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479385814-2358-2-git-send-email-tvrtko.ursulin@linux.intel.com

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 1cc971cb6cb1893486a7a0d19acdcd4eaf50ceb9..96407f684f7f5458ac6c9027dcb109376c02a385 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1762,8 +1762,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)
        intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);
        intel_runtime_pm_put(dev_priv);
 
-       seq_printf(m, "self-refresh: %s\n",
-                  sr_enabled ? "enabled" : "disabled");
+       seq_printf(m, "self-refresh: %s\n", enableddisabled(sr_enabled));
 
        return 0;
 }

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 63c0ea07df9eb522bc49c43bba4b2de8ca5c35d8..be67aeece749cbe7eb8f1666badc7bd5e07abc82 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -129,6 +129,11 @@ static inline const char *onoff(bool v)
        return v ? "on" : "off";
 }
 
+static inline const char *enableddisabled(bool v)
+{
+       return v ? "enabled" : "disabled";
+}
+
 enum pipe {
        INVALID_PIPE = -1,
        PIPE_A = 0,

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a7f832f24235e465f62508fd56f9e5422724a37f..58fc78702e2b25dad79d997eeff517a18ffac2ec 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12783,7 +12783,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
                DRM_DEBUG_KMS("pch pfit: pos: 0x%08x, size: 0x%08x, %s\n",
                              pipe_config->pch_pfit.pos,
                              pipe_config->pch_pfit.size,
-                             pipe_config->pch_pfit.enabled ? "enabled" : "disabled");
+                             enableddisabled(pipe_config->pch_pfit.enabled));
 
        DRM_DEBUG_KMS("ips: %i, double wide: %i\n",
                      pipe_config->ips_enabled, pipe_config->double_wide);
@@ -16837,7 +16837,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
 
                DRM_DEBUG_KMS("[CRTC:%d:%s] hw state readout: %s\n",
                              crtc->base.base.id, crtc->base.name,
-                             crtc->active ? "enabled" : "disabled");
+                             enableddisabled(crtc->active));
        }
 
        for (i = 0; i < dev_priv->num_shared_dpll; i++) {
@@ -16870,9 +16870,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                }
 
                DRM_DEBUG_KMS("[ENCODER:%d:%s] hw state readout: %s, pipe %c\n",
-                             encoder->base.base.id,
-                             encoder->base.name,
-                             encoder->base.crtc ? "enabled" : "disabled",
+                             encoder->base.base.id, encoder->base.name,
+                             enableddisabled(encoder->base.crtc),
                              pipe_name(pipe));
        }
 
@@ -16901,9 +16900,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                        connector->base.encoder = NULL;
                }
                DRM_DEBUG_KMS("[CONNECTOR:%d:%s] hw state readout: %s\n",
-                             connector->base.base.id,
-                             connector->base.name,
-                             connector->base.encoder ? "enabled" : "disabled");
+                             connector->base.base.id, connector->base.name,
+                             enableddisabled(connector->base.encoder));
        }
 
        for_each_intel_crtc(dev, crtc) {

diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index 9f279a3d0f745e44179d00b056903d7de3d62f6b..0d8ff0034b88567369861dc9ee5aa8de6651b05b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -774,9 +774,8 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id)
                        8);
        intel_dsi->clk_hs_to_lp_count += extra_byte_count;
 
-       DRM_DEBUG_KMS("Eot %s\n", intel_dsi->eotp_pkt ? "enabled" : "disabled");
-       DRM_DEBUG_KMS("Clockstop %s\n", intel_dsi->clock_stop ?
-                                               "disabled" : "enabled");
+       DRM_DEBUG_KMS("Eot %s\n", enableddisabled(intel_dsi->eotp_pkt));
+       DRM_DEBUG_KMS("Clockstop %s\n", enableddisabled(!intel_dsi->clock_stop));
        DRM_DEBUG_KMS("Mode %s\n", intel_dsi->operation_mode ? "command" : "video");
        if (intel_dsi->dual_link == DSI_DUAL_LINK_FRONT_BACK)
                DRM_DEBUG_KMS("Dual link: DSI_DUAL_LINK_FRONT_BACK\n");
@@ -795,8 +794,7 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id)
        DRM_DEBUG_KMS("LP to HS Clock Count 0x%x\n", intel_dsi->clk_lp_to_hs_count);
        DRM_DEBUG_KMS("HS to LP Clock Count 0x%x\n", intel_dsi->clk_hs_to_lp_count);
        DRM_DEBUG_KMS("BTA %s\n",
-                       intel_dsi->video_frmt_cfg_bits & DISABLE_VIDEO_BTA ?
-                       "disabled" : "enabled");
+                       enableddisabled(!(intel_dsi->video_frmt_cfg_bits & DISABLE_VIDEO_BTA)));
 
        /* delays in VBT are in unit of 100us, so need to convert
         * here in ms

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 374a733864d4bd097958e47227967c79ceef55f4..08ab6d762ca42211bd11a4f3c9ab73d21648d66f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1722,7 +1722,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
 
        DRM_DEBUG_KMS("Connector %s backlight initialized, %s, brightness %u/%u\n",
                      connector->name,
-                     panel->backlight.enabled ? "enabled" : "disabled",
+                     enableddisabled(panel->backlight.enabled),
                      panel->backlight.level, panel->backlight.max);
 
        return 0;

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 14c3ae502cb23fb56aec48ef3b5bf1f3de74b4dc..e207dc69e8b39ff27c5ed4d5384ec648c8be3b55 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -347,8 +347,7 @@ void intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enable)
                return;
        }
 
-       DRM_DEBUG_KMS("memory self-refresh is %s\n",
-                     enable ? "enabled" : "disabled");
+       DRM_DEBUG_KMS("memory self-refresh is %s\n", enableddisabled(enable));
 }