diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 8fe6b730c67..60ce9305e77 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -26,8 +26,6 @@ | |||
26 | #define __INTEL_DRV_H__ | 26 | #define __INTEL_DRV_H__ |
27 | 27 | ||
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/i2c-id.h> | ||
30 | #include <linux/i2c-algo-bit.h> | ||
31 | #include "i915_drv.h" | 29 | #include "i915_drv.h" |
32 | #include "drm_crtc.h" | 30 | #include "drm_crtc.h" |
33 | #include "drm_crtc_helper.h" | 31 | #include "drm_crtc_helper.h" |
@@ -127,13 +125,6 @@ intel_mode_get_pixel_multiplier(const struct drm_display_mode *mode) | |||
127 | return (mode->private_flags & INTEL_MODE_PIXEL_MULTIPLIER_MASK) >> INTEL_MODE_PIXEL_MULTIPLIER_SHIFT; | 125 | return (mode->private_flags & INTEL_MODE_PIXEL_MULTIPLIER_MASK) >> INTEL_MODE_PIXEL_MULTIPLIER_SHIFT; |
128 | } | 126 | } |
129 | 127 | ||
130 | struct intel_i2c_chan { | ||
131 | struct intel_encoder *encoder; | ||
132 | u32 reg; /* GPIO reg */ | ||
133 | struct i2c_adapter adapter; | ||
134 | struct i2c_algo_bit_data algo; | ||
135 | }; | ||
136 | |||
137 | struct intel_framebuffer { | 128 | struct intel_framebuffer { |
138 | struct drm_framebuffer base; | 129 | struct drm_framebuffer base; |
139 | struct drm_gem_object *obj; | 130 | struct drm_gem_object *obj; |
@@ -149,8 +140,6 @@ struct intel_fbdev { | |||
149 | struct intel_encoder { | 140 | struct intel_encoder { |
150 | struct drm_encoder base; | 141 | struct drm_encoder base; |
151 | int type; | 142 | int type; |
152 | struct i2c_adapter *i2c_bus; | ||
153 | struct i2c_adapter *ddc_bus; | ||
154 | bool load_detect_temp; | 143 | bool load_detect_temp; |
155 | bool needs_tv_clock; | 144 | bool needs_tv_clock; |
156 | void (*hot_plug)(struct intel_encoder *); | 145 | void (*hot_plug)(struct intel_encoder *); |
@@ -206,14 +195,8 @@ struct intel_unpin_work { | |||
206 | bool enable_stall_check; | 195 | bool enable_stall_check; |
207 | }; | 196 | }; |
208 | 197 | ||
209 | struct i2c_adapter *intel_i2c_create(struct intel_encoder *encoder, | ||
210 | const u32 reg, | ||
211 | const char *name); | ||
212 | void intel_i2c_destroy(struct i2c_adapter *adapter); | ||
213 | int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); | 198 | int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); |
214 | extern bool intel_ddc_probe(struct intel_encoder *intel_encoder); | 199 | extern bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus); |
215 | void intel_i2c_quirk_set(struct drm_device *dev, bool enable); | ||
216 | void intel_i2c_reset_gmbus(struct drm_device *dev); | ||
217 | 200 | ||
218 | extern void intel_crt_init(struct drm_device *dev); | 201 | extern void intel_crt_init(struct drm_device *dev); |
219 | extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg); | 202 | extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg); |