.. | .. |
---|
24 | 24 | * Eric Anholt <eric@anholt.net> |
---|
25 | 25 | */ |
---|
26 | 26 | |
---|
| 27 | +#include <linux/delay.h> |
---|
27 | 28 | #include <linux/i2c.h> |
---|
28 | | -#include <drm/drmP.h> |
---|
| 29 | +#include <linux/pm_runtime.h> |
---|
29 | 30 | |
---|
| 31 | +#include <drm/drm_simple_kms_helper.h> |
---|
| 32 | + |
---|
| 33 | +#include "cdv_device.h" |
---|
30 | 34 | #include "intel_bios.h" |
---|
| 35 | +#include "power.h" |
---|
31 | 36 | #include "psb_drv.h" |
---|
32 | 37 | #include "psb_intel_drv.h" |
---|
33 | 38 | #include "psb_intel_reg.h" |
---|
34 | | -#include "power.h" |
---|
35 | | -#include "cdv_device.h" |
---|
36 | | -#include <linux/pm_runtime.h> |
---|
37 | 39 | |
---|
38 | 40 | |
---|
39 | 41 | static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode) |
---|
.. | .. |
---|
237 | 239 | .best_encoder = gma_best_encoder, |
---|
238 | 240 | }; |
---|
239 | 241 | |
---|
240 | | -static void cdv_intel_crt_enc_destroy(struct drm_encoder *encoder) |
---|
241 | | -{ |
---|
242 | | - drm_encoder_cleanup(encoder); |
---|
243 | | -} |
---|
244 | | - |
---|
245 | | -static const struct drm_encoder_funcs cdv_intel_crt_enc_funcs = { |
---|
246 | | - .destroy = cdv_intel_crt_enc_destroy, |
---|
247 | | -}; |
---|
248 | | - |
---|
249 | 242 | void cdv_intel_crt_init(struct drm_device *dev, |
---|
250 | 243 | struct psb_intel_mode_device *mode_dev) |
---|
251 | 244 | { |
---|
.. | .. |
---|
271 | 264 | &cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA); |
---|
272 | 265 | |
---|
273 | 266 | encoder = &gma_encoder->base; |
---|
274 | | - drm_encoder_init(dev, encoder, |
---|
275 | | - &cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC, NULL); |
---|
| 267 | + drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_DAC); |
---|
276 | 268 | |
---|
277 | 269 | gma_connector_attach_encoder(gma_connector, gma_encoder); |
---|
278 | 270 | |
---|