drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2)
Subsystems (2)
PATCH 1/1 drm/i915: Be sure to turn hsync/vsync back on at crt enable (v2)
f40ebd6b 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.
--- drivers/gpu/drm/i915/intel_crt.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +17 -23
@@ -45,6 +45,9 @@struct intel_crt {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;u32 adpa_reg; };
@@ -81,29 +84,6 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,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 * platform. */ 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); } +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->dpms); +} + +static void intel_crt_dpms (struct drm_connector *connector,int mode) {struct drm_device *dev = connector->dev;
@@ -746,6 +739,7 @@ void intel_crt_init(struct drm_device *dev) } connector = &intel_connector->base; + crt->connector = connector;drm_connector_init (dev, &intel_connector->base, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA );
Signature · 1 line
1.8.1.4
Daniel Vetter
AppliedQuoted 9 lines · Adam Jackson
f40ebd6bproperly 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 Adam Jackson <[email protected]>
Picked up for -fixes, thanks for the patch. Also adding Patrick to cc in case he wants to chime in.
-Daniel
Quoted 83 lines
--- drivers/gpu/drm/i915/intel_crt.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/intel_crt.c +17
-23@@ -45,6 +45,9 @@struct intel_crt {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;u32 adpa_reg; };@@ -81,29 +84,6 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,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 * platform. */ 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); } +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->dpms); +} + +static void intel_crt_dpms (struct drm_connector *connector,int mode) {struct drm_device *dev = connector->dev;@@ -746,6 +739,7 @@ void intel_crt_init(struct drm_device *dev) } connector = &intel_connector->base; + crt->connector = connector;drm_connector_init (dev, &intel_connector->base, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA );Signature · 6 lines
1.8.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 9 lines · Daniel Vetter
Quoted 8 lines · Adam Jackson
f40ebd6bproperly 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.
Quoted 4 lines
Quoted 1 line
Signed-off-by Adam Jackson <[email protected]>Picked up for -fixes, thanks for the patch. Also adding Patrick to cc in case he wants to chime in.
-Daniel
Looks good.
-Patrik