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

Commit 637f44d2 authored by Adam Jackson's avatar Adam Jackson Committed by Daniel Vetter
Browse files

drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2) 



commit f40ebd6b
Author: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Date:   Tue Mar 5 14:24:48 2013 +0100

    drm/i915: Turn off hsync and vsync on ADPA when disabling crt

properly disabled the hsync/vsync logic at disable time, but neglected
to re-enable them at enable time.

v2: In the enable hook, restore the connector's expected DPMS level
instead of forcing ON.  Do this by stashing a back pointer to the
connector in the crt (suggested by danvet) since otherwise it's awkward
to look up.

Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Cc: stable@vger.kernel.org
[danvet: Added more verbose commit citation and cc: stable tag. Also,
make it compile. Then self-lart and try to assign the right pointer.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bd173813

drivers/gpu/drm/i915/intel_crt.c

+17 −23
Original line number Original line Diff line number Diff line
@@ -45,6 +45,9 @@ 




struct intel_crt {

struct intel_crt {

	struct intel_encoder base;

	struct intel_encoder base;

	/* DPMS state is stored in the connector, which we need in the

	 * encoder's enable/disable callbacks */

	struct intel_connector *connector;

	bool force_hotplug_required;

	bool force_hotplug_required;

	u32 adpa_reg;

	u32 adpa_reg;

};

};
@@ -81,29 +84,6 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder, 
	return true;

	return true;

}

}





static void intel_disable_crt(struct intel_encoder *encoder)

{

	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;

	struct intel_crt *crt = intel_encoder_to_crt(encoder);

	u32 temp;



	temp = I915_READ(crt->adpa_reg);

	temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE;

	temp &= ~ADPA_DAC_ENABLE;

	I915_WRITE(crt->adpa_reg, temp);

}



static void intel_enable_crt(struct intel_encoder *encoder)

{

	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;

	struct intel_crt *crt = intel_encoder_to_crt(encoder);

	u32 temp;



	temp = I915_READ(crt->adpa_reg);

	temp |= ADPA_DAC_ENABLE;

	I915_WRITE(crt->adpa_reg, temp);

}



/* Note: The caller is required to filter out dpms modes not supported by the

/* Note: The caller is required to filter out dpms modes not supported by the

 * platform. */

 * platform. */

static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)

static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
@@ -135,6 +115,19 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode) 
	I915_WRITE(crt->adpa_reg, temp);

	I915_WRITE(crt->adpa_reg, temp);

}

}





static void intel_disable_crt(struct intel_encoder *encoder)

{

	intel_crt_set_dpms(encoder, DRM_MODE_DPMS_OFF);

}



static void intel_enable_crt(struct intel_encoder *encoder)

{

	struct intel_crt *crt = intel_encoder_to_crt(encoder);



	intel_crt_set_dpms(encoder, crt->connector->base.dpms);

}





static void intel_crt_dpms(struct drm_connector *connector, int mode)

static void intel_crt_dpms(struct drm_connector *connector, int mode)

{

{

	struct drm_device *dev = connector->dev;

	struct drm_device *dev = connector->dev;
@@ -746,6 +739,7 @@ void intel_crt_init(struct drm_device *dev) 
	}

	}





	connector = &intel_connector->base;

	connector = &intel_connector->base;

	crt->connector = intel_connector;

	drm_connector_init(dev, &intel_connector->base,

	drm_connector_init(dev, &intel_connector->base,

			   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);

			   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);