Commit fc467a22 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915: Use crtc->hwmode for vblanks, v2. 



intel_crtc->config will be removed eventually, so use crtc->hwmode.
drm_atomic_helper_update_legacy_modeset_state updates hwmode,
but crtc->active will eventually be gone too. Set dotclock to zero
to indicate the crtc is inactive.

Changes since v1:
- With the hwmode update in drm*update_legacy_modeset_state removed,
  intel_modeset_update_state has to assign it instead.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 1c5e19f8

drivers/gpu/drm/i915/i915_irq.c

+6 −7
Original line number Diff line number Diff line
@@ -564,8 +564,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, int pipe) 
	u32 high1, high2, low, pixel, vbl_start, hsync_start, htotal;

	struct intel_crtc *intel_crtc =

		to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);

	const struct drm_display_mode *mode =

		&intel_crtc->config->base.adjusted_mode;

	const struct drm_display_mode *mode = &intel_crtc->base.hwmode;



	htotal = mode->crtc_htotal;

	hsync_start = mode->crtc_hsync_start;
@@ -620,7 +619,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) 
{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	const struct drm_display_mode *mode = &crtc->config->base.adjusted_mode;

	const struct drm_display_mode *mode = &crtc->base.hwmode;

	enum pipe pipe = crtc->pipe;

	int position, vtotal;
@@ -647,14 +646,14 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe, 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	const struct drm_display_mode *mode = &intel_crtc->config->base.adjusted_mode;

	const struct drm_display_mode *mode = &intel_crtc->base.hwmode;

	int position;

	int vbl_start, vbl_end, hsync_start, htotal, vtotal;

	bool in_vbl = true;

	int ret = 0;

	unsigned long irqflags;



	if (!intel_crtc->active) {

	if (WARN_ON(!mode->crtc_clock)) {

		DRM_DEBUG_DRIVER("trying to get scanoutpos for disabled "

				 "pipe %c\n", pipe_name(pipe));

		return 0;
@@ -796,7 +795,7 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe, 
		return -EINVAL;

	}



	if (!crtc->state->active) {

	if (!crtc->hwmode.crtc_clock) {

		DRM_DEBUG_KMS("crtc %d is disabled\n", pipe);

		return -EBUSY;

	}
@@ -805,7 +804,7 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe, 
	return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error,

						     vblank_time, flags,

						     crtc,

						     &to_intel_crtc(crtc)->config->base.adjusted_mode);

						     &crtc->hwmode);

}



static bool intel_hpd_irq_event(struct drm_device *dev,

drivers/gpu/drm/i915/intel_display.c

+6 −0
Original line number Diff line number Diff line
@@ -12209,6 +12209,12 @@ intel_modeset_update_state(struct drm_atomic_state *state) 
		WARN_ON(crtc->state->enable != intel_crtc_in_use(crtc));



		to_intel_crtc(crtc)->config = to_intel_crtc_state(crtc->state);



		/* Update hwmode for vblank functions */

		if (crtc->state->active)

			crtc->hwmode = crtc->state->adjusted_mode;

		else

			crtc->hwmode.crtc_clock = 0;

	}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE