forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/gpu/drm/gma500/cdv_intel_crt.c
....@@ -24,16 +24,18 @@
2424 * Eric Anholt <eric@anholt.net>
2525 */
2626
27
+#include <linux/delay.h>
2728 #include <linux/i2c.h>
28
-#include <drm/drmP.h>
29
+#include <linux/pm_runtime.h>
2930
31
+#include <drm/drm_simple_kms_helper.h>
32
+
33
+#include "cdv_device.h"
3034 #include "intel_bios.h"
35
+#include "power.h"
3136 #include "psb_drv.h"
3237 #include "psb_intel_drv.h"
3338 #include "psb_intel_reg.h"
34
-#include "power.h"
35
-#include "cdv_device.h"
36
-#include <linux/pm_runtime.h>
3739
3840
3941 static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)
....@@ -237,15 +239,6 @@
237239 .best_encoder = gma_best_encoder,
238240 };
239241
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
-
249242 void cdv_intel_crt_init(struct drm_device *dev,
250243 struct psb_intel_mode_device *mode_dev)
251244 {
....@@ -271,8 +264,7 @@
271264 &cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
272265
273266 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);
276268
277269 gma_connector_attach_encoder(gma_connector, gma_encoder);
278270