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

Commit c8ecb2f1 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Use atomic state for load detect in crt. 



Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455697119-31416-3-git-send-email-maarten.lankhorst@linux.intel.com
parent edde3617

drivers/gpu/drm/i915/intel_crt.c

+3 −3
Original line number Diff line number Diff line
@@ -480,11 +480,10 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector) 
}



static enum drm_connector_status

intel_crt_load_detect(struct intel_crt *crt)

intel_crt_load_detect(struct intel_crt *crt, uint32_t pipe)

{

	struct drm_device *dev = crt->base.base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	uint32_t pipe = to_intel_crtc(crt->base.base.crtc)->pipe;

	uint32_t save_bclrpat;

	uint32_t save_vtotal;

	uint32_t vtotal, vactive;
@@ -653,7 +652,8 @@ intel_crt_detect(struct drm_connector *connector, bool force) 
		if (intel_crt_detect_ddc(connector))

			status = connector_status_connected;

		else if (INTEL_INFO(dev)->gen < 4)

			status = intel_crt_load_detect(crt);

			status = intel_crt_load_detect(crt,

				to_intel_crtc(connector->state->crtc)->pipe);

		else

			status = connector_status_unknown;

		intel_release_load_detect_pipe(connector, &tmp, &ctx);