From 5ecfe6a8b5460fb9e16102798ceb027d3935d6af Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 8 Aug 2017 12:03:12 -0500 Subject: [PATCH] ecore_drm2: Remove ecore_drm2_output_crtc_size_get() Replaced with ecore_drm2_output_info_get() --- src/lib/ecore_drm2/Ecore_Drm2.h | 12 ------------ src/lib/ecore_drm2/ecore_drm2_outputs.c | 19 ------------------- .../ecore_evas/engines/drm/ecore_evas_drm.c | 2 +- 3 files changed, 1 insertion(+), 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 @@ -515,18 +515,6 @@ EAPI unsigned int ecore_drm2_output_crtc_get(Ecore_Drm2_Output *output); */ EAPI Ecore_Drm2_Fb *ecore_drm2_output_latest_fb_get(Ecore_Drm2_Output *output); -/** - * Get the size of the crtc for a given output - * - * @param output - * @param *w - * @param *h - * - * @ingroup Ecore_Drm2_Output_Group - * @since 1.18 - */ -EAPI void ecore_drm2_output_crtc_size_get(Ecore_Drm2_Output *output, int *w, int *h); - /** * Get if a given output is marked as the primary 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) return output->next.fb; } -EAPI void -ecore_drm2_output_crtc_size_get(Ecore_Drm2_Output *output, int *w, int *h) -{ - drmModeCrtcPtr crtc; - - if (w) *w = 0; - if (h) *h = 0; - - EINA_SAFETY_ON_NULL_RETURN(output); - - crtc = sym_drmModeGetCrtc(output->fd, output->crtc_id); - if (!crtc) return; - - if (w) *w = crtc->width; - if (h) *h = crtc->height; - - sym_drmModeFreeCrtc(crtc); -} - EAPI Eina_Bool ecore_drm2_output_primary_get(Ecore_Drm2_Output *output) { 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 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); _ecore_event_window_direct_cb_set(ee->prop.window, _ecore_evas_input_direct_cb); - ecore_drm2_output_crtc_size_get(edata->output, &mw, &mh); + ecore_drm2_output_info_get(edata->output, NULL, NULL, &mw, &mh, NULL); ecore_drm2_device_calibrate(edata->dev, mw, mh); ecore_drm2_device_pointer_max_set(edata->dev, mw, mh);