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

Commit e2f0ba97 authored by Jesse Barnes's avatar Jesse Barnes Committed by Dave Airlie
Browse files

drm/i915: sync SDVO code with stable userland modesetting driver 



Pull in an update from the 2D driver (hopefully the last one, future work
should be done here and pulled back into xf86-video-intel as needed).

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 72daad40

drivers/gpu/drm/i915/intel_display.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -755,6 +755,8 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc, 
		case INTEL_OUTPUT_SDVO:

		case INTEL_OUTPUT_SDVO:

		case INTEL_OUTPUT_HDMI:

		case INTEL_OUTPUT_HDMI:

			is_sdvo = true;

			is_sdvo = true;

			if (intel_output->needs_tv_clock)

				is_tv = true;

			break;

			break;

		case INTEL_OUTPUT_DVO:

		case INTEL_OUTPUT_DVO:

			is_dvo = true;

			is_dvo = true;

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,7 @@ struct intel_output { 
	struct intel_i2c_chan *i2c_bus; /* for control functions */

	struct intel_i2c_chan *i2c_bus; /* for control functions */

	struct intel_i2c_chan *ddc_bus; /* for DDC only stuff */

	struct intel_i2c_chan *ddc_bus; /* for DDC only stuff */

	bool load_detect_temp;

	bool load_detect_temp;

	bool needs_tv_clock;

	void *dev_priv;

	void *dev_priv;

};

};