summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-08-08 12:03:12 -0500
committerDerek Foreman <derekf@osg.samsung.com>2017-08-09 14:56:59 -0500
commit5ecfe6a8b5460fb9e16102798ceb027d3935d6af (patch)
tree216b61c60ea009dc0904f2dda878aae7e9aac1a8
parent846db0e0e7ad3cff1fac4437e378c28e60c68bf2 (diff)
ecore_drm2: Remove ecore_drm2_output_crtc_size_get()
Replaced with ecore_drm2_output_info_get()
-rw-r--r--src/lib/ecore_drm2/Ecore_Drm2.h12
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_outputs.c19
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c2
3 files changed, 1 insertions, 32 deletions
diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index d979881867..ea87c19cbb 100644
--- a/src/lib/ecore_drm2/Ecore_Drm2.h
+++ b/src/lib/ecore_drm2/Ecore_Drm2.h
@@ -516,18 +516,6 @@ EAPI unsigned int ecore_drm2_output_crtc_get(Ecore_Drm2_Output *output);
516EAPI Ecore_Drm2_Fb *ecore_drm2_output_latest_fb_get(Ecore_Drm2_Output *output); 516EAPI Ecore_Drm2_Fb *ecore_drm2_output_latest_fb_get(Ecore_Drm2_Output *output);
517 517
518/** 518/**
519 * Get the size of the crtc for a given output
520 *
521 * @param output
522 * @param *w
523 * @param *h
524 *
525 * @ingroup Ecore_Drm2_Output_Group
526 * @since 1.18
527 */
528EAPI void ecore_drm2_output_crtc_size_get(Ecore_Drm2_Output *output, int *w, int *h);
529
530/**
531 * Get if a given output is marked as the primary output 519 * Get if a given output is marked as the primary output
532 * 520 *
533 * @param output 521 * @param output
diff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c b/src/lib/ecore_drm2/ecore_drm2_outputs.c
index 7cf8198adc..4e7db927bf 100644
--- a/src/lib/ecore_drm2/ecore_drm2_outputs.c
+++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c
@@ -1146,25 +1146,6 @@ ecore_drm2_output_latest_fb_get(Ecore_Drm2_Output *output)
1146 return output->next.fb; 1146 return output->next.fb;
1147} 1147}
1148 1148
1149EAPI void
1150ecore_drm2_output_crtc_size_get(Ecore_Drm2_Output *output, int *w, int *h)
1151{
1152 drmModeCrtcPtr crtc;
1153
1154 if (w) *w = 0;
1155 if (h) *h = 0;
1156
1157 EINA_SAFETY_ON_NULL_RETURN(output);
1158
1159 crtc = sym_drmModeGetCrtc(output->fd, output->crtc_id);
1160 if (!crtc) return;
1161
1162 if (w) *w = crtc->width;
1163 if (h) *h = crtc->height;
1164
1165 sym_drmModeFreeCrtc(crtc);
1166}
1167
1168EAPI Eina_Bool 1149EAPI Eina_Bool
1169ecore_drm2_output_primary_get(Ecore_Drm2_Output *output) 1150ecore_drm2_output_primary_get(Ecore_Drm2_Output *output)
1170{ 1151{
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 6d031daef6..f2da72ff6f 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -940,7 +940,7 @@ _ecore_evas_new_internal(const char *device, int x, int y, int w, int h, Eina_Bo
940 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); 940 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
941 _ecore_event_window_direct_cb_set(ee->prop.window, _ecore_evas_input_direct_cb); 941 _ecore_event_window_direct_cb_set(ee->prop.window, _ecore_evas_input_direct_cb);
942 942
943 ecore_drm2_output_crtc_size_get(edata->output, &mw, &mh); 943 ecore_drm2_output_info_get(edata->output, NULL, NULL, &mw, &mh, NULL);
944 944
945 ecore_drm2_device_calibrate(edata->dev, mw, mh); 945 ecore_drm2_device_calibrate(edata->dev, mw, mh);
946 ecore_drm2_device_pointer_max_set(edata->dev, mw, mh); 946 ecore_drm2_device_pointer_max_set(edata->dev, mw, mh);