Remove TDM_CONFIG_KEY_GENERAL_COMMIT_PER_VBLANK

it is for configuration of tdm_layer and tdm_layer is deprecated

Change-Id: Ib98b5ac3ebaaa794d4e7d4533ab0b6c193904b20

diff --git a/haltests/src/tc_tdm.h b/haltests/src/tc_tdm.h
index 705929699827482d47c47e0ed60e04af74968c99..5126365589e48ead094ef8e7dd0093f208a7418c 100644 (file)
--- a/haltests/src/tc_tdm.h
+++ b/haltests/src/tc_tdm.h
@@ -121,7 +121,7 @@ using ::testing::Values;
 using ::testing::Combine;
 
 #ifdef TDM_UT_TEST_WITH_PARAMS
-class TDMEnv : public TestWithParam< ::testing::tuple<bool, bool, const char*> >
+class TDMEnv : public TestWithParam< ::testing::tuple<bool, const char*> >
 {
 public:
        void SetUp(void);

diff --git a/haltests/src/tc_tdm_backend_capture.cpp b/haltests/src/tc_tdm_backend_capture.cpp
index 8b2ede974cdf63707cc0ccb8f5ab161a303d2049..1ded0d1fc5c460c11ada17c2eea905f814a0e02f 100644 (file)
--- a/haltests/src/tc_tdm_backend_capture.cpp
+++ b/haltests/src/tc_tdm_backend_capture.cpp
@@ -1081,7 +1081,7 @@ retry:
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMBackendCaptureParams,
                                                TDMBackendCapture,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMBackendCaptureParams,
                                                TDMBackendCapture,

diff --git a/haltests/src/tc_tdm_backend_display.cpp b/haltests/src/tc_tdm_backend_display.cpp
index 98e886aad4a759d553027c864ca1617b7df6968d..8bf5cf5fd896c82a3273950fc79e3b6aab1bab3c 100644 (file)
--- a/haltests/src/tc_tdm_backend_display.cpp
+++ b/haltests/src/tc_tdm_backend_display.cpp
@@ -872,7 +872,7 @@ TEST_P(TDMBackendBasic, VerifyCaptureAvaiableFormats)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMBackendBasicParams,
                                                TDMBackendBasic,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMBackendBasicParams,
                                                TDMBackendBasic,
@@ -1376,7 +1376,7 @@ TEST_P(TDMBackendDisplay, DISABLED_VerifyLayerSetVideoPos)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMBackendDisplayParams,
                                                TDMBackendDisplay,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMBackendDisplayParams,
                                                TDMBackendDisplay,

diff --git a/haltests/src/tc_tdm_backend_env.cpp b/haltests/src/tc_tdm_backend_env.cpp
index bb4b395677d94c290a6657eda1824fc98805b742..0f72643005ed3fc757d86a204f3b672f4b16297f 100644 (file)
--- a/haltests/src/tc_tdm_backend_env.cpp
+++ b/haltests/src/tc_tdm_backend_env.cpp
@@ -40,12 +40,7 @@ void TDMBackendEnv::SetUp(void)
 
        TDMEnv::SetUp();
 
-       /* thread, commit_per_vblank should be turned off for testing TDMBackend
-        * all TDMBackend's tcs should call tdm_output_commit once in a vblank.
-        * don't call tdm_layer_commit.
-        */
        tdm_config_set_int(TDM_CONFIG_KEY_GENERAL_THREAD, 0);
-       tdm_config_set_int(TDM_CONFIG_KEY_GENERAL_COMMIT_PER_VBLANK, 0);
 
        debug = getenv("TDM_UT_DEBUG_BACKEND");
        if (debug && (debug[0] == '1'))
@@ -73,7 +68,7 @@ TEST_P(TDMBackendEnv, VerifyDisplay)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMBackendEnvParams,
                                                TDMBackendEnv,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMBackendEnvParams,
                                                TDMBackendEnv,

diff --git a/haltests/src/tc_tdm_backend_pp.cpp b/haltests/src/tc_tdm_backend_pp.cpp
index c59b7edcf2154b903b311642e5b75123a3895c4a..b5ea0401ca9c9c43ab9c96dfc01b8de9f809cb8b 100644 (file)
--- a/haltests/src/tc_tdm_backend_pp.cpp
+++ b/haltests/src/tc_tdm_backend_pp.cpp
@@ -858,7 +858,7 @@ TEST_P(TDMBackendPP, PPDestroyBeforeDone)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMBackendPPParams,
                                                TDMBackendPP,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMBackendPPParams,
                                                TDMBackendPP,

diff --git a/haltests/src/tc_tdm_buffer.cpp b/haltests/src/tc_tdm_buffer.cpp
index 6ab4e92a25f3be31778903c2cde9aa047a186c03..6d99f043292d047e120c7469a9dfb283a1889af0 100644 (file)
--- a/haltests/src/tc_tdm_buffer.cpp
+++ b/haltests/src/tc_tdm_buffer.cpp
@@ -289,7 +289,7 @@ TEST_P(TDMBuffer, BufferRemoveReleaseHandlerNoAdd)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMBufferParams,
                                                TDMBuffer,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMBufferParams,
                                                TDMBuffer,

diff --git a/haltests/src/tc_tdm_client.cpp b/haltests/src/tc_tdm_client.cpp
index 93fc1c5735aeb06c9f8bc80d8cffefac99471f24..4219a25d0095f2b37b1c9325e4c43f6920c12a9e 100644 (file)
--- a/haltests/src/tc_tdm_client.cpp
+++ b/haltests/src/tc_tdm_client.cpp
@@ -2027,7 +2027,7 @@ TEST_F(TDMVirtualOutput, SetModeInvalidIndex)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMClientParams,
                                                TDMClient,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMClientParams,
                                                TDMClient,

diff --git a/haltests/src/tc_tdm_display.cpp b/haltests/src/tc_tdm_display.cpp
index 80e49d81b9f2839213b5b1e967e8a5094ca76fdc..027d5cbba2d2fd7db0cba0f7ca8b6f0d44b34e9b 100644 (file)
--- a/haltests/src/tc_tdm_display.cpp
+++ b/haltests/src/tc_tdm_display.cpp
@@ -489,7 +489,7 @@ TEST_P(TDMDisplay, ModuleGetInfoNullOther)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMDisplayParams,
                                                TDMDisplay,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMDisplayParams,
                                                TDMDisplay,

diff --git a/haltests/src/tc_tdm_env.cpp b/haltests/src/tc_tdm_env.cpp
index 30b73ea4c528550d522a26205d825e4a1c53e5a0..9421fd4670e4e54f1b14315ebe9aebc89554e551 100644 (file)
--- a/haltests/src/tc_tdm_env.cpp
+++ b/haltests/src/tc_tdm_env.cpp
@@ -43,14 +43,8 @@ void TDMEnv::SetUp(void)
        setenv("TBM_DISPLAY_SERVER", "1", 1);
 
 #ifdef TDM_UT_TEST_WITH_PARAMS
-       /* commit_per_vblank depends on backend. can't choose it in frontend side.
-        * this is only for testing.
-        */
-       int commit_per_vblank = ::testing::get<0>(GetParam());
-       tdm_config_set_int(TDM_CONFIG_KEY_GENERAL_COMMIT_PER_VBLANK, commit_per_vblank);
-
-       thread = ::testing::get<1>(GetParam());
-       test_backend = ::testing::get<2>(GetParam());
+       thread = ::testing::get<0>(GetParam());
+       test_backend = ::testing::get<1>(GetParam());
 #else
        test_backend = ::testing::get<0>(GetParam());
 #endif
@@ -148,7 +142,7 @@ TEST_P(TDMEnv, DisplayDeinitWithNULL)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMEnvParams,
                                                TDMEnv,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMEnvParams,
                                                TDMEnv,

diff --git a/haltests/src/tc_tdm_event_loop.cpp b/haltests/src/tc_tdm_event_loop.cpp
index 826ebd32370f74adbd8a66e7c8a6a10b1a9e1183..5f19717a7d319ed32a7d68e6b0441a561131457e 100644 (file)
--- a/haltests/src/tc_tdm_event_loop.cpp
+++ b/haltests/src/tc_tdm_event_loop.cpp
@@ -214,7 +214,7 @@ TEST_P(TDMEventLoop, EventLoopSourceRemoveNullObject)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMEventLoopParams,
                                                TDMEventLoop,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMEventLoopParams,
                                                TDMEventLoop,

diff --git a/haltests/src/tc_tdm_helper.cpp b/haltests/src/tc_tdm_helper.cpp
index 4eb554cfe8664228a7961afe6183e0b877e3d22d..b1e3228dd0f252542a14d7a6320765d3cb584154 100644 (file)
--- a/haltests/src/tc_tdm_helper.cpp
+++ b/haltests/src/tc_tdm_helper.cpp
@@ -444,14 +444,6 @@ TEST_P(TDMHelper, HelperCaptureOutputNullObject)
 
 TEST_P(TDMHelper, HelperCaptureOutputNullOther)
 {
-       for (int o = 0; o < output_count; o++) {
-               tdm_error ret;
-               tdm_output *output = tdm_display_get_output(dpy, o, &ret);
-               EXPECT_EQ(ret, TDM_ERROR_NONE);
-               EXPECT_NE(output, NULL);
-               tdm_helper_output_commit_per_vblank_enabled(output);
-       }
-
        tbm_surface_h dump = (tbm_surface_h)TDM_UT_INVALID_VALUE;
 
        EXPECT_EQ(tdm_helper_capture_output(NULL, dump, 0, 0, TDM_UT_BUFFER_SIZE, TDM_UT_BUFFER_SIZE,
@@ -490,25 +482,10 @@ TEST_P(TDMHelper, HelperGetDisplayInformationNullOther)
        tdm_helper_get_display_information(dpy, NULL, NULL);
 }
 
-TEST_P(TDMHelper, HelperCommitPerVblankEnabled)
-{
-       EXPECT_EQ(tdm_helper_commit_per_vblank_enabled(dpy), 0);
-}
-
-TEST_P(TDMHelper, HelperCommitPerVblankEnabledNullOBject)
-{
-       EXPECT_EQ(tdm_helper_commit_per_vblank_enabled(NULL), 0);
-}
-
-TEST_P(TDMHelper, HelperOutputCommitPerVblankEnabledNullObject)
-{
-       EXPECT_EQ(tdm_helper_output_commit_per_vblank_enabled(NULL), -1);
-}
-
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMHelperParams,
                                                TDMHelper,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMHelperParams,
                                                TDMHelper,

diff --git a/haltests/src/tc_tdm_hwc.cpp b/haltests/src/tc_tdm_hwc.cpp
index 93d4c6ffe76a05f8ca58bfe6e869cff109a60a64..9c8a6bba5e8ce7578540c94c74dd2d6c110ebee3 100644 (file)
--- a/haltests/src/tc_tdm_hwc.cpp
+++ b/haltests/src/tc_tdm_hwc.cpp
@@ -710,7 +710,7 @@ TEST_P(TDMHwc, GetPropertySuccess)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMHwcParams,
                                                TDMHwc,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMHwcParams,
                                                TDMHwc,

diff --git a/haltests/src/tc_tdm_hwc_window.cpp b/haltests/src/tc_tdm_hwc_window.cpp
index e407e7b8d9a0334052371208c50e6446a6c6e195..c2c6ddd26bead7f28c18bee8500c612e5df924e6 100644 (file)
--- a/haltests/src/tc_tdm_hwc_window.cpp
+++ b/haltests/src/tc_tdm_hwc_window.cpp
@@ -439,7 +439,7 @@ TEST_P(TDMHwcWindow, GetPropertyFailWrongId)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMHwcWindowParams,
                                                TDMHwcWindow,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMHwcWindowParams,
                                                TDMHwcWindow,

diff --git a/haltests/src/tc_tdm_layer.cpp b/haltests/src/tc_tdm_layer.cpp
index 34596e96cdcb6eaa76e0a84551947b87676d8025..ec270706767a61080b0428b06345572ea3c3e384 100644 (file)
--- a/haltests/src/tc_tdm_layer.cpp
+++ b/haltests/src/tc_tdm_layer.cpp
@@ -1468,7 +1468,7 @@ TEST_P(TDMLayer, LayerCreateCaptureNullObject)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMLayerParams,
                                                TDMLayer,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMLayerParams,
                                                TDMLayer,

diff --git a/haltests/src/tc_tdm_output.cpp b/haltests/src/tc_tdm_output.cpp
index 9b8a66a4bfa55d2202b76f6cfc05f988bd9148c8..d379ff09d4063bb08ad4e558ee19eddb347b7533 100644 (file)
--- a/haltests/src/tc_tdm_output.cpp
+++ b/haltests/src/tc_tdm_output.cpp
@@ -236,10 +236,7 @@ tc_tdm_output_prepare(tdm_display *dpy, tdm_output *output, bool fill)
 
                TDM_UT_GOTO_IF_FAIL(tc_tdm_layer_set_buffer(layer, buffer) == true, failed);
 
-               if (tdm_helper_output_commit_per_vblank_enabled(output))
-                       TDM_UT_GOTO_IF_FAIL(tdm_layer_commit(layer, NULL, NULL) == TDM_ERROR_NONE, failed);
-               else
-                       TDM_UT_GOTO_IF_FAIL(tdm_output_commit(output, 0, NULL, NULL) == TDM_ERROR_NONE, failed);
+               TDM_UT_GOTO_IF_FAIL(tdm_output_commit(output, 0, NULL, NULL) == TDM_ERROR_NONE, failed);
        }
 
        TDM_UT_GOTO_IF_FAIL(tdm_output_get_conn_status(output, &status) == TDM_ERROR_NONE, failed);
@@ -1520,10 +1517,6 @@ TEST_P(TDMOutput, OutputCommit)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1563,10 +1556,6 @@ TEST_P(TDMOutput, OutputCommitNullOther)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1583,10 +1572,6 @@ TEST_P(TDMOutput, OutputCommitDpmsSuspend)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1606,10 +1591,6 @@ TEST_P(TDMOutput, OutputCommitDpmsOff)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1629,10 +1610,6 @@ TEST_P(TDMOutput, OutputCommitDpmsAOD)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1678,10 +1655,7 @@ TEST_P(TDMOutput, OutputCommitAfterLayerCommit)
 
                EXPECT_EQ(tdm_layer_commit(layer, NULL, NULL), TDM_ERROR_NONE);
 
-               if (!tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       EXPECT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_NONE);
-               else
-                       EXPECT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_BAD_REQUEST);
+               EXPECT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_BAD_REQUEST);
        }
 }
 
@@ -1690,8 +1664,6 @@ TEST_P(TDMOutput, OutputCommitMismatchCommitType)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               if (!tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
                EXPECT_EQ(tdm_output_commit(outputs[o], 0, NULL, NULL), TDM_ERROR_BAD_REQUEST);
        }
 }
@@ -1701,10 +1673,6 @@ TEST_P(TDMOutput, OutputCommitFewTimesInOneVblank)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1735,10 +1703,6 @@ TEST_P(TDMOutput, OutputRemoveCommitHandler)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1764,10 +1728,6 @@ TEST_P(TDMOutput, OutputRemoveCommitHandlerDifferentData)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1793,10 +1753,6 @@ TEST_P(TDMOutput, OutputRemoveCommitHandlerInHandler)
        TDM_UT_SKIP_FLAG(has_outputs);
 
        for (int o = 0; o < output_count; o++) {
-               /* if true, have to use tdm_layer_commit. so skip */
-               if (tdm_helper_output_commit_per_vblank_enabled(outputs[o]))
-                       continue;
-
                if (!tc_tdm_output_is_connected(outputs[o]))
                        continue;
 
@@ -1819,7 +1775,7 @@ TEST_P(TDMOutput, OutputRemoveCommitHandlerInHandler)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMOutputParams,
                                                TDMOutput,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMOutputParams,
                                                TDMOutput,

diff --git a/haltests/src/tc_tdm_vblank.cpp b/haltests/src/tc_tdm_vblank.cpp
index 74d53ca43da084c7b9895f3ac88c537e516b212f..86089851b893e8426ed79f078d74a83372f9e226 100644 (file)
--- a/haltests/src/tc_tdm_vblank.cpp
+++ b/haltests/src/tc_tdm_vblank.cpp
@@ -1471,7 +1471,7 @@ TEST_P(TDMVblank, VblankWaitTimeout)
 #ifdef TDM_UT_TEST_WITH_PARAMS
 INSTANTIATE_TEST_CASE_P(TDMVblankParams,
                                                TDMVblank,
-                                               Combine(Bool(), Bool(), Values(TDM_DEFAULT_MODULE)));
+                                               Combine(Bool(), Values(TDM_DEFAULT_MODULE)));
 #else
 INSTANTIATE_TEST_CASE_P(TDMVblankParams,
                                                TDMVblank,

diff --git a/include/tdm_deprecated.h b/include/tdm_deprecated.h
index 20c452ed03c93ab0ebb1173e36f0ed1312aace0a..b3ac51fd5537362303d167105cf0686064cb8651 100644 (file)
--- a/include/tdm_deprecated.h
+++ b/include/tdm_deprecated.h
@@ -94,15 +94,6 @@ tdm_display_get_backend_info(tdm_display *dpy, const char **name,
 tdm_error
 tdm_display_get_max_layer_count(tdm_display *dpy, int *max_count);
 
-/**
- * @deprecated use @c tdm_helper_output_commit_per_vblank_enabled instead
- * @brief Get whether the commit-per-vblank functionality is enabled or not.
- * @param[in] dpy A display object
- * @return 1 if enabled. Otherwise, 0.
- */
-int
-tdm_helper_commit_per_vblank_enabled(tdm_display *dpy);
-
 /**
  * @brief Commit changes for a output object
  * @details After all change of a output object are applied, a user commit handler

diff --git a/include/tdm_helper.h b/include/tdm_helper.h
index 62f3cb32a20f8bb688a0668de7caf3babe6c5a87..9f6417db9c1c2792587d296160f39c631f94ebb8 100644 (file)
--- a/include/tdm_helper.h
+++ b/include/tdm_helper.h
@@ -224,14 +224,6 @@ tdm_helper_capture_output(tdm_output *output, tbm_surface_h dst_buffer,
 void
 tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len);
 
-/**
- * @brief Get whether the commit-per-vblank functionality is enabled or not for the output.
- * @param[in] output An output the functionality has to be checked for
- * @return -1 if error occurred, 1 if enabled, 0 if disabled.
- */
-int
-tdm_helper_output_commit_per_vblank_enabled(tdm_output *output);
-
 /**
  * @brief Get whether the vblank timer is expired or not for the output.
  * @param[in] output An output the functionality has to be checked for

diff --git a/src/tdm.c b/src/tdm.c
index 350515ec7f385c3cdae3cb1072754c49f822136e..fceeffa4f1d4c1653a84439cf86988c90b204f07 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -1356,7 +1356,6 @@ tdm_display_init(tdm_error *error)
        const char *str;
        tdm_error ret;
        double stamp1, stamp2, start;
-       int mode;
 
        pthread_mutex_lock(&gLock);
 
@@ -1489,24 +1488,6 @@ tdm_display_init(tdm_error *error)
        private_display->init_count = 1;
        g_private_display = private_display;
 
-       /* the COMMIT_PER_VBLANK functionality is ability of an output to support
-        * several operational modes (commit_per_vblank modes) related to tdm_commit;
-        * this functionality can be turned off which means a default mode */
-       mode = tdm_config_get_int(TDM_CONFIG_KEY_GENERAL_COMMIT_PER_VBLANK, 0);
-       if (mode > 0) {
-               tdm_private_module *b = NULL;
-               tdm_private_output *o = NULL;
-
-               /* outputs which support hwc capability can work only
-                * if commit_per_vblank mode is '0' (default mode) */
-               LIST_FOR_EACH_ENTRY(b, &private_display->module_list, link) {
-                       LIST_FOR_EACH_ENTRY(o, &b->output_list, link) {
-                               if (!(o->caps.capabilities & TDM_OUTPUT_CAPABILITY_HWC))
-                                       tdm_output_choose_commit_per_vblank_mode(o, mode);
-                       }
-               }
-       }
-
        if (error)
                *error = TDM_ERROR_NONE;
 

diff --git a/src/tdm_config.h b/src/tdm_config.h
index f9d43a967830a85989162284a7b1560ff400f9c7..fcdab0f8c75c4768c8d9dff15992772e5915cb71 100644 (file)
--- a/src/tdm_config.h
+++ b/src/tdm_config.h
@@ -108,12 +108,6 @@ tdm_config_set_string(const char *key, const char *value);
  */
 #define TDM_CONFIG_KEY_GENERAL_THREAD             "general:thread"
 
-/* enable the tdm commit-per-vblank functionality. [0(disable), 1(enable)]
- * default: 0
- * ex) 1
- */
-#define TDM_CONFIG_KEY_GENERAL_COMMIT_PER_VBLANK  "general:commit_per_vblank"
-
 /* enable the tdm virtual output module. [0(disable), 1(enable)]
  * default: 0
  * ex) 1

diff --git a/src/tdm_display.c b/src/tdm_display.c
index 85a026e95a28c96c463d64a6908079f014c16dfb..32497564cc00ff9695a0d38a6195462be6df23b4 100644 (file)
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -1159,9 +1159,6 @@ tdm_display_voutput_create(tdm_display *dpy, const char *name, tdm_error *error)
                private_voutput->private_output = private_output;
                private_output->private_voutput = private_voutput;
 
-               /* do not use vblank */
-               tdm_output_choose_commit_per_vblank_mode(private_output, 0);
-
                LIST_ADDTAIL(&private_voutput->link, &private_module->voutput_list);
        }
 

diff --git a/src/tdm_helper.c b/src/tdm_helper.c
index 2990bd8e20bf93b9155e22af33bd38f596256e02..0d07631d7ae0d972a813094e3a34c8056a5e899a 100644 (file)
--- a/src/tdm_helper.c
+++ b/src/tdm_helper.c
@@ -1075,26 +1075,6 @@ tdm_helper_get_display_information(tdm_display *dpy, char *reply, int *len)
        _pthread_mutex_unlock(&private_display->lock);
 }
 
-/* LCOV_EXCL_START */
-EXTERN int
-tdm_helper_commit_per_vblank_enabled(tdm_display *dpy)
-{
-       TDM_DEPRECATED("Use tdm_helper_output_commit_per_vblank_enabled");
-
-       return 0;
-}
-/* LCOV_EXCL_STOP */
-
-EXTERN int
-tdm_helper_output_commit_per_vblank_enabled(tdm_output *output)
-{
-       tdm_private_output *private_output = output;
-
-       TDM_RETURN_VAL_IF_FAIL(private_output != NULL, -1);
-
-       return !!private_output->commit_per_vblank;
-}
-
 EXTERN unsigned int
 tdm_helper_output_vblank_timer_expired(tdm_output *output)
 {

diff --git a/src/tdm_monitor_server.c b/src/tdm_monitor_server.c
index b3ccf7e2219dce63be18d4079bfddf7f819b1922..cbba77f6aee7965162c9db86d412794271726c2b 100644 (file)
--- a/src/tdm_monitor_server.c
+++ b/src/tdm_monitor_server.c
@@ -204,37 +204,6 @@ done:
        TDM_SNPRINTF(reply, len, "log path: '%s'\n", path);
 }
 
-static void
-_tdm_monitor_server_choose_commit_per_vblank_mode(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
-{
-       int output_idx;
-       int mode;
-       char *arg;
-       char *end;
-       tdm_error err;
-
-       /* TODO: do we have to provide an ability to choose commit_per_vblank mode outside? */
-
-       if (argc < 4) {
-               _tdm_monitor_server_usage(argv[0], reply, len);
-               return;
-       }
-
-       arg = argv[2];
-       output_idx = strtol(arg, &end, 10);
-
-       arg = argv[3];
-       mode = strtol(arg, &end, 10);
-
-       err = tdm_output_choose_commit_per_vblank_mode(tdm_display_get_output(dpy, output_idx, NULL), mode);
-       if (err != TDM_ERROR_NONE) {
-               TDM_SNPRINTF(reply, len, "an error: output_idx or mode is wrong\n");
-               return;
-       }
-
-       TDM_SNPRINTF(reply, len, "the mode's been set\n");
-}
-
 static void
 _tdm_monitor_server_fps(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
@@ -537,12 +506,6 @@ static struct {
                "<path>",
                "console"
        },
-       {
-               "choose_commit_per_vblank_mode", _tdm_monitor_server_choose_commit_per_vblank_mode,
-               "choose a commit_per_vblank mode for the output",
-               "<output_idx> <mode>",
-               "0 1 or 1 2 or 2 0"
-       },
        {
                "fps", _tdm_monitor_server_fps,
                "enable/disable to print fps",

diff --git a/src/tdm_output.c b/src/tdm_output.c
index d8c3946a023ed9729c247ad7ecb7f313b211dba4..675f5d188ae2a7f4be64ea7e5f5b3a9e4f2b1a0b 100644 (file)
--- a/src/tdm_output.c
+++ b/src/tdm_output.c
@@ -2306,27 +2306,6 @@ tdm_output_unset_mirror(tdm_output *output)
        /* LCOV_EXCL_STOP */
 }
 
-INTERN tdm_error
-tdm_output_choose_commit_per_vblank_mode(tdm_private_output *private_output, int mode)
-{
-       if (!private_output)
-               return TDM_ERROR_INVALID_PARAMETER;
-
-       if (mode < 0 || mode > 2)
-               return TDM_ERROR_INVALID_PARAMETER;
-
-       private_output->commit_per_vblank = mode;
-
-       if (private_output->commit_per_vblank == 0)
-               TDM_INFO("commit per vblank: disable");
-       else if (private_output->commit_per_vblank == 1)
-               TDM_INFO("commit per vblank: enable (1 layer)");
-       else if (private_output->commit_per_vblank == 2)
-               TDM_INFO("commit per vblank: enable (previous commit)");
-
-       return TDM_ERROR_NONE;
-}
-
 /* LCOV_EXCL_START */
 INTERN tdm_error
 tdm_voutput_destroy(tdm_voutput *voutput)

diff --git a/src/tdm_private.h b/src/tdm_private.h
index 4e37bf3d4591a513a475af13c9a6b217b41ac419..1f912c54f61e1c1b01b0bfffa02dddbcad325b1b 100644 (file)
--- a/src/tdm_private.h
+++ b/src/tdm_private.h
@@ -138,9 +138,6 @@ tdm_output_get_dpms_internal(tdm_output *output, tdm_output_dpms *dpms_value);
 tdm_error
 tdm_output_get_dpms_changing(tdm_output *output, int *changing);
 
-tdm_error
-tdm_output_choose_commit_per_vblank_mode(tdm_private_output *private_output, int mode);
-
 void
 tdm_output_remove_vblank_handler_internal(tdm_output *output, tdm_output_vblank_handler func, void *user_data);
 void