diff --gIT a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c old mode 100644 new mode 100755 index 17c3b94..2b39662 --- a/drivers/gpu/drm/panel/panel-simple.C +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -504,6 +504,7 @@ static int panel_simple_enable(struct drm_panel *panel)     }     p->enabled = true; +    printk("%s exit/n", __func__);     return 0;  } diff --git a/drivers/input/keyboard/rk_keys.c b/drivers/input/keyboard/rk_keys.c old mode 100644 new mode 100755 index fed5ced..537b599 --- a/drivers/input/keyboard/rk_keys.c +++ b/drivers/input/keyboard/rk_keys.c @@ -134,6 +134,10 @@ static void keys_timer(unsigned long _data)         key_dbg(pdata, "%skey[%s]: report event[%d] state[%d]/n",             button->tyPE == TYPE_ADC ? "adc" : "gpio",             button->desc, button->code, button->state); +        if(strcmp(button->desc, "power") == 0) +        printk("%skey[%s]: report event[%d] state[%d]/n", +            button->type == TYPE_ADC ? "adc" : "gpio", +            button->desc, button->code, button->state);         input_event(input, EV_KEY, button->code, button->state);         input_sync(input);     }

 static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info)                             {           ktime_t calltime;   u64 usecs64;   int usecs;   calltime = ktime_get();   usecs64 = ktime_to_ns(ktime_sub(calltime, starttime));   do_div(usecs64, NSEC_PER_USEC);   usecs = usecs64;   if (usecs == 0)     usecs = 1;    pr_info("PM: %s%s%s of devices complete after %ld.%03ld msecs/n",     info ?: "", info ? " " : "", pm_verb(state.event),     usecs / USEC_PER_MSEC, usecs % USEC_PER_MSEC); }

 echo N > /Sys/module/printk/parameters/console_suspend //使控制台在suspend最后才关闭，这样可以打印出休眠过程完整信息 echo 1 > /sys/power/pm_print_times //使能调试变量

 --- a/Arch/arm/boot/dts/rk3288-pad.dts +++ b/arch/arm/boot/dts/rk3288-pad.dts @@ -169,10 +169,10 @@         dsi,lanes = <4>;         prepare-delay-ms = <20>; -        init-delay-ms = <20>; -        enable-delay-ms = <100>; -        disable-delay-ms = <20>; -        unprepare-delay-ms = <20>; +        //init-delay-ms = <20>; +        enable-delay-ms = <1>; +        disable-delay-ms = <1>; +        unprepare-delay-ms = <1>;         panel-init-sequence = [             15 32 02 8F A5             15 01 02 83 00

 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -139,6 +139,9 @@  #define to_vop_win(x) container_of(x, struct vop_win, base)  #define to_vop_plane_state(x) container_of(x, struct vop_plane_state, base) +/*add by VENDOR_PATCH for seep up the drm vop driver at 2018/1/18 for RK Defect #191554, VENDOR_PATCH PAD100-193*/ +#define VENDOR_PATCH +  struct vop_zpos {     int win_id;     int zpos; @@ -868,9 +871,15 @@ static void vop_disable_all_planes(struct vop *vop)     vop_disable_allwin(vop);     vop_CFg_done(vop); +#ifdef VENDOR_PATCH     ret = readx_poll_timeout_atomic(vop_is_allwin_disabled,                     vop, active, active, +                    0, 100 * 1000); +#else +    ret = readx_poll_timeout_atomic(vop_is_allwin_disabled, +                vop, active, active,                     0, 500 * 1000); +#endif     if (ret)         dev_err(vop->dev, "wait win close timeout/n");  } @@ -2215,20 +2224,36 @@ static size_t vop_crtc_bandwidth(struct drm_crtc *crtc,     u16 htotal = adjusted_mode->crtc_htotal;     u16 vdisplay = adjusted_mode->crtc_vdisplay;     int clock = adjusted_mode->crtc_clock; +#ifndef VENDOR_PATCH     struct vop *vop = to_vop(crtc);     const struct vop_data *vop_data = vop->data; +#endif     struct vop_plane_state *vop_plane_state;     struct drm_plane_state *pstate;     struct vop_bandwidth *pbandwidth;     struct drm_plane *plane;     u64 bandwidth;     int i, cnt = 0; +#ifdef VENDOR_PATCH +    int plane_num = 0; +#endif     if (!htotal || !vdisplay)         return 0; +#ifndef VENDOR_PATCH     pbandwidth = kmalloc_array(vop_data->win_size, sizeof(*pbandwidth),                   GFP_KERNEL); +#else +    for_each_plane_in_state(state, plane, pstate, i) { +        if (pstate->crtc != crtc || !pstate->fb) +            continue; +        plane_num++; +    } +    pbandwidth = kmalloc_array(plane_num, sizeof(*pbandwidth), +                 GFP_KERNEL); +#endif +     if (!pbandwidth)         return -ENOMEM; @@ -2421,7 +2446,10 @@ static void vop_crtc_enable(struct drm_crtc *crtc)     rockchip_set_system_status(sys_status);     mutex_lock(&vop->vop_lock);     vop_initial(crtc); - +#ifdef VENDOR_PATCH +    vop_disable_allwin(vop); +    VOP_CTRL_SET(vop, standby, 0); +#endif     VOP_CTRL_SET(vop, dclk_pol, 1);     val = (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC) ?           0 : BIT(HSYNC_POSITIVE); @@ -2549,8 +2577,9 @@ static void vop_crtc_enable(struct drm_crtc *crtc)     /*      * enable vop, all the register would take effect when vop exit standby      */ +#ifndef VENDOR_PATCH     VOP_CTRL_SET(vop, standby, 0); - +#endif     enable_irq(vop->irq);     drm_crtc_vblank_on(crtc);     mutex_unlock(&vop->vop_lock);