forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777
kernel/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
....@@ -27,15 +27,17 @@
2727 * We should probably make this generic and share it with Medfield
2828 */
2929
30
-#include <drm/drmP.h>
30
+#include <linux/pm_runtime.h>
31
+
3132 #include <drm/drm.h>
3233 #include <drm/drm_crtc.h>
3334 #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
+
3737 #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"
3941
4042 /* hdmi control bits */
4143 #define HDMI_NULL_PACKETS_DURING_VSYNC (1 << 9)
....@@ -310,8 +312,7 @@
310312 &cdv_hdmi_connector_funcs,
311313 DRM_MODE_CONNECTOR_DVID);
312314
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);
315316
316317 gma_connector_attach_encoder(gma_connector, gma_encoder);
317318 gma_encoder->type = INTEL_OUTPUT_HDMI;