Merge tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes (84ade45e) · Commits · 戴 / test

Two more regression fixes for 4.7. * tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel: drm/i915: add missing condition for committing planes on crtc drm/i915: Treat eDP as always connected, again

drivers/gpu/drm/i915/intel_display.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -11997,6 +11997,12 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
		ret = intel_color_check(crtc, crtc_state);
		if (ret)
		return ret;

		/*
		* Changing color management on Intel hardware is
		* handled as part of planes update.
		*/
		crtc_state->planes_changed = true;
		}

		ret = 0;

drivers/gpu/drm/i915/intel_dp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4645,7 +4645,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)

		intel_dp->detect_done = false;

		if (intel_connector->detect_edid)
		if (is_edp(intel_dp) \|\| intel_connector->detect_edid)
		return connector_status_connected;
		else
		return connector_status_disconnected;

Admin message