Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+17 -18
+1 -2
drivers/gpu/drm/i915/i915_debugfs.c
··· 1762 1762 intel_display_power_put(dev_priv, POWER_DOMAIN_INIT); 1763 1763 intel_runtime_pm_put(dev_priv); 1764 1764 1765 - seq_printf(m, "self-refresh: %s\n", 1766 - sr_enabled ? "enabled" : "disabled"); 1765 + seq_printf(m, "self-refresh: %s\n", enableddisabled(sr_enabled)); 1767 1766 1768 1767 return 0; 1769 1768 }
+5
drivers/gpu/drm/i915/i915_drv.h
··· 129 129 return v ? "on" : "off"; 130 130 } 131 131 132 + static inline const char *enableddisabled(bool v) 133 + { 134 + return v ? "enabled" : "disabled"; 135 + } 136 + 132 137 enum pipe { 133 138 INVALID_PIPE = -1, 134 139 PIPE_A = 0,
+6 -8
drivers/gpu/drm/i915/intel_display.c
··· 12783 12783 DRM_DEBUG_KMS("pch pfit: pos: 0x%08x, size: 0x%08x, %s\n", 12784 12784 pipe_config->pch_pfit.pos, 12785 12785 pipe_config->pch_pfit.size, 12786 - pipe_config->pch_pfit.enabled ? "enabled" : "disabled"); 12786 + enableddisabled(pipe_config->pch_pfit.enabled)); 12787 12787 12788 12788 DRM_DEBUG_KMS("ips: %i, double wide: %i\n", 12789 12789 pipe_config->ips_enabled, pipe_config->double_wide); ··· 16837 16837 16838 16838 DRM_DEBUG_KMS("[CRTC:%d:%s] hw state readout: %s\n", 16839 16839 crtc->base.base.id, crtc->base.name, 16840 - crtc->active ? "enabled" : "disabled"); 16840 + enableddisabled(crtc->active)); 16841 16841 } 16842 16842 16843 16843 for (i = 0; i < dev_priv->num_shared_dpll; i++) { ··· 16870 16870 } 16871 16871 16872 16872 DRM_DEBUG_KMS("[ENCODER:%d:%s] hw state readout: %s, pipe %c\n", 16873 - encoder->base.base.id, 16874 - encoder->base.name, 16875 - encoder->base.crtc ? "enabled" : "disabled", 16873 + encoder->base.base.id, encoder->base.name, 16874 + enableddisabled(encoder->base.crtc), 16876 16875 pipe_name(pipe)); 16877 16876 } 16878 16877 ··· 16900 16901 connector->base.encoder = NULL; 16901 16902 } 16902 16903 DRM_DEBUG_KMS("[CONNECTOR:%d:%s] hw state readout: %s\n", 16903 - connector->base.base.id, 16904 - connector->base.name, 16905 - connector->base.encoder ? "enabled" : "disabled"); 16904 + connector->base.base.id, connector->base.name, 16905 + enableddisabled(connector->base.encoder)); 16906 16906 } 16907 16907 16908 16908 for_each_intel_crtc(dev, crtc) {
+3 -5
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
··· 774 774 8); 775 775 intel_dsi->clk_hs_to_lp_count += extra_byte_count; 776 776 777 - DRM_DEBUG_KMS("Eot %s\n", intel_dsi->eotp_pkt ? "enabled" : "disabled"); 778 - DRM_DEBUG_KMS("Clockstop %s\n", intel_dsi->clock_stop ? 779 - "disabled" : "enabled"); 777 + DRM_DEBUG_KMS("Eot %s\n", enableddisabled(intel_dsi->eotp_pkt)); 778 + DRM_DEBUG_KMS("Clockstop %s\n", enableddisabled(!intel_dsi->clock_stop)); 780 779 DRM_DEBUG_KMS("Mode %s\n", intel_dsi->operation_mode ? "command" : "video"); 781 780 if (intel_dsi->dual_link == DSI_DUAL_LINK_FRONT_BACK) 782 781 DRM_DEBUG_KMS("Dual link: DSI_DUAL_LINK_FRONT_BACK\n"); ··· 794 795 DRM_DEBUG_KMS("LP to HS Clock Count 0x%x\n", intel_dsi->clk_lp_to_hs_count); 795 796 DRM_DEBUG_KMS("HS to LP Clock Count 0x%x\n", intel_dsi->clk_hs_to_lp_count); 796 797 DRM_DEBUG_KMS("BTA %s\n", 797 - intel_dsi->video_frmt_cfg_bits & DISABLE_VIDEO_BTA ? 798 - "disabled" : "enabled"); 798 + enableddisabled(!(intel_dsi->video_frmt_cfg_bits & DISABLE_VIDEO_BTA))); 799 799 800 800 /* delays in VBT are in unit of 100us, so need to convert 801 801 * here in ms
+1 -1
drivers/gpu/drm/i915/intel_panel.c
··· 1722 1722 1723 1723 DRM_DEBUG_KMS("Connector %s backlight initialized, %s, brightness %u/%u\n", 1724 1724 connector->name, 1725 - panel->backlight.enabled ? "enabled" : "disabled", 1725 + enableddisabled(panel->backlight.enabled), 1726 1726 panel->backlight.level, panel->backlight.max); 1727 1727 1728 1728 return 0;
+1 -2
drivers/gpu/drm/i915/intel_pm.c
··· 347 347 return; 348 348 } 349 349 350 - DRM_DEBUG_KMS("memory self-refresh is %s\n", 351 - enable ? "enabled" : "disabled"); 350 + DRM_DEBUG_KMS("memory self-refresh is %s\n", enableddisabled(enable)); 352 351 } 353 352 354 353