Remove TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT_HWC_TARGET_BO_DEFAULT

use TBM_BO_DEFAULT flag

Change-Id: Icfcc54899e6c0350d0d04f5decdabeeb41bcff08

diff --git a/backends/virtual/tdm_virtual_display.c b/backends/virtual/tdm_virtual_display.c
index 91854345920e2abf286672fe066c26cf9ccf9753..2a45bf90231d081f4f8b63c73ec81987ed2235f8 100644 (file)
--- a/backends/virtual/tdm_virtual_display.c
+++ b/backends/virtual/tdm_virtual_display.c
@@ -705,7 +705,7 @@ virtual_display_voutput_create(tdm_backend_data *bdata, const char *name, tdm_er
        voutput_data->mmwidth = 10;
        voutput_data->mmheight = 10;
 
-       voutput_data->target_buffer_queue_flag = TBM_BO_SCANOUT;
+       voutput_data->target_buffer_queue_flag = TBM_BO_DEFAULT;
 
        voutput_data->virtual_data = virtual_data;
 

diff --git a/src/tdm.c b/src/tdm.c
index fceeffa4f1d4c1653a84439cf86988c90b204f07..1b28711ac72a24240f21fb6ffbf4a6d8a3331ede 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -805,7 +805,6 @@ _tdm_display_setup(tdm_private_display *private_display)
        tdm_error ret = TDM_ERROR_NONE;
        int output_count = 0;
        int virtual = 0;
-       int virtual_hwc_target_buffer_bo_default = 0;
 
        if (private_display->pp_module && !private_display->pp_module->use_hal_tdm) {
                ret = _tdm_display_update_caps_pp(private_display->pp_module,
@@ -871,10 +870,6 @@ _tdm_display_setup(tdm_private_display *private_display)
                ret = _tdm_display_load_module_with_file(private_display, TDM_VIRTUAL_MODULE);
                TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, failed_update);
                TDM_GOTO_IF_FAIL(private_display->virtual_module != NULL, failed_update);
-
-               virtual_hwc_target_buffer_bo_default = tdm_config_get_int(TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT_HWC_TARGET_BO_DEFAULT, 0);
-               if (virtual_hwc_target_buffer_bo_default)
-                       private_display->virtual_module->use_default_type_bo = 1;
        }
 
        return TDM_ERROR_NONE;

diff --git a/src/tdm_config.h b/src/tdm_config.h
index fcdab0f8c75c4768c8d9dff15992772e5915cb71..5f752f2f58efc155dde3bbcd80fc78cb040f44fe 100644 (file)
--- a/src/tdm_config.h
+++ b/src/tdm_config.h
@@ -114,12 +114,6 @@ tdm_config_set_string(const char *key, const char *value);
  */
 #define TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT  "general:virtual_output"
 
-/* set the tdm virtual output hwc target buffer bo to default. [0(unset), 1(set)]
- * default: 0
- * ex) 1
- */
-#define TDM_CONFIG_KEY_GENERAL_VIRTUAL_OUTPUT_HWC_TARGET_BO_DEFAULT  "general:virtual_output_hwc_target_bo_default"
-
 /* use the global fps to commit. [0(disable), 1(enable)]
  * default: 0
  * ex) 1

diff --git a/src/tdm_display.c b/src/tdm_display.c
index 32497564cc00ff9695a0d38a6195462be6df23b4..9133bc67f679a417bfcaaeb83ca35c2eb83feaeb 100644 (file)
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -1110,19 +1110,10 @@ tdm_display_voutput_create(tdm_display *dpy, const char *name, tdm_error *error)
                goto output_get_fail;
        }
 
-       if (private_module->use_hal_tdm) {
-               if (private_module->use_default_type_bo == 1)
-                       hal_tdm_voutput_set_target_buffer_queue_flag((hal_tdm_voutput *)voutput_backend, TBM_BO_DEFAULT);
-               else
-                       hal_tdm_voutput_set_target_buffer_queue_flag((hal_tdm_voutput *)voutput_backend, TBM_BO_SCANOUT);
-       } else {
-               if (func_voutput->voutput_set_target_buffer_queue_flag) {
-                       if (private_module->use_default_type_bo == 1)
-                               func_voutput->voutput_set_target_buffer_queue_flag(voutput_backend, TBM_BO_DEFAULT);
-                       else
-                               func_voutput->voutput_set_target_buffer_queue_flag(voutput_backend, TBM_BO_SCANOUT);
-               }
-       }
+       if (private_module->use_hal_tdm)
+               hal_tdm_voutput_set_target_buffer_queue_flag((hal_tdm_voutput *)voutput_backend, TBM_BO_DEFAULT);
+       else
+               func_voutput->voutput_set_target_buffer_queue_flag(voutput_backend, TBM_BO_DEFAULT);
 
        ret = tdm_display_update_output(private_display->current_module, output_backend);
        if (ret != TDM_ERROR_NONE) {

diff --git a/src/tdm_private_types.h b/src/tdm_private_types.h
index fd8567f52abd3f22b22f24bce456825ce8437db6..7c646e1e34c1736791dfbfcea8fa72f9c0fccdd5 100644 (file)
--- a/src/tdm_private_types.h
+++ b/src/tdm_private_types.h
@@ -162,9 +162,6 @@ struct _tdm_private_module {
        int fd;
        tdm_event_loop_source *event_source;
 
-       /* backend virtual output target buffer type default set for hwc */
-       int use_default_type_bo;
-
        /* hal tdm */
        int use_hal_tdm;
        hal_tdm_backend *htdm_backend;