evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: Reset compression config after dynamic DSC off"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-09 01:32:23 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1939b80fcd
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/video/fbdev/msm/mdss_dsi_host.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -1216,6 +1216,15 @@ void mdss_dsi_dsc_config(struct mdss_dsi_ctrl_pdata *ctrl, struct dsc_desc *dsc)
{ {
u32 data, offset; u32 data, offset;
if (!dsc) {
if (ctrl->panel_mode == DSI_VIDEO_MODE)
offset = MDSS_DSI_VIDEO_COMPRESSION_MODE_CTRL;
else
offset = MDSS_DSI_COMMAND_COMPRESSION_MODE_CTRL;
MIPI_OUTP((ctrl->ctrl_base) + offset, 0);
return;
}
if (dsc->pkt_per_line <= 0) { if (dsc->pkt_per_line <= 0) {
pr_err("%s: Error: pkt_per_line cannot be negative or 0\n", pr_err("%s: Error: pkt_per_line cannot be negative or 0\n",
__func__); __func__);
@ -1404,8 +1413,7 @@ static void mdss_dsi_mode_setup(struct mdss_panel_data *pdata)
MIPI_OUTP((ctrl_pdata->ctrl_base) + 0x5C, stream_total); MIPI_OUTP((ctrl_pdata->ctrl_base) + 0x5C, stream_total);
} }
if (dsc) /* compressed */ mdss_dsi_dsc_config(ctrl_pdata, dsc);
mdss_dsi_dsc_config(ctrl_pdata, dsc);
} }
void mdss_dsi_ctrl_setup(struct mdss_dsi_ctrl_pdata *ctrl) void mdss_dsi_ctrl_setup(struct mdss_dsi_ctrl_pdata *ctrl)