Gfx-Display: check hdmi state in display runtime suspend

BZ: 37468

This is the patch to correct the logic of patch 49533 in which it will
block display goes into D0i3. By adding hdmi_state check to determine
if it need to check hdmi audio suspend status.

Change-Id: I6ae9a768f4c1d795b2fd7e17c4c2624646d9ce66
Signed-off-by: Tong, Bo <box.tong@intel.com>
Reviewed-on: http://android.intel.com:8080/51779
Reviewed-by: Xu, Randy <randy.xu@intel.com>
Tested-by: Xu, Randy <randy.xu@intel.com>
Reviewed-by: Zhang, Lei <lei.zhang@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/staging/mrst/drv/psb_powermgmt.c b/drivers/staging/mrst/drv/psb_powermgmt.c
index 0a89e19..ca6639e 100644 (file)
--- a/drivers/staging/mrst/drv/psb_powermgmt.c
+++ b/drivers/staging/mrst/drv/psb_powermgmt.c
@@ -2080,7 +2080,7 @@ int ospm_power_suspend(struct pci_dev *pdev, pm_message_t state)
                        || display_access_count
 #if (defined(CONFIG_SND_INTELMID_HDMI_AUDIO) || \
                defined(CONFIG_SND_INTELMID_HDMI_AUDIO_MODULE))
-                       || !hdmi_audio_suspend
+                       || ((!hdmi_audio_suspend) && hdmi_state)
 #endif
                )
                         ret = -EBUSY;