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

Commit 510d5f2f authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915: split encoder get_config calls from crtc get_clock calls 



This should help on HSW, where we don't currently have a get_clock call.

Reported-by: default avatarPaulo Zanoni <przanoni@gmail.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6f02488e

drivers/gpu/drm/i915/intel_display.c

+14 −10
Original line number Diff line number Diff line
@@ -8377,14 +8377,13 @@ check_crtc_state(struct drm_device *dev) 
				    base.head) {

			if (encoder->base.crtc != &crtc->base)

				continue;

			if (encoder->get_config &&

			    dev_priv->display.get_clock) {

			if (encoder->get_config)

				encoder->get_config(encoder, &pipe_config);

				dev_priv->display.get_clock(crtc,

							    &pipe_config);

			}

		}



		if (dev_priv->display.get_clock)

			dev_priv->display.get_clock(crtc, &pipe_config);



		WARN(crtc->active != active,

		     "crtc active state doesn't match with hw state "

		     "(expected %i, found %i)\n", crtc->active, active);
@@ -9956,12 +9955,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
		if (encoder->get_hw_state(encoder, &pipe)) {

			crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);

			encoder->base.crtc = &crtc->base;

			if (encoder->get_config &&

			    dev_priv->display.get_clock) {

			if (encoder->get_config)

				encoder->get_config(encoder, &crtc->config);

				dev_priv->display.get_clock(crtc,

							    &crtc->config);

			}

		} else {

			encoder->base.crtc = NULL;

		}
@@ -9974,6 +9969,15 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) 
			      pipe);

	}



	list_for_each_entry(crtc, &dev->mode_config.crtc_list,

			    base.head) {

		if (!crtc->active)

			continue;

		if (dev_priv->display.get_clock)

			dev_priv->display.get_clock(crtc,

						    &crtc->config);

	}



	list_for_each_entry(connector, &dev->mode_config.connector_list,

			    base.head) {

		if (connector->get_hw_state(connector)) {