Commit d9f5160b authored by Jani Nikula's avatar Jani Nikula
Browse files

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



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

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


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

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

+4 −6
Original line number Diff line number Diff line
@@ -1093,7 +1093,6 @@ intel_tv_get_config(struct intel_encoder *encoder, 
		    struct intel_crtc_state *pipe_config)

{

	struct intel_display *display = to_intel_display(encoder);

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct drm_display_mode *adjusted_mode =

		&pipe_config->hw.adjusted_mode;

	struct drm_display_mode mode = {};
@@ -1167,7 +1166,7 @@ intel_tv_get_config(struct intel_encoder *encoder, 
		adjusted_mode->crtc_clock /= 2;



	/* pixel counter doesn't work on i965gm TV output */

	if (IS_I965GM(dev_priv))

	if (display->platform.i965gm)

		pipe_config->mode_flags |=

			I915_MODE_FLAG_USE_SCANLINE_COUNTER;

}
@@ -1197,7 +1196,6 @@ intel_tv_compute_config(struct intel_encoder *encoder, 
	struct intel_atomic_state *state =

		to_intel_atomic_state(pipe_config->uapi.state);

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

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_tv_connector_state *tv_conn_state =

		to_intel_tv_connector_state(conn_state);

	const struct tv_mode *tv_mode = intel_tv_mode_find(conn_state);
@@ -1349,7 +1347,7 @@ intel_tv_compute_config(struct intel_encoder *encoder, 
	adjusted_mode->name[0] = '\0';



	/* pixel counter doesn't work on i965gm TV output */

	if (IS_I965GM(dev_priv))

	if (display->platform.i965gm)

		pipe_config->mode_flags |=

			I915_MODE_FLAG_USE_SCANLINE_COUNTER;
@@ -1525,7 +1523,7 @@ static void intel_tv_pre_enable(struct intel_atomic_state *state, 
		tv_mode->dda3_inc << TV_SCDDA3_INC_SHIFT;



	/* Enable two fixes for the chips that need them. */

	if (IS_I915GM(dev_priv))

	if (display->platform.i915gm)

		tv_ctl |= TV_ENC_C0_FIX | TV_ENC_SDP_FIX;



	set_tv_mode_timings(display, tv_mode, burst_ena);
@@ -1627,7 +1625,7 @@ intel_tv_detect_type(struct intel_tv *intel_tv, 
	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise

	 * the TV is misdetected. This is hardware requirement.

	 */

	if (IS_GM45(dev_priv))

	if (display->platform.gm45)

		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |

			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);