diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-27 18:12:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-27 18:12:02 -0700 |
| commit | de3a51ca17e10fcdf6833f93b60789f7d757fd8f (patch) | |
| tree | d8d1b181d085193a33d666b96737ea1108416b81 /drivers/platform | |
| parent | c9b46c3b0ca9caf14000757901ef1cfc52326c08 (diff) | |
| parent | 3c1b6b9787c7ee062fd73ded05c82eaac19cb4cb (diff) | |
Merge "msm: mdss: remove HDMI connected flags"
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/msm/msm_ext_display.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/platform/msm/msm_ext_display.c b/drivers/platform/msm/msm_ext_display.c index c7c1b1567bf3..53c85773b377 100644 --- a/drivers/platform/msm/msm_ext_display.c +++ b/drivers/platform/msm/msm_ext_display.c @@ -39,7 +39,6 @@ struct msm_ext_disp { struct list_head display_list; struct mutex lock; struct completion hpd_comp; - u32 flags; }; 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) return false; end: - ext_disp->flags |= flags; ext_disp->current_disp = type; return true; } @@ -304,13 +302,7 @@ static bool msm_ext_disp_validate_disconnect(struct msm_ext_disp *ext_disp, if (ext_disp->current_disp != type) return false; - /* allow only an already connected type */ - if (ext_disp->flags & flags) { - ext_disp->flags &= ~flags; - return true; - } - - return false; + return true; } static int msm_ext_disp_hpd(struct platform_device *pdev, @@ -378,8 +370,7 @@ static int msm_ext_disp_hpd(struct platform_device *pdev, msm_ext_disp_update_audio_ops(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; } pr_debug("Hpd (%d) for display (%s)\n", state, |