A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-05 19:31:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

disp: msm: dp: fix compilation errors

Browse source 
Changes to fix compilation errors.

Change-Id: I4f54447bdf2631f5bd17ef4bef13fecc6da0e106
Signed-off-by: Nilesh Laad <quic_nlaad@quicinc.com>
This commit is contained in:
Nilesh Laad 2023-07-18 13:35:13 +05:30
commit cfcbecd497
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
msm/dp/dp_display.c
View file

@ -2666,11 +2666,7 @@ static void dp_display_stream_post_enable(struct dp_display_private *dp,
struct dp_panel *dp_panel)
{
<<<<<<< HEAD
if (dp->dp_display.is_edp) {
=======
if (dp->dp_display.cont_splash_enabled) {
>>>>>>> 452e643352bd41612f5634d8b38d7be9cbc9a875
dp->dp_display.cont_splash_enabled = false;
dp->pll->cont_splash_enabled = false;
}
@ -4323,8 +4319,4 @@ void __exit dp_display_unregister(void)
module_param_string(edp_display0, edp_display_primary, MAX_CMDLINE_PARAM_LEN,
0600);
MODULE_PARM_DESC(edp_display0,
<<<<<<< HEAD
"msm_drm.edp_display0=<display node>:<configX> where <display node> is 'primary dp display node name' and <configX> where x represents index in the topology list");
=======
"msm_drm.edp_display0=<display node>: where <display node> is 'primary dp display node name' ");
>>>>>>> 452e643352bd41612f5634d8b38d7be9cbc9a875