Commit 331313aa authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/vblank: use display->platform.<platform> instead of IS_<PLATFORM>() 



Switch to using the new display->platform.<platform> members for
platform identification in display code.

v2: Split out an unrelated hunk to a separate patch (Rodrigo)

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ed7295a7246bf00d8ae39f78c78dcc842c6939d9.1730144869.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b95d975c

drivers/gpu/drm/i915/display/intel_vblank.c

+4 −4
Original line number Diff line number Diff line
@@ -326,14 +326,13 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc, 
				     const struct drm_display_mode *mode)

{

	struct intel_display *display = to_intel_display(_crtc->dev);

	struct drm_i915_private *dev_priv = to_i915(display->drm);

	struct intel_crtc *crtc = to_intel_crtc(_crtc);

	enum pipe pipe = crtc->pipe;

	int position;

	int vbl_start, vbl_end, hsync_start, htotal, vtotal;

	unsigned long irqflags;

	bool use_scanline_counter = DISPLAY_VER(display) >= 5 ||

		IS_G4X(dev_priv) || DISPLAY_VER(display) == 2 ||

		display->platform.g4x || DISPLAY_VER(display) == 2 ||

		crtc->mode_flags & I915_MODE_FLAG_USE_SCANLINE_COUNTER;



	if (drm_WARN_ON(display->drm, !mode->crtc_clock)) {
@@ -602,14 +601,15 @@ void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state, 
			     const struct intel_crtc_state *new_crtc_state,

			     struct intel_vblank_evade_ctx *evade)

{

	struct intel_display *display = to_intel_display(new_crtc_state);

	struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);

	struct drm_i915_private *i915 = to_i915(crtc->base.dev);

	const struct intel_crtc_state *crtc_state;

	const struct drm_display_mode *adjusted_mode;



	evade->crtc = crtc;



	evade->need_vlv_dsi_wa = (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) &&

	evade->need_vlv_dsi_wa = (display->platform.valleyview ||

				  display->platform.cherryview) &&

		intel_crtc_has_type(new_crtc_state, INTEL_OUTPUT_DSI);



	/*