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

Commit 19c8054c authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: prefer for_each_intel_* macros for iteration 



Use the for_each_intel_* macros for iterating intel_encoder,
intel_connector, and intel_crtc. No functional changes.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450262896-5325-1-git-send-email-jani.nikula@intel.com
parent ada8f955

drivers/gpu/drm/i915/i915_drv.c

+4 −7
Original line number Diff line number Diff line
@@ -543,15 +543,12 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) 
static void intel_suspend_encoders(struct drm_i915_private *dev_priv)

{

	struct drm_device *dev = dev_priv->dev;

	struct drm_encoder *encoder;

	struct intel_encoder *encoder;



	drm_modeset_lock_all(dev);

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		struct intel_encoder *intel_encoder = to_intel_encoder(encoder);



		if (intel_encoder->suspend)

			intel_encoder->suspend(intel_encoder);

	}

	for_each_intel_encoder(dev, encoder)

		if (encoder->suspend)

			encoder->suspend(encoder);

	drm_modeset_unlock_all(dev);

}

drivers/gpu/drm/i915/intel_display.c

+3 −7
Original line number Diff line number Diff line
@@ -15823,7 +15823,7 @@ void intel_connector_unregister(struct intel_connector *intel_connector) 
void intel_modeset_cleanup(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_connector *connector;

	struct intel_connector *connector;



	intel_disable_gt_powersave(dev);
@@ -15850,12 +15850,8 @@ void intel_modeset_cleanup(struct drm_device *dev) 
	flush_scheduled_work();



	/* destroy the backlight and sysfs files before encoders/connectors */

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		struct intel_connector *intel_connector;



		intel_connector = to_intel_connector(connector);

		intel_connector->unregister(intel_connector);

	}

	for_each_intel_connector(dev, connector)

		connector->unregister(connector);



	drm_mode_config_cleanup(dev);

drivers/gpu/drm/i915/intel_dp.c

+3 −5
Original line number Diff line number Diff line
@@ -389,8 +389,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp) 
	 * We don't have power sequencer currently.

	 * Pick one that's not used by other ports.

	 */

	list_for_each_entry(encoder, &dev->mode_config.encoder_list,

			    base.head) {

	for_each_intel_encoder(dev, encoder) {

		struct intel_dp *tmp;



		if (encoder->type != INTEL_OUTPUT_EDP)
@@ -530,7 +529,7 @@ void vlv_power_sequencer_reset(struct drm_i915_private *dev_priv) 
	 * should use them always.

	 */



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head) {

	for_each_intel_encoder(dev, encoder) {

		struct intel_dp *intel_dp;



		if (encoder->type != INTEL_OUTPUT_EDP)
@@ -2850,8 +2849,7 @@ static void vlv_steal_power_sequencer(struct drm_device *dev, 
	if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))

		return;



	list_for_each_entry(encoder, &dev->mode_config.encoder_list,

			    base.head) {

	for_each_intel_encoder(dev, encoder) {

		struct intel_dp *intel_dp;

		enum port port;

drivers/gpu/drm/i915/intel_opregion.c

+3 −3
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state) 
static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_connector *intel_connector;

	struct intel_connector *connector;

	struct opregion_asle *asle = dev_priv->opregion.asle;



	DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
@@ -446,8 +446,8 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp) 
	 * only one).

	 */

	DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);

	list_for_each_entry(intel_connector, &dev->mode_config.connector_list, base.head)

		intel_panel_set_backlight_acpi(intel_connector, bclp, 255);

	for_each_intel_connector(dev, connector)

		intel_panel_set_backlight_acpi(connector, bclp, 255);

	asle->cblv = DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID;



	drm_modeset_unlock(&dev->mode_config.connection_mutex);

drivers/gpu/drm/i915/intel_panel.c

+2 −2
Original line number Diff line number Diff line
@@ -1845,7 +1845,7 @@ void intel_backlight_register(struct drm_device *dev) 
{

	struct intel_connector *connector;



	list_for_each_entry(connector, &dev->mode_config.connector_list, base.head)

	for_each_intel_connector(dev, connector)

		intel_backlight_device_register(connector);

}
@@ -1853,6 +1853,6 @@ void intel_backlight_unregister(struct drm_device *dev) 
{

	struct intel_connector *connector;



	list_for_each_entry(connector, &dev->mode_config.connector_list, base.head)

	for_each_intel_connector(dev, connector)

		intel_backlight_device_unregister(connector);

}