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/dvo_ch7xxx.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/dvo_ch7xxx.c')
-rw-r--r-- | drivers/gpu/drm/i915/dvo_ch7xxx.c | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c index d56ff5cc22b2..6f1944b24441 100644 --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c | |||
@@ -92,21 +92,10 @@ static struct ch7xxx_id_struct { | |||
92 | { CH7301_VID, "CH7301" }, | 92 | { CH7301_VID, "CH7301" }, |
93 | }; | 93 | }; |
94 | 94 | ||
95 | struct ch7xxx_reg_state { | ||
96 | uint8_t regs[CH7xxx_NUM_REGS]; | ||
97 | }; | ||
98 | |||
99 | struct ch7xxx_priv { | 95 | struct ch7xxx_priv { |
100 | bool quiet; | 96 | bool quiet; |
101 | |||
102 | struct ch7xxx_reg_state save_reg; | ||
103 | struct ch7xxx_reg_state mode_reg; | ||
104 | uint8_t save_TCTL, save_TPCP, save_TPD, save_TPVT; | ||
105 | uint8_t save_TLPF, save_TCT, save_PM, save_IDF; | ||
106 | }; | 97 | }; |
107 | 98 | ||
108 | static void ch7xxx_save(struct intel_dvo_device *dvo); | ||
109 | |||
110 | static char *ch7xxx_get_id(uint8_t vid) | 99 | static char *ch7xxx_get_id(uint8_t vid) |
111 | { | 100 | { |
112 | int i; | 101 | int i; |
@@ -312,42 +301,17 @@ static void ch7xxx_dpms(struct intel_dvo_device *dvo, int mode) | |||
312 | 301 | ||
313 | static void ch7xxx_dump_regs(struct intel_dvo_device *dvo) | 302 | static void ch7xxx_dump_regs(struct intel_dvo_device *dvo) |
314 | { | 303 | { |
315 | struct ch7xxx_priv *ch7xxx = dvo->dev_priv; | ||
316 | int i; | 304 | int i; |
317 | 305 | ||
318 | for (i = 0; i < CH7xxx_NUM_REGS; i++) { | 306 | for (i = 0; i < CH7xxx_NUM_REGS; i++) { |
307 | uint8_t val; | ||
319 | if ((i % 8) == 0 ) | 308 | if ((i % 8) == 0 ) |
320 | DRM_LOG_KMS("\n %02X: ", i); | 309 | DRM_LOG_KMS("\n %02X: ", i); |
321 | DRM_LOG_KMS("%02X ", ch7xxx->mode_reg.regs[i]); | 310 | ch7xxx_readb(dvo, i, &val); |
311 | DRM_LOG_KMS("%02X ", val); | ||
322 | } | 312 | } |
323 | } | 313 | } |
324 | 314 | ||
325 | static void ch7xxx_save(struct intel_dvo_device *dvo) | ||
326 | { | ||
327 | struct ch7xxx_priv *ch7xxx= dvo->dev_priv; | ||
328 | |||
329 | ch7xxx_readb(dvo, CH7xxx_TCTL, &ch7xxx->save_TCTL); | ||
330 | ch7xxx_readb(dvo, CH7xxx_TPCP, &ch7xxx->save_TPCP); | ||
331 | ch7xxx_readb(dvo, CH7xxx_TPD, &ch7xxx->save_TPD); | ||
332 | ch7xxx_readb(dvo, CH7xxx_TPVT, &ch7xxx->save_TPVT); | ||
333 | ch7xxx_readb(dvo, CH7xxx_TLPF, &ch7xxx->save_TLPF); | ||
334 | ch7xxx_readb(dvo, CH7xxx_PM, &ch7xxx->save_PM); | ||
335 | ch7xxx_readb(dvo, CH7xxx_IDF, &ch7xxx->save_IDF); | ||
336 | } | ||
337 | |||
338 | static void ch7xxx_restore(struct intel_dvo_device *dvo) | ||
339 | { | ||
340 | struct ch7xxx_priv *ch7xxx = dvo->dev_priv; | ||
341 | |||
342 | ch7xxx_writeb(dvo, CH7xxx_TCTL, ch7xxx->save_TCTL); | ||
343 | ch7xxx_writeb(dvo, CH7xxx_TPCP, ch7xxx->save_TPCP); | ||
344 | ch7xxx_writeb(dvo, CH7xxx_TPD, ch7xxx->save_TPD); | ||
345 | ch7xxx_writeb(dvo, CH7xxx_TPVT, ch7xxx->save_TPVT); | ||
346 | ch7xxx_writeb(dvo, CH7xxx_TLPF, ch7xxx->save_TLPF); | ||
347 | ch7xxx_writeb(dvo, CH7xxx_IDF, ch7xxx->save_IDF); | ||
348 | ch7xxx_writeb(dvo, CH7xxx_PM, ch7xxx->save_PM); | ||
349 | } | ||
350 | |||
351 | static void ch7xxx_destroy(struct intel_dvo_device *dvo) | 315 | static void ch7xxx_destroy(struct intel_dvo_device *dvo) |
352 | { | 316 | { |
353 | struct ch7xxx_priv *ch7xxx = dvo->dev_priv; | 317 | struct ch7xxx_priv *ch7xxx = dvo->dev_priv; |
@@ -365,7 +329,5 @@ struct intel_dvo_dev_ops ch7xxx_ops = { | |||
365 | .mode_set = ch7xxx_mode_set, | 329 | .mode_set = ch7xxx_mode_set, |
366 | .dpms = ch7xxx_dpms, | 330 | .dpms = ch7xxx_dpms, |
367 | .dump_regs = ch7xxx_dump_regs, | 331 | .dump_regs = ch7xxx_dump_regs, |
368 | .save = ch7xxx_save, | ||
369 | .restore = ch7xxx_restore, | ||
370 | .destroy = ch7xxx_destroy, | 332 | .destroy = ch7xxx_destroy, |
371 | }; | 333 | }; |