本文转载自：http://blog.csdn.net/dearsq/article/details/55050125

Platform: RK3399 
OS: Android 6.0 
Version: v2016.08 
LCD interface: eDP + mipi

Patch Code

Date: Fri, 09 Dec 2016 10:53:11 +0800 
Subject: [PATCH] video: rockchip: fb: add support dual lcd 
Change-Id: I246f8e7d725d26abf2555d3077dd87da72920731 
Signed-off-by: Huang xxx < ××× >

dtsi

rk3399-android.dtsi

  1. diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
  2. index a009537..05a8377 100644
  3. --- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
  4. +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
  5. @@ -287,7 +287,7 @@
  6.         status = "okay";
  7.         compatible = "rockchip,rk-fb";
  8.         rockchip,disp-mode = <DUAL>;
  9. -       rockchip,uboot-logo-on = <1>;
  10. +       rockchip,uboot-logo-on = <0>;
  11.         memory-region = <&rockchip_logo>;
  12.     };
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12

rk3399-evb-rev3-android.dts

在 rk_screen 中默认只有一个 screen0, 用于填充 primary screen 的 timing 
现在需要添加 screen1，用于填充 extend screen 的 timing

  1. diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
  2. index 3b3ff7c..3653205 100644
  3. --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
  4. +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
  5. @@ -51,18 +51,55 @@
  6.  };
  8.  &rk_screen {
  9. -   #include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
  10. +   status = "okay";
  11. +   screen0 {
  12. +       screen_prop = <PRMRY>;
  13. +       native-mode = <DEFAULT_MODE>;
  14. +       power_ctr {
  15. +           lcd_en0: lcd-en {
  16. +               rockchip,power_type = <GPIO>;
  17. +               gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
  18. +               rockchip,delay = <10>;
  19. +           };
  20. +           /* lcd_cs {
  21. +               rockchip,power_type = <GPIO>;
  22. +               gpios = <&gpio7 GPIO_A4 GPIO_ACTIVE_HIGH>;
  23. +               rockchip,delay = <10>;
  24. +           }; */
  25. +       };
  26. +       #include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
  27. +       //#include <dt-bindings/display/screen-timing/lcd-F402.dtsi>
  28. +   };
  29. +   screen1 {
  30. +       screen_prop = <EXTEND>;
  31. +       native-mode = <DEFAULT_MODE>;
  32. +       power_ctr {
  33. +           /* cd_en1: lcd-en {
  34. +               rockchip,power_type = <GPIO>;
  35. +               gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
  36. +               rockchip,delay = <10>;
  37. +           };*/
  38. +           /* lcd_cs {
  39. +               rockchip,power_type = <GPIO>;
  40. +               gpios = <&gpio7 GPIO_A4 GPIO_ACTIVE_HIGH>;
  41. +               rockchip,delay = <10>;
  42. +           }; */
  43. +       };
  44. +       #include <dt-bindings/display/screen-timing/lcd-F402.dtsi>
  45. +       //#include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
  46. +       //#include "lcd-box.dtsi"
  47. +   };
  48.  };
  50.  &vopb_rk_fb {
  51.     status = "okay";
  52.     power_ctr: power_ctr {
  53.         rockchip,debug = <0>;
  54. -       lcd_en: lcd-en {
  55. +       /* lcd_en: lcd-en {
  56.             rockchip,power_type = <GPIO>;
  57.             gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
  58.             rockchip,delay = <10>;
  59. -       };
  60. +       }; */
  62.         /*lcd_cs: lcd-cs {
  63.             rockchip,power_type = <GPIO>;
  64. @@ -80,14 +117,23 @@
  66.  &vopl_rk_fb {
  67.     status = "okay";
  68. +   rockchip,uboot-logo-on = <0>;
  69.  };
  71. //设置 mipi 通道的为主屏， eDP 的为副屏
  73.  &mipi0_rk_fb {
  74.     status = "okay";
  75. +   prop = <PRMRY>;
  76. +   //prop = <EXTEND>;
  77. +};
  78. +
  79. +&edp_rk_fb {
  80. +   status = "okay";
  81. +   prop = <EXTEND>;
  82. +   //prop = <PRMRY>;
  83.  };
  85.  &hdmi_rk_fb {
  86. -   status = "okay";
  87. +   status = "disabled";
  88.     rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
  89.  };
  90.  ```
  92.  ```
  93. diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
  94. index b3c7141..b72ce6c 100644
  95. --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
  96. +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
  97. @@ -101,7 +101,7 @@
  98.             232 233 234 235 236 237 238 239
  99.             240 241 242 243 244 245 246 247
  100.             248 249 250 251 252 253 254 255>;
  101. -       default-brightness-level = <200>;
  102. +       default-brightness-level = <128>;
  103.     };
  105.     clkin_gmac: external-gmac-clock {
  106. @@ -370,7 +370,7 @@
  107.  };
  109.  &i2c4 {
  110. -   status = "okay";
  111. +   status = "disabled";
  112.     i2c-scl-rising-time-ns = <600>;
  113.     i2c-scl-falling-time-ns = <20>;
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • 32
  • 33
  • 34
  • 35
  • 36
  • 37
  • 38
  • 39
  • 40
  • 41
  • 42
  • 43
  • 44
  • 45
  • 46
  • 47
  • 48
  • 49
  • 50
  • 51
  • 52
  • 53
  • 54
  • 55
  • 56
  • 57
  • 58
  • 59
  • 60
  • 61
  • 62
  • 63
  • 64
  • 65
  • 66
  • 67
  • 68
  • 69
  • 70
  • 71
  • 72
  • 73
  • 74
  • 75
  • 76
  • 77
  • 78
  • 79
  • 80
  • 81
  • 82
  • 83
  • 84
  • 85
  • 86
  • 87
  • 88
  • 89
  • 90
  • 91
  • 92
  • 93
  • 94
  • 95
  • 96
  • 97
  • 98
  • 99
  • 100
  • 101
  • 102
  • 103
  • 104
  • 105
  • 106
  • 107
  • 108
  • 109
  • 110
  • 111
  • 112
  • 113

lcdc 控制器

rk322x_lcdc.c

  1. diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
  2. index 93c996a..d6bdff3 100644
  3. --- a/drivers/video/rockchip/lcdc/rk322x_lcdc.c
  4. +++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
  5. @@ -5252,6 +5252,10 @@
  7.     rk322x_pdev = pdev;
  9. +   if (dev_drv->cur_screen->type != SCREEN_HDMI &&
  10. +       dev_drv->cur_screen->type != SCREEN_TVOUT)
  11. +       dev_drv->hot_plug_state = 1;
  12. +
  13.     if (dev_drv->cur_screen->refresh_mode == SCREEN_CMD_MODE) {
  14.         te_pin = of_get_named_gpio_flags(np, "te-gpio", 0, NULL);
  15.         if (IS_ERR_VALUE(te_pin)) {
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15

rk_fb.c

  1. diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
  2. index 25563a4..80db2e2 100644
  3. --- a/drivers/video/rockchip/rk_fb.c
  4. +++ b/drivers/video/rockchip/rk_fb.c
  5. @@ -73,9 +73,8 @@
  6.  extern phys_addr_t uboot_logo_base;
  7.  extern phys_addr_t uboot_logo_size;
  8.  extern phys_addr_t uboot_logo_offset;
  9. -static struct rk_fb_trsm_ops *trsm_lvds_ops;
  10. -static struct rk_fb_trsm_ops *trsm_edp_ops;
  11. -static struct rk_fb_trsm_ops *trsm_mipi_ops;
  12. +static struct rk_fb_trsm_ops *trsm_prmry_ops;
  13. +static struct rk_fb_trsm_ops *trsm_extend_ops;
  14.  static int uboot_logo_on;
  16.  static int rk_fb_debug_lvl;
  17. @@ -115,26 +114,13 @@
  19.  int rk_fb_trsm_ops_register(struct rk_fb_trsm_ops *ops, int type)
  20.  {
  21. -   switch (type) {
  22. -   case SCREEN_RGB:
  23. -   case SCREEN_LVDS:
  24. -   case SCREEN_DUAL_LVDS:
  25. -   case SCREEN_LVDS_10BIT:
  26. -   case SCREEN_DUAL_LVDS_10BIT:
  27. -       trsm_lvds_ops = ops;
  28. -       break;
  29. -   case SCREEN_EDP:
  30. -       trsm_edp_ops = ops;
  31. -       break;
  32. -   case SCREEN_MIPI:
  33. -   case SCREEN_DUAL_MIPI:
  34. -       trsm_mipi_ops = ops;
  35. -       break;
  36. -   default:
  37. -       pr_warn("%s: unsupported transmitter: %d!\n",
  38. -           __func__, type);
  39. -       break;
  40. -   }
  41. +   if (type == PRMRY)
  42. +       trsm_prmry_ops = ops;
  43. +   else if (type == EXTEND)
  44. +       trsm_extend_ops = ops;
  45. +   else
  46. +       pr_err("%s, type:%d\n", __func__, type);
  47. +
  48.     return 0;
  49.  }
  51. @@ -142,27 +128,12 @@
  52.  {
  53.     struct rk_fb_trsm_ops *ops;
  55. -   switch (type) {
  56. -   case SCREEN_RGB:
  57. -   case SCREEN_LVDS:
  58. -   case SCREEN_DUAL_LVDS:
  59. -   case SCREEN_LVDS_10BIT:
  60. -   case SCREEN_DUAL_LVDS_10BIT:
  61. -       ops = trsm_lvds_ops;
  62. -       break;
  63. -   case SCREEN_EDP:
  64. -       ops = trsm_edp_ops;
  65. -       break;
  66. -   case SCREEN_MIPI:
  67. -   case SCREEN_DUAL_MIPI:
  68. -       ops = trsm_mipi_ops;
  69. -       break;
  70. -   default:
  71. -       ops = NULL;
  72. -       pr_warn("%s: unsupported transmitter: %d!\n",
  73. -           __func__, type);
  74. -       break;
  75. -   }
  76. +   if (type == PRMRY)
  77. +       ops = trsm_prmry_ops;
  78. +   else if (type == EXTEND)
  79. +       ops = trsm_extend_ops;
  80. +   else
  81. +       pr_err("%s, type:%d\n", __func__, type);
  82.     return ops;
  83.  }
  85. @@ -317,10 +288,10 @@
  86.  /*
  87.   * rk display power control parse from dts
  88.   */
  89. -int rk_disp_pwr_ctr_parse_dt(struct rk_lcdc_driver *dev_drv)
  90. +int rk_disp_pwr_ctr_parse_dt(struct device_node *np,
  91. +                struct rk_screen *rk_screen)
  92.  {
  93. -   struct device_node *root = of_get_child_by_name(dev_drv->dev->of_node,
  94. -                           "power_ctr");
  95. +   struct device_node *root = of_get_child_by_name(np, "power_ctr");
  96.     struct device_node *child;
  97.     struct rk_disp_pwr_ctr_list *pwr_ctr;
  98.     struct list_head *pos;
  99. @@ -329,10 +300,10 @@
  100.     u32 debug = 0;
  101.     int ret;
  103. -   INIT_LIST_HEAD(&dev_drv->pwrlist_head);
  104. +   INIT_LIST_HEAD(rk_screen->pwrlist_head);
  105.     if (!root) {
  106. -       dev_err(dev_drv->dev, "can't find power_ctr node for lcdc%d\n",
  107. -           dev_drv->id);
  108. +       dev_err(rk_screen->dev, "can't find power_ctr node for lcdc%d\n",
  109. +           rk_screen->lcdc_id);
  110.         return -ENODEV;
  111.     }
  113. @@ -347,7 +318,7 @@
  114.                 pwr_ctr->pwr_ctr.type = GPIO;
  115.                 pwr_ctr->pwr_ctr.gpio = of_get_gpio_flags(child, 0, &flags);
  116.                 if (!gpio_is_valid(pwr_ctr->pwr_ctr.gpio)) {
  117. -                   dev_err(dev_drv->dev, "%s ivalid gpio\n",
  118. +                   dev_err(rk_screen->dev, "%s ivalid gpio\n",
  119.                         child->name);
  120.                     return -EINVAL;
  121.                 }
  122. @@ -355,7 +326,7 @@
  123.                 ret = gpio_request(pwr_ctr->pwr_ctr.gpio,
  124.                            child->name);
  125.                 if (ret) {
  126. -                   dev_err(dev_drv->dev,
  127. +                   dev_err(rk_screen->dev,
  128.                         "request %s gpio fail:%d\n",
  129.                         child->name, ret);
  130.                 }
  131. @@ -364,9 +335,9 @@
  132.                 pwr_ctr->pwr_ctr.type = REGULATOR;
  133.                 pwr_ctr->pwr_ctr.rgl_name = NULL;
  134.                 ret = of_property_read_string(child, "rockchip,regulator_name",
  135. -                                 &(pwr_ctr->pwr_ctr.rgl_name));
  136. +                                &(pwr_ctr->pwr_ctr.rgl_name));
  137.                 if (ret || IS_ERR_OR_NULL(pwr_ctr->pwr_ctr.rgl_name))
  138. -                   dev_err(dev_drv->dev, "get regulator name failed!\n");
  139. +                   dev_err(rk_screen->dev, "get regulator name failed!\n");
  140.                 if (!of_property_read_u32(child, "rockchip,regulator_voltage", &val))
  141.                     pwr_ctr->pwr_ctr.volt = val;
  142.                 else
  143. @@ -378,29 +349,30 @@
  144.             pwr_ctr->pwr_ctr.delay = val;
  145.         else
  146.             pwr_ctr->pwr_ctr.delay = 0;
  147. -       list_add_tail(&pwr_ctr->list, &dev_drv->pwrlist_head);
  148. +       list_add_tail(&pwr_ctr->list, rk_screen->pwrlist_head);
  149.     }
  151.     of_property_read_u32(root, "rockchip,debug", &debug);
  153.     if (debug) {
  154. -       list_for_each(pos, &dev_drv->pwrlist_head) {
  155. +       list_for_each(pos, rk_screen->pwrlist_head) {
  156.             pwr_ctr = list_entry(pos, struct rk_disp_pwr_ctr_list,
  157.                          list);
  158. -           pr_info("pwr_ctr_name:%s\n"
  159. -               "pwr_type:%s\n"
  160. -               "gpio:%d\n"
  161. -               "atv_val:%d\n"
  162. -               "delay:%d\n\n",
  163. -               pwr_ctr->pwr_ctr.name,
  164. -               (pwr_ctr->pwr_ctr.type == GPIO) ? "gpio" : "regulator",
  165. -               pwr_ctr->pwr_ctr.gpio,
  166. -               pwr_ctr->pwr_ctr.atv_val,
  167. -               pwr_ctr->pwr_ctr.delay);
  168. +           printk(KERN_INFO "pwr_ctr_name:%s\n"
  169. +                  "pwr_type:%s\n"
  170. +                  "gpio:%d\n"
  171. +                  "atv_val:%d\n"
  172. +                  "delay:%d\n\n",
  173. +                  pwr_ctr->pwr_ctr.name,
  174. +                  (pwr_ctr->pwr_ctr.type == GPIO) ? "gpio" : "regulator",
  175. +                  pwr_ctr->pwr_ctr.gpio,
  176. +                  pwr_ctr->pwr_ctr.atv_val,
  177. +                  pwr_ctr->pwr_ctr.delay);
  178.         }
  179.     }
  181.     return 0;
  182. +
  183.  }
  185.  int rk_disp_pwr_enable(struct rk_lcdc_driver *dev_drv)
  186. @@ -411,9 +383,14 @@
  187.     struct regulator *regulator_lcd = NULL;
  188.     int count = 10;
  190. -   if (list_empty(&dev_drv->pwrlist_head))
  191. +   if (!dev_drv->cur_screen->pwrlist_head) {
  192. +       pr_info("error:  %s, lcdc%d screen pwrlist null\n",
  193. +           __func__, dev_drv->id);
  194.         return 0;
  195. -   list_for_each(pos, &dev_drv->pwrlist_head) {
  196. +   }
  197. +   if (list_empty(dev_drv->cur_screen->pwrlist_head))
  198. +       return 0;
  199. +   list_for_each(pos, dev_drv->cur_screen->pwrlist_head) {
  200.         pwr_ctr_list = list_entry(pos, struct rk_disp_pwr_ctr_list,
  201.                       list);
  202.         pwr_ctr = &pwr_ctr_list->pwr_ctr;
  203. @@ -422,8 +399,7 @@
  204.             mdelay(pwr_ctr->delay);
  205.         } else if (pwr_ctr->type == REGULATOR) {
  206.             if (pwr_ctr->rgl_name)
  207. -               regulator_lcd =
  208. -                   regulator_get(NULL, pwr_ctr->rgl_name);
  209. +               regulator_lcd = regulator_get(NULL, pwr_ctr->rgl_name);
  210.             if (regulator_lcd == NULL) {
  211.                 dev_err(dev_drv->dev,
  212.                     "%s: regulator get failed,regulator name:%s\n",
  213. @@ -456,9 +432,14 @@
  214.     struct regulator *regulator_lcd = NULL;
  215.     int count = 10;
  217. -   if (list_empty(&dev_drv->pwrlist_head))
  218. +   if (!dev_drv->cur_screen->pwrlist_head) {
  219. +       pr_info("error:  %s, lcdc%d screen pwrlist null\n",
  220. +           __func__, dev_drv->id);
  221.         return 0;
  222. -   list_for_each(pos, &dev_drv->pwrlist_head) {
  223. +   }
  224. +   if (list_empty(dev_drv->cur_screen->pwrlist_head))
  225. +       return 0;
  226. +   list_for_each(pos, dev_drv->cur_screen->pwrlist_head) {
  227.         pwr_ctr_list = list_entry(pos, struct rk_disp_pwr_ctr_list,
  228.                       list);
  229.         pwr_ctr = &pwr_ctr_list->pwr_ctr;
  230. @@ -474,8 +455,7 @@
  231.                 continue;
  232.             }
  233.             while (regulator_is_enabled(regulator_lcd) > 0) {
  234. -               if (regulator_disable(regulator_lcd) == 0 ||
  235. -                   count == 0)
  236. +               if (regulator_disable(regulator_lcd) == 0 || count == 0)
  237.                     break;
  238.                 else
  239.                     dev_err(dev_drv->dev,
  240. @@ -530,6 +510,8 @@
  241.         screen->pin_den = 1;
  242.     else
  243.         screen->pin_den = 0;
  244. +   printk("hjc>>>prop:%d, x:%d, y:%d, dclk:%d\n", screen->prop,
  245. +       screen->mode.xres, screen->mode.yres, screen->mode.pixclock);
  247.     return 0;
  248.  }
  249. @@ -544,7 +526,7 @@
  250.         pr_err("parse display timing err\n");
  251.         return -EINVAL;
  252.     }
  253. -   dt = display_timings_get(disp_timing, disp_timing->native_mode);
  254. +   dt = display_timings_get(disp_timing, screen->native_mode);
  255.     rk_fb_video_mode_from_timing(dt, screen);
  257.     return 0;
  258. @@ -3942,7 +3924,8 @@
  259.         win = dev_drv->win[win_id];
  261.     if (!strcmp(fbi->fix.id, "fb0")) {
  262. -       fb_mem_size = get_fb_size(dev_drv->reserved_fb);
  263. +       fb_mem_size = get_fb_size(dev_drv->reserved_fb,
  264. +                     dev_drv->cur_screen);
  265.  #if defined(CONFIG_ION_ROCKCHIP)
  266.         if (rk_fb_alloc_buffer_by_ion(fbi, win, fb_mem_size) < 0)
  267.             return -ENOMEM;
  268. @@ -3963,8 +3946,7 @@
  269.         if (dev_drv->prop == EXTEND && dev_drv->iommu_enabled) {
  270.             struct rk_lcdc_driver *dev_drv_prmry;
  271.             int win_id_prmry;
  272. -
  273. -           fb_mem_size = get_fb_size(dev_drv->reserved_fb);
  274. +           fb_mem_size = get_fb_size(dev_drv->reserved_fb, dev_drv->cur_screen);
  275.  #if defined(CONFIG_ION_ROCKCHIP)
  276.             dev_drv_prmry = rk_get_prmry_lcdc_drv();
  277.             if (dev_drv_prmry == NULL)
  278. @@ -4129,14 +4111,9 @@
  279.         dev_drv->area_support[i] = 1;
  280.     if (dev_drv->ops->area_support_num)
  281.         dev_drv->ops->area_support_num(dev_drv, dev_drv->area_support);
  282. -   rk_disp_pwr_ctr_parse_dt(dev_drv);
  283. -   if (dev_drv->prop == PRMRY) {
  284. -       rk_fb_set_prmry_screen(screen);
  285. -       rk_fb_get_prmry_screen(screen);
  286. -   }
  287. -   dev_drv->trsm_ops = rk_fb_trsm_ops_get(screen->type);
  288. -   if (dev_drv->prop != PRMRY)
  289. -       rk_fb_get_extern_screen(screen);
  290. +   rk_fb_set_screen(screen, dev_drv->prop);
  291. +   rk_fb_get_screen(screen, dev_drv->prop);
  292. +   dev_drv->trsm_ops = rk_fb_trsm_ops_get(dev_drv->prop);
  293.     dev_drv->output_color = screen->color_mode;
  295.     return 0;
  296. @@ -4511,15 +4488,24 @@
  297.         struct fb_info *extend_fbi = rk_fb->fb[dev_drv->fb_index_base];
  299.         extend_fbi->var.pixclock = rk_fb->fb[0]->var.pixclock;
  300. -       if (rk_fb->disp_mode == DUAL_LCD) {
  301. -           extend_fbi->fbops->fb_open(extend_fbi, 1);
  302. -           if (dev_drv->iommu_enabled) {
  303. -               if (dev_drv->mmu_dev)
  304. -                   rockchip_iovmm_set_fault_handler(dev_drv->dev,
  305. -                                    rk_fb_sysmmu_fault_handler);
  306. -           }
  307. -           rk_fb_alloc_buffer(extend_fbi);
  308. +       extend_fbi->var.xres_virtual = rk_fb->fb[0]->var.xres_virtual;
  309. +       extend_fbi->var.yres_virtual = rk_fb->fb[0]->var.yres_virtual;
  310. +       extend_fbi->var.xres = rk_fb->fb[0]->var.xres;
  311. +       extend_fbi->var.yres = rk_fb->fb[0]->var.yres;
  312. +       extend_fbi->fbops->fb_open(extend_fbi, 1);
  313. +       if (dev_drv->iommu_enabled) {
  314. +           if (dev_drv->mmu_dev)
  315. +               rockchip_iovmm_set_fault_handler(dev_drv->dev,
  316. +                                rk_fb_sysmmu_fault_handler);
  317. +           if (dev_drv->ops->mmu_en)
  318. +               dev_drv->ops->mmu_en(dev_drv);
  319.         }
  320. +       rk_fb_alloc_buffer(extend_fbi);
  321. +       //if (rk_fb->disp_mode == DUAL_LCD) {
  322. +       extend_fbi->fbops->fb_set_par(extend_fbi);
  323. +       extend_fbi->fbops->fb_pan_display(&extend_fbi->var,
  324. +                         extend_fbi);
  325. +       //}
  326.     }
  327.  #endif
  328.     return 0;
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • 32
  • 33
  • 34
  • 35
  • 36
  • 37
  • 38
  • 39
  • 40
  • 41
  • 42
  • 43
  • 44
  • 45
  • 46
  • 47
  • 48
  • 49
  • 50
  • 51
  • 52
  • 53
  • 54
  • 55
  • 56
  • 57
  • 58
  • 59
  • 60
  • 61
  • 62
  • 63
  • 64
  • 65
  • 66
  • 67
  • 68
  • 69
  • 70
  • 71
  • 72
  • 73
  • 74
  • 75
  • 76
  • 77
  • 78
  • 79
  • 80
  • 81
  • 82
  • 83
  • 84
  • 85
  • 86
  • 87
  • 88
  • 89
  • 90
  • 91
  • 92
  • 93
  • 94
  • 95
  • 96
  • 97
  • 98
  • 99
  • 100
  • 101
  • 102
  • 103
  • 104
  • 105
  • 106
  • 107
  • 108
  • 109
  • 110
  • 111
  • 112
  • 113
  • 114
  • 115
  • 116
  • 117
  • 118
  • 119
  • 120
  • 121
  • 122
  • 123
  • 124
  • 125
  • 126
  • 127
  • 128
  • 129
  • 130
  • 131
  • 132
  • 133
  • 134
  • 135
  • 136
  • 137
  • 138
  • 139
  • 140
  • 141
  • 142
  • 143
  • 144
  • 145
  • 146
  • 147
  • 148
  • 149
  • 150
  • 151
  • 152
  • 153
  • 154
  • 155
  • 156
  • 157
  • 158
  • 159
  • 160
  • 161
  • 162
  • 163
  • 164
  • 165
  • 166
  • 167
  • 168
  • 169
  • 170
  • 171
  • 172
  • 173
  • 174
  • 175
  • 176
  • 177
  • 178
  • 179
  • 180
  • 181
  • 182
  • 183
  • 184
  • 185
  • 186
  • 187
  • 188
  • 189
  • 190
  • 191
  • 192
  • 193
  • 194
  • 195
  • 196
  • 197
  • 198
  • 199
  • 200
  • 201
  • 202
  • 203
  • 204
  • 205
  • 206
  • 207
  • 208
  • 209
  • 210
  • 211
  • 212
  • 213
  • 214
  • 215
  • 216
  • 217
  • 218
  • 219
  • 220
  • 221
  • 222
  • 223
  • 224
  • 225
  • 226
  • 227
  • 228
  • 229
  • 230
  • 231
  • 232
  • 233
  • 234
  • 235
  • 236
  • 237
  • 238
  • 239
  • 240
  • 241
  • 242
  • 243
  • 244
  • 245
  • 246
  • 247
  • 248
  • 249
  • 250
  • 251
  • 252
  • 253
  • 254
  • 255
  • 256
  • 257
  • 258
  • 259
  • 260
  • 261
  • 262
  • 263
  • 264
  • 265
  • 266
  • 267
  • 268
  • 269
  • 270
  • 271
  • 272
  • 273
  • 274
  • 275
  • 276
  • 277
  • 278
  • 279
  • 280
  • 281
  • 282
  • 283
  • 284
  • 285
  • 286
  • 287
  • 288
  • 289
  • 290
  • 291
  • 292
  • 293
  • 294
  • 295
  • 296
  • 297
  • 298
  • 299
  • 300
  • 301
  • 302
  • 303
  • 304
  • 305
  • 306
  • 307
  • 308
  • 309
  • 310
  • 311
  • 312
  • 313
  • 314
  • 315
  • 316
  • 317
  • 318
  • 319
  • 320
  • 321
  • 322
  • 323
  • 324
  • 325
  • 326
  • 327
  • 328

timing 初始化

rk_screen.c

  1. diff --git a/drivers/video/rockchip/screen/rk_screen.c b/drivers/video/rockchip/screen/rk_screen.c
  2. index 3a4e6c3..7473e5f 100644
  3. --- a/drivers/video/rockchip/screen/rk_screen.c
  4. +++ b/drivers/video/rockchip/screen/rk_screen.c
  5. @@ -4,57 +4,102 @@
  6.  #include "lcd.h"
  7.  #include "../hdmi/rockchip-hdmi.h"
  9. -static struct rk_screen *rk_screen;
  10. +static struct rk_screen *prmry_screen;
  11. +static struct rk_screen *extend_screen;
  12. +
  13. +static void rk_screen_info_error(struct rk_screen *screen, int prop)
  14. +{
  15. +   pr_err(">>>>>>>>>>>>>>>>>>>>error<<<<<<<<<<<<<<<<<<<<\n");
  16. +   pr_err(">>please init %s screen info in dtsi file<<\n",
  17. +       (prop == PRMRY) ? "prmry" : "extend");
  18. +   pr_err(">>>>>>>>>>>>>>>>>>>>error<<<<<<<<<<<<<<<<<<<<\n");
  19. +}
  21.  int rk_fb_get_extern_screen(struct rk_screen *screen)
  22.  {
  23. -   if (unlikely(!rk_screen) || unlikely(!screen))
  24. +   if (unlikely(!extend_screen) || unlikely(!screen))
  25.         return -1;
  26. -
  27. -   memcpy(screen, rk_screen, sizeof(struct rk_screen));
  28. +   memcpy(screen, extend_screen, sizeof(struct rk_screen));
  29.     screen->dsp_lut = NULL;
  30.     screen->cabc_lut = NULL;
  31. -   screen->type = SCREEN_NULL;
  32. -
  33.     return 0;
  34.  }
  36. -int  rk_fb_get_prmry_screen(struct rk_screen *screen)
  37. +int rk_fb_get_prmry_screen(struct rk_screen *screen)
  38.  {
  39. -   if (unlikely(!rk_screen) || unlikely(!screen))
  40. +   if (unlikely(!prmry_screen) || unlikely(!screen))
  41.         return -1;
  43. -   memcpy(screen, rk_screen, sizeof(struct rk_screen));
  44. +   memcpy(screen, prmry_screen, sizeof(struct rk_screen));
  45.     return 0;
  46.  }
  48. -int rk_fb_set_prmry_screen(struct rk_screen *screen)
  49. +int  rk_fb_get_screen(struct rk_screen *screen, int prop)
  50.  {
  51. -   if (unlikely(!rk_screen) || unlikely(!screen))
  52. +   struct rk_screen *cur_screen = NULL;
  53. +   if (unlikely(!screen))
  54.         return -1;
  56. -   rk_screen->lcdc_id = screen->lcdc_id;
  57. -   rk_screen->screen_id = screen->screen_id;
  58. -   rk_screen->x_mirror = screen->x_mirror;
  59. -   rk_screen->y_mirror = screen->y_mirror;
  60. -   rk_screen->overscan.left = screen->overscan.left;
  61. -   rk_screen->overscan.top = screen->overscan.left;
  62. -   rk_screen->overscan.right = screen->overscan.left;
  63. -   rk_screen->overscan.bottom = screen->overscan.left;
  64. +   if (prop == PRMRY) {
  65. +       if (unlikely(!prmry_screen)) {
  66. +           rk_screen_info_error(screen, prop);
  67. +           return -1;
  68. +       }
  69. +       cur_screen = prmry_screen;
  70. +   } else {
  71. +       if (unlikely(!extend_screen)) {
  72. +           rk_screen_info_error(screen, prop);
  73. +           return -1;
  74. +       }
  75. +       cur_screen = extend_screen;
  76. +   }
  77. +   memcpy(screen, cur_screen, sizeof(struct rk_screen));
  78.     return 0;
  79.  }
  81. -size_t get_fb_size(u8 reserved_fb)
  82. +int rk_fb_set_screen(struct rk_screen *screen, int prop)
  83. +{
  84. +   struct rk_screen *cur_screen = NULL;
  85. +
  86. +   if (unlikely(!screen))
  87. +       return -1;
  88. +   if (prop == PRMRY) {
  89. +       if (unlikely(!prmry_screen)) {
  90. +           rk_screen_info_error(screen, prop);
  91. +           return -1;
  92. +       }
  93. +   cur_screen = prmry_screen;
  94. +   } else {
  95. +       if (unlikely(!extend_screen)) {
  96. +           rk_screen_info_error(screen, prop);
  97. +           return -1;
  98. +       }
  99. +       cur_screen = extend_screen;
  100. +   }
  101. +
  102. +   cur_screen->lcdc_id = screen->lcdc_id;
  103. +   cur_screen->screen_id = screen->screen_id;
  104. +   cur_screen->x_mirror = screen->x_mirror;
  105. +   cur_screen->y_mirror = screen->y_mirror;
  106. +   cur_screen->overscan.left = screen->overscan.left;
  107. +   cur_screen->overscan.top = screen->overscan.left;
  108. +   cur_screen->overscan.right = screen->overscan.left;
  109. +   cur_screen->overscan.bottom = screen->overscan.left;
  110. +
  111. +   return 0;
  112. +}
  113. +
  114. +size_t get_fb_size(u8 reserved_fb, struct rk_screen *screen)
  115.  {
  116.     size_t size = 0;
  117.     u32 xres = 0;
  118.     u32 yres = 0;
  120. -   if (unlikely(!rk_screen))
  121. +   if (unlikely(!screen))
  122.         return 0;
  124. -   xres = rk_screen->mode.xres;
  125. -   yres = rk_screen->mode.yres;
  126. +   xres = screen->mode.xres;
  127. +   yres = screen->mode.yres;
  129.     /* align as 64 bytes(16*4) in an odd number of times */
  130.     xres = ALIGN_64BYTE_ODD_TIMES(xres, ALIGN_PIXEL_64BYTE_RGB8888);
  131. @@ -73,22 +118,51 @@
  132.  static int rk_screen_probe(struct platform_device *pdev)
  133.  {
  134.     struct device_node *np = pdev->dev.of_node;
  135. -   int ret;
  136. +   struct device_node *screen_np;
  137. +   struct rk_screen *rk_screen;
  138. +   int ret, screen_prop;
  140.     if (!np) {
  141.         dev_err(&pdev->dev, "Missing device tree node.\n");
  142.         return -EINVAL;
  143.     }
  144. -   rk_screen = devm_kzalloc(&pdev->dev,
  145. -           sizeof(struct rk_screen), GFP_KERNEL);
  146. -   if (!rk_screen) {
  147. -       dev_err(&pdev->dev, "kmalloc for rk screen fail!");
  148. -       return  -ENOMEM;
  149. +
  150. +   for_each_child_of_node(np, screen_np) {
  151. +       rk_screen = devm_kzalloc(&pdev->dev,
  152. +                    sizeof(struct rk_screen), GFP_KERNEL);
  153. +       if (!rk_screen) {
  154. +           dev_err(&pdev->dev, "kmalloc for rk screen fail!");
  155. +           return  -ENOMEM;
  156. +       }
  157. +       rk_screen->pwrlist_head = devm_kzalloc(&pdev->dev,
  158. +               sizeof(struct list_head), GFP_KERNEL);
  159. +       if (!rk_screen->pwrlist_head) {
  160. +           dev_err(&pdev->dev, "kmalloc for rk_screen pwrlist_head fail!");
  161. +           return  -ENOMEM;
  162. +       }
  163. +       of_property_read_u32(screen_np, "screen_prop", &screen_prop);
  164. +       if (screen_prop == PRMRY)
  165. +           prmry_screen = rk_screen;
  166. +       else if (screen_prop == EXTEND)
  167. +           extend_screen = rk_screen;
  168. +       else
  169. +           dev_err(&pdev->dev, "unknow screen prop: %d\n",
  170. +               screen_prop);
  171. +       rk_screen->prop = screen_prop;
  172. +       of_property_read_u32(screen_np, "native-mode", &rk_screen->native_mode);
  173. +       rk_screen->dev = &pdev->dev;
  174. +       ret = rk_fb_prase_timing_dt(screen_np, rk_screen);
  175. +       pr_info("%s screen timing parse %s\n",
  176. +           (screen_prop == PRMRY) ? "prmry" : "extend",
  177. +           ret ? "failed" : "success");
  178. +       ret = rk_disp_pwr_ctr_parse_dt(screen_np, rk_screen);
  179. +       pr_info("%s screen power ctrl parse %s\n",
  180. +           (screen_prop == PRMRY) ? "prmry" : "extend",
  181. +           ret ? "failed" : "success");
  182.     }
  183. -   ret = rk_fb_prase_timing_dt(np, rk_screen);
  184. -   dev_info(&pdev->dev, "rockchip screen probe %s\n",
  185. -               ret ? "failed" : "success");
  186. -   return ret;
  187. +
  188. +   dev_info(&pdev->dev, "rockchip screen probe success\n");
  189. +   return 0;
  190.  }
  192.  static const struct of_device_id rk_screen_dt_ids[] = {
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • 32
  • 33
  • 34
  • 35
  • 36
  • 37
  • 38
  • 39
  • 40
  • 41
  • 42
  • 43
  • 44
  • 45
  • 46
  • 47
  • 48
  • 49
  • 50
  • 51
  • 52
  • 53
  • 54
  • 55
  • 56
  • 57
  • 58
  • 59
  • 60
  • 61
  • 62
  • 63
  • 64
  • 65
  • 66
  • 67
  • 68
  • 69
  • 70
  • 71
  • 72
  • 73
  • 74
  • 75
  • 76
  • 77
  • 78
  • 79
  • 80
  • 81
  • 82
  • 83
  • 84
  • 85
  • 86
  • 87
  • 88
  • 89
  • 90
  • 91
  • 92
  • 93
  • 94
  • 95
  • 96
  • 97
  • 98
  • 99
  • 100
  • 101
  • 102
  • 103
  • 104
  • 105
  • 106
  • 107
  • 108
  • 109
  • 110
  • 111
  • 112
  • 113
  • 114
  • 115
  • 116
  • 117
  • 118
  • 119
  • 120
  • 121
  • 122
  • 123
  • 124
  • 125
  • 126
  • 127
  • 128
  • 129
  • 130
  • 131
  • 132
  • 133
  • 134
  • 135
  • 136
  • 137
  • 138
  • 139
  • 140
  • 141
  • 142
  • 143
  • 144
  • 145
  • 146
  • 147
  • 148
  • 149
  • 150
  • 151
  • 152
  • 153
  • 154
  • 155
  • 156
  • 157
  • 158
  • 159
  • 160
  • 161
  • 162
  • 163
  • 164
  • 165
  • 166
  • 167
  • 168
  • 169
  • 170
  • 171
  • 172
  • 173
  • 174
  • 175
  • 176
  • 177
  • 178
  • 179
  • 180
  • 181
  • 182
  • 183
  • 184
  • 185
  • 186
  • 187
  • 188
  • 189
  • 190
  • 191
  • 192

rk32_dp.c

  1. diff --git a/drivers/video/rockchip/transmitter/rk32_dp.c b/drivers/video/rockchip/transmitter/rk32_dp.c
  2. index 6d386bc..0bffdb0 100755
  3. --- a/drivers/video/rockchip/transmitter/rk32_dp.c
  4. +++ b/drivers/video/rockchip/transmitter/rk32_dp.c
  5. @@ -129,7 +129,7 @@
  6.     struct rk_screen *screen = &edp->screen;
  7.     u32 val = 0;
  9. -   rk_fb_get_prmry_screen(screen);
  10. +   rk_fb_get_screen(screen, edp->prop);
  12.     if (cpu_is_rk3288()) {
  13.         if (screen->lcdc_id == 1)  /*select lcdc*/
  14. @@ -1734,17 +1734,21 @@
  15.     struct resource *res;
  16.     struct device_node *np = pdev->dev.of_node;
  17.     int ret;
  18. +   int prop;
  20.     if (!np) {
  21.         dev_err(&pdev->dev, "Missing device tree node.\n");
  22.         return -EINVAL;
  23.     }
  24. +   of_property_read_u32(np, "prop", &prop);
  25. +   pr_info("Use EDP as %s screen\n", (prop == PRMRY) ? "prmry" : "extend");
  27.     edp = devm_kzalloc(&pdev->dev, sizeof(struct rk32_edp), GFP_KERNEL);
  28.     if (!edp) {
  29.         dev_err(&pdev->dev, "no memory for state\n");
  30.         return -ENOMEM;
  31.     }
  32. +   edp->prop = prop;
  33.     edp->dev = &pdev->dev;
  34.     edp->video_info.h_sync_polarity = 0;
  35.     edp->video_info.v_sync_polarity = 0;
  36. @@ -1756,7 +1760,7 @@
  38.     edp->video_info.link_rate   = LINK_RATE_1_62GBPS;
  39.     edp->video_info.lane_count  = LANE_CNT4;
  40. -   rk_fb_get_prmry_screen(&edp->screen);
  41. +   rk_fb_get_screen(&edp->screen, prop);
  42.     if (edp->screen.type != SCREEN_EDP) {
  43.         dev_err(&pdev->dev, "screen is not edp!\n");
  44.         return -EINVAL;
  45. @@ -1852,7 +1856,7 @@
  46.         pm_runtime_get_sync(&pdev->dev);
  48.     rk32_edp = edp;
  49. -   rk_fb_trsm_ops_register(&trsm_edp_ops, SCREEN_EDP);
  50. +   rk_fb_trsm_ops_register(&trsm_edp_ops, prop);
  51.  #if defined(CONFIG_DEBUG_FS)
  52.     edp->debugfs_dir = debugfs_create_dir("edp", NULL);
  53.     if (IS_ERR(edp->debugfs_dir)) {
  54. diff --git a/drivers/video/rockchip/transmitter/rk32_dp.h b/drivers/video/rockchip/transmitter/rk32_dp.h
  55. index 2dc41c6..fda0de2 100755
  56. --- a/drivers/video/rockchip/transmitter/rk32_dp.h
  57. +++ b/drivers/video/rockchip/transmitter/rk32_dp.h
  58. @@ -571,6 +571,7 @@
  59.     bool edp_en;
  60.     int soctype;
  61.     struct dentry *debugfs_dir;
  62. +   int prop;
  63.  };
  64.  ```
  65.  #### rk32_mipi_dsi.c
  66.  ```
  67. diff --git a/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c b/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
  68. index 741fdb5..ed68d85 100644
  69. --- a/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
  70. +++ b/drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
  71. @@ -1609,7 +1609,7 @@
  72.         pm_runtime_get_sync(&dsi0->pdev->dev);
  73.  #endif
  74.         opt_mode = dsi0->screen.refresh_mode;
  75. -       rk_fb_get_prmry_screen(dsi0->screen.screen);
  76. +       rk_fb_get_screen(dsi0->screen.screen, dsi0->prop);
  77.         dsi0->screen.lcdc_id = dsi0->screen.screen->lcdc_id;
  78.         rk32_init_phy_mode(dsi0->screen.lcdc_id);
  80. @@ -1875,7 +1875,7 @@
  81.  static int rk32_mipi_dsi_probe(struct platform_device *pdev)
  82.  {
  83.     int ret = 0;
  84. -   static int id;
  85. +   static int id, prop;
  86.     struct dsi *dsi;
  87.     struct mipi_dsi_ops *ops;
  88.     struct rk_screen *screen;
  89. @@ -1890,7 +1890,8 @@
  90.         return -ENODEV;
  91.     }
  92.     data = of_id->data;
  93. -
  94. +   of_property_read_u32(np, "prop", &prop);
  95. +   pr_info("Use mipi as %s screen\n", (prop == PRMRY) ? "prmry" : "extend");
  96.     dsi = devm_kzalloc(&pdev->dev, sizeof(struct dsi), GFP_KERNEL);
  97.     if (!dsi) {
  98.         dev_err(&pdev->dev, "request struct dsi fail!\n");
  99. @@ -1997,8 +1998,8 @@
  100.         dev_err(&pdev->dev, "request struct rk_screen fail!\n");
  101.         return -1;
  102.     }
  103. -   rk_fb_get_prmry_screen(screen);
  104. -
  105. +   rk_fb_get_screen(screen, prop);
  106. +   dsi->prop = prop;
  107.     dsi->pdev = pdev;
  108.     ops = &dsi->ops;
  109.     ops->dsi = dsi;
  110. @@ -2056,7 +2057,7 @@
  111.         if(!support_uboot_display())
  112.             rk32_init_phy_mode(dsi_screen->lcdc_id);
  113.         */
  114. -       rk_fb_trsm_ops_register(&trsm_dsi_ops, SCREEN_MIPI);
  115. +       rk_fb_trsm_ops_register(&trsm_dsi_ops, prop);
  116.  #ifdef MIPI_DSI_REGISTER_IO
  117.         debugfs_create_file("mipidsi0", S_IFREG | S_IRUGO, dsi->debugfs_dir, dsi,
  118.                             &reg_proc_fops);
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • 32
  • 33
  • 34
  • 35
  • 36
  • 37
  • 38
  • 39
  • 40
  • 41
  • 42
  • 43
  • 44
  • 45
  • 46
  • 47
  • 48
  • 49
  • 50
  • 51
  • 52
  • 53
  • 54
  • 55
  • 56
  • 57
  • 58
  • 59
  • 60
  • 61
  • 62
  • 63
  • 64
  • 65
  • 66
  • 67
  • 68
  • 69
  • 70
  • 71
  • 72
  • 73
  • 74
  • 75
  • 76
  • 77
  • 78
  • 79
  • 80
  • 81
  • 82
  • 83
  • 84
  • 85
  • 86
  • 87
  • 88
  • 89
  • 90
  • 91
  • 92
  • 93
  • 94
  • 95
  • 96
  • 97
  • 98
  • 99
  • 100
  • 101
  • 102
  • 103
  • 104
  • 105
  • 106
  • 107
  • 108
  • 109
  • 110
  • 111
  • 112
  • 113
  • 114
  • 115
  • 116
  • 117
  • 118

rk32_mipi_dsi.h

  1. diff --git a/drivers/video/rockchip/transmitter/rk32_mipi_dsi.h b/drivers/video/rockchip/transmitter/rk32_mipi_dsi.h
  2. index f568254..473db82 100644
  3. --- a/drivers/video/rockchip/transmitter/rk32_mipi_dsi.h
  4. +++ b/drivers/video/rockchip/transmitter/rk32_mipi_dsi.h
  5. @@ -307,6 +307,7 @@
  6.  struct dsi {
  7.     u8 dsi_id;
  8.     u8 lcdc_id;
  9. +   int prop;
  10.     u8 vid;
  11.     u8 clk_on;
  12.     struct regmap *grf_base;
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12

rk_fb.h

  1. diff --git a/include/dt-bindings/display/rk_fb.h b/include/dt-bindings/display/rk_fb.h
  2. index 81c9855..ae7241d 100755
  3. --- a/include/dt-bindings/display/rk_fb.h
  4. +++ b/include/dt-bindings/display/rk_fb.h
  5. @@ -14,6 +14,13 @@
  6.  #define DUAL       2
  7.  #define DUAL_LCD   3
  9. +#define DEFAULT_MODE   0
  10. +#define HDMI_720P  0
  11. +#define HDMI_1080P 1
  12. +#define HDMI_2160P 2
  13. +#define NTSC_CVBS  3
  14. +#define PAL_CVBS   4
  15. +
  16.  #define DEFAULT_MODE           0
  17.  #define ONE_VOP_DUAL_MIPI_HOR_SCAN 1
  18.  #define ONE_VOP_DUAL_MIPI_VER_SCAN 2
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18

lcd 的 dtsi

  1. diff --git a/include/dt-bindings/display/screen-timing/lcd-F402.dtsi b/include/dt-bindings/display/screen-timing/lcd-F402.dtsi
  2. index a3ad25f..abe178f 100644
  3. --- a/include/dt-bindings/display/screen-timing/lcd-F402.dtsi
  4. +++ b/include/dt-bindings/display/screen-timing/lcd-F402.dtsi
  5. @@ -4,9 +4,9 @@
  6.   */
  8. -disp_timings: display-timings {
  9. -        native-mode = <&timing0>;
  10. -        timing0: timing0 {
  11. +display-timings {
  12. +        native-mode = <&f402>;
  13. +        f402: timing0 {
  14.         screen-type = <SCREEN_EDP>;
  15.         out-face    = <OUT_P666>;
  16.         clock-frequency = <205000000>;
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  1. diff --git a/include/dt-bindings/display/screen-timing/lcd-box.dtsi b/include/dt-bindings/display/screen-timing/lcd-box.dtsi
  2. index 2109a89..20e2a21 100644
  3. --- a/include/dt-bindings/display/screen-timing/lcd-box.dtsi
  4. +++ b/include/dt-bindings/display/screen-timing/lcd-box.dtsi
  5. @@ -3,36 +3,9 @@
  6.   *
  7.   */
  9. -   disp_power_ctr: power_ctr {
  10. -     /*                        rockchip,debug = <0>;
  11. -        lcd_en:lcd_en {
  12. -                rockchip,power_type = <GPIO>;
  13. -                gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>;
  14. -                rockchip,delay = <10>;
  15. -        };
  16. -
  17. -        bl_en:bl_en {
  18. -                rockchip,power_type = <GPIO>;
  19. -                gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
  20. -                rockchip,delay = <10>;
  21. -        };
  22. -
  23. -        bl_ctr:bl_ctr {
  24. -                rockchip,power_type = <GPIO>;
  25. -                gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
  26. -                rockchip,delay = <10>;
  27. -        };
  28. -
  29. -        lcd_rst:lcd_rst {
  30. -                rockchip,power_type = <REGULATOR>;
  31. -                rockchip,delay = <5>;
  32. -        };*/
  33. -
  34. -};
  35. -
  36. -disp_timings: display-timings {
  37. -   native-mode = <&timing0>;
  38. -   timing0: timing0 {
  39. +display-timings {
  40. +   native-mode = <&hdmi_720p>;
  41. +   hdmi_720p: timing0 {
  42.         screen-type = <SCREEN_RGB>;
  43.         out-face    = <OUT_P888>;
  44.         color-mode = <COLOR_YCBCR>;
  45. @@ -53,7 +26,7 @@
  46.         swap-rg = <0>;
  47.         swap-gb = <0>;
  48.     };
  49. -   timing1: timing1 {
  50. +   hdmi_1080p: timing1 {
  51.         screen-type = <SCREEN_RGB>;
  52.         out-face    = <OUT_P888>;
  53.         color-mode = <COLOR_YCBCR>;
  54. @@ -74,7 +47,7 @@
  55.         swap-rg = <0>;
  56.         swap-gb = <0>;
  57.     };
  58. -   timing2: timing2 {
  59. +   hdmi_2160p: timing2 {
  60.         screen-type = <SCREEN_RGB>;
  61.         out-face    = <OUT_P888>;
  62.         color-mode = <COLOR_YCBCR>;
  • 1
  • 2
  • 3
  • 4
  • 5
  • 6
  • 7
  • 8
  • 9
  • 10
  • 11
  • 12
  • 13
  • 14
  • 15
  • 16
  • 17
  • 18
  • 19
  • 20
  • 21
  • 22
  • 23
  • 24
  • 25
  • 26
  • 27
  • 28
  • 29
  • 30
  • 31
  • 32
  • 33
  • 34
  • 35
  • 36
  • 37
  • 38
  • 39
  • 40
  • 41
  • 42
  • 43
  • 44
  • 45
  • 46
  • 47
  • 48
  • 49
  • 50
  • 51
  • 52
  • 53
  • 54
  • 55
  • 56
  • 57
  • 58
  • 59
  • 60
  • 61
  • 62
  1. diff --git a/include/dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi b/include/dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi
  2. index b408d65..6a203a9 100644
  3. --- a/include/dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi
  4. +++ b/include/dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi
  5. @@ -84,10 +84,10 @@
  6.     */
  7.  };
  9. -disp_timings: display-timings {
  10. -   native-mode = <&timing0>;
  11. +display-timings {
  12. +   native-mode = <&tv080wum_nl0_mipi>;
  13.     compatible = "rockchip,display-timings";
  14. -   timing0: timing0 {
  15. +   tv080wum_nl0_mipi: timing0 {
  16.         screen-type = <SCREEN_MIPI>;
  17.         lvds-format = <LVDS_8BIT_2>;
  18.         out-face    = <OUT_P888>;
  19. diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
  20. index d7634a8..1130ea4 100755
  21. --- a/include/linux/rk_fb.h
  22. +++ b/include/linux/rk_fb.h
  23. @@ -811,7 +811,10 @@
  24.  extern int rk_fb_get_prmry_screen( struct rk_screen *screen);
  25.  extern int rk_fb_set_prmry_screen(struct rk_screen *screen);
  26.  extern u32 rk_fb_get_prmry_screen_pixclock(void);
  27. -extern int rk_disp_pwr_ctr_parse_dt(struct rk_lcdc_driver *dev_drv);
  28. +extern int rk_fb_get_screen(struct rk_screen *screen, int prop);
  29. +extern int rk_fb_set_screen(struct rk_screen *screen, int prop);
  30. +extern int rk_disp_pwr_ctr_parse_dt(struct device_node *np,
  31. +                   struct rk_screen *rk_screen);
  32.  extern int rk_disp_pwr_enable(struct rk_lcdc_driver *dev_drv);
  33.  extern int rk_disp_pwr_disable(struct rk_lcdc_driver *dev_drv);
  34.  extern bool is_prmry_rk_lcdc_registered(void);
  35. diff --git a/include/linux/rk_screen.h b/include/linux/rk_screen.h
  36. index 5e5cd30..71a0d4d 100644
  37. --- a/include/linux/rk_screen.h
  38. +++ b/include/linux/rk_screen.h
  39. @@ -61,13 +61,17 @@
  40.  *ft: the time need to display one frame time
  41.  */
  42.  struct rk_screen {
  43. -   u16 type;
  44. +   struct device   *dev;
  45. +   int prop;
  46.     u16 refresh_mode;
  47. +   struct list_head *pwrlist_head;
  48. +   u16 type;
  49.     u16 lvds_format;
  50.     u16 face;
  51.     u16 color_mode;
  52.     u8 lcdc_id;
  53.     u8 screen_id;
  54. +   int native_mode;
  55.     struct fb_videomode mode;
  56.     u32 post_dsp_stx;
  57.     u32 post_dsp_sty;
  58. @@ -145,7 +149,7 @@
  59.  };
  61.  extern void set_lcd_info(struct rk_screen *screen, struct rk29lcd_info *lcd_info);
  62. -extern size_t get_fb_size(u8 reserved_fb);
  63. +extern size_t get_fb_size(u8 reserved_fb, struct rk_screen *screen);
  65.  extern void set_tv_info(struct rk_screen *screen);
  66.  extern void set_hdmi_info(struct rk_screen *screen);

[Android6.0][RK3399] 双屏异显代码实现流程分析（二）【转】的更多相关文章

  1. [Android6.0][RK3399] 双屏异显代码实现流程分析（一）【转】

    本文转载自:http://blog.csdn.net/dearsq/article/details/55049182 Platform: RK3399 OS: Android 6.0 Version: ...

  2. RK3288 6.0 双屏异显，横屏+竖屏【转】

    本文转载自:http://blog.csdn.net/clx44551/article/details/78215730?locationNum=8&fps=1 RK3288 6.0 双屏异显 ...

  3. Android6.0以上关于RecyclerView显是不全的问题

    Android6.0以上关于RecyclerView显是不全的问题 需求描述 适配的时候发现Android 6.0以上,RecyclerView显示不全,以下是没有问题的.这个时候查看布局文件,可以看 ...

  4. RK3288 增加双屏异显 eDP+LVDS

    CPU:RK3288 系统:Android 5.1 下面是官方文档中的信息. 1.rk3288 支持的显示接口可以任意组合. 2.双屏异显时,一个显示接口当主屏,另一个当副屏:主副屏由板级 dts 文 ...

  5. iTOP-4418/6818开发板支持双屏异显，双屏同显

    iTOP-4418/6818开发板平台安卓系统下支持双屏异显,双屏同显,客户可按照不同用途,分别播放适合屏幕显示方式的内容 ,如HDMI屏幕和LCD屏幕显示不同内容, 一个屏幕播放广告,另一个屏幕运行 ...

  6. 【ARM开发板】迅为IMX6开发板QT下LVDS和HDMI双屏异显

    本文转自迅为论坛:http://www.topeetboard.com 平台:迅为-IMX6开发板 首先开发板分别连接9.7寸屏和HDMI显示器,然后使用MfgTool工具烧写QT系统,然后拨码开关设 ...

  7. Rk3288 双屏异显单触摸

    系统版本:RK3288 android 5.1 设备同时有两个lcd,主屏是mipi接口,带有触摸屏,触摸屏是usb接口,副屏是hdmi接口,没有触摸屏,正常情况下,两个lcd显示相同内容,触摸屏一切 ...

  8. RK3288 双屏异显，两屏默认方向不一致

    CPU:RK3288 系统:Android 5.1 RK3288 支持双屏异显,一般都会同方向显示,如果遇到两个 lcd 的默认方向不一致,只需修改下面参数即可. 例如:主屏为mipi接口,分辨率为 ...

  9. RK3288 双屏异显时，触摸屏(USB接口)无反应

    系统版本:RK3288 android 5.1 设备同时有两个lcd,主屏是mipi接口,带有触摸屏,触摸屏是usb接口,副屏是hdmi接口,没有触摸屏,正常情况下,两个lcd显示相同内容,触摸屏一切 ...

随机推荐

  1. 56.fielddata filter的细粒度内存加载控制

    语法: POST /test_index/_mapping/test_type { "properties": { "test_field": { " ...

  2. PHP 数组使用之道

    本文首发于 PHP 数组使用之道,转载请注明出处. 这个教程我将通过一些实用的实例和最佳实践的方式列举出 PHP 中常用的数组函数.每个 PHP 工程师都应该掌握它们的使用方法,以及如何通过组合使用来 ...

  3. Python Pandas库的学习（一）

    今天我们来学习一下Pandas库,前面我们讲了Numpy库的学习 接下来我们学习一下比较重要的库Pandas库,这个库比Numpy库还重要 Pandas库是在Numpy库上进行了封装,相当于高级Num ...

  4. Linux最常用的基础命令 下篇

    Linux最常用的基础命令个人总结 shell脚本 脚本就是:写一堆指令存成一个文本,用于完成一些小任务 a="123" linux中定义一个变量 echo $a echo $b ...

  5. CUDA_one

    首先我看了讲解CUDA基础部分以后,大致对CUDA的基本了解如下: 第一:CUDA实行并行化的过程分为两部分,一个是线程块之间的并行(这是在每个线程网格中grid进行的),一个是对于每一个线程块内部各 ...

  6. S3C2440的内存情况在NAND FLASH或者NOR FLASH启动的情况下

    1,从NANDFLASH启动时,在ARM上电时,ARM会自动把NANDFLASH前4K的内容拷贝到S3C2440内部SRAM中,同时把SRAM的地址映射到0X00000000.ARM上电后会从SRAM ...

  7. Android ImageView加载圆形图片且同时绘制圆形图片的外部边缘边线及边框

     Android ImageView加载圆形图片且同时绘制圆形图片的外部边缘边线及边框 在Android早期的开发中,如果涉及到圆形图片的处理,往往需要借助于第三方的实现,见附录文章1,2.And ...

  8. LaTex/Overleaf使用笔记

    1. 添加网页引用 @misc{ r1,   author = "Wikipedia",   title = "Binary decision diagram --- { ...

  9. Quartz.net框架使用

    概述:Quartz.NET是一个开源的作业调度框架,非常适合在平时的工作中,定时轮询数据库同步,定时邮件通知,定时处理数据等. Quartz.NET允许开发人员根据时间间隔(或天)来调度作业.它实现了 ...

  10. [NOIP2008] 提高组 洛谷P1125 笨小猴

    题目描述 笨小猴的词汇量很小,所以每次做英语选择题的时候都很头疼.但是他找到了一种方法,经试验证明,用这种方法去选择选项的时候选对的几率非常大! 这种方法的具体描述如下:假设maxn是单词中出现次数最 ...