Implement no LVDS mode.

Change-Id: I1571a631643a3e81a544e7667cdf76e31a27cdfd

diff --git a/src/accel/sec_dri2.c b/src/accel/sec_dri2.c
index da3255e..96e8af9 100644 (file)
--- a/src/accel/sec_dri2.c
+++ b/src/accel/sec_dri2.c
@@ -171,7 +171,9 @@ _initBackBufPixmap (DRI2BufferPtr pBackBuf, DrawablePtr pDraw, Bool canFlip)
         {
             /* pipe is -1 */
             canFlip = FALSE;
-            XDBG_WARNING(MDRI2, "pipe is -1");
+#ifndef NO_CRTC_MODE
+            XDBG_WARNING(MDRI2, "pipe is -1\n");
+#endif
         }
     }
 
@@ -1391,6 +1393,16 @@ SECDri2ScheduleSwapWithRegion (ClientPtr pClient, DrawablePtr pDraw,
         (pSec->dump_xid == 0 || pSec->dump_xid == pDraw->id))
         _saveDrawable (pDraw, pBackBuf, swap_type);
 
+#ifdef NO_CRTC_MODE
+    if (pSec->isCrtcOn == FALSE)
+    {
+        _asyncSwapBuffers (pClient, pDraw, pFrameEvent);
+        _SendSyncDrawDoneMessage(pScreen, pClient, pDraw);
+        _deleteFrame (pDraw, pFrameEvent);
+        return TRUE;
+    }
+    else
+#endif //NO_CRTC_MODE
     /* If lcd is off status, SwapBuffers do not consider the vblank sync.
      * The client that launches after lcd is off wants to render the frame
      * on the fly.

diff --git a/src/accel/sec_exa_sw.c b/src/accel/sec_exa_sw.c
index 1093c05..ea58d3f 100644 (file)
--- a/src/accel/sec_exa_sw.c
+++ b/src/accel/sec_exa_sw.c
@@ -260,7 +260,7 @@ static ExaOpInfo* _swPrepareAccess (PixmapPtr pPix, int index)
     tbm_bo *bos;
     tbm_bo_handle bo_handle;
     SECFbBoDataPtr bo_data;
-    int num_bo;
+    int num_bo = 0;
     int ret;
 
     XDBG_RETURN_VAL_IF_FAIL ((privPixmap != NULL), NULL);
@@ -312,6 +312,16 @@ static ExaOpInfo* _swPrepareAccess (PixmapPtr pPix, int index)
         }
         else
         {
+
+#ifdef NO_CRTC_MODE
+            if (num_bo == 0)
+            {
+                num_bo = 1;
+                bos = (tbm_bo *)calloc(1, sizeof(tbm_bo *));
+                bos[0] = pSec->pFb->default_bo;
+            }
+#endif //NO_CRTC_MODE
+
             op->num = num_bo;
             op->isSame = 0;
 

diff --git a/src/crtcconfig/sec_crtc.c b/src/crtcconfig/sec_crtc.c
index f16c0ce..39d5610 100644 (file)
--- a/src/crtcconfig/sec_crtc.c
+++ b/src/crtcconfig/sec_crtc.c
@@ -61,6 +61,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "sec_accel.h"
 #include "sec_drm_ipp.h"
 #include "fimg2d.h"
+#include "xf86RandR12.h"
 
 static void _cursorRegisterBlockHandler (xf86CrtcPtr pCrtc);
 static void _cursorUnregisterBlockHandler (xf86CrtcPtr pCrtc);
@@ -91,6 +92,8 @@ _overlayEnsureBuffer (xf86CrtcPtr pCrtc, Bool move_layer)
 {
     SECModePtr pSecMode = (SECModePtr) SECPTR (pCrtc->scrn)->pSecMode;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     if (move_layer)
     {
@@ -125,6 +128,8 @@ static Bool
 _overlayEnsureLayer (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if ( pCrtcPriv == NULL)
+        return FALSE;
     int connector_type;
     SECLayerOutput output = LAYER_OUTPUT_LCD;
     SECLayer *layer;
@@ -166,6 +171,8 @@ static Bool
 _overlaySelectBuffer (xf86CrtcPtr pCrtc, Bool move_layer)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     SECModePtr pSecMode = (SECModePtr) SECPTR (pCrtc->scrn)->pSecMode;
 
     if (!_overlayEnsureLayer (pCrtc))
@@ -214,6 +221,8 @@ static Bool
 _cursorEnsureCursorImage(xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     SECPtr pSec = SECPTR (pCrtc->scrn);
 
     int x, y, cursor_x, cursor_y;
@@ -333,6 +342,8 @@ static Bool
 _cursorEnsureCanvas (xf86CrtcPtr pCrtc, SECVideoBuf *vbuf, int width, int height)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     tbm_bo_handle bo_handle;
 
     if (pCrtcPriv->ovl_canvas)
@@ -361,7 +372,8 @@ static Bool
 _cursorEnsureSavedImage (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
-
+    if (pCrtcPriv == NULL)
+        return FALSE;
     if (pCrtcPriv->saved_image)
         return TRUE;
 
@@ -379,6 +391,8 @@ static void
 _cursorSaveImage (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
     SECModePtr pSecMode = (SECModePtr) SECPTR (pCrtc->scrn)->pSecMode;
 
     XDBG_RETURN_IF_FAIL (pCrtcPriv->move_layer == FALSE);
@@ -412,6 +426,8 @@ static void
 _cursorRestoreImage (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     if (!pCrtcPriv->saved_image || !pCrtcPriv->ovl_canvas)
         return;
@@ -436,6 +452,8 @@ static void
 _cursorDrawCursor (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
     int x, y;
 
     XDBG_RETURN_IF_FAIL (pCrtcPriv->ovl_canvas != NULL);
@@ -479,6 +497,8 @@ _cursorReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
 {
     xf86CrtcPtr pCrtc = (xf86CrtcPtr)closure;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
     SECPtr pSec = SECPTR (pCrtc->scrn);
 
     if (pCrtcPriv->move_layer)
@@ -514,7 +534,8 @@ _cursorBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead)
     xf86CrtcPtr pCrtc = (xf86CrtcPtr)data;
     SECPtr pSec = SECPTR (pCrtc->scrn);
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
-
+    if (pCrtcPriv == NULL)
+        return;
     XDBG_RETURN_IF_FAIL (pCrtcPriv->move_layer == FALSE);
 
     if(pSec->ovl_drawable)
@@ -642,9 +663,15 @@ _cursorSetPointerDeviceRotate (DeviceIntPtr dev, int rotate)
 static Bool
 _cursorFindRelativeDevice (xf86CrtcPtr pCrtc)
 {
+    if (pCrtc == NULL)
+    {
+        return FALSE;
+    }
     InputInfoPtr localDevices;
     DeviceIntPtr dev;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     XDBG_TRACE (MCRS, "[%p]  \n", pCrtc);
 
@@ -664,6 +691,8 @@ _cursorRotateHook (CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     ScrnInfoPtr pScrn = (ScrnInfoPtr) unused;
     xf86CrtcPtr pCrtc = xf86CompatCrtc (pScrn);
+    if (pCrtc == NULL)
+        return;
     XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
     PropertyPtr pProp = *rec->ppProp;
     Atom name = pProp->propertyName;
@@ -699,6 +728,8 @@ static void
 _cursorRegisterBlockHandler (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     XDBG_RETURN_IF_FAIL (pCrtcPriv->move_layer == FALSE);
 
@@ -717,6 +748,8 @@ static void
 _cursorUnregisterBlockHandler (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     if (!pCrtcPriv->registered_block_handler)
         return;
@@ -733,6 +766,8 @@ static void
 _cursorMove (xf86CrtcPtr pCrtc, int x, int y)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     if (!pCrtcPriv->move_layer)
         return;
@@ -760,6 +795,8 @@ static void
 _cursorInit (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     XDBG_TRACE (MCRS, "[%p] \n", pCrtc);
 
@@ -772,6 +809,8 @@ static int
 _cursorDestroy (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     XDBG_TRACE (MCRS, "[%p]  \n", pCrtc);
 
@@ -809,6 +848,8 @@ static void
 _cursorShow (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
     SECPtr pSec = SECPTR (pCrtc->scrn);
 
     if(!pSec->enableCursor)
@@ -849,6 +890,8 @@ static void
 _cursorHide (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     XDBG_TRACE (MCRS, "[%p] \n", pCrtc);
 
@@ -891,6 +934,8 @@ _cursorEnable (xf86CrtcPtr pCrtc, Bool enable)
 {
     ScrnInfoPtr pScrn = pCrtc->scrn;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     if (!pCrtcPriv->cursor_show)
         return FALSE;
@@ -951,6 +996,8 @@ _cursorRotate (xf86CrtcPtr pCrtc, int rotate)
 {
     SECPtr pSec = SECPTR (pCrtc->scrn);
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     if (pCrtcPriv->user_rotate == rotate)
         return TRUE;
@@ -1003,6 +1050,8 @@ static Bool
 _cursorChangeStatus (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     SECPtr pSec = SECPTR (pCrtc->scrn);
     int new_value;
 
@@ -1088,6 +1137,8 @@ _flipPixmapInit (xf86CrtcPtr pCrtc)
     ScrnInfoPtr pScrn = pCrtc->scrn;
     SECPtr pSec = SECPTR (pScrn);
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
     int flip_backbufs = pSec->flip_bufs - 1;
     int i;
 
@@ -1105,6 +1156,8 @@ static void
 _flipPixmapDeinit (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
     ScreenPtr pScreen = pCrtc->scrn->pScreen;
     int i;
 
@@ -1140,6 +1193,8 @@ _secCrtcGetFromPipe (ScrnInfoPtr pScrn, int pipe)
     {
         pCrtc = pXf86CrtcConfig->crtc[i];
         pCrtcPriv = pCrtc->driver_private;
+        if (pCrtcPriv == NULL)
+            continue;
         if (pCrtcPriv->pipe == pipe)
         {
             return pCrtc;
@@ -1164,6 +1219,10 @@ SECCrtcSetModeMajor(xf86CrtcPtr pCrtc, DisplayModePtr pMode,
     SECPtr pSec = SECPTR (pScrn);
     SECFbPtr pFb = pSec->pFb;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+    {
+        return TRUE;
+    }
     SECModePtr pSecMode = pCrtcPriv->pSecMode;
     tbm_bo bo = NULL, old_bo = NULL;
     tbm_bo bo_accessibility[2] = {0,}, old_bo_accessibility[2] = {0,};
@@ -1219,7 +1278,9 @@ SECCrtcSetModeMajor(xf86CrtcPtr pCrtc, DisplayModePtr pMode,
 
     ret = secCrtcApply(pCrtc);
     XDBG_GOTO_IF_FAIL (ret == TRUE, fail);
-
+#ifdef NO_CRTC_MODE
+    pSec->isCrtcOn = secCrtcCheckInUseAll(pScrn);
+#endif
     /* set the default external mode */
     secDisplayModeToKmode (pCrtc->scrn, &pSecMode->ext_connector_mode, pMode);
 
@@ -1277,6 +1338,10 @@ static void
 SECCrtcSetCursorPosition (xf86CrtcPtr pCrtc, int x, int y)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+    {
+        return;
+    }
     SECPtr pSec = SECPTR (pCrtc->scrn);
 
     pCrtcPriv->cursor_pos_x = x;
@@ -1319,6 +1384,11 @@ SECCrtcShowCursor (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
 
+    if (pCrtcPriv == NULL)
+    {
+        return;
+    }
+
     XDBG_TRACE (MCRS, "[%p] cursor_show(%d)\n", pCrtc, pCrtcPriv->cursor_show);
 
     if(pCrtcPriv->cursor_show)
@@ -1334,6 +1404,11 @@ SECCrtcHideCursor (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
 
+    if (pCrtcPriv == NULL)
+    {
+        return;
+    }
+
     XDBG_TRACE (MCRS, "[%p] cursor_show(%d)\n", pCrtc, pCrtcPriv->cursor_show);
 
     if(!pCrtcPriv->cursor_show)
@@ -1353,13 +1428,14 @@ SECCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
 
-    if (image == NULL)
+    if (pCrtcPriv == NULL || image == NULL)
+    {
 #ifdef LATEST_XORG
         return FALSE;
 #else
        return;
 #endif
-
+    }
     XDBG_TRACE (MCRS, "[%p] image(%p) \n", pCrtc, image);
 
     if (pCrtcPriv->backup_image)
@@ -1521,6 +1597,10 @@ SECCrtcGammaSet(xf86CrtcPtr pCrtc,
                 CARD16 *red, CARD16 *green, CARD16 *blue, int size)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+    {
+        return;
+    }
     SECModePtr pSecMode = pCrtcPriv->pSecMode;
 
     drmModeCrtcSetGamma(pSecMode->fd, secCrtcID(pCrtcPriv),
@@ -1531,7 +1611,10 @@ static void
 SECCrtcDestroy(xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
-
+    if (pCrtcPriv == NULL)
+    {
+        return;
+    }
     DRI2FrameEventPtr event_ref=NULL, event_next=NULL;
     xorg_list_for_each_entry_safe (event_ref, event_next, &pCrtcPriv->pending_flips, crtc_pending_link)
     {
@@ -1640,7 +1723,15 @@ static const xf86CrtcFuncsRec sec_crtc_funcs =
     .gamma_set = SECCrtcGammaSet,
     .destroy = SECCrtcDestroy,
 };
-
+#ifdef NO_CRTC_MODE
+xf86CrtcPtr
+secCrtcDummyInit (ScrnInfoPtr pScrn)
+{
+    xf86CrtcPtr pCrtc = NULL;
+    pCrtc = xf86CrtcCreate (pScrn, &sec_crtc_funcs);
+    return pCrtc;
+}
+#endif //NO_CRTC_MODE
 void
 secCrtcInit (ScrnInfoPtr pScrn, SECModePtr pSecMode, int num)
 {
@@ -1692,6 +1783,9 @@ secCrtcInit (ScrnInfoPtr pScrn, SECModePtr pSecMode, int num)
     _flipPixmapInit (pCrtc);
 
     xorg_list_add(&(pCrtcPriv->link), &(pSecMode->crtcs));
+#ifdef NO_CRTC_MODE
+    pSecMode->num_real_crtc++;
+#endif
 }
 
 /* check the crtc is on */
@@ -1722,6 +1816,8 @@ secCrtcApply(xf86CrtcPtr pCrtc)
 {
     ScrnInfoPtr pScrn = pCrtc->scrn;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     SECModePtr pSecMode = pCrtcPriv->pSecMode;
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR (pCrtc->scrn);
     uint32_t *output_ids;
@@ -1744,14 +1840,23 @@ secCrtcApply(xf86CrtcPtr pCrtc)
             continue;
 
         pOutputPriv = pOutput->driver_private;
+        if (pOutputPriv == NULL)
+        {
+            continue;
+        }
 
         /* modify the physical size of monitor */
+#if 0
         if (!strcmp(pOutput->name, "LVDS1"))
+#endif
         {
             pOutput->mm_width = pOutputPriv->mode_output->mmWidth;
             pOutput->mm_height = pOutputPriv->mode_output->mmHeight;
-            pOutput->conf_monitor->mon_width = pOutputPriv->mode_output->mmWidth;
-            pOutput->conf_monitor->mon_height = pOutputPriv->mode_output->mmHeight;
+            if (pOutput->conf_monitor)
+            {
+                pOutput->conf_monitor->mon_width = pOutputPriv->mode_output->mmWidth;
+                pOutput->conf_monitor->mon_height = pOutputPriv->mode_output->mmHeight;
+            }
         }
 
         output_ids[output_count] = pOutputPriv->mode_output->connector_id;
@@ -1830,6 +1935,9 @@ secCrtcApply(xf86CrtcPtr pCrtc)
                 continue;
 
             pOutputPriv = pOutput->driver_private;
+#if 1
+        memcpy (&pSecMode->main_lcd_mode, pOutputPriv->mode_output->modes, sizeof(drmModeModeInfo));
+#endif
 
             /* TODO :: soolim :: check this out */
             secOutputDpmsSet(pOutput, DPMSModeOn);
@@ -1972,7 +2080,12 @@ secCrtcGetConnectType (xf86CrtcPtr pCrtc)
         SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
 
         if (pOutput->crtc == pCrtc)
-            return pOutputPriv->mode_output->connector_type;
+        {
+            if (pOutputPriv != NULL)
+                return pOutputPriv->mode_output->connector_type;
+            else
+                return DRM_MODE_CONNECTOR_Unknown;
+        }
     }
 
     return DRM_MODE_CONNECTOR_Unknown;
@@ -1985,6 +2098,8 @@ secCrtcIsFlipping (xf86CrtcPtr pCrtc)
 
     XDBG_RETURN_VAL_IF_FAIL (pCrtc != NULL, FALSE);
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     /* if isFlipping is true, return true */
     if (pCrtcPriv->is_flipping)
@@ -2006,6 +2121,8 @@ secCrtcGetPendingFlip (xf86CrtcPtr pCrtc, DRI2FrameEventPtr pEvent)
 
     XDBG_RETURN_VAL_IF_FAIL (pCrtc != NULL, NULL);
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return NULL;
 
     if (xorg_list_is_empty (&pCrtcPriv->pending_flips))
         return NULL;
@@ -2030,6 +2147,8 @@ secCrtcGetFirstPendingFlip (xf86CrtcPtr pCrtc)
 
     XDBG_RETURN_VAL_IF_FAIL (pCrtc != NULL, NULL);
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return NULL;
 
     if (xorg_list_is_empty (&pCrtcPriv->pending_flips))
         return NULL;
@@ -2055,6 +2174,8 @@ secCrtcAddPendingFlip (xf86CrtcPtr pCrtc, DRI2FrameEventPtr pEvent)
     XDBG_RETURN_IF_FAIL (pCrtc != NULL);
 
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     xorg_list_add(&(pEvent->crtc_pending_link), &(pCrtcPriv->pending_flips));
 }
@@ -2068,6 +2189,8 @@ secCrtcRemovePendingFlip (xf86CrtcPtr pCrtc, DRI2FrameEventPtr pEvent)
     XDBG_RETURN_IF_FAIL (pCrtc != NULL);
 
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     if (xorg_list_is_empty (&pCrtcPriv->pending_flips))
         return;
@@ -2095,6 +2218,8 @@ _secCrtcExecAccessibilityScaleNegative (xf86CrtcPtr pCrtc, tbm_bo src_bo, tbm_bo
     }
 
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     XDBG_RETURN_VAL_IF_FAIL(src_bo != NULL, FALSE);
     XDBG_RETURN_VAL_IF_FAIL(dst_bo != NULL, FALSE);
@@ -2177,6 +2302,8 @@ _secCrtcExecRotate (xf86CrtcPtr pCrtc, tbm_bo src_bo, tbm_bo dst_bo)
     XDBG_RETURN_VAL_IF_FAIL(pCrtc != NULL, FALSE);
 
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     XDBG_RETURN_VAL_IF_FAIL(pCrtcPriv->screen_rotate_prop_id > 0, FALSE);
 
     pSec = SECPTR(pCrtc->scrn);
@@ -2234,6 +2361,8 @@ Bool
 secCrtcExecAccessibility (xf86CrtcPtr pCrtc, tbm_bo src_bo, tbm_bo dst_bo)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     Bool ret = FALSE;
     CARD32 elapsed = 0;
     SECPtr pSec = SECPTR(pCrtc->scrn);
@@ -2267,6 +2396,8 @@ secCrtcEnableAccessibility (xf86CrtcPtr pCrtc)
 
     ScrnInfoPtr pScrn = pCrtc->scrn;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     /* accessibility and screen rotate can't be enable at the same time */
     XDBG_RETURN_VAL_IF_FAIL (pCrtcPriv->screen_rotate_degree == 0, FALSE);
@@ -2381,6 +2512,8 @@ secCrtcEnableScreenRotate (xf86CrtcPtr pCrtc, Bool enable)
 
     ScrnInfoPtr pScrn = pCrtc->scrn;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     int width = pCrtc->mode.HDisplay;
     int height = pCrtc->mode.VDisplay;
     int degree = pCrtcPriv->screen_rotate_degree;
@@ -2479,6 +2612,8 @@ secCrtcScreenRotate (xf86CrtcPtr pCrtc, int degree)
     ScrnInfoPtr pScrn = pCrtc->scrn;
     SECPtr pSec = SECPTR(pCrtc->scrn);
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     CARD32 elapsed[3] = {0,};
 
     if (pCrtcPriv->screen_rotate_degree == degree)
@@ -2535,6 +2670,8 @@ secCrtcTurn (xf86CrtcPtr pCrtc, Bool onoff, Bool always, Bool user)
 {
     SECModePtr pSecMode = SECPTR (pCrtc->scrn)->pSecMode;
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
     int crtc_id = secCrtcID(pCrtcPriv);
     int mode;
 
@@ -2576,6 +2713,8 @@ Bool
 secCrtcCheckOn (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return FALSE;
 
     return pCrtcPriv->onoff;
 }
@@ -2593,6 +2732,9 @@ secCrtcFullFreeFlipPixmap (ScrnInfoPtr pScrn, int crtc_pipe)
 
     pCrtcPriv = pCrtc->driver_private;
 
+    if (pCrtcPriv == NULL)
+        return FALSE;
+
     /* there is a free flip pixmap, return false */
     for (i = 0; i < pCrtcPriv->flip_backpixs.num; i++)
     {
@@ -2623,6 +2765,9 @@ secCrtcGetFreeFlipPixmap (ScrnInfoPtr pScrn, int crtc_pipe, DrawablePtr pDraw, u
 
     pCrtcPriv = pCrtc->driver_private;
 
+    if (pCrtcPriv == NULL)
+        return NULL;
+
     /* check if there is free flip pixmaps */
     if (secCrtcFullFreeFlipPixmap(pScrn, crtc_pipe))
     {
@@ -2704,6 +2849,9 @@ secCrtcRelFlipPixmap (ScrnInfoPtr pScrn, int crtc_pipe, PixmapPtr pPixmap)
 
     pCrtcPriv = pCrtc->driver_private;
 
+    if (pCrtcPriv == NULL)
+        return;
+
     /* release flip pixmap */
     for (i = 0; i < pCrtcPriv->flip_backpixs.num; i++)
     {
@@ -2730,6 +2878,8 @@ secCrtcRelAllFlipPixmap (ScrnInfoPtr pScrn, int crtc_pipe)
     XDBG_RETURN_IF_FAIL(pCrtc != NULL);
 
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
 
     /* release flip pixmap */
     for (i = 0; i < pCrtcPriv->flip_backpixs.num; i++)
@@ -2759,7 +2909,32 @@ secCrtcCountFps(xf86CrtcPtr pCrtc)
         return;
 
     pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return;
     conn_type = secCrtcGetConnectType (pCrtc);
 
     xDbgLogFpsDebugCount (pCrtcPriv->pFpsDebug, conn_type);
 }
+#ifdef NO_CRTC_MODE
+Bool
+secCrtcCheckInUseAll(ScrnInfoPtr pScrn)
+{
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int i;
+    Bool ret = FALSE;
+    if (config == NULL)
+        return ret;
+    for (i = 0; i < config->num_crtc; i++)
+    {
+        xf86CrtcPtr pCrtc = config->crtc[i];
+        if (xf86CrtcInUse(pCrtc))
+        {
+            ret = TRUE;
+            break;
+        }
+    }
+    xf86DrvMsg (pScrn->scrnIndex, X_INFO ,
+                "%s found active CRTC\n", ret?"":"NOT");
+    return ret;
+}
+#endif //NO_CRTC_MODE

diff --git a/src/crtcconfig/sec_crtc.h b/src/crtcconfig/sec_crtc.h
index 64d4a44..e306011 100644 (file)
--- a/src/crtcconfig/sec_crtc.h
+++ b/src/crtcconfig/sec_crtc.h
@@ -123,7 +123,10 @@ typedef struct _secCrtcPriv
     xf86CrtcPtr pCrtc;
     struct xorg_list link;
 } SECCrtcPrivRec, *SECCrtcPrivPtr;
-
+#ifdef NO_CRTC_MODE
+xf86CrtcPtr    secCrtcDummyInit (ScrnInfoPtr pScrn);
+Bool    secCrtcCheckInUseAll(ScrnInfoPtr pScrn);
+#endif
 void    secCrtcInit  (ScrnInfoPtr pScrn, SECModePtr pSecMode, int num);
 Bool    secCrtcOn    (xf86CrtcPtr pCrtc);
 Bool    secCrtcApply (xf86CrtcPtr pCrtc);

diff --git a/src/crtcconfig/sec_display.c b/src/crtcconfig/sec_display.c
index ea09f6f..bf65c55 100644 (file)
--- a/src/crtcconfig/sec_display.c
+++ b/src/crtcconfig/sec_display.c
@@ -55,7 +55,7 @@
 #include "sec_converter.h"
 #include "sec_util.h"
 #include "sec_xberc.h"
-
+#include <xf86RandR12.h>
 #include "common.h"
 
 static Bool SECCrtcConfigResize(ScrnInfoPtr pScrn, int width, int height);
@@ -93,6 +93,8 @@ _secSetMainMode (ScrnInfoPtr pScrn, SECModePtr pSecMode)
     {
         xf86OutputPtr pOutput = pXf86CrtcConfig->output[i];
         SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+        if (!pOutputPriv)
+            continue;
         if (pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_LVDS ||
             pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_Unknown)
         {
@@ -100,7 +102,13 @@ _secSetMainMode (ScrnInfoPtr pScrn, SECModePtr pSecMode)
             return 1;
         }
     }
-
+    if (pSecMode->main_lcd_mode.hdisplay == 0 ||
+        pSecMode->main_lcd_mode.vdisplay == 0)
+    {
+        pSecMode->main_lcd_mode.hdisplay = 640;
+        pSecMode->main_lcd_mode.vdisplay = 480;
+        return 1;
+    }
     return -1;
 }
 
@@ -251,18 +259,21 @@ SECCrtcConfigResize(ScrnInfoPtr pScrn, int width, int height)
                pScrn->virtualX,
                pScrn->virtualY,
                width, height);
-
+#ifdef NO_CRTC_MODE
+    pSec->isCrtcOn = secCrtcCheckInUseAll(pScrn);
+#else
     if (pScrn->virtualX == width &&
         pScrn->virtualY == height)
     {
         return TRUE;
     }
-
+#endif
     secFbResize(pSec->pFb, width, height);
 
     /* set  the new size of pScrn */
     pScrn->virtualX = width;
     pScrn->virtualY = height;
+    pScrn->displayWidth = width;
     secExaScreenSetScrnPixmap (pScreen);
 
     secOutputDrmUpdate (pScrn);
@@ -515,9 +526,18 @@ secModePreInit (ScrnInfoPtr pScrn, int drm_fd)
 
     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);
+    }
+#endif //NO_CRTC_MODE
     _secSetMainMode (pScrn, pSecMode);
 
+    /* virtaul x and virtual y of the screen is ones from main lcd mode */
+    pScrn->virtualX = pSecMode->main_lcd_mode.hdisplay;
+    pScrn->virtualY = pSecMode->main_lcd_mode.vdisplay;
     xf86InitialConfiguration (pScrn, TRUE);
 
     /* soolim::
@@ -595,6 +615,25 @@ secModeDeinit (ScrnInfoPtr pScrn)
 
     /* mode->rotate_fb_id should have been destroyed already */
 
+#ifdef NO_CRTC_MODE
+    if (pSecMode->num_dummy_output > 0)
+    {
+        xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+        int i;
+        for (i = 0; i < xf86_config->num_crtc; i++)
+        {
+            xf86CrtcPtr pCrtc = xf86_config->crtc[i];
+            xf86CrtcDestroy (pCrtc);
+        }
+
+        for (i = 0; i < xf86_config->num_output; i++)
+        {
+            xf86OutputPtr pOutput = xf86_config->output[i];
+            xf86OutputDestroy(pOutput);
+        }
+    }
+#endif //NO_CRTC_MODE
+
     free (pSecMode);
     pSec->pSecMode = NULL;
 }
@@ -664,6 +703,8 @@ secModeCoveringCrtc (ScrnInfoPtr pScrn, BoxPtr pBox, xf86CrtcPtr pDesiredCrtc, B
 int secModeGetCrtcPipe (xf86CrtcPtr pCrtc)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
+    if (pCrtcPriv == NULL)
+        return -1;
     return pCrtcPriv->pipe;
 }
 
@@ -1220,7 +1261,9 @@ secDisplaySetDispSetMode  (ScrnInfoPtr pScrn, SECDisplaySetMode set_mode)
 {
     SECPtr pSec = SECPTR (pScrn);
     SECModePtr pSecMode = pSec->pSecMode;
-
+#ifdef NO_CRTC_MODE
+    return TRUE;
+#endif
     if (pSecMode->set_mode == set_mode)
     {
         XDBG_INFO (MDISP, "set_mode(%d) is already set\n", set_mode);
@@ -1391,6 +1434,15 @@ secDisplayGetCurMSC (ScrnInfoPtr pScrn, int pipe, CARD64 *ust, CARD64 *msc)
     SECModePtr pSecMode = pSec->pSecMode;
 
     /* if lcd is off, return true with msc = 0 */
+#ifdef NO_CRTC_MODE
+    if (pSec->isCrtcOn == FALSE)
+    {
+        *ust = 0;
+        *msc = 0;
+        return TRUE;
+    }
+    else
+#endif //NO_CRTC_MODE
     if (pSec->isLcdOff)
     {
         *ust = 0;
@@ -1569,10 +1621,19 @@ Bool secDisplayUpdateRequest(ScrnInfoPtr pScrn)
     Bool ret = FALSE;
     SECPageFlipPtr pPageFlip = NULL;
 
+#ifdef NO_CRTC_MODE
+    if (pCrtc == NULL)
+        return FALSE;
+#else
     XDBG_RETURN_VAL_IF_FAIL (pCrtc != NULL, FALSE);
-
+#endif
     pCrtcPriv =  pCrtc->driver_private;
+#ifdef NO_CRTC_MODE
+    if (pCrtcPriv == NULL)
+        return TRUE;
+#else
     XDBG_RETURN_VAL_IF_FAIL (pCrtcPriv != NULL, FALSE);
+#endif
 
     bo = pCrtcPriv->front_bo;
 
@@ -1680,3 +1741,104 @@ fail :
     return ret;
 }
 
+#ifdef NO_CRTC_MODE
+Bool
+secDisplayChangeMode (ScrnInfoPtr pScrn)
+{
+    SECPtr pSec = SECPTR(pScrn);
+    SECModePtr pSecMode = pSec->pSecMode;
+    xf86CrtcPtr pCrtc = NULL;
+    xf86OutputPtr pOutput = NULL;
+    int temp = 99, i = 0;
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    for (i = 0; i < config->num_crtc; i++)
+    {
+        if (config->crtc[i]->active == TRUE)
+        {
+            /* Nothing to do */
+            return TRUE;
+        }
+    }
+    SECOutputPrivPtr output_ref, output_next;
+/* Priority LVDS > HDMI > Virtual */
+    xorg_list_for_each_entry_safe (output_ref, output_next, &pSecMode->outputs, link)
+    {
+        if (output_ref->pOutput->crtc == NULL)
+            continue;
+        if (output_ref->mode_output == NULL)
+            continue;
+        if (output_ref->mode_output->connector_type == DRM_MODE_CONNECTOR_Unknown)
+            continue;
+        if (output_ref->mode_output->connector_type < temp)
+        {
+            pOutput = output_ref->pOutput;
+            pCrtc = output_ref->pOutput->crtc;
+            temp = (int) output_ref->mode_output->connector_type;
+        }
+    }
+
+    if (pCrtc != NULL && pOutput != NULL && pCrtc->active == FALSE)
+    {
+        DisplayModePtr max_mode = xf86CVTMode( 4096, 4096, 60, 0, 0);
+        DisplayModePtr mode =
+                xf86OutputFindClosestMode(pOutput, max_mode);
+        if (mode == NULL)
+        {
+            XDBG_ERROR(MDISP,
+                       "Can't find display mode for output: %s\n", pOutput->name);
+            if (max_mode)
+                free(max_mode);
+            return FALSE;
+        }
+        if (!RRScreenSizeSet(pScrn->pScreen,
+                             mode->HDisplay, mode->VDisplay,
+                             pOutput->mm_width, pOutput->mm_height))
+        {
+            XDBG_ERROR(MDISP,
+                       "Can't setup screen size H:%d V:%d for output: %s\n", mode->HDisplay, mode->VDisplay);
+            if (max_mode)
+                free(max_mode);
+            return FALSE;
+        }
+        if (!xf86CrtcSetModeTransform(pCrtc, mode, RR_Rotate_0, NULL, 0, 0))
+        {
+            XDBG_ERROR(MDISP,
+                       "Can't transform Crtc to mode: %s\n", pCrtc, mode->name);
+            if (max_mode)
+                free(max_mode);
+            RRScreenSizeSet(pScrn->pScreen, 640, 480, 0, 0);
+            return FALSE;
+        }
+        if (max_mode)
+            free(max_mode);
+        pSec->enableCursor = TRUE;
+        secCrtcCursorEnable (pScrn, TRUE);
+//        xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+//        for (temp = 0; temp < config->num_output; temp++)
+//        {
+//            if (config->output[temp] == pOutput)
+//            {
+//                config->compat_output = temp;
+//                break;
+//            }
+//        }
+        xf86SetScrnInfoModes(pScrn);
+        xf86RandR12TellChanged(pScrn->pScreen);
+    }
+
+    if (pSec->isCrtcOn == FALSE)
+    {
+        pSec->enableCursor = FALSE;
+        secCrtcCursorEnable (pScrn, FALSE);
+    }
+
+    if (pCrtc == NULL)
+    {
+        RRScreenSizeSet(pScrn->pScreen, 640, 480, 0, 0);
+        xf86SetScrnInfoModes(pScrn);
+        xf86RandR12TellChanged(pScrn->pScreen);
+    }
+
+    return TRUE;
+}
+#endif

diff --git a/src/crtcconfig/sec_display.h b/src/crtcconfig/sec_display.h
index e45cc05..8e492c8 100644 (file)
--- a/src/crtcconfig/sec_display.h
+++ b/src/crtcconfig/sec_display.h
@@ -103,7 +103,11 @@ typedef struct _secDrmMode
     struct xorg_list outputs;
     struct xorg_list crtcs;
     struct xorg_list planes;
-
+#ifdef NO_CRTC_MODE
+    int num_dummy_output;
+    int num_real_output;
+    int num_real_crtc;
+#endif
     SECDisplaySetMode  set_mode;
     SECDisplayConnMode conn_mode;
     int                rotate;
@@ -178,6 +182,8 @@ int secDisplayDrawablePipe (DrawablePtr pDraw);
 int secDisplayCrtcPipe (ScrnInfoPtr pScrn, int crtc_id);
 
 Bool secDisplayUpdateRequest(ScrnInfoPtr pScrn);
-
+#ifdef NO_CRTC_MODE
+Bool secDisplayChangeMode (ScrnInfoPtr pScrn);
+#endif
 #endif /* __SEC_DISPLAY_H__ */
 

diff --git a/src/crtcconfig/sec_layer.c b/src/crtcconfig/sec_layer.c
index 474c00f..4ff5601 100644 (file)
--- a/src/crtcconfig/sec_layer.c
+++ b/src/crtcconfig/sec_layer.c
@@ -302,6 +302,11 @@ _secLayerWatchVblank (SECLayer *layer)
     SECPtr pSec = SECPTR (layer->pScrn);
 
     /* if lcd is off, do not request vblank information */
+#ifdef NO_CRTC_MODE
+    if (pSec->isCrtcOn == FALSE)
+        return;
+    else
+#endif //NO_CRTC_MODE
     if (pSec->isLcdOff)
         return;
 
@@ -704,6 +709,8 @@ secLayerUpdate (SECLayer *layer)
     {
         xf86CrtcPtr pCrtc = pCrtcConfig->crtc[c];
         SECCrtcPrivPtr pTemp =  pCrtc->driver_private;
+        if (pTemp == NULL)
+            continue;
         if (pTemp->mode_crtc && pTemp->mode_crtc->crtc_id == layer->crtc_id)
         {
             pCrtcPriv = pTemp;

diff --git a/src/crtcconfig/sec_output.c b/src/crtcconfig/sec_output.c
index b0e5e41..13c0e6e 100644 (file)
--- a/src/crtcconfig/sec_output.c
+++ b/src/crtcconfig/sec_output.c
@@ -3,6 +3,7 @@
 xserver-xorg-video-exynos
 
 Copyright 2011 Samsung Electronics co., Ltd. All Rights Reserved.
+Copyright 2013 Intel Corporation
 
 Contact: SooChan Lim <sc1.lim@samsung.com>
 
@@ -116,6 +117,10 @@ static void
 _secOutputAttachEdid(xf86OutputPtr pOutput)
 {
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+    if (pOutputPriv == NULL)
+    {
+        return;
+    }
     drmModeConnectorPtr koutput = pOutputPriv->mode_output;
     SECModePtr pSecMode = pOutputPriv->pSecMode;
     drmModePropertyBlobPtr edid_blob = NULL;
@@ -181,10 +186,30 @@ _secOutputPropertyIgnore(drmModePropertyPtr prop)
 }
 
 static xf86OutputStatus
-SECOutputDetect(xf86OutputPtr output)
+SECOutputDetect(xf86OutputPtr pOutput)
 {
     /* go to the hw and retrieve a new output struct */
-    SECOutputPrivPtr pOutputPriv = output->driver_private;
+    SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+
+    if (pOutputPriv == NULL)
+    {
+#ifdef NO_CRTC_MODE
+        if (pOutput->randr_output && pOutput->randr_output->numUserModes)
+        {
+            xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pOutput->scrn);
+
+            if (xf86_config->output[xf86_config->num_output-1] == pOutput)
+            {
+               SECPtr pSec = (SECPtr) pOutput->scrn->driverPrivate;
+               secOutputDummyInit(pOutput->scrn, pSec->pSecMode, TRUE);
+            }
+
+            return XF86OutputStatusConnected;
+        }
+#endif //NO_CRTC_MODE
+        return XF86OutputStatusDisconnected;
+    }
+
     SECModePtr pSecMode = pOutputPriv->pSecMode;
     xf86OutputStatus status;
 //    char *conn_str[] = {"connected", "disconnected", "unknow"};
@@ -219,7 +244,7 @@ SECOutputDetect(xf86OutputPtr output)
     case DRM_MODE_DISCONNECTED:
         status = XF86OutputStatusDisconnected;
         /* unset write-back clone */
-        secPropUnSetDisplayMode (output);
+        secPropUnSetDisplayMode (pOutput);
         break;
     default:
     case DRM_MODE_UNKNOWNCONNECTION:
@@ -233,12 +258,24 @@ static Bool
 SECOutputModeValid(xf86OutputPtr pOutput, DisplayModePtr pModes)
 {
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+    if (pOutputPriv == NULL)
+    {
+#ifdef NO_CRTC_MODE
+        if (pModes->type & M_T_DEFAULT)
+            return MODE_BAD;
+        return MODE_OK;
+#else
+        return MODE_ERROR;
+#endif //NO_CRTC_MODE
+    }
     drmModeConnectorPtr koutput = pOutputPriv->mode_output;
     int i;
 
     /* driver want to remain available modes which is same as mode
        supported from drmmode */
+#if NO_CRTC_MODE
     if (pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_LVDS)
+#endif
     {
         for (i = 0; i < koutput->count_modes; i++)
         {
@@ -255,9 +292,19 @@ SECOutputModeValid(xf86OutputPtr pOutput, DisplayModePtr pModes)
 static DisplayModePtr
 SECOutputGetModes(xf86OutputPtr pOutput)
 {
+    DisplayModePtr Modes = NULL;
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+    if (pOutputPriv == NULL)
+    {
+#ifdef NO_CRTC_MODE
+        Modes = xf86ModesAdd(Modes, xf86CVTMode(1024,
+                                                768,
+                                                60, 0, 0));
+#endif
+        return Modes;
+    }
+
     drmModeConnectorPtr koutput = pOutputPriv->mode_output;
-    DisplayModePtr Modes = NULL;
     int i;
     SECPtr pSec = SECPTR (pOutput->scrn);
     DisplayModePtr Mode;
@@ -288,6 +335,10 @@ static void
 SECOutputDestory(xf86OutputPtr pOutput)
 {
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+    if (pOutputPriv == NULL)
+    {
+        return;
+    }
     SECPtr pSec = SECPTR (pOutput->scrn);
     int i;
 
@@ -317,6 +368,8 @@ static void
 SECOutputDpms(xf86OutputPtr pOutput, int dpms)
 {
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+    if (pOutputPriv == NULL)
+        return;
     drmModeConnectorPtr koutput = pOutputPriv->mode_output;
     SECModePtr pSecMode = pOutputPriv->pSecMode;
     SECPtr pSec = SECPTR (pOutput->scrn);
@@ -475,6 +528,8 @@ static void
 SECOutputCreateReaources(xf86OutputPtr pOutput)
 {
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+    if (pOutputPriv == NULL)
+        return;
     drmModeConnectorPtr mode_output = pOutputPriv->mode_output;
     SECModePtr pSecMode = pOutputPriv->pSecMode;
     int i, j, err;
@@ -580,6 +635,8 @@ SECOutputSetProperty(xf86OutputPtr output, Atom property,
                      RRPropertyValuePtr value)
 {
     SECOutputPrivPtr pOutputPriv = output->driver_private;
+    if (pOutputPriv == NULL)
+        return TRUE;
     SECModePtr pSecMode = pOutputPriv->pSecMode;
     int i;
 
@@ -636,7 +693,11 @@ SECOutputSetProperty(xf86OutputPtr output, Atom property,
      */
     /* set the hidden properties : features for sec debugging*/
     /* TODO : xberc can works on only LVDS????? */
-    if (pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_LVDS)
+#ifdef NO_CRTC_MODE
+        if ((pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_HDMIA) || (pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_VIRTUAL))
+#else
+        if (pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_LVDS)
+#endif
     {
         if (secPropSetLvdsFunc (output, property, value))
             return TRUE;
@@ -654,6 +715,7 @@ SECOutputSetProperty(xf86OutputPtr output, Atom property,
             return TRUE;
     }
     /* set the hidden properties : features for driver specific funtions */
+#ifndef NO_CRTC_MODE
     if (pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
         pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_HDMIB ||
         pOutputPriv->mode_output->connector_type == DRM_MODE_CONNECTOR_VIRTUAL)
@@ -662,7 +724,7 @@ SECOutputSetProperty(xf86OutputPtr output, Atom property,
         if (secPropSetDisplayMode(output, property, value))
             return TRUE;
     }
-
+#endif
     return TRUE;
 }
 
@@ -698,12 +760,16 @@ static const xf86OutputFuncsRec sec_output_funcs =
 Bool
 secOutputDrmUpdate (ScrnInfoPtr pScrn)
 {
-    SECModePtr pSecMode = (SECModePtr) SECPTR (pScrn)->pSecMode;
+    SECPtr pSec = SECPTR (pScrn);
+    SECModePtr pSecMode = pSec->pSecMode;
     Bool ret = TRUE;
     int i;
 
     for (i = 0; i < pSecMode->mode_res->count_connectors; i++)
     {
+#ifdef NO_CRTC_MODE
+                ret = TRUE;
+#endif
         SECOutputPrivPtr pOutputPriv = NULL;
         SECOutputPrivPtr pCur, pNext;
         drmModeConnectorPtr koutput;
@@ -721,24 +787,38 @@ secOutputDrmUpdate (ScrnInfoPtr pScrn)
 
         if (!pOutputPriv)
         {
+#ifdef NO_CRTC_MODE
+            continue;
+#else
             ret = FALSE;
             break;
+#endif
         }
-
+#ifdef NO_CRTC_MODE
+        pOutputPriv->pOutput->crtc = NULL;
+#endif
         koutput = drmModeGetConnector (pSecMode->fd,
                                        pSecMode->mode_res->connectors[i]);
         if (!koutput)
         {
+#ifdef NO_CRTC_MODE
+            continue;
+#else
             ret = FALSE;
             break;
+#endif
         }
 
         kencoder = drmModeGetEncoder (pSecMode->fd, koutput->encoders[0]);
         if (!kencoder)
         {
             drmModeFreeConnector (koutput);
+#ifdef NO_CRTC_MODE
+            continue;
+#else
             ret = FALSE;
             break;
+#endif
         }
 
         if (pOutputPriv->mode_output)
@@ -754,27 +834,139 @@ secOutputDrmUpdate (ScrnInfoPtr pScrn)
             pOutputPriv->mode_encoder = NULL;
         }
         pOutputPriv->mode_encoder = kencoder;
-
+#ifdef NO_CRTC_MODE
+        SECCrtcPrivPtr crtc_ref=NULL, crtc_next=NULL;
+        xorg_list_for_each_entry_safe (crtc_ref, crtc_next, &pSecMode->crtcs, link)
+        {
+            if (pOutputPriv->mode_encoder->crtc_id == crtc_ref->mode_crtc->crtc_id)
+            {
+                pOutputPriv->pOutput->crtc = crtc_ref->pCrtc;
+            }
+        }
+#endif
         XDBG_INFO (MSEC, "drm update : connect(%d, type:%d, status:%s) encoder(%d) crtc(%d).\n",
                    pSecMode->mode_res->connectors[i], koutput->connector_type,
                    conn_str[pOutputPriv->mode_output->connection-1],
                    kencoder->encoder_id, kencoder->crtc_id);
-#if 0
+#ifdef NO_CRTC_MODE
         /* Does these need to update? */
-        pOutput->mm_width = koutput->mmWidth;
-        pOutput->mm_height = koutput->mmHeight;
-
-        pOutput->possible_crtcs = kencoder->possible_crtcs;
-        pOutput->possible_clones = kencoder->possible_clones;
+        pOutputPriv->pOutput->mm_width = koutput->mmWidth;
+        pOutputPriv->pOutput->mm_height = koutput->mmHeight;
+        pOutputPriv->pOutput->possible_crtcs = kencoder->possible_crtcs;
+        pOutputPriv->pOutput->possible_clones = kencoder->possible_clones;
 #endif
     }
-
+#ifdef NO_CRTC_MODE
+    SECCrtcPrivPtr crtc_ref=NULL, crtc_next=NULL;
+    xorg_list_for_each_entry_safe (crtc_ref, crtc_next, &pSecMode->crtcs, link)
+    {
+        crtc_ref->pCrtc->enabled = xf86CrtcInUse(crtc_ref->pCrtc);
+    }
+    xf86DisableUnusedFunctions(pScrn);
+    pSec->isCrtcOn = secCrtcCheckInUseAll(pScrn);
+#endif
     if (!ret)
         xf86DrvMsg (pScrn->scrnIndex, X_ERROR, "drm(output) update error. (%s)\n", strerror (errno));
-
     return ret;
 }
+#ifdef NO_CRTC_MODE
+Bool
+secOutputDummyInit (ScrnInfoPtr pScrn, SECModePtr pSecMode, Bool late)
+{
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86OutputPtr pOutput;
+    xf86CrtcPtr pCrtc;
+    RROutputPtr clones[32];
+    RRCrtcPtr crtcs[32];
+    char buf[80];
+    int i, len;
+
+    if (pSecMode->num_dummy_output >= 32)
+        return FALSE;
+
+    XDBG_DEBUG(MDISP,"(late=%d, num_dummy=%d)\n", late, pSecMode->num_dummy_output+1);
+
+    len = sprintf(buf, "DUMMY%d", pSecMode->num_dummy_output+1);
+    pOutput = xf86OutputCreate(pScrn, &sec_output_funcs, buf);
+    if (!pOutput)
+    {
+        return FALSE;
+    }
+
+    pCrtc = secCrtcDummyInit(pScrn);
+
+    if (pCrtc == NULL)
+    {
+        xf86OutputDestroy(pOutput);
+        return FALSE;
+    }
+
+    pOutput->mm_width = 0;
+    pOutput->mm_height = 0;
+    pOutput->interlaceAllowed = FALSE;
+    pOutput->subpixel_order = SubPixelNone;
+
+    pOutput->possible_crtcs = ~((1 << pSecMode->num_real_crtc) - 1);
+    pOutput->possible_clones = ~((1 << pSecMode->num_real_output) - 1);
+
+    if (late) {
+        ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
+        pCrtc->randr_crtc = RRCrtcCreate(pScreen, pCrtc);
+        pOutput->randr_output = RROutputCreate(pScreen, buf, len, pOutput);
+        if (pCrtc->randr_crtc == NULL || pOutput->randr_output == NULL)
+        {
+            xf86OutputDestroy(pOutput);
+            xf86CrtcDestroy(pCrtc);
+            return FALSE;
+        }
 
+        RRPostPendingProperties(pOutput->randr_output);
+
+        for (i = pSecMode->num_real_output; i < xf86_config->num_output; i++)
+            clones[i - pSecMode->num_real_output] = xf86_config->output[i]->randr_output;
+        XDBG_RETURN_VAL_IF_FAIL(i - pSecMode->num_real_output == pSecMode->num_dummy_output + 1, FALSE);
+
+        for (i = pSecMode->num_real_crtc; i < xf86_config->num_crtc; i++)
+            crtcs[i - pSecMode->num_real_crtc] = xf86_config->crtc[i]->randr_crtc;
+        XDBG_RETURN_VAL_IF_FAIL(i - pSecMode->num_real_crtc == pSecMode->num_dummy_output + 1, FALSE);
+
+        for (i = pSecMode->num_real_output; i < xf86_config->num_output; i++)
+        {
+            RROutputPtr rr_output = xf86_config->output[i]->randr_output;
+
+            if (!RROutputSetCrtcs(rr_output, crtcs, pSecMode->num_dummy_output + 1) ||
+                !RROutputSetClones(rr_output, clones, pSecMode->num_dummy_output + 1))
+                goto err;
+        }
+
+        RRCrtcSetRotations(pCrtc->randr_crtc,
+                   RR_Rotate_All | RR_Reflect_All);
+    }
+
+    pSecMode->num_dummy_output++;
+    return TRUE;
+
+err:
+    for (i = 0; i < xf86_config->num_output; i++)
+    {
+        pOutput = xf86_config->output[i];
+        if (pOutput->driver_private)
+            continue;
+
+        xf86OutputDestroy(pOutput);
+    }
+
+    for (i = 0; i < xf86_config->num_crtc; i++)
+    {
+        pCrtc = xf86_config->crtc[i];
+        if (pCrtc->driver_private)
+            continue;
+        xf86CrtcDestroy(pCrtc);
+    }
+    pSecMode->num_dummy_output = -1;
+    return FALSE;
+}
+#endif //NO_CRTC_MODE
 void
 secOutputInit (ScrnInfoPtr pScrn, SECModePtr pSecMode, int num)
 {
@@ -838,12 +1030,17 @@ secOutputInit (ScrnInfoPtr pScrn, SECModePtr pSecMode, int num)
     pOutputPriv->pOutput = pOutput;
     /* TODO : soolim : management crtc privates */
     xorg_list_add(&pOutputPriv->link, &pSecMode->outputs);
+#ifdef NO_CRTC_MODE
+    ++(pSecMode->num_real_output);
+#endif
 }
 
 int
 secOutputDpmsStatus(xf86OutputPtr pOutput)
 {
     SECOutputPrivPtr pOutputPriv = pOutput->driver_private;
+    if (pOutputPriv == NULL)
+        return 0;
     return pOutputPriv->dpms_mode;
 }
 
@@ -871,8 +1068,8 @@ secOutputGetPrivateForConnType (ScrnInfoPtr pScrn, int connect_type)
                 return pCur;
         }
     }
-
+#ifndef NO_CRTC_MODE
     XDBG_ERROR (MSEC, "no output for connect_type(%d) \n", connect_type);
-
+#endif
     return NULL;
 }

diff --git a/src/crtcconfig/sec_output.h b/src/crtcconfig/sec_output.h
index 7b9b107..ed789e6 100644 (file)
--- a/src/crtcconfig/sec_output.h
+++ b/src/crtcconfig/sec_output.h
@@ -33,6 +33,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "sec_display.h"
 
+#ifndef RR_Rotate_All
+#define RR_Rotate_All  (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
+#endif //RR_Rotate_All
+#ifndef RR_Reflect_All
+#define RR_Reflect_All (RR_Reflect_X|RR_Reflect_Y)
+#endif //RR_Reflect_All
+
 typedef struct _secOutputPriv
 {
     SECModePtr pSecMode;
@@ -51,8 +58,9 @@ typedef struct _secOutputPriv
     xf86OutputPtr pOutput;
     struct xorg_list link;
 } SECOutputPrivRec, *SECOutputPrivPtr;
-
-
+#ifdef NO_CRTC_MODE
+Bool    secOutputDummyInit  (ScrnInfoPtr pScrn, SECModePtr pSecMode, Bool late);
+#endif
 void    secOutputInit       (ScrnInfoPtr pScrn, SECModePtr pSecMode, int num);
 int     secOutputDpmsStatus (xf86OutputPtr pOutput);
 void    secOutputDpmsSet    (xf86OutputPtr pOutput, int mode);

diff --git a/src/crtcconfig/sec_plane.c b/src/crtcconfig/sec_plane.c
index 6247a04..e1b2220 100644 (file)
--- a/src/crtcconfig/sec_plane.c
+++ b/src/crtcconfig/sec_plane.c
@@ -329,9 +329,24 @@ _check_hw_restriction (ScrnInfoPtr pScrn, int crtc_id, int buf_w,
                        int *new_src_x, int *new_src_w,
                        int *new_dst_x, int *new_dst_w)
 {
-    SECOutputPrivPtr pOutputPriv = secOutputGetPrivateForConnType (pScrn, DRM_MODE_CONNECTOR_LVDS);
+#ifdef NO_CRTC_MODE
+    SECOutputPrivPtr pOutputPriv = NULL;
+    int i = 1;
+    while (i <= DRM_MODE_CONNECTOR_VIRTUAL)
+    {
+        pOutputPriv = secOutputGetPrivateForConnType (pScrn, i++);
+        if (pOutputPriv != NULL && pOutputPriv->pOutput->crtc != NULL)
+            break;
+        pOutputPriv = NULL;
+    }
+    if (pOutputPriv == NULL)
+        return FALSE;
+    int max = pScrn->virtualX;
+#else
     SECModePtr pSecMode = (SECModePtr) SECPTR (pScrn)->pSecMode;
+    SECOutputPrivPtr pOutputPriv = secOutputGetPrivateForConnType (pScrn, DRM_MODE_CONNECTOR_LVDS);
     int max = pSecMode->main_lcd_mode.hdisplay;
+#endif
     int start, end, diff;
     Bool virtual_screen;
 

diff --git a/src/sec.c b/src/sec.c
index e465da6..7be6309 100644 (file)
--- a/src/sec.c
+++ b/src/sec.c
@@ -52,8 +52,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "sec_xberc.h"
 #include "sec_util.h"
 #include "sec_wb.h"
+#include "sec_crtc.h"
 #include <tbm_bufmgr.h>
 #include "fimg2d.h"
+#include "sec_output.h"
 
 #define OPTION_FLIP_BUFFERS 0
 
@@ -409,7 +411,10 @@ _secHwInit (ScrnInfoPtr pScrn, struct pci_device *pPci, char *device)
     else
         xf86DrvMsg (pScrn->scrnIndex, X_CONFIG
                     , "G2D is disabled\n");
-
+#ifdef NO_CRTC_MODE 
+   /*** Temporary disable G2D acceleration for using PIXMAN ***/
+    pSec->is_accel_2d = FALSE;
+#endif
     return TRUE;
 }
 
@@ -668,7 +673,11 @@ SECUdevEventsHandler (int fd, void *closure)
             hotplug && atoi(hotplug) == 1)
     {
         XDBG_INFO(MSEC, "SEC-UDEV: HotPlug\n");
-        RRGetInfo (screenInfo.screens[pScrn->scrnIndex], TRUE);
+        RRGetInfo (xf86ScrnToScreen(pScrn), TRUE);
+#ifdef NO_CRTC_MODE
+        secOutputDrmUpdate (pScrn);
+        secDisplayChangeMode(pScrn);
+#endif
     }
 
     udev_device_unref(dev);
@@ -849,8 +858,17 @@ SECPreInit (ScrnInfoPtr pScrn, int flags)
                     "fail to set the gamma\n");
         goto bail1;
     }
-
+#ifdef NO_CRTC_MODE
+    if (pScrn->modes == NULL)
+    {
+        pScrn->modes = xf86ModesAdd(pScrn->modes,
+                                    xf86CVTMode(pScrn->virtualX,
+                                                pScrn->virtualY,
+                                                60, 0, 0));
+    }
+#endif
     pScrn->currentMode = pScrn->modes;
+
     pScrn->displayWidth = pScrn->virtualX;
     xf86PrintModes (pScrn); /* just print the current mode */
 
@@ -1083,7 +1101,9 @@ SECScreenInit (ScreenPtr pScreen, int argc, char **argv)
 #if USE_XDBG
     xDbgLogPListInit (pScreen);
 #endif
-
+#ifdef NO_CRTC_MODE
+    pSec->isCrtcOn = secCrtcCheckInUseAll(pScrn);
+#endif
     XDBG_KLOG(MSEC, "Init Screen\n");
     return TRUE;
 }

diff --git a/src/sec.h b/src/sec.h
index de04a1b..9d6d075 100644 (file)
--- a/src/sec.h
+++ b/src/sec.h
@@ -127,7 +127,9 @@ typedef struct
     SECVideoPrivPtr pVideoPriv;
 
     Bool isLcdOff; /* lvds connector on/off status */
-
+#ifdef NO_CRTC_MODE
+    Bool isCrtcOn; /* Global crtc status */
+#endif
     /* screen wrapper functions */
     CloseScreenProcPtr CloseScreen;
     CreateScreenResourcesProcPtr CreateScreenResources;

diff --git a/src/xv/sec_video.c b/src/xv/sec_video.c
index f737bf0..769c068 100644 (file)
--- a/src/xv/sec_video.c
+++ b/src/xv/sec_video.c
@@ -1630,7 +1630,13 @@ _secVideoArrangeLayerPos (SECPortPrivPtr pPort, Bool by_notify)
     SECPortPrivPtr pCur = NULL, pNext = NULL;
     SECPortPrivPtr pAnother = NULL;
     int i = 0;
-
+#ifdef NO_CRTC_MODE
+/* Sorry This is temporary part */
+    secCrtcCursorEnable (pPort->pScrn, FALSE);
+    secLayerSetPos (pPort->layer, LAYER_UPPER);
+    return;
+/* ************************* */
+#endif
     xorg_list_for_each_entry_safe (pCur, pNext, &layer_owners, link)
     {
         if (pCur == pPort)
@@ -2453,6 +2459,13 @@ SECVideoPutImage (ScrnInfoPtr pScrn,
                   DrawablePtr pDraw)
 {
     SECPtr pSec = SECPTR (pScrn);
+#ifdef NO_CRTC_MODE
+    if (pSec->isCrtcOn == FALSE)
+    {
+        XDBG_WARNING (MVDO, "XV PutImage Disabled (No active CRTCs)\n");
+        return BadRequest;
+    }
+#endif
     SECModePtr pSecMode = (SECModePtr)SECPTR (pScrn)->pSecMode;
     SECVideoPrivPtr pVideo = SECPTR (pScrn)->pVideoPriv;
     SECPortPrivPtr pPort = (SECPortPrivPtr) data;

diff --git a/src/xv/sec_video_virtual.c b/src/xv/sec_video_virtual.c
index 2272f6b..552e1da 100644 (file)
--- a/src/xv/sec_video_virtual.c
+++ b/src/xv/sec_video_virtual.c
@@ -761,7 +761,7 @@ _secVirtualVideoGetBlackBuffer (SECPortPrivPtr pPort)
 {
     int i;
 
-    if (!pPort->outbuf[0])
+    if (!pPort->outbuf)
     {
         XDBG_RETURN_VAL_IF_FAIL (pPort->pDraw != NULL, NULL);
         _secVirtualVideoEnsureOutBuffers (pPort->pScrn, pPort, pPort->id,
@@ -1071,7 +1071,7 @@ _secVirtualVideoComposite (SECVideoBuf *src, SECVideoBuf *dst,
 }
 
 static int
-_secVirtualVideoCompositeExtLayers (SECPortPrivPtr pPort)
+_secVirtualVideoCompositeExtLayers (SECPortPrivPtr pPort, int connector_type)
 {
     SECVideoBuf *dst_buf = NULL;
     SECLayer    *lower_layer = NULL;
@@ -1081,6 +1081,9 @@ _secVirtualVideoCompositeExtLayers (SECPortPrivPtr pPort)
     int index;
     Bool comp = FALSE;
 
+    if (!_secVirtualVideoEnsureOutBuffers (pPort->pScrn, pPort, pPort->id, pPort->pDraw->width, pPort->pDraw->height))
+        return FALSE;
+
     index = _secVirtualVideoGetOutBufferIndex (pPort);
     if (index < 0)
     {
@@ -1112,7 +1115,9 @@ _secVirtualVideoCompositeExtLayers (SECPortPrivPtr pPort)
     /* before compositing, flush all */
     secUtilCacheFlush (pPort->pScrn);
 
-    ui_buf = _secVirtualVideoGetUIBuffer (pPort, DRM_MODE_CONNECTOR_VIRTUAL);
+    comp = TRUE;//if set to FALSE capture will be black. something with layers?
+
+    ui_buf = _secVirtualVideoGetUIBuffer (pPort, connector_type); //Need to choose active connector DRM_MODE_CONNECTOR_VIRTUAL
     if (ui_buf)
     {
         XDBG_DEBUG (MVA, "ui : %c%c%c%c  %dx%d (%d,%d %dx%d) => dst : %c%c%c%c  %dx%d (%d,%d %dx%d)\n",
@@ -1136,7 +1141,7 @@ _secVirtualVideoCompositeExtLayers (SECPortPrivPtr pPort)
             return FALSE;
         }
 
-        comp = TRUE;
+//        comp = TRUE;
     }
 
     upper_layer = secLayerFind (LAYER_OUTPUT_EXT, LAYER_UPPER);
@@ -1280,7 +1285,7 @@ fail_layer_noti:
 }
 
 static int
-_secVirtualVideoPutStill (SECPortPrivPtr pPort)
+_secVirtualVideoPutStill (SECPortPrivPtr pPort, int connector_type)
 {
     SECModePtr pSecMode = (SECModePtr)SECPTR (pPort->pScrn)->pSecMode;
     SECVideoBuf *pix_buf = NULL;
@@ -1297,12 +1302,12 @@ _secVirtualVideoPutStill (SECPortPrivPtr pPort)
         pPort->retire_timer = NULL;
     }
 
-    comp = FALSE;
+    comp = TRUE;//if set to FALSE capture will be black. something with layers?
 
     pix_buf = _secVirtualVideoGetDrawableBuffer (pPort);
     XDBG_GOTO_IF_FAIL (pix_buf != NULL, done_still);
 
-    ui_buf = _secVirtualVideoGetUIBuffer (pPort, DRM_MODE_CONNECTOR_LVDS);
+    ui_buf = _secVirtualVideoGetUIBuffer (pPort, connector_type);
     XDBG_GOTO_IF_FAIL (ui_buf != NULL, done_still);
 
     tbm_bo_map (pix_buf->bo[0], TBM_DEVICE_2D, TBM_OPTION_WRITE);
@@ -1542,9 +1547,9 @@ _secVirtualVideoPutVideoOnly (SECPortPrivPtr pPort)
 }
 
 static int
-_secVirtualVideoPutExt (SECPortPrivPtr pPort)
+_secVirtualVideoPutExt (SECPortPrivPtr pPort, int active_connector)
 {
-    if (_secVirtualVideoCompositeExtLayers (pPort))
+    if (_secVirtualVideoCompositeExtLayers (pPort, active_connector))
         return Success;
 
     return BadRequest;
@@ -1780,16 +1785,35 @@ SECVirtualVideoPutStill (ScrnInfoPtr pScrn,
 
     pPort->need_damage = TRUE;
 
+    /*find what connector is active*/
+    int active_connector = -1, i = 0; //DRM_MODE_CONNECTOR_HDMIA
+    xf86CrtcConfigPtr pXf86CrtcConfig;
+    xf86OutputPtr pOutput;
+
+    pXf86CrtcConfig = XF86_CRTC_CONFIG_PTR (pPort->pScrn);
+
+    for ( i = 0; i < pXf86CrtcConfig->num_output; i++)
+    {
+        if (pXf86CrtcConfig->output[i]->status == XF86OutputStatusConnected)
+        {
+            pOutput = pXf86CrtcConfig->output[i];
+            if (!strcmp(pOutput->name, "HDMI1"))
+            {
+                active_connector = DRM_MODE_CONNECTOR_HDMIA;
+            } else if (!strcmp(pOutput->name, "Virtual1"))
+            {
+                active_connector = DRM_MODE_CONNECTOR_VIRTUAL;
+            }
+
+        }
+    }
+    XDBG_RETURN_VAL_IF_FAIL (active_connector != -1, BadRequest);
+
     if (pPort->capture == CAPTURE_MODE_STILL && pPort->display == DISPLAY_LCD)
     {
         XDBG_DEBUG (MVA, "still mode.\n");
 
-        if (1)
-            ret = _secVirtualVideoPutStill (pPort);
-        else
-            /* camera buffer can't be mapped. we should use WB to capture screen */
-            ret = _secVirtualVideoPutWB (pPort);
-
+        ret = _secVirtualVideoPutStill (pPort, active_connector);
         XDBG_GOTO_IF_FAIL (ret == Success, put_still_fail);
     }
     else if (pPort->capture == CAPTURE_MODE_STREAM && pPort->display == DISPLAY_LCD)
@@ -1801,8 +1825,11 @@ SECVirtualVideoPutStill (ScrnInfoPtr pScrn,
             ret = BadRequest;
             goto put_still_fail;
         }
-
-        ret = _secVirtualVideoPutWB (pPort);
+//#ifndef SNEAKERS
+        if (0)
+            ret = _secVirtualVideoPutWB (pPort);
+        else
+            ret = _secVirtualVideoPutExt (pPort, active_connector);
         if (ret != Success)
             goto put_still_fail;
     }
@@ -1859,7 +1886,7 @@ SECVirtualVideoPutStill (ScrnInfoPtr pScrn,
                 goto put_still_fail;
             }
 
-            ret = _secVirtualVideoPutExt (pPort);
+            ret = _secVirtualVideoPutExt (pPort, active_connector);
             if (ret != Success)
                 goto put_still_fail;
             break;