Gfx-display: add new parameter to check FORCE turn on/off HDMI panel

BZ: 37296

This patch adds new parameter to check whether to force to turn on/off
HDMI panel. It is used for incoming call UC to forcely turn on/off HDMI
even when rotation happens.

Change-Id: I082319411d08a97068690e6010d86f89011c162f
Signed-off-by: Lei Zhang <lei.zhang@intel.com>
Signed-off-by: Lei Zhang <lei.zhang@intel.com>
Reviewed-on: http://android.intel.com:8080/49468
Reviewed-by: Geng, Xiujun <xiujun.geng@intel.com>
Reviewed-by: Ai, Ke <ke.ai@intel.com>
Tested-by: Tong, BoX <box.tong@intel.com>
Reviewed-by: Xu, Randy <randy.xu@intel.com>
Tested-by: Xu, Randy <randy.xu@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/staging/mrst/drv/psb_drm.h b/drivers/staging/mrst/drv/psb_drm.h
index 72291dc..e34213d 100644 (file)
--- a/drivers/staging/mrst/drv/psb_drm.h
+++ b/drivers/staging/mrst/drv/psb_drm.h
@@ -860,6 +860,7 @@ struct drm_psb_flip_chain_data {
 struct drm_psb_disp_ctrl {
        uint32_t cmd;
        union {
+               uint32_t data;
                struct drm_psb_buffer_data buf_data;
                struct drm_psb_flip_chain_data flip_chain_data;
        } u;

diff --git a/drivers/staging/mrst/drv/psb_drv.c b/drivers/staging/mrst/drv/psb_drv.c
index e574ccd..755900e 100644 (file)
--- a/drivers/staging/mrst/drv/psb_drv.c
+++ b/drivers/staging/mrst/drv/psb_drv.c
@@ -2340,7 +2340,15 @@ static int psb_disp_ioctl(struct drm_device *dev, void *data,
 
                        ospm_power_using_hw_end(OSPM_DISPLAY_ISLAND);
                 }
+
+               /* If data=1, then force setting plane status. */
+               if (dp_ctrl->u.data == 1)
+                       DISP_PLANEB_STATUS = DISPLAY_PLANE_DISABLE;
        } else if (dp_ctrl->cmd == DRM_PSB_DISP_PLANEB_ENABLE) {
+               /* If data=1, then force setting plane status. */
+               if (dp_ctrl->u.data == 1)
+                       DISP_PLANEB_STATUS = DISPLAY_PLANE_ENABLE;
+
                 if (DISP_PLANEB_STATUS == DISPLAY_PLANE_DISABLE)
                         ret = -1;
                 else {