diff options
author | Eric Anholt <eric@anholt.net> | 2010-04-02 18:24:27 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-04-12 12:23:30 -0400 |
commit | 6443170f6d862a1cc89e61e4bb2410b714b875f4 (patch) | |
tree | 17767306f21c95f066163d1d7df9c2a2e35bbbc9 /drivers/gpu/drm/i915/intel_dvo.c | |
parent | 335af9a235a82842854b394507ab5e310d88be42 (diff) |
drm/i915: Remove dead KMS encoder save/restore code.
This was brought over from UMS, and used for a while until we decided
that drm_helper_resume_force_mode was easier and more reliable, since
it didn't require duplicating all the code deleted here. We just
forgot to delete all that junk for a while.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index a3e6efa38c75..1bf6697061bf 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c | |||
@@ -95,35 +95,6 @@ static void intel_dvo_dpms(struct drm_encoder *encoder, int mode) | |||
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
98 | static void intel_dvo_save(struct drm_connector *connector) | ||
99 | { | ||
100 | struct drm_i915_private *dev_priv = connector->dev->dev_private; | ||
101 | struct intel_encoder *intel_encoder = to_intel_encoder(connector); | ||
102 | struct intel_dvo_device *dvo = intel_encoder->dev_priv; | ||
103 | |||
104 | /* Each output should probably just save the registers it touches, | ||
105 | * but for now, use more overkill. | ||
106 | */ | ||
107 | dev_priv->saveDVOA = I915_READ(DVOA); | ||
108 | dev_priv->saveDVOB = I915_READ(DVOB); | ||
109 | dev_priv->saveDVOC = I915_READ(DVOC); | ||
110 | |||
111 | dvo->dev_ops->save(dvo); | ||
112 | } | ||
113 | |||
114 | static void intel_dvo_restore(struct drm_connector *connector) | ||
115 | { | ||
116 | struct drm_i915_private *dev_priv = connector->dev->dev_private; | ||
117 | struct intel_encoder *intel_encoder = to_intel_encoder(connector); | ||
118 | struct intel_dvo_device *dvo = intel_encoder->dev_priv; | ||
119 | |||
120 | dvo->dev_ops->restore(dvo); | ||
121 | |||
122 | I915_WRITE(DVOA, dev_priv->saveDVOA); | ||
123 | I915_WRITE(DVOB, dev_priv->saveDVOB); | ||
124 | I915_WRITE(DVOC, dev_priv->saveDVOC); | ||
125 | } | ||
126 | |||
127 | static int intel_dvo_mode_valid(struct drm_connector *connector, | 98 | static int intel_dvo_mode_valid(struct drm_connector *connector, |
128 | struct drm_display_mode *mode) | 99 | struct drm_display_mode *mode) |
129 | { | 100 | { |
@@ -317,8 +288,6 @@ static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = { | |||
317 | 288 | ||
318 | static const struct drm_connector_funcs intel_dvo_connector_funcs = { | 289 | static const struct drm_connector_funcs intel_dvo_connector_funcs = { |
319 | .dpms = drm_helper_connector_dpms, | 290 | .dpms = drm_helper_connector_dpms, |
320 | .save = intel_dvo_save, | ||
321 | .restore = intel_dvo_restore, | ||
322 | .detect = intel_dvo_detect, | 291 | .detect = intel_dvo_detect, |
323 | .destroy = intel_dvo_destroy, | 292 | .destroy = intel_dvo_destroy, |
324 | .fill_modes = drm_helper_probe_single_connector_modes, | 293 | .fill_modes = drm_helper_probe_single_connector_modes, |