| .. | .. |
|---|
| 27 | 27 | * We should probably make this generic and share it with Medfield |
|---|
| 28 | 28 | */ |
|---|
| 29 | 29 | |
|---|
| 30 | | -#include <drm/drmP.h> |
|---|
| 30 | +#include <linux/pm_runtime.h> |
|---|
| 31 | + |
|---|
| 31 | 32 | #include <drm/drm.h> |
|---|
| 32 | 33 | #include <drm/drm_crtc.h> |
|---|
| 33 | 34 | #include <drm/drm_edid.h> |
|---|
| 34 | | -#include "psb_intel_drv.h" |
|---|
| 35 | | -#include "psb_drv.h" |
|---|
| 36 | | -#include "psb_intel_reg.h" |
|---|
| 35 | +#include <drm/drm_simple_kms_helper.h> |
|---|
| 36 | + |
|---|
| 37 | 37 | #include "cdv_device.h" |
|---|
| 38 | | -#include <linux/pm_runtime.h> |
|---|
| 38 | +#include "psb_drv.h" |
|---|
| 39 | +#include "psb_intel_drv.h" |
|---|
| 40 | +#include "psb_intel_reg.h" |
|---|
| 39 | 41 | |
|---|
| 40 | 42 | /* hdmi control bits */ |
|---|
| 41 | 43 | #define HDMI_NULL_PACKETS_DURING_VSYNC (1 << 9) |
|---|
| .. | .. |
|---|
| 310 | 312 | &cdv_hdmi_connector_funcs, |
|---|
| 311 | 313 | DRM_MODE_CONNECTOR_DVID); |
|---|
| 312 | 314 | |
|---|
| 313 | | - drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs, |
|---|
| 314 | | - DRM_MODE_ENCODER_TMDS, NULL); |
|---|
| 315 | + drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_TMDS); |
|---|
| 315 | 316 | |
|---|
| 316 | 317 | gma_connector_attach_encoder(gma_connector, gma_encoder); |
|---|
| 317 | 318 | gma_encoder->type = INTEL_OUTPUT_HDMI; |
|---|