Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c4d7fc authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Introduce enableddisabled helper 



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

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

drivers/gpu/drm/i915/i915_debugfs.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/i915/i915_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/intel_display.c

+6 −8
Original line number Diff line number Diff line
@@ -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) {

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c

+3 −5
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/intel_panel.c

+1 −1
Original line number Diff line number Diff line
@@ -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;