Merge branch 'devel/dri3' into devel/tizen

Conflicts:
	src/crtcconfig/sec_crtc.c

Note that Present extension might don't work with "xdbg".
So for using Present you should disable "xdbg" (remove "#define USE_XDBG 1" in "sec.h")
or set the latest version of "xdbg" from tizen.org server

Change-Id: If6f68410d97b87555486187797c0d193771be0a7
Signed-off-by: Roman Marchenko <r.marchenko@samsung.com>

diff --cc src/Makefile.am
Simple merge

diff --cc src/accel/sec_dri2.c
Simple merge

diff --cc src/crtcconfig/sec_display.c
Simple merge

diff --cc src/crtcconfig/sec_display.h
Simple merge

diff --cc src/sec.c
index ce12104,89a4948..ae933ec
--- 1/src/sec.c
--- 2/src/sec.c
+++ b/src/sec.c
@@@ -504,6 -508,18 +508,18 @@@ _checkDriverOptions (ScrnInfoPtr pScrn
          }
      }
  
 -      pSec->is_dri3 = TRUE;
+     /* present */
+     if (xf86ReturnOptValBool (pSec->Options, OPTION_PRESENT, FALSE))
+     {
+         pSec->is_present = TRUE;
+     }
+     
+     /* dri3 */
+     if (xf86ReturnOptValBool (pSec->Options, OPTION_DRI3, FALSE))
+     {
++        pSec->is_dri3 = TRUE;
+     }
+ 
      /* rotate */
      pSec->rotate = RR_Rotate_0;
      if (( s= xf86GetOptValString (pSec->Options, OPTION_ROTATE)))

diff --cc src/sec.h
Simple merge

diff --cc src/util/sec_util.h
Simple merge