Merge branch 'devel/dri3' into devel/tizen

[platform/adaptation/samsung_exynos/xf86-video-exynos.git] / src / crtcconfig / sec_display.c

diff --git a/src/crtcconfig/sec_display.c b/src/crtcconfig/sec_display.c
index ee23479..545ddc7 100644 (file)
--- a/src/crtcconfig/sec_display.c
+++ b/src/crtcconfig/sec_display.c
@@ -57,6 +57,7 @@
 #include "sec_xberc.h"
 #include <xf86RandR12.h>
 #include "common.h"
+#include "sec_dummy.h"
 
 static Bool SECCrtcConfigResize(ScrnInfoPtr pScrn, int width, int height);
 static void SECModeVblankHandler(int fd, unsigned int frame, unsigned int tv_sec,
@@ -523,21 +524,17 @@ secModePreInit (ScrnInfoPtr pScrn, int drm_fd)
 
     xf86CrtcSetSizeRange (pScrn, 320, 200, pSecMode->mode_res->max_width,
                           pSecMode->mode_res->max_height);
-
+#if 1
     for (i = 0; i < pSecMode->mode_res->count_crtcs; i++)
         secCrtcInit (pScrn, pSecMode, i);
 
     for (i = 0; i < pSecMode->mode_res->count_connectors; i++)
         secOutputInit (pScrn, pSecMode, i);
-
+#endif
     for (i = 0; i < pSecMode->plane_res->count_planes; i++)
         secPlaneInit (pScrn, pSecMode, i);
-#ifdef NO_CRTC_MODE
-    if (pSecMode->num_real_crtc == 0 ||
-        pSecMode->num_real_output == 0)
-    {
-        secOutputDummyInit(pScrn, pSecMode, FALSE);
-    }
+#if 0
+    secDummyOutputInit(pScrn, pSecMode, FALSE);
 #endif //NO_CRTC_MODE
     _secSetMainMode (pScrn, pSecMode);
 
@@ -1449,7 +1446,6 @@ secDisplayGetCurMSC (ScrnInfoPtr pScrn, int pipe, CARD64 *ust, CARD64 *msc)
         *msc = 0;
         return TRUE;
     }
-    else
 #endif //NO_CRTC_MODE
     if (pSec->isLcdOff)
     {