From 846db0e0e7ad3cff1fac4437e378c28e60c68bf2 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Tue, 8 Aug 2017 12:02:15 -0500
Subject: [PATCH] ecore_drm2: Remove ecore_drm2_output_geometry_get()

Replaced with ecore_drm2_output_info_get()
---
 src/lib/ecore_drm2/Ecore_Drm2.h                    | 14 --------------
 src/lib/ecore_drm2/ecore_drm2_outputs.c            | 12 ------------
 .../ecore_evas/engines/drm/ecore_evas_drm.c        |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index ef35304c35..d979881867 100644
--- a/src/lib/ecore_drm2/Ecore_Drm2.h
+++ b/src/lib/ecore_drm2/Ecore_Drm2.h
@@ -475,20 +475,6 @@ EAPI Eina_Bool ecore_drm2_output_backlight_get(Ecore_Drm2_Output *output);
  */
 EAPI Ecore_Drm2_Output *ecore_drm2_output_find(Ecore_Drm2_Device *device, int x, int y);
 
-/**
- * Get the geometry of a given output
- *
- * @param output
- * @param x
- * @param y
- * @param w
- * @param h
- *
- * @ingroup Ecore_Drm2_Output_Group
- * @since 1.18
- */
-EAPI void ecore_drm2_output_geometry_get(Ecore_Drm2_Output *output, int *x, int *y, int *w, int *h);
-
 /**
  * Get the dpi of a given output
  *
diff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c b/src/lib/ecore_drm2/ecore_drm2_outputs.c
index f3f13081b0..7cf8198adc 100644
--- a/src/lib/ecore_drm2/ecore_drm2_outputs.c
+++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c
@@ -1117,18 +1117,6 @@ ecore_drm2_output_find(Ecore_Drm2_Device *device, int x, int y)
    return NULL;
 }
 
-EAPI void
-ecore_drm2_output_geometry_get(Ecore_Drm2_Output *output, int *x, int *y, int *w, int *h)
-{
-   EINA_SAFETY_ON_NULL_RETURN(output);
-   EINA_SAFETY_ON_TRUE_RETURN(!output->enabled);
-
-   if (x) *x = output->x;
-   if (y) *y = output->y;
-   if (w) *w = output->current_mode->width;
-   if (h) *h = output->current_mode->height;
-}
-
 EAPI void
 ecore_drm2_output_dpi_get(Ecore_Drm2_Output *output, int *xdpi, int *ydpi)
 {
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 be1bd38567..6d031daef6 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -246,7 +246,7 @@ _drm_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h)
    Ecore_Evas_Engine_Drm_Data *edata;
 
    edata = ee->engine.data;
-   ecore_drm2_output_geometry_get(edata->output, x, y, w, h);
+   ecore_drm2_output_info_get(edata->output, x, y, w, h, NULL);
 }
 
 static void
@@ -490,7 +490,7 @@ _drm_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
         edata->w = ee->w;
         edata->h = ee->h;
 
-        ecore_drm2_output_geometry_get(edata->output, NULL, NULL, &ow, &oh);
+        ecore_drm2_output_info_get(edata->output, NULL, NULL, &ow, &oh, NULL);
         if ((ow == 0) || (oh == 0))
           {
              ow = ee->w;