Revert "Revert "msm: mdss: hdmi: skip pan_display during handoff""
This reverts commit ac0bcfe881
.
Change-Id: I5ed3edd4cdd4a5f8026ba1b5b71c21248f0b1fe7
This commit is contained in:
parent
10ed5f7e10
commit
11c85590a0
1 changed files with 8 additions and 6 deletions
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Core MDSS framebuffer driver.
|
* Core MDSS framebuffer driver.
|
||||||
*
|
*
|
||||||
* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.
|
* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.
|
||||||
* Copyright (C) 2007 Google Incorporated
|
* Copyright (C) 2007 Google Incorporated
|
||||||
*
|
*
|
||||||
* This software is licensed under the terms of the GNU General Public
|
* This software is licensed under the terms of the GNU General Public
|
||||||
|
@ -3768,13 +3768,15 @@ static int mdss_fb_pan_display(struct fb_var_screeninfo *var,
|
||||||
{
|
{
|
||||||
struct mdp_display_commit disp_commit;
|
struct mdp_display_commit disp_commit;
|
||||||
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
|
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
|
||||||
|
struct mdss_data_type *mdata = mfd_to_mdata(mfd);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* during mode switch through mode sysfs node, it will trigger a
|
* Abort pan_display operations in following cases:
|
||||||
* pan_display after switch. This assumes that fb has been adjusted,
|
* 1. during mode switch through mode sysfs node, it will trigger a
|
||||||
* however when using overlays we may not have the right size at this
|
* pan_display after switch. This assumes that fb has been adjusted,
|
||||||
* point, so it needs to go through PREPARE first. Abort pan_display
|
* however when using overlays we may not have the right size at this
|
||||||
* operations until that happens
|
* point, so it needs to go through PREPARE first.
|
||||||
|
* 2. When the splash handoff is pending.
|
||||||
*/
|
*/
|
||||||
if ((mfd->switch_state != MDSS_MDP_NO_UPDATE_REQUESTED) ||
|
if ((mfd->switch_state != MDSS_MDP_NO_UPDATE_REQUESTED) ||
|
||||||
(mdss_fb_is_hdmi_primary(mfd) && mdata->handoff_pending)) {
|
(mdss_fb_is_hdmi_primary(mfd) && mdata->handoff_pending)) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue