meson_display: delete setting zorder API [1/1]
PD#SWPL-199539
Problem:
delete setting zorder API
Solution:
delete setting zorder API
Verify:
sc2
Change-Id: Ida457346df2a5c77c7087c2718ffa8d0da7e6056
Signed-off-by: chen.wang1 <chen.wang1@amlogic.com>
diff --git a/display_framework/src/extension/display_settings/display_settings.h b/display_framework/src/extension/display_settings/display_settings.h
index af3fe11..156aec0 100644
--- a/display_framework/src/extension/display_settings/display_settings.h
+++ b/display_framework/src/extension/display_settings/display_settings.h
@@ -151,7 +151,6 @@
int getDisplayVrrEnabled(DISPLAY_CONNECTOR_TYPE connType );
ENUM_DISPLAY_HDR_MODE getDisplayHdrStatus(DISPLAY_CONNECTOR_TYPE connType );
int setDisplayAutoMode(DISPLAY_CONNECTOR_TYPE connType);
-int setDisplayVideoZorder( unsigned int index, unsigned int zorder, unsigned int flag);
ENUM_DISPLAY_ASPECT_RATIO getDisplayAspectRatioValue(DISPLAY_CONNECTOR_TYPE connType );
int setDisplayAspectRatioValue(ENUM_DISPLAY_ASPECT_RATIO ASPECTRATIO, DISPLAY_CONNECTOR_TYPE connType);
int setDisplayModeAttr(DisplayModeInfo* modeInfo,uint32_t colorDepth,
diff --git a/display_framework/src/extension/display_settings/meson/meson_settings.c b/display_framework/src/extension/display_settings/meson/meson_settings.c
index a3fe2ef..16a596a 100644
--- a/display_framework/src/extension/display_settings/meson/meson_settings.c
+++ b/display_framework/src/extension/display_settings/meson/meson_settings.c
@@ -728,26 +728,6 @@
return ret;
}
-int setDisplayVideoZorder(unsigned int index, unsigned int zorder, unsigned int flag) {
- int ret = -1;
- int fd = -1;
- DEBUG("%s %d set video zorder index:%d,zorder:%d,flag:%d",__FUNCTION__,__LINE__,index,zorder,flag);
- fd = open(DEFAULT_CARD, O_RDWR|O_CLOEXEC);
- if (fd < 0) {
- ERROR("%s %d failed to open device %s", __FUNCTION__,__LINE__,strerror(errno));
- }
- ret = drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1);
- if (ret < 0) {
- ERROR("%s %d no atomic modesetting support", __FUNCTION__,__LINE__);
- }
- ret = meson_drm_setVideoZorder( fd, index, zorder, flag);
- if (ret) {
- ERROR("%s %d set video zorder fail.", __FUNCTION__,__LINE__);
- }
- meson_close_drm(fd);
- return ret;
-}
-
int setDisplayBackGroundColor(unsigned char red, unsigned char green, unsigned char blue,
DISPLAY_CONNECTOR_TYPE connType) {
int res = -1;
diff --git a/display_framework/src/extension/display_settings/meson/meson_settings_Test.c b/display_framework/src/extension/display_settings/meson/meson_settings_Test.c
index 257c383..52d38a5 100644
--- a/display_framework/src/extension/display_settings/meson/meson_settings_Test.c
+++ b/display_framework/src/extension/display_settings/meson/meson_settings_Test.c
@@ -288,20 +288,7 @@
printf("\n setDisplayFunctionAttribute Fail \n");
}
} else if (set == 15 && len == 1) {
- printf("\n please enter the parameters in order(index zorder flag): \n");
- //<--index：Representing video index Index 0 corresponds to modifying video 0;Index 1 corresponds to modifying video 1 -->//
- //<--zpos：Represents the zorder value set-->//
- //<--flag： Make the settings effective Set flag equal to 1 to indicate effectiveness-->//
- int zorder = 0;
- int index = 0;
- int flag = 0;
- len = scanf("%d %d %d", &index,&zorder,&flag);
- if (len == 3) {
- if (setDisplayVideoZorder(index, zorder, flag))
- printf("\n setDisplayVideoZorder fail:\n");
- } else {
- printf("\n \ scanf fail\n");
- }
+ printf("\ncannot set video zorder.\n");
} else if (set == 16 && len == 1) {
printf("dvmode: \n");
int dvmode = -1;