summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm2/ecore_drm2_outputs.c
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-06-09 14:20:05 -0400
committerChris Michael <cp.michael@samsung.com>2017-06-09 14:20:05 -0400
commitbbd18510d690cfc02c20e36850a0aea75fd4e4a0 (patch)
tree78b703385c87acc9d2c61e726fd806090f0443e0 /src/lib/ecore_drm2/ecore_drm2_outputs.c
parentde12621c900177b99fd05684f2e101cea9e628f3 (diff)
ecore-drm2: Remove #ifdef HAVE_ATOMIC_DRM
As we now use static_libs/libdrm for compiling ecore-drm2, we can remove the atomic #ifdefs as we can run-time check this now. Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib/ecore_drm2/ecore_drm2_outputs.c')
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_outputs.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c b/src/lib/ecore_drm2/ecore_drm2_outputs.c
index e760c02d74..89a6767133 100644
--- a/src/lib/ecore_drm2/ecore_drm2_outputs.c
+++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c
@@ -193,7 +193,6 @@ _output_edid_parse(Ecore_Drm2_Output *output, const uint8_t *data, size_t len)
193 return 0; 193 return 0;
194} 194}
195 195
196//#ifdef HAVE_ATOMIC_DRM
197static void 196static void
198_output_edid_atomic_find(Ecore_Drm2_Output *output) 197_output_edid_atomic_find(Ecore_Drm2_Output *output)
199{ 198{
@@ -213,7 +212,6 @@ _output_edid_atomic_find(Ecore_Drm2_Output *output)
213 eina_stringshare_replace(&output->serial, output->edid.serial); 212 eina_stringshare_replace(&output->serial, output->edid.serial);
214 } 213 }
215} 214}
216//#endif
217 215
218static void 216static void
219_output_edid_find(Ecore_Drm2_Output *output, const drmModeConnector *conn) 217_output_edid_find(Ecore_Drm2_Output *output, const drmModeConnector *conn)
@@ -576,7 +574,6 @@ _output_matrix_update(Ecore_Drm2_Output *output)
576 eina_matrix4_inverse(&output->inverse, &output->matrix); 574 eina_matrix4_inverse(&output->inverse, &output->matrix);
577} 575}
578 576
579//#ifdef HAVE_ATOMIC_DRM
580static Ecore_Drm2_Crtc_State * 577static Ecore_Drm2_Crtc_State *
581_atomic_state_crtc_duplicate(Ecore_Drm2_Crtc_State *state) 578_atomic_state_crtc_duplicate(Ecore_Drm2_Crtc_State *state)
582{ 579{
@@ -673,7 +670,6 @@ _output_plane_states_get(Ecore_Drm2_Atomic_State *state, unsigned int crtc_id, i
673 670
674 return states; 671 return states;
675} 672}
676//#endif
677 673
678static Eina_Bool 674static Eina_Bool
679_output_create(Ecore_Drm2_Device *dev, const drmModeRes *res, const drmModeConnector *conn, int x, int y, int *w, Eina_Bool cloned) 675_output_create(Ecore_Drm2_Device *dev, const drmModeRes *res, const drmModeConnector *conn, int x, int y, int *w, Eina_Bool cloned)
@@ -756,11 +752,9 @@ _output_create(Ecore_Drm2_Device *dev, const drmModeRes *res, const drmModeConne
756 752
757 _output_modes_create(dev, output, conn); 753 _output_modes_create(dev, output, conn);
758 754
759#ifdef HAVE_ATOMIC_DRM
760 if (_ecore_drm2_use_atomic) 755 if (_ecore_drm2_use_atomic)
761 _output_edid_atomic_find(output); 756 _output_edid_atomic_find(output);
762 else 757 else
763#endif
764 _output_edid_find(output, conn); 758 _output_edid_find(output, conn);
765 759
766 if (output->connected) output->enabled = EINA_TRUE; 760 if (output->connected) output->enabled = EINA_TRUE;
@@ -887,13 +881,11 @@ _output_destroy(Ecore_Drm2_Device *dev, Ecore_Drm2_Output *output)
887 Ecore_Drm2_Plane *plane; 881 Ecore_Drm2_Plane *plane;
888 Ecore_Drm2_Plane_State *pstate; 882 Ecore_Drm2_Plane_State *pstate;
889 883
890#ifdef HAVE_ATOMIC_DRM
891 if (_ecore_drm2_use_atomic) 884 if (_ecore_drm2_use_atomic)
892 { 885 {
893 if (output->prep.atomic_req) 886 if (output->prep.atomic_req)
894 sym_drmModeAtomicFree(output->prep.atomic_req); 887 sym_drmModeAtomicFree(output->prep.atomic_req);
895 } 888 }
896#endif
897 889
898 if (_ecore_drm2_use_atomic) 890 if (_ecore_drm2_use_atomic)
899 { 891 {
@@ -1055,11 +1047,9 @@ ecore_drm2_output_edid_get(Ecore_Drm2_Output *output)
1055 1047
1056 EINA_SAFETY_ON_NULL_RETURN_VAL(output, NULL); 1048 EINA_SAFETY_ON_NULL_RETURN_VAL(output, NULL);
1057 1049
1058#ifdef HAVE_ATOMIC_DRM
1059 if (_ecore_drm2_use_atomic) 1050 if (_ecore_drm2_use_atomic)
1060 blob = output->conn_state->edid.data; 1051 blob = output->conn_state->edid.data;
1061 else 1052 else
1062#endif
1063 { 1053 {
1064 EINA_SAFETY_ON_NULL_RETURN_VAL(output->edid.blob, NULL); 1054 EINA_SAFETY_ON_NULL_RETURN_VAL(output->edid.blob, NULL);
1065 blob = output->edid.blob; 1055 blob = output->edid.blob;
@@ -1266,7 +1256,6 @@ ecore_drm2_output_mode_info_get(Ecore_Drm2_Output_Mode *mode, int *w, int *h, un
1266 if (flags) *flags = mode->flags; 1256 if (flags) *flags = mode->flags;
1267} 1257}
1268 1258
1269#ifdef HAVE_ATOMIC_DRM
1270static Eina_Bool 1259static Eina_Bool
1271_output_mode_atomic_set(Ecore_Drm2_Output *output, Ecore_Drm2_Output_Mode *mode) 1260_output_mode_atomic_set(Ecore_Drm2_Output *output, Ecore_Drm2_Output_Mode *mode)
1272{ 1261{
@@ -1337,7 +1326,6 @@ err:
1337 sym_drmModeAtomicFree(req); 1326 sym_drmModeAtomicFree(req);
1338 return ret; 1327 return ret;
1339} 1328}
1340#endif
1341 1329
1342EAPI Eina_Bool 1330EAPI Eina_Bool
1343ecore_drm2_output_mode_set(Ecore_Drm2_Output *output, Ecore_Drm2_Output_Mode *mode, int x, int y) 1331ecore_drm2_output_mode_set(Ecore_Drm2_Output *output, Ecore_Drm2_Output_Mode *mode, int x, int y)
@@ -1351,11 +1339,9 @@ ecore_drm2_output_mode_set(Ecore_Drm2_Output *output, Ecore_Drm2_Output_Mode *mo
1351 output->y = y; 1339 output->y = y;
1352 output->current_mode = mode; 1340 output->current_mode = mode;
1353 1341
1354#ifdef HAVE_ATOMIC_DRM
1355 if (_ecore_drm2_use_atomic) 1342 if (_ecore_drm2_use_atomic)
1356 ret = _output_mode_atomic_set(output, mode); 1343 ret = _output_mode_atomic_set(output, mode);
1357 else 1344 else
1358#endif
1359 { 1345 {
1360 if (mode) 1346 if (mode)
1361 { 1347 {
@@ -1553,7 +1539,6 @@ ecore_drm2_output_rotation_set(Ecore_Drm2_Output *output, int rotation)
1553 1539
1554 EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE); 1540 EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE);
1555 1541
1556#ifdef HAVE_ATOMIC_DRM
1557 if (_ecore_drm2_use_atomic) 1542 if (_ecore_drm2_use_atomic)
1558 { 1543 {
1559 Eina_List *l; 1544 Eina_List *l;
@@ -1596,7 +1581,6 @@ ecore_drm2_output_rotation_set(Ecore_Drm2_Output *output, int rotation)
1596err: 1581err:
1597 sym_drmModeAtomicFree(req); 1582 sym_drmModeAtomicFree(req);
1598 } 1583 }
1599#endif
1600 1584
1601 return ret; 1585 return ret;
1602} 1586}