.. | .. |
---|
25 | 25 | * Jackie Li<yaodong.li@intel.com> |
---|
26 | 26 | */ |
---|
27 | 27 | |
---|
| 28 | +#include <linux/delay.h> |
---|
| 29 | + |
---|
| 30 | +#include <drm/drm_simple_kms_helper.h> |
---|
| 31 | + |
---|
28 | 32 | #include "mdfld_dsi_dpi.h" |
---|
29 | | -#include "mdfld_output.h" |
---|
30 | 33 | #include "mdfld_dsi_pkg_sender.h" |
---|
| 34 | +#include "mdfld_output.h" |
---|
31 | 35 | #include "psb_drv.h" |
---|
32 | 36 | #include "tc35876x-dsi-lvds.h" |
---|
33 | 37 | |
---|
.. | .. |
---|
951 | 955 | |
---|
952 | 956 | /* panel hard-reset */ |
---|
953 | 957 | if (p_funcs->reset) { |
---|
954 | | - ret = p_funcs->reset(pipe); |
---|
| 958 | + ret = p_funcs->reset(dev, pipe); |
---|
955 | 959 | if (ret) { |
---|
956 | 960 | DRM_ERROR("Panel %d hard-reset failed\n", pipe); |
---|
957 | 961 | return NULL; |
---|
.. | .. |
---|
991 | 995 | /*create drm encoder object*/ |
---|
992 | 996 | connector = &dsi_connector->base.base; |
---|
993 | 997 | encoder = &dpi_output->base.base.base; |
---|
994 | | - drm_encoder_init(dev, |
---|
995 | | - encoder, |
---|
996 | | - p_funcs->encoder_funcs, |
---|
997 | | - DRM_MODE_ENCODER_LVDS, NULL); |
---|
| 998 | + drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_LVDS); |
---|
998 | 999 | drm_encoder_helper_add(encoder, |
---|
999 | 1000 | p_funcs->encoder_helper_funcs); |
---|
1000 | 1001 | |
---|
.. | .. |
---|
1004 | 1005 | /*set possible crtcs and clones*/ |
---|
1005 | 1006 | if (dsi_connector->pipe) { |
---|
1006 | 1007 | encoder->possible_crtcs = (1 << 2); |
---|
1007 | | - encoder->possible_clones = (1 << 1); |
---|
| 1008 | + encoder->possible_clones = 0; |
---|
1008 | 1009 | } else { |
---|
1009 | 1010 | encoder->possible_crtcs = (1 << 0); |
---|
1010 | | - encoder->possible_clones = (1 << 0); |
---|
| 1011 | + encoder->possible_clones = 0; |
---|
1011 | 1012 | } |
---|
1012 | 1013 | |
---|
1013 | 1014 | dsi_connector->base.encoder = &dpi_output->base.base; |
---|