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

Merge "msm: mdss: remove HDMI connected flags"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-27 18:12:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit de3a51ca17
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/platform/msm/msm_ext_display.c
View file

@ -39,7 +39,6 @@ struct msm_ext_disp {
struct list_head display_list; struct list_head display_list;
struct mutex lock; struct mutex lock;
struct completion hpd_comp; struct completion hpd_comp;
u32 flags;
}; };
static int msm_ext_disp_get_intf_data(struct msm_ext_disp *ext_disp, static int msm_ext_disp_get_intf_data(struct msm_ext_disp *ext_disp,
@ -288,7 +287,6 @@ static bool msm_ext_disp_validate_connect(struct msm_ext_disp *ext_disp,
if (ext_disp->current_disp != type) if (ext_disp->current_disp != type)
return false; return false;
end: end:
ext_disp->flags |= flags;
ext_disp->current_disp = type; ext_disp->current_disp = type;
return true; return true;
} }
@ -304,15 +302,9 @@ static bool msm_ext_disp_validate_disconnect(struct msm_ext_disp *ext_disp,
if (ext_disp->current_disp != type) if (ext_disp->current_disp != type)
return false; return false;
/* allow only an already connected type */
if (ext_disp->flags & flags) {
ext_disp->flags &= ~flags;
return true; return true;
} }
return false;
}
static int msm_ext_disp_hpd(struct platform_device *pdev, static int msm_ext_disp_hpd(struct platform_device *pdev,
enum msm_ext_disp_type type, enum msm_ext_disp_type type,
enum msm_ext_disp_cable_state state, enum msm_ext_disp_cable_state state,
@ -378,7 +370,6 @@ static int msm_ext_disp_hpd(struct platform_device *pdev,
msm_ext_disp_update_audio_ops(ext_disp, type, state, flags); msm_ext_disp_update_audio_ops(ext_disp, type, state, flags);
msm_ext_disp_process_display(ext_disp, type, state, flags); msm_ext_disp_process_display(ext_disp, type, state, flags);
if (!ext_disp->flags)
ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX; ext_disp->current_disp = EXT_DISPLAY_TYPE_MAX;
} }