OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0fc565e
92e847b
)
Merge "msm: mdss: add debug bus support for dsi block"
author
Linux Build Service Account
<lnxbuild@localhost>
Sat, 22 Apr 2017 00:57:37 +0000
(17:57 -0700)
committer
Gerrit - the friendly Code Review server
<code-review@localhost>
Sat, 22 Apr 2017 00:57:37 +0000
(17:57 -0700)
1
2
drivers/video/fbdev/msm/mdss_debug.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/msm/mdss_dsi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/msm/mdss_dsi.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/msm/mdss_dsi_host.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/fbdev/msm/mdss_mdp_intf_video.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/video/fbdev/msm/mdss_debug.c
Simple merge
diff --cc
drivers/video/fbdev/msm/mdss_dsi.c
Simple merge
diff --cc
drivers/video/fbdev/msm/mdss_dsi.h
index
00f2338
,
44e67c0
..
3350378
---
1
/
drivers/video/fbdev/msm/mdss_dsi.h
---
2
/
drivers/video/fbdev/msm/mdss_dsi.h
+++ b/
drivers/video/fbdev/msm/mdss_dsi.h
@@@
-704,8
-706,9
+706,10
@@@
void mdss_dsi_cfg_lane_ctrl(struct mdss
void mdss_dsi_set_reg(struct mdss_dsi_ctrl_pdata *ctrl, int off,
u32 mask, u32 val);
int mdss_dsi_phy_pll_reset_status(struct mdss_dsi_ctrl_pdata *ctrl);
+int mdss_dsi_check_panel_status(struct mdss_dsi_ctrl_pdata *ctrl, void *arg);
+ void mdss_dsi_debug_bus_init(struct mdss_dsi_data *sdata);
+
static inline const char *__mdss_dsi_pm_name(enum dsi_pm_type module)
{
switch (module) {
diff --cc
drivers/video/fbdev/msm/mdss_dsi_host.c
Simple merge
diff --cc
drivers/video/fbdev/msm/mdss_mdp_intf_video.c
Simple merge