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

Commit 7d6ff785 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt
Browse files

drm/i915: fix TV mode setting in property change 



Only set TV DAC in property change seems doesn't work, we have to
setup whole crtc pipe which assigned to TV alone.

Signed-off-by: default avatarZhenyu Wang <zhenyu.z.wang@intel.com>
[anholt: Note that this should also fix the oops at startup with new 2D]
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent ebcc8f2e

drivers/gpu/drm/i915/intel_tv.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -1570,6 +1570,8 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop 
	struct drm_device *dev = connector->dev;

	struct drm_device *dev = connector->dev;

	struct intel_output *intel_output = to_intel_output(connector);

	struct intel_output *intel_output = to_intel_output(connector);

	struct intel_tv_priv *tv_priv = intel_output->dev_priv;

	struct intel_tv_priv *tv_priv = intel_output->dev_priv;

	struct drm_encoder *encoder = &intel_output->enc;

	struct drm_crtc *crtc = encoder->crtc;

	int ret = 0;

	int ret = 0;

	bool changed = false;

	bool changed = false;
@@ -1608,8 +1610,9 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop 
		goto out;

		goto out;

	}

	}





	if (changed)

	if (changed && crtc)

		intel_tv_mode_set(&intel_output->enc, NULL, NULL);

		drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,

				crtc->y, crtc->fb);

out:

out:

	return ret;

	return ret;

}

}