dpms: save current dpms value

do not set buffer and commit when dpms is not on.

Change-Id: I855c87a3380a9dab6611a66e8f4b94f02ae302ff
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --git a/src/tdm_drm_display.c b/src/tdm_drm_display.c
index bac6dbe..debc71a 100644 (file)
--- a/src/tdm_drm_display.c
+++ b/src/tdm_drm_display.c
@@ -1313,6 +1313,8 @@ drm_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value)
                return TDM_ERROR_OPERATION_FAILED;
        }
 
+       output_data->current_dpms = dpms_value;
+
        return TDM_ERROR_NONE;
 }
 

diff --git a/src/tdm_drm_hwc.c b/src/tdm_drm_hwc.c
index c775ff3..de657e2 100644 (file)
--- a/src/tdm_drm_hwc.c
+++ b/src/tdm_drm_hwc.c
@@ -648,6 +648,11 @@ drm_hwc_accept_validation(tdm_hwc *hwc)
 
        TDM_INFO(" ==============Accept Changes Done=================================");
 
+       if (hwc_data->output_data->current_dpms != TDM_OUTPUT_DPMS_ON) {
+               TDM_ERR("dpms is not on. do not set buffer");
+               return TDM_ERROR_BAD_REQUEST;
+       }
+
        ret = _drm_hwc_prepare_commit(hwc_data);
        RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
 
@@ -668,6 +673,11 @@ drm_hwc_commit(tdm_hwc *hwc, int sync, void *user_data)
 
        TDM_INFO(" ==============COMMIT=================================");
 
+       if (hwc_data->output_data->current_dpms != TDM_OUTPUT_DPMS_ON) {
+               TDM_ERR("dpms is not on. do not commit");
+               return TDM_ERROR_BAD_REQUEST;
+       }
+
        ret = drm_output_commit(output_data, sync, user_data);
        RETURN_VAL_IF_FAIL(ret == TDM_ERROR_NONE, ret);
 

diff --git a/src/tdm_drm_types.h b/src/tdm_drm_types.h
index 74a51bc..34ca532 100644 (file)
--- a/src/tdm_drm_types.h
+++ b/src/tdm_drm_types.h
@@ -173,6 +173,9 @@ struct _tdm_drm_output_data {
        /* hwc */
        int hwc_enable;
        tdm_drm_hwc_data *hwc_data;
+
+       /* dpms */
+       tdm_output_dpms current_dpms;
 };
 
 struct _tdm_drm_layer_data {