aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-11 06:31:53 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-20 06:21:39 -0400
commit4d678e1670ad3c7240d559c98e481b43342a2974 (patch)
tree3154c31588f1ad993e9d68714d3296357ebd3b16 /drivers/gpu
parenta2bd1f541f1990dda7dd62f190342c9a964ceb4f (diff)
drm/i915: kill intel_ddc_probe
We have way too much lying hardware to rely on a simple "does someone answer on the ddc i2c address?" check. And now it's unused, so just kill it. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h1
-rw-r--r--drivers/gpu/drm/i915/intel_modes.c28
2 files changed, 0 insertions, 29 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 6f3bf22d32f5..84353559441c 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -342,7 +342,6 @@ struct intel_fbc_work {
342}; 342};
343 343
344int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); 344int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
345extern bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus);
346 345
347extern void intel_attach_force_audio_property(struct drm_connector *connector); 346extern void intel_attach_force_audio_property(struct drm_connector *connector);
348extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector); 347extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index d67ec3a51e42..45848b9b670b 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -33,34 +33,6 @@
33#include "i915_drv.h" 33#include "i915_drv.h"
34 34
35/** 35/**
36 * intel_ddc_probe
37 *
38 */
39bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus)
40{
41 struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
42 u8 out_buf[] = { 0x0, 0x0};
43 u8 buf[2];
44 struct i2c_msg msgs[] = {
45 {
46 .addr = DDC_ADDR,
47 .flags = 0,
48 .len = 1,
49 .buf = out_buf,
50 },
51 {
52 .addr = DDC_ADDR,
53 .flags = I2C_M_RD,
54 .len = 1,
55 .buf = buf,
56 }
57 };
58
59 return i2c_transfer(intel_gmbus_get_adapter(dev_priv, ddc_bus),
60 msgs, 2) == 2;
61}
62
63/**
64 * intel_ddc_get_modes - get modelist from monitor 36 * intel_ddc_get_modes - get modelist from monitor
65 * @connector: DRM connector device to use 37 * @connector: DRM connector device to use
66 * @adapter: i2c adapter 38 * @adapter: i2c adapter