summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2012-11-30 15:33:21 +0100
committerThierry Reding <thierry.reding@avionic-design.de>2013-01-09 16:37:10 +0100
commitc62b0c23456ea41607c805f7a9152da420880862 (patch)
tree206a137b849161198081b947c637b8def02809af
parent404b5e2b53578d8b78471da5aaaaa80a85c6acc4 (diff)
Rebrand and cleanup
Rebrand xf86-video-modesetting to xf86-video-opentegra. Furthermore drop some code that will never be used on Tegra (PCI, ...). Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--README9
-rw-r--r--configure.ac35
-rw-r--r--man/opentegra.man (renamed from man/modesetting.man)35
-rw-r--r--src/Makefile.am10
-rw-r--r--src/driver.c1242
-rw-r--r--src/driver.h13
-rw-r--r--src/drmmode_display.c2148
-rw-r--r--src/drmmode_display.h30
9 files changed, 1687 insertions, 1837 deletions
diff --git a/.gitignore b/.gitignore
index dc5a5cd..442fc4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,7 @@ core
*.tar.bz2
*.tar.gz
#
-# Add & Override patterns for xf86-video-modesetting
+# Add & Override patterns for xf86-video-tegra
#
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
diff --git a/README b/README
index 7ca3286..1aab933 100644
--- a/README
+++ b/README
@@ -1,6 +1,5 @@
-This is a generic modesetting driver.
-The idea is to piggy-back the X driver on top of the DRM and Gallium3D
-drivers (DRM for modesetting and Gallium3D for Exa acceleration)
+xf86-video-tegra
+Open-source X.org graphics driver for NVIDIA Tegra
All questions regarding this software should be directed at the
Xorg mailing list:
@@ -13,9 +12,9 @@ Please submit bug reports to the Xorg bugzilla:
The master development code repository can be found at:
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-modesetting
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-tegra
- http://cgit.freedesktop.org/xorg/driver/xf86-video-modesetting
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-tegra
For patch submission instructions, see:
diff --git a/configure.ac b/configure.ac
index 562249e..e448599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,10 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xf86-video-modesetting],
- [0.6.0],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- [xf86-video-modesetting])
+AC_INIT([xf86-video-opentegra],
+ [0.6.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xf86-video-opentegra])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -42,45 +42,40 @@ AC_PROG_LIBTOOL
# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AS_HELP_STRING([--with-xorg-module-dir=DIR],
- [Default xorg module directory [[default=$libdir/xorg/modules]]]),
- [moduledir="$withval"],
- [moduledir="$libdir/xorg/modules"])
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# check for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Checks for pkg-config packages
+# check for X.Org server
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
- HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
- HAVE_XEXTPROTO_71="no")
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
-
-# Checks for libraries.
-
-# Checks for header files.
AC_HEADER_STDC
PKG_CHECK_MODULES(DRM, [libdrm >= 2.2])
-PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
AM_CONDITIONAL(DRM, test "x$DRM" = xyes)
PKG_CHECK_MODULES(UDEV, [libudev], [udev=yes], [udev=no])
if test x"$udev" = xyes; then
- AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
+ AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
fi
SAVE_CFLAGS=$CFLAGS
@@ -91,7 +86,7 @@ AC_CHECK_FUNCS([drmPrimeFDToHandle])
CFLAGS=$SAVE_CFLAGS
LIBS=$SAVE_LIBS
-DRIVER_NAME=modesetting
+DRIVER_NAME=opentegra
AC_SUBST([DRIVER_NAME])
AC_SUBST([moduledir])
diff --git a/man/modesetting.man b/man/opentegra.man
index 34baa9c..d1b9fb2 100644
--- a/man/modesetting.man
+++ b/man/opentegra.man
@@ -1,28 +1,30 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
-.TH MODESETTING __drivermansuffix__ __vendorversion__
+.TH TEGRA __drivermansuffix__ __vendorversion__
.SH NAME
-modesetting \- video driver for framebuffer device
+opentegra \- video driver for NVIDIA Tegra
.SH SYNOPSIS
.nf
.B "Section \*qDevice\*q"
.BI " Identifier \*q" devname \*q
-.B " Driver \*qmodesetting\*q"
-.BI " BusID \*qpci:" bus : dev : func \*q
+.B " Driver \*qopentegra\*q"
\ \ ...
.B EndSection
.fi
.SH DESCRIPTION
-.B modesetting
-is an __xservername__ driver for KMS devices. This is a non-accelerated
-driver, the following framebuffer depths are supported: 8, 15, 16, 24.
-All visual types are supported for depth 8, and TrueColor visual is
-supported for the other depths. RandR 1.2 is supported.
+.B opentegra
+is an __xservername__ driver for NVIDIA Tegra SoCs. It sits on top of
+the Linux kernel NVIDIA Tegra DRM driver. The following framebuffer
+depths are supported: 8, 15, 16, 24. All visual types are supported for
+depth 8, and TrueColor visual is supported for the other depths. RandR
+1.2 is supported.
.SH SUPPORTED HARDWARE
The
-.B modesetting
-driver supports all hardware where a KMS driver is available.
-modesetting uses the Linux DRM KMS ioctls and dumb object create/map.
+.B opentegra
+driver supports all NVIDIA Tegra hardware that is supported by the Linux
+kernel DRM driver.
+.B opentegra
+uses the Linux DRM KMS ioctls and dumb object create/map.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to
@@ -30,19 +32,16 @@ this driver.
.PP
For this driver it is not required to specify modes in the screen
section of the config file. The
-.B modesetting
+.B opentegra
driver can pick up the currently used video mode from the kernel
driver and will use it if there are no video modes configured.
.PP
-For PCI boards you might have to add a BusID line to the Device
-section. See above for a sample line.
-.PP
The following driver
.B Options
are supported:
.TP
-.BI "Option \*qkmsdev\*q \*q" string \*q
-The framebuffer device to use. Default: /dev/dri/card0.
+.BI "Option \*qdevice\*q \*q" string \*q
+The DRI device to use. Default: /dev/dri/card0.
.TP
.BI "Option \*qShadowFB\*q \*q" boolean \*q
Enable or disable use of the shadow framebuffer layer. Default: on.
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cc4624..907249d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,12 +26,12 @@
AM_CFLAGS = $(XORG_CFLAGS) $(DRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS)
-modesetting_drv_la_LTLIBRARIES = modesetting_drv.la
-modesetting_drv_la_LDFLAGS = -module -avoid-version
-modesetting_drv_la_LIBADD = @UDEV_LIBS@ @DRM_LIBS@
-modesetting_drv_ladir = @moduledir@/drivers
+opentegra_drv_la_LTLIBRARIES = opentegra_drv.la
+opentegra_drv_la_LDFLAGS = -module -avoid-version
+opentegra_drv_la_LIBADD = @UDEV_LIBS@ @DRM_LIBS@
+opentegra_drv_ladir = @moduledir@/drivers
-modesetting_drv_la_SOURCES = \
+opentegra_drv_la_SOURCES = \
compat-api.h \
driver.c \
driver.h \
diff --git a/src/driver.c b/src/driver.c
index 05b6176..91049a0 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -35,89 +35,33 @@
#include <unistd.h>
#include <fcntl.h>
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
-#include "xf86Pci.h"
+#include "xf86platformBus.h"
#include "mipointer.h"
#include "micmap.h"
+
#include <X11/extensions/randr.h>
-#include "fb.h"
-#include "edid.h"
-#include "xf86i2c.h"
-#include "xf86Crtc.h"
-#include "miscstruct.h"
+
#include "dixstruct.h"
+#include "scrnintstr.h"
+
+#include "fb.h"
#include "shadow.h"
-#include "xf86xv.h"
-#include <X11/extensions/Xv.h>
-#include <xorg-server.h>
-#ifdef XSERVER_PLATFORM_BUS
-#include "xf86platformBus.h"
-#endif
-#if XSERVER_LIBPCIACCESS
-#include <pciaccess.h>
-#endif
+
+#include "xorg-server.h"
+#include "xf86Crtc.h"
+#include "xf86drm.h"
+#include "xf86drmMode.h"
#include "compat-api.h"
#include "driver.h"
-static void AdjustFrame(ADJUST_FRAME_ARGS_DECL);
-static Bool CloseScreen(CLOSE_SCREEN_ARGS_DECL);
-static Bool EnterVT(VT_FUNC_ARGS_DECL);
-static void Identify(int flags);
-static const OptionInfoRec *AvailableOptions(int chipid, int busid);
-static ModeStatus ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
- int flags);
-static void FreeScreen(FREE_SCREEN_ARGS_DECL);
-static void LeaveVT(VT_FUNC_ARGS_DECL);
-static Bool SwitchMode(SWITCH_MODE_ARGS_DECL);
-static Bool ScreenInit(SCREEN_INIT_ARGS_DECL);
-static Bool PreInit(ScrnInfoPtr pScrn, int flags);
-
-static Bool Probe(DriverPtr drv, int flags);
-static Bool ms_pci_probe(DriverPtr driver,
- int entity_num, struct pci_device *device,
- intptr_t match_data);
-static Bool ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op,
- void *data);
-
-#ifdef XSERVER_LIBPCIACCESS
-static const struct pci_id_match ms_device_match[] = {
- {
- PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
- 0x00030000, 0x00ffffff, 0
- },
-
- { 0, 0, 0 },
-};
-#endif
-
-#ifdef XSERVER_PLATFORM_BUS
-static Bool ms_platform_probe(DriverPtr driver,
- int entity_num, int flags, struct xf86_platform_device *device,
- intptr_t match_data);
-#endif
-
-_X_EXPORT DriverRec modesetting = {
- 1,
- "modesetting",
- Identify,
- Probe,
- AvailableOptions,
- NULL,
- 0,
- ms_driver_func,
- ms_device_match,
- ms_pci_probe,
-#ifdef XSERVER_PLATFORM_BUS
- ms_platform_probe,
-#endif
-};
-
static SymTabRec Chipsets[] = {
- {0, "kms" },
- {-1, NULL}
+ { 0, "kms" },
+ { -1, NULL }
};
typedef enum
@@ -125,583 +69,368 @@ typedef enum
OPTION_SW_CURSOR,
OPTION_DEVICE_PATH,
OPTION_SHADOW_FB,
-} modesettingOpts;
+} TegraOptions;
static const OptionInfoRec Options[] = {
- {OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_DEVICE_PATH, "kmsdev", OPTV_STRING, {0}, FALSE },
- {OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE },
- {-1, NULL, OPTV_NONE, {0}, FALSE}
+ { OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, { 0 }, FALSE },
+ { OPTION_DEVICE_PATH, "device", OPTV_STRING, { 0 }, FALSE },
+ { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, { 0 }, FALSE },
+ { -1, NULL, OPTV_NONE, { 0 }, FALSE }
};
-int modesettingEntityIndex = -1;
+int tegraEntityIndex = -1;
-static MODULESETUPPROTO(Setup);
-
-static XF86ModuleVersionInfo VersRec = {
- "modesetting",
- MODULEVENDORSTRING,
- MODINFOSTRING1,
- MODINFOSTRING2,
- XORG_VERSION_CURRENT,
- PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
- ABI_CLASS_VIDEODRV,
- ABI_VIDEODRV_VERSION,
- MOD_CLASS_VIDEODRV,
- {0, 0, 0, 0}
-};
-
-_X_EXPORT XF86ModuleData modesettingModuleData = { &VersRec, Setup, NULL };
-
-static pointer
-Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+static int
+dispatch_dirty_region(ScrnInfoPtr scrn, PixmapPtr pixmap, DamagePtr damage,
+ int fb_id)
{
- static Bool setupDone = 0;
-
- /* This module should be loaded only once, but check to be sure.
- */
- if (!setupDone) {
- setupDone = 1;
- xf86AddDriver(&modesetting, module, HaveDriverFuncs);
-
- /*
- * The return value must be non-NULL on success even though there
- * is no TearDownProc.
- */
- return (pointer) 1;
- } else {
- if (errmaj)
- *errmaj = LDR_ONCEONLY;
- return NULL;
- }
-}
+ TegraPtr tegra = TegraPTR(scrn);
+ RegionPtr dirty = DamageRegion(damage);
+ unsigned num_cliprects = REGION_NUM_RECTS(dirty);
-static void
-Identify(int flags)
-{
- xf86PrintChipsets("modesetting", "Driver for Modesetting Kernel Drivers",
- Chipsets);
-}
+ if (num_cliprects) {
+ drmModeClip *clip = malloc(num_cliprects * sizeof(drmModeClip));
+ BoxPtr rect = REGION_RECTS(dirty);
+ int i, ret;
+
+ if (!clip)
+ return -ENOMEM;
+
+ /* XXX no need for copy? */
+ for (i = 0; i < num_cliprects; i++, rect++) {
+ clip[i].x1 = rect->x1;
+ clip[i].y1 = rect->y1;
+ clip[i].x2 = rect->x2;
+ clip[i].y2 = rect->y2;
+ }
-static int open_hw(char *dev)
-{
- int fd;
- if (dev)
- fd = open(dev, O_RDWR, 0);
- else {
- dev = getenv("KMSDEVICE");
- if ((NULL == dev) || ((fd = open(dev, O_RDWR, 0)) == -1)) {
- dev = "/dev/dri/card0";
- fd = open(dev,O_RDWR, 0);
- }
+ /* TODO query connector property to see if this is needed */
+ ret = drmModeDirtyFB(tegra->fd, fb_id, clip, num_cliprects);
+ free(clip);
+ DamageEmpty(damage);
+ if (ret) {
+ if (ret == -EINVAL)
+ return ret;
+ }
}
- if (fd == -1)
- xf86DrvMsg(-1, X_ERROR,"open %s: %s\n", dev, strerror(errno));
- return fd;
+ return 0;
}
-static Bool probe_hw(char *dev)
+static void dispatch_dirty(ScreenPtr pScreen)
{
- int fd = open_hw(dev);
- if (fd != -1) {
- close(fd);
- return TRUE;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
+ TegraPtr tegra = TegraPTR(scrn);
+ PixmapPtr pixmap = pScreen->GetScreenPixmap(pScreen);
+ int fb_id = tegra->drmmode.fb_id;
+ int ret;
+
+ ret = dispatch_dirty_region(scrn, pixmap, tegra->damage, fb_id);
+ if (ret == -EINVAL || ret == -ENOSYS) {
+ tegra->dirty_enabled = FALSE;
+ DamageUnregister(&pScreen->GetScreenPixmap(pScreen)->drawable,
+ tegra->damage);
+ DamageDestroy(tegra->damage);
+ tegra->damage = NULL;
+ xf86DrvMsg(scrn->scrnIndex, X_INFO, "Disabling kernel dirty updates, not required.\n");
+ return;
}
- return FALSE;
}
-static char *
-ms_DRICreatePCIBusID(const struct pci_device *dev)
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+static void dispatch_dirty_crtc(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
{
- char *busID;
-
- if (asprintf(&busID, "pci:%04x:%02x:%02x.%d",
- dev->domain, dev->bus, dev->dev, dev->func) == -1)
- return NULL;
+ TegraPtr tegra = TegraPTR(scrn);
+ PixmapPtr pixmap = crtc->randr_crtc->scanout_pixmap;
+ TegraPixmapPrivPtr ppriv = TegraGetPixmapPriv(&tegra->drmmode, pixmap);
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ DamagePtr damage = drmmode_crtc->slave_damage;
+ int fb_id = ppriv->fb_id;
+ int ret;
- return busID;
+ ret = dispatch_dirty_region(scrn, pixmap, damage, fb_id);
+ if (ret) {
+ }
}
-
-static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
+static void dispatch_slave_dirty(ScreenPtr pScreen)
{
- int fd = open_hw(dev);
- char *id, *devid;
- drmSetVersion sv;
-
- if (fd == -1)
- return FALSE;
-
- sv.drm_di_major = 1;
- sv.drm_di_minor = 4;
- sv.drm_dd_major = -1;
- sv.drm_dd_minor = -1;
- if (drmSetInterfaceVersion(fd, &sv)) {
- close(fd);
- return FALSE;
- }
-
-
- id = drmGetBusid(fd);
- devid = ms_DRICreatePCIBusID(pdev);
- close(fd);
-
- if (!id || !devid)
- return FALSE;
-
- if (!strcmp(id, devid))
- return TRUE;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ int c;
- return FALSE;
-}
-static const OptionInfoRec *
-AvailableOptions(int chipid, int busid)
-{
- return Options;
-}
+ for (c = 0; c < xf86_config->num_crtc; c++) {
+ xf86CrtcPtr crtc = xf86_config->crtc[c];
-static Bool
-ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data)
-{
- xorgHWFlags *flag;
-
- switch (op) {
- case GET_REQUIRED_HW_INTERFACES:
- flag = (CARD32 *)data;
- (*flag) = 0;
- return TRUE;
- default:
- return FALSE;
- }
-}
+ if (!crtc->randr_crtc)
+ continue;
-#if XSERVER_LIBPCIACCESS
-static Bool
-ms_pci_probe(DriverPtr driver,
- int entity_num, struct pci_device *dev, intptr_t match_data)
-{
- ScrnInfoPtr scrn = NULL;
+ if (!crtc->randr_crtc->scanout_pixmap)
+ continue;
- scrn = xf86ConfigPciEntity(scrn, 0, entity_num, NULL,
- NULL, NULL, NULL, NULL, NULL);
- if (scrn) {
- char *devpath;
- GDevPtr devSection = xf86GetDevFromEntity(scrn->entityList[0],
- scrn->entityInstanceList[0]);
-
- devpath = xf86FindOptionValue(devSection->options, "kmsdev");
- if (probe_hw_pci(devpath, dev)) {
- scrn->driverVersion = 1;
- scrn->driverName = "modesetting";
- scrn->name = "modeset";
- scrn->Probe = NULL;
- scrn->PreInit = PreInit;
- scrn->ScreenInit = ScreenInit;
- scrn->SwitchMode = SwitchMode;
- scrn->AdjustFrame = AdjustFrame;
- scrn->EnterVT = EnterVT;
- scrn->LeaveVT = LeaveVT;
- scrn->FreeScreen = FreeScreen;
- scrn->ValidMode = ValidMode;
-
- xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
- "claimed PCI slot %d@%d:%d:%d\n",
- dev->bus, dev->domain, dev->dev, dev->func);
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "using %s\n", devpath ? devpath : "default device");
- } else
- scrn = NULL;
+ dispatch_dirty_crtc(scrn, crtc);
}
- return scrn != NULL;
}
#endif
-#ifdef XSERVER_PLATFORM_BUS
static Bool
-ms_platform_probe(DriverPtr driver,
- int entity_num, int flags, struct xf86_platform_device *dev, intptr_t match_data)
+GetRec(ScrnInfoPtr pScrn)
{
- ScrnInfoPtr scrn = NULL;
- char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
- int scr_flags = 0;
-
- if (flags & PLATFORM_PROBE_GPU_SCREEN)
- scr_flags = XF86_ALLOCATE_GPU_SCREEN;
-
- if (probe_hw(path)) {
- scrn = xf86AllocateScreen(driver, scr_flags);
- xf86AddEntityToScreen(scrn, entity_num);
+ if (pScrn->driverPrivate)
+ return TRUE;
- scrn->driverName = "modesetting";
- scrn->name = "modesetting";
- scrn->PreInit = PreInit;
- scrn->ScreenInit = ScreenInit;
- scrn->SwitchMode = SwitchMode;
- scrn->AdjustFrame = AdjustFrame;
- scrn->EnterVT = EnterVT;
- scrn->LeaveVT = LeaveVT;
- scrn->FreeScreen = FreeScreen;
- scrn->ValidMode = ValidMode;
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "using drv %s\n", path ? path : "default device");
- }
+ pScrn->driverPrivate = xnfcalloc(sizeof(TegraRec), 1);
- return scrn != NULL;
+ return TRUE;
}
-#endif
-static Bool
-Probe(DriverPtr drv, int flags)
+static void
+FreeRec(ScrnInfoPtr pScrn)
{
- int i, numDevSections;
- GDevPtr *devSections;
- Bool foundScreen = FALSE;
- char *dev;
- ScrnInfoPtr scrn = NULL;
-
- /* For now, just bail out for PROBE_DETECT. */
- if (flags & PROBE_DETECT)
- return FALSE;
-
- /*
- * Find the config file Device sections that match this
- * driver, and return if there are none.
- */
- if ((numDevSections = xf86MatchDevice("modesetting", &devSections)) <= 0) {
- return FALSE;
- }
-
- for (i = 0; i < numDevSections; i++) {
+ if (!pScrn)
+ return;
- dev = xf86FindOptionValue(devSections[i]->options,"kmsdev");
- if (probe_hw(dev)) {
- int entity;
- entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
- scrn = xf86ConfigFbEntity(scrn, 0, entity,
- NULL, NULL, NULL, NULL);
- }
-
- if (scrn) {
- foundScreen = TRUE;
- scrn->driverVersion = 1;
- scrn->driverName = "modesetting";
- scrn->name = "modesetting";
- scrn->Probe = Probe;
- scrn->PreInit = PreInit;
- scrn->ScreenInit = ScreenInit;
- scrn->SwitchMode = SwitchMode;
- scrn->AdjustFrame = AdjustFrame;
- scrn->EnterVT = EnterVT;
- scrn->LeaveVT = LeaveVT;
- scrn->FreeScreen = FreeScreen;
- scrn->ValidMode = ValidMode;
-
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "using %s\n", dev ? dev : "default device");
- }
- }
+ if (!pScrn->driverPrivate)
+ return;
- free(devSections);
+ free(pScrn->driverPrivate);
- return foundScreen;
+ pScrn->driverPrivate = NULL;
}
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
static Bool
-GetRec(ScrnInfoPtr pScrn)
+TegraSetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
{
- if (pScrn->driverPrivate)
- return TRUE;
+ ScreenPtr screen = ppix->drawable.pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ TegraPtr tegra = TegraPTR(scrn);
+ Bool ret;
+ int size = ppix->devKind * ppix->drawable.height;
+ int ihandle = (int)(long)fd_handle;
- pScrn->driverPrivate = xnfcalloc(sizeof(modesettingRec), 1);
+ ret = drmmode_SetSlaveBO(ppix, &tegra->drmmode, ihandle, ppix->devKind,
+ size);
+ if (ret == FALSE)
+ return ret;
return TRUE;
}
+#endif
-static int dispatch_dirty_region(ScrnInfoPtr scrn,
- PixmapPtr pixmap,
- DamagePtr damage,
- int fb_id)
+static void
+TegraIdentify(int flags)
{
- modesettingPtr ms = modesettingPTR(scrn);
- RegionPtr dirty = DamageRegion(damage);
- unsigned num_cliprects = REGION_NUM_RECTS(dirty);
-
- if (num_cliprects) {
- drmModeClip *clip = malloc(num_cliprects * sizeof(drmModeClip));
- BoxPtr rect = REGION_RECTS(dirty);
- int i, ret;
-
- if (!clip)
- return -ENOMEM;
-
- /* XXX no need for copy? */
- for (i = 0; i < num_cliprects; i++, rect++) {
- clip[i].x1 = rect->x1;
- clip[i].y1 = rect->y1;
- clip[i].x2 = rect->x2;
- clip[i].y2 = rect->y2;
- }
-
- /* TODO query connector property to see if this is needed */
- ret = drmModeDirtyFB(ms->fd, fb_id, clip, num_cliprects);
- free(clip);
- DamageEmpty(damage);
- if (ret) {
- if (ret == -EINVAL)
- return ret;
- }
- }
- return 0;
+ xf86PrintChipsets("opentegra", "Open Source Driver for NVIDIA Tegra",
+ Chipsets);
}
-static void dispatch_dirty(ScreenPtr pScreen)
+static int
+TegraOpenHardware(const char *dev)
{
- ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(scrn);
- PixmapPtr pixmap = pScreen->GetScreenPixmap(pScreen);
- int fb_id = ms->drmmode.fb_id;
- int ret;
+ int fd;
- ret = dispatch_dirty_region(scrn, pixmap, ms->damage, fb_id);
- if (ret == -EINVAL || ret == -ENOSYS) {
- ms->dirty_enabled = FALSE;
- DamageUnregister(&pScreen->GetScreenPixmap(pScreen)->drawable, ms->damage);
- DamageDestroy(ms->damage);
- ms->damage = NULL;
- xf86DrvMsg(scrn->scrnIndex, X_INFO, "Disabling kernel dirty updates, not required.\n");
- return;
+ if (dev)
+ fd = open(dev, O_RDWR, 0);
+ else {
+ dev = getenv("KMSDEVICE");
+ if ((dev == NULL) || ((fd = open(dev, O_RDWR, 0)) == -1)) {
+ dev = "/dev/dri/card0";
+ fd = open(dev,O_RDWR, 0);
+ }
}
-}
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
-static void dispatch_dirty_crtc(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
-{
- modesettingPtr ms = modesettingPTR(scrn);
- PixmapPtr pixmap = crtc->randr_crtc->scanout_pixmap;
- msPixmapPrivPtr ppriv = msGetPixmapPriv(&ms->drmmode, pixmap);
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- DamagePtr damage = drmmode_crtc->slave_damage;
- int fb_id = ppriv->fb_id;
- int ret;
-
- ret = dispatch_dirty_region(scrn, pixmap, damage, fb_id);
- if (ret) {
+ if (fd == -1)
+ xf86DrvMsg(-1, X_ERROR, "open %s: %s\n", dev, strerror(errno));
- }
+ return fd;
}
-static void dispatch_slave_dirty(ScreenPtr pScreen)
+static Bool
+TegraProbeHardware(const char *dev)
{
- ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- int c;
-
- for (c = 0; c < xf86_config->num_crtc; c++) {
- xf86CrtcPtr crtc = xf86_config->crtc[c];
-
- if (!crtc->randr_crtc)
- continue;
- if (!crtc->randr_crtc->scanout_pixmap)
- continue;
+ int fd;
- dispatch_dirty_crtc(scrn, crtc);
+ fd = TegraOpenHardware(dev);
+ if (fd != -1) {
+ close(fd);
+ return TRUE;
}
+
+ return FALSE;
}
-#endif
-static void msBlockHandler(BLOCKHANDLER_ARGS_DECL)
+static const OptionInfoRec *
+TegraAvailableOptions(int chipid, int busid)
{
- SCREEN_PTR(arg);
- modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
-
- pScreen->BlockHandler = ms->BlockHandler;
- pScreen->BlockHandler(BLOCKHANDLER_ARGS);
- pScreen->BlockHandler = msBlockHandler;
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
- if (pScreen->isGPU)
- dispatch_slave_dirty(pScreen);
- else
-#endif
- if (ms->dirty_enabled)
- dispatch_dirty(pScreen);
+ return Options;
}
-static void
-FreeRec(ScrnInfoPtr pScrn)
+static Bool
+TegraDriverFunc(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data)
{
- if (!pScrn)
- return;
-
- if (!pScrn->driverPrivate)
- return;
-
- free(pScrn->driverPrivate);
+ xorgHWFlags *flag;
- pScrn->driverPrivate = NULL;
+ switch (op) {
+ case GET_REQUIRED_HW_INTERFACES:
+ flag = (CARD32 *)data;
+ (*flag) = 0;
+ return TRUE;
+ default:
+ return FALSE;
+ }
}
static Bool
-PreInit(ScrnInfoPtr pScrn, int flags)
+TegraPreInit(ScrnInfoPtr pScrn, int flags)
{
- modesettingPtr ms;
+ TegraPtr tegra;
rgb defaultWeight = { 0, 0, 0 };
EntityInfoPtr pEnt;
- EntPtr msEnt = NULL;
- char *BusID = NULL, *devicename;
+ EntPtr tegraEnt = NULL;
+ char *devicename;
Bool prefer_shadow = TRUE;
uint64_t value = 0;
int ret;
int bppflags;
int defaultdepth, defaultbpp;
+ Gamma zeros = { 0.0, 0.0, 0.0 };
if (pScrn->numEntities != 1)
- return FALSE;
+ return FALSE;
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
- if (flags & PROBE_DETECT) {
- return FALSE;
- }
+ if (flags & PROBE_DETECT)
+ return FALSE;
/* Allocate driverPrivate */
if (!GetRec(pScrn))
- return FALSE;
+ return FALSE;
- ms = modesettingPTR(pScrn);
- ms->SaveGeneration = -1;
- ms->pEnt = pEnt;
+ tegra = TegraPTR(pScrn);
+ tegra->SaveGeneration = -1;
+ tegra->pEnt = pEnt;
- pScrn->displayWidth = 640; /* default it */
+ pScrn->displayWidth = 640; /* default it */
/* Allocate an entity private if necessary */
if (xf86IsEntityShared(pScrn->entityList[0])) {
- msEnt = xf86GetEntityPrivate(pScrn->entityList[0],
- modesettingEntityIndex)->ptr;
- ms->entityPrivate = msEnt;
+ tegraEnt = xf86GetEntityPrivate(pScrn->entityList[0],
+ tegraEntityIndex)->ptr;
+ tegra->entityPrivate = tegraEnt;
} else
- ms->entityPrivate = NULL;
+ tegra->entityPrivate = NULL;
if (xf86IsEntityShared(pScrn->entityList[0])) {
- if (xf86IsPrimInitDone(pScrn->entityList[0])) {
- /* do something */
- } else {
- xf86SetPrimInitDone(pScrn->entityList[0]);
- }
+ if (xf86IsPrimInitDone(pScrn->entityList[0])) {
+ /* do something */
+ } else {
+ xf86SetPrimInitDone(pScrn->entityList[0]);
+ }
}
pScrn->monitor = pScrn->confScreen->monitor;
pScrn->progClock = TRUE;
pScrn->rgbBits = 8;
-#if XSERVER_PLATFORM_BUS
if (pEnt->location.type == BUS_PLATFORM) {
- char *path = xf86_get_platform_device_attrib(pEnt->location.id.plat, ODEV_ATTRIB_PATH);
- ms->fd = open_hw(path);
- }
- else
-#endif
- if (pEnt->location.type == BUS_PCI) {
- ms->PciInfo = xf86GetPciInfoForEntity(ms->pEnt->index);
- if (ms->PciInfo) {
- BusID = malloc(64);
- sprintf(BusID, "PCI:%d:%d:%d",
-#if XSERVER_LIBPCIACCESS
- ((ms->PciInfo->domain << 8) | ms->PciInfo->bus),
- ms->PciInfo->dev, ms->PciInfo->func
-#else
- ((pciConfigPtr) ms->PciInfo->thisCard)->busnum,
- ((pciConfigPtr) ms->PciInfo->thisCard)->devnum,
- ((pciConfigPtr) ms->PciInfo->thisCard)->funcnum
-#endif
- );
- }
- ms->fd = drmOpen(NULL, BusID);
+ char *path;
+ path = xf86_get_platform_device_attrib(pEnt->location.id.plat,
+ ODEV_ATTRIB_PATH);
+ tegra->fd = TegraOpenHardware(path);
} else {
- devicename = xf86FindOptionValue(ms->pEnt->device->options, "kmsdev");
- ms->fd = open_hw(devicename);
+ devicename = xf86GetOptValString(tegra->pEnt->device->options,
+ OPTION_DEVICE_PATH);
+ tegra->fd = TegraOpenHardware(devicename);
}
- if (ms->fd < 0)
- return FALSE;
- ms->drmmode.fd = ms->fd;
+ if (tegra->fd < 0)
+ return FALSE;
+
+ tegra->drmmode.fd = tegra->fd;
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
pScrn->capabilities = 0;
#ifdef DRM_CAP_PRIME
- ret = drmGetCap(ms->fd, DRM_CAP_PRIME, &value);
+ ret = drmGetCap(tegra->fd, DRM_CAP_PRIME, &value);
if (ret == 0) {
if (value & DRM_PRIME_CAP_IMPORT)
pScrn->capabilities |= RR_Capability_SinkOutput;
}
#endif
#endif
- drmmode_get_default_bpp(pScrn, &ms->drmmode, &defaultdepth, &defaultbpp);
+ drmmode_get_default_bpp(pScrn, &tegra->drmmode, &defaultdepth, &defaultbpp);
if (defaultdepth == 24 && defaultbpp == 24)
- bppflags = Support24bppFb;
+ bppflags = Support24bppFb;
else
- bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb;
-
- if (!xf86SetDepthBpp
- (pScrn, defaultdepth, defaultdepth, defaultbpp, bppflags))
- return FALSE;
+ bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb;
+
+ if (!xf86SetDepthBpp(pScrn, defaultdepth, defaultdepth, defaultbpp,
+ bppflags))
+ return FALSE;
switch (pScrn->depth) {
case 15:
case 16:
case 24:
- break;
+ break;
+
default:
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Given depth (%d) is not supported by the driver\n",
- pScrn->depth);
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Given depth (%d) is not supported by the driver\n",
+ pScrn->depth);
+ return FALSE;
}
+
xf86PrintDepthBpp(pScrn);
/* Process the options */
xf86CollectOptions(pScrn, NULL);
- if (!(ms->Options = malloc(sizeof(Options))))
- return FALSE;
- memcpy(ms->Options, Options, sizeof(Options));
- xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, ms->Options);
+
+ tegra->Options = malloc(sizeof(Options));
+ if (!tegra->Options)
+ return FALSE;
+
+ memcpy(tegra->Options, Options, sizeof(Options));
+ xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, tegra->Options);
if (!xf86SetWeight(pScrn, defaultWeight, defaultWeight))
- return FALSE;
+ return FALSE;
+
if (!xf86SetDefaultVisual(pScrn, -1))
- return FALSE;
+ return FALSE;
- if (xf86ReturnOptValBool(ms->Options, OPTION_SW_CURSOR, FALSE)) {
- ms->drmmode.sw_cursor = TRUE;
- }
+ if (xf86ReturnOptValBool(tegra->Options, OPTION_SW_CURSOR, FALSE))
+ tegra->drmmode.sw_cursor = TRUE;
- ret = drmGetCap(ms->fd, DRM_CAP_DUMB_PREFER_SHADOW, &value);
- if (!ret) {
- prefer_shadow = !!value;
- }
+ ret = drmGetCap(tegra->fd, DRM_CAP_DUMB_PREFER_SHADOW, &value);
+ if (!ret)
+ prefer_shadow = !!value;
- ms->drmmode.shadow_enable = xf86ReturnOptValBool(ms->Options, OPTION_SHADOW_FB, prefer_shadow);
+ tegra->drmmode.shadow_enable = xf86ReturnOptValBool(tegra->Options,
+ OPTION_SHADOW_FB,
+ prefer_shadow);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ShadowFB: preferred %s, enabled %s\n", prefer_shadow ? "YES" : "NO", ms->drmmode.shadow_enable ? "YES" : "NO");
- if (drmmode_pre_init(pScrn, &ms->drmmode, pScrn->bitsPerPixel / 8) == FALSE) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "KMS setup failed\n");
- goto fail;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "ShadowFB: preferred %s, enabled %s\n",
+ prefer_shadow ? "YES" : "NO",
+ tegra->drmmode.shadow_enable ? "YES" : "NO");
+
+ if (!drmmode_pre_init(pScrn, &tegra->drmmode, pScrn->bitsPerPixel / 8)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "KMS setup failed\n");
+ return FALSE;
}
/*
* If the driver can do gamma correction, it should call xf86SetGamma() here.
*/
- {
- Gamma zeros = { 0.0, 0.0, 0.0 };
-
- if (!xf86SetGamma(pScrn, zeros)) {
- return FALSE;
- }
- }
+ if (!xf86SetGamma(pScrn, zeros))
+ return FALSE;
if (pScrn->modes == NULL) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n");
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n");
+ return FALSE;
}
pScrn->currentMode = pScrn->modes;
@@ -710,194 +439,255 @@ PreInit(ScrnInfoPtr pScrn, int flags)
xf86SetDpi(pScrn, 0, 0);
/* Load the required sub modules */
- if (!xf86LoadSubModule(pScrn, "fb")) {
- return FALSE;
- }
+ if (!xf86LoadSubModule(pScrn, "fb"))
+ return FALSE;
- if (ms->drmmode.shadow_enable) {
- if (!xf86LoadSubModule(pScrn, "shadow")) {
- return FALSE;
- }
+ if (tegra->drmmode.shadow_enable) {
+ if (!xf86LoadSubModule(pScrn, "shadow"))
+ return FALSE;
}
return TRUE;
- fail:
- return FALSE;
+}
+
+/*
+ * This gets called when gaining control of the VT, and from ScreenInit().
+ */
+static Bool
+TegraEnterVT(VT_FUNC_ARGS_DECL)
+{
+ SCRN_INFO_PTR(arg);
+ TegraPtr tegra = TegraPTR(pScrn);
+
+ pScrn->vtSema = TRUE;
+
+ if (drmSetMaster(tegra->fd))
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "drmSetMaster failed: %s\n",
+ strerror(errno));
+
+ if (!drmmode_set_desired_modes(pScrn, &tegra->drmmode))
+ return FALSE;
+
+ return TRUE;
+}
+
+static void
+TegraLeaveVT(VT_FUNC_ARGS_DECL)
+{
+ SCRN_INFO_PTR(arg);
+ TegraPtr tegra = TegraPTR(pScrn);
+ xf86_hide_cursors(pScrn);
+
+ pScrn->vtSema = FALSE;
+
+ drmDropMaster(tegra->fd);
+}
+
+static Bool
+TegraShadowInit(ScreenPtr pScreen)
+{
+ if (!shadowSetup(pScreen))
+ return FALSE;
+
+ return TRUE;
}
static void *
-msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
- CARD32 *size, void *closure)
+TegraShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
+ CARD32 *size, void *closure)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
- modesettingPtr ms = modesettingPTR(pScrn);
+ TegraPtr tegra = TegraPTR(pScrn);
int stride;
stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
*size = stride;
- return ((uint8_t *)ms->drmmode.front_bo->ptr + row * stride + offset);
+ return ((uint8_t *)tegra->drmmode.front_bo->ptr + row * stride + offset);
}
static Bool
-CreateScreenResources(ScreenPtr pScreen)
+TegraCreateScreenResources(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
+ TegraPtr tegra = TegraPTR(pScrn);
PixmapPtr rootPixmap;
Bool ret;
void *pixels;
- pScreen->CreateScreenResources = ms->createScreenResources;
+ pScreen->CreateScreenResources = tegra->createScreenResources;
ret = pScreen->CreateScreenResources(pScreen);
- pScreen->CreateScreenResources = CreateScreenResources;
+ pScreen->CreateScreenResources = TegraCreateScreenResources;
- if (!drmmode_set_desired_modes(pScrn, &ms->drmmode))
+ if (!drmmode_set_desired_modes(pScrn, &tegra->drmmode))
return FALSE;
- drmmode_uevent_init(pScrn, &ms->drmmode);
+ drmmode_uevent_init(pScrn, &tegra->drmmode);
+
+ if (!tegra->SWCursor)
+ drmmode_map_cursor_bos(pScrn, &tegra->drmmode);
- if (!ms->SWCursor)
- drmmode_map_cursor_bos(pScrn, &ms->drmmode);
- pixels = drmmode_map_front_bo(&ms->drmmode);
+ pixels = drmmode_map_front_bo(&tegra->drmmode);
if (!pixels)
- return FALSE;
+ return FALSE;
rootPixmap = pScreen->GetScreenPixmap(pScreen);
- if (ms->drmmode.shadow_enable)
- pixels = ms->drmmode.shadow_fb;
-
+ if (tegra->drmmode.shadow_enable)
+ pixels = tegra->drmmode.shadow_fb;
+
if (!pScreen->ModifyPixmapHeader(rootPixmap, -1, -1, -1, -1, -1, pixels))
- FatalError("Couldn't adjust screen pixmap\n");
+ FatalError("Couldn't adjust screen pixmap\n");
- if (ms->drmmode.shadow_enable) {
- if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(),
- msShadowWindow, 0, 0))
- return FALSE;
+ if (tegra->drmmode.shadow_enable) {
+ if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(),
+ TegraShadowWindow, 0, 0))
+ return FALSE;
}
- ms->damage = DamageCreate(NULL, NULL, DamageReportNone, TRUE,
- pScreen, rootPixmap);
-
- if (ms->damage) {
- DamageRegister(&rootPixmap->drawable, ms->damage);
- ms->dirty_enabled = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Damage tracking initialized\n");
+ tegra->damage = DamageCreate(NULL, NULL, DamageReportNone, TRUE, pScreen,
+ rootPixmap);
+ if (tegra->damage) {
+ DamageRegister(&rootPixmap->drawable, tegra->damage);
+ tegra->dirty_enabled = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Damage tracking initialized\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Failed to create screen damage record\n");
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to create screen damage record\n");
+ return FALSE;
}
+
return ret;
}
static Bool
-msShadowInit(ScreenPtr pScreen)
+TegraCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
- if (!shadowSetup(pScreen)) {
- return FALSE;
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ TegraPtr tegra = TegraPTR(pScrn);
+
+ if (tegra->damage) {
+ DamageUnregister(&pScreen->GetScreenPixmap(pScreen)->drawable,
+ tegra->damage);
+ DamageDestroy(tegra->damage);
+ tegra->damage = NULL;
}
- return TRUE;
-}
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
-static Bool
-msSetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
-{
- ScreenPtr screen = ppix->drawable.pScreen;
- ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- modesettingPtr ms = modesettingPTR(scrn);
- Bool ret;
- int size = ppix->devKind * ppix->drawable.height;
- int ihandle = (int)(long)fd_handle;
+ if (tegra->drmmode.shadow_enable) {
+ shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
+ free(tegra->drmmode.shadow_fb);
+ tegra->drmmode.shadow_fb = NULL;
+ }
- ret = drmmode_SetSlaveBO(ppix, &ms->drmmode, ihandle, ppix->devKind, size);
- if (ret == FALSE)
- return ret;
+ drmmode_uevent_fini(pScrn, &tegra->drmmode);
+ drmmode_free_bos(pScrn, &tegra->drmmode);
- return TRUE;
+ if (pScrn->vtSema)
+ TegraLeaveVT(VT_FUNC_ARGS);
+
+ pScreen->CreateScreenResources = tegra->createScreenResources;
+ pScreen->BlockHandler = tegra->BlockHandler;
+
+ pScrn->vtSema = FALSE;
+ pScreen->CloseScreen = tegra->CloseScreen;
+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
+
+static void TegraBlockHandler(BLOCKHANDLER_ARGS_DECL)
+{
+ SCREEN_PTR(arg);
+ TegraPtr tegra = TegraPTR(xf86ScreenToScrn(pScreen));
+
+ pScreen->BlockHandler = tegra->BlockHandler;
+ pScreen->BlockHandler(BLOCKHANDLER_ARGS);
+ pScreen->BlockHandler = TegraBlockHandler;
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+ if (pScreen->isGPU)
+ dispatch_slave_dirty(pScreen);
+ else
#endif
+ if (tegra->dirty_enabled)
+ dispatch_dirty(pScreen);
+}
static Bool
-ScreenInit(SCREEN_INIT_ARGS_DECL)
+TegraScreenInit(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
+ TegraPtr tegra = TegraPTR(pScrn);
VisualPtr visual;
int ret;
pScrn->pScreen = pScreen;
- ret = drmSetMaster(ms->fd);
+ ret = drmSetMaster(tegra->fd);
if (ret) {
ErrorF("Unable to set master\n");
return FALSE;
}
-
+
/* HW dependent - FIXME */
pScrn->displayWidth = pScrn->virtualX;
- if (!drmmode_create_initial_bos(pScrn, &ms->drmmode))
- return FALSE;
-
- if (ms->drmmode.shadow_enable) {
- ms->drmmode.shadow_fb = calloc(1, pScrn->displayWidth * pScrn->virtualY *
- ((pScrn->bitsPerPixel + 7) >> 3));
- if (!ms->drmmode.shadow_fb)
- ms->drmmode.shadow_enable = FALSE;
- }
-
+
+ if (!drmmode_create_initial_bos(pScrn, &tegra->drmmode))
+ return FALSE;
+
+ if (tegra->drmmode.shadow_enable) {
+ tegra->drmmode.shadow_fb = calloc(1, pScrn->displayWidth * pScrn->virtualY *
+ ((pScrn->bitsPerPixel + 7) >> 3));
+ if (!tegra->drmmode.shadow_fb)
+ tegra->drmmode.shadow_enable = FALSE;
+ }
+
miClearVisualTypes();
- if (!miSetVisualTypes(pScrn->depth,
- miGetDefaultVisualMask(pScrn->depth),
- pScrn->rgbBits, pScrn->defaultVisual))
- return FALSE;
+ if (!miSetVisualTypes(pScrn->depth, miGetDefaultVisualMask(pScrn->depth),
+ pScrn->rgbBits, pScrn->defaultVisual))
+ return FALSE;
if (!miSetPixmapDepths())
- return FALSE;
+ return FALSE;
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
- if (!dixRegisterScreenSpecificPrivateKey(pScreen, &ms->drmmode.pixmapPrivateKeyRec,
- PRIVATE_PIXMAP, sizeof(msPixmapPrivRec))) {
- return FALSE;
- }
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+ if (!dixRegisterScreenSpecificPrivateKey(pScreen,
+ &tegra->drmmode.pixmapPrivateKeyRec,
+ PRIVATE_PIXMAP,
+ sizeof(TegraPixmapPrivRec)))
+ return FALSE;
#endif
pScrn->memPhysBase = 0;
pScrn->fbOffset = 0;
- if (!fbScreenInit(pScreen, NULL,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- pScrn->displayWidth, pScrn->bitsPerPixel))
- return FALSE;
+ if (!fbScreenInit(pScreen, NULL, pScrn->virtualX, pScrn->virtualY,
+ pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
+ pScrn->bitsPerPixel))
+ return FALSE;
if (pScrn->bitsPerPixel > 8) {
- /* Fixup RGB ordering */
- visual = pScreen->visuals + pScreen->numVisuals;
- while (--visual >= pScreen->visuals) {
- if ((visual->class | DynamicClass) == DirectColor) {
- visual->offsetRed = pScrn->offset.red;
- visual->offsetGreen = pScrn->offset.green;
- visual->offsetBlue = pScrn->offset.blue;
- visual->redMask = pScrn->mask.red;
- visual->greenMask = pScrn->mask.green;
- visual->blueMask = pScrn->mask.blue;
- }
- }
+ /* Fixup RGB ordering */
+ visual = pScreen->visuals + pScreen->numVisuals;
+
+ while (--visual >= pScreen->visuals) {
+ if ((visual->class | DynamicClass) == DirectColor) {
+ visual->offsetRed = pScrn->offset.red;
+ visual->offsetGreen = pScrn->offset.green;
+ visual->offsetBlue = pScrn->offset.blue;
+ visual->redMask = pScrn->mask.red;
+ visual->greenMask = pScrn->mask.green;
+ visual->blueMask = pScrn->mask.blue;
+ }
+ }
}
fbPictureInit(pScreen, NULL, 0);
- if (ms->drmmode.shadow_enable && !msShadowInit(pScreen)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "shadow fb init failed\n");
- return FALSE;
+ if (tegra->drmmode.shadow_enable && !TegraShadowInit(pScreen)) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "shadow fb init failed\n");
+ return FALSE;
}
-
- ms->createScreenResources = pScreen->CreateScreenResources;
- pScreen->CreateScreenResources = CreateScreenResources;
+
+ tegra->createScreenResources = pScreen->CreateScreenResources;
+ pScreen->CreateScreenResources = TegraCreateScreenResources;
xf86SetBlackWhitePixels(pScreen);
@@ -906,42 +696,50 @@ ScreenInit(SCREEN_INIT_ARGS_DECL)
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
/* Need to extend HWcursor support to handle mask interleave */
- if (!ms->drmmode.sw_cursor)
- xf86_cursors_init(pScreen, 64, 64,
- HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
- HARDWARE_CURSOR_ARGB);
+ if (!tegra->drmmode.sw_cursor)
+ xf86_cursors_init(pScreen, 64, 64,
+ HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
+ HARDWARE_CURSOR_ARGB);
/* Must force it before EnterVT, so we are in control of VT and
* later memory should be bound when allocating, e.g rotate_mem */
pScrn->vtSema = TRUE;
pScreen->SaveScreen = xf86SaveScreen;
- ms->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = CloseScreen;
+ tegra->CloseScreen = pScreen->CloseScreen;
+ pScreen->CloseScreen = TegraCloseScreen;
- ms->BlockHandler = pScreen->BlockHandler;
- pScreen->BlockHandler = msBlockHandler;
+ tegra->BlockHandler = pScreen->BlockHandler;
+ pScreen->BlockHandler = TegraBlockHandler;
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
- pScreen->SetSharedPixmapBacking = msSetSharedPixmapBacking;
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+ pScreen->SetSharedPixmapBacking = TegraSetSharedPixmapBacking;
#endif
if (!xf86CrtcScreenInit(pScreen))
- return FALSE;
+ return FALSE;
if (!miCreateDefColormap(pScreen))
- return FALSE;
+ return FALSE;
xf86DPMSInit(pScreen, xf86DPMSSet, 0);
if (serverGeneration == 1)
- xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+ xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+
+ return TegraEnterVT(VT_FUNC_ARGS);
+}
+
+static Bool
+TegraSwitchMode(SWITCH_MODE_ARGS_DECL)
+{
+ SCRN_INFO_PTR(arg);
- return EnterVT(VT_FUNC_ARGS);
+ return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
}
static void
-AdjustFrame(ADJUST_FRAME_ARGS_DECL)
+TegraAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
SCRN_INFO_PTR(arg);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
@@ -949,97 +747,165 @@ AdjustFrame(ADJUST_FRAME_ARGS_DECL)
xf86CrtcPtr crtc = output->crtc;
if (crtc && crtc->enabled) {
- crtc->funcs->mode_set(crtc, pScrn->currentMode, pScrn->currentMode, x,
- y);
- crtc->x = output->initial_x + x;
- crtc->y = output->initial_y + y;
+ crtc->funcs->mode_set(crtc, pScrn->currentMode, pScrn->currentMode, x,
+ y);
+ crtc->x = output->initial_x + x;
+ crtc->y = output->initial_y + y;
}
}
static void
-FreeScreen(FREE_SCREEN_ARGS_DECL)
+TegraFreeScreen(FREE_SCREEN_ARGS_DECL)
{
SCRN_INFO_PTR(arg);
FreeRec(pScrn);
}
-static void
-LeaveVT(VT_FUNC_ARGS_DECL)
+static ModeStatus
+TegraValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
{
- SCRN_INFO_PTR(arg);
- modesettingPtr ms = modesettingPTR(pScrn);
- xf86_hide_cursors(pScrn);
-
- pScrn->vtSema = FALSE;
-
- drmDropMaster(ms->fd);
+ return MODE_OK;
}
-/*
- * This gets called when gaining control of the VT, and from ScreenInit().
- */
static Bool
-EnterVT(VT_FUNC_ARGS_DECL)
+TegraPlatformProbe(DriverPtr driver, int entity_num, int flags,
+ struct xf86_platform_device *dev, intptr_t match_data)
{
- SCRN_INFO_PTR(arg);
- modesettingPtr ms = modesettingPTR(pScrn);
+ char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
+ ScrnInfoPtr scrn = NULL;
+ int scr_flags = 0;
- pScrn->vtSema = TRUE;
+ if (flags & PLATFORM_PROBE_GPU_SCREEN)
+ scr_flags = XF86_ALLOCATE_GPU_SCREEN;
- if (drmSetMaster(ms->fd)) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "drmSetMaster failed: %s\n",
- strerror(errno));
- }
+ if (TegraProbeHardware(path)) {
+ scrn = xf86AllocateScreen(driver, scr_flags);
- if (!drmmode_set_desired_modes(pScrn, &ms->drmmode))
- return FALSE;
+ xf86AddEntityToScreen(scrn, entity_num);
- return TRUE;
-}
+ scrn->driverName = "opentegra";
+ scrn->name = "opentegra";
+ scrn->PreInit = TegraPreInit;
+ scrn->ScreenInit = TegraScreenInit;
+ scrn->SwitchMode = TegraSwitchMode;
+ scrn->AdjustFrame = TegraAdjustFrame;
+ scrn->EnterVT = TegraEnterVT;
+ scrn->LeaveVT = TegraLeaveVT;
+ scrn->FreeScreen = TegraFreeScreen;
+ scrn->ValidMode = TegraValidMode;
-static Bool
-SwitchMode(SWITCH_MODE_ARGS_DECL)
-{
- SCRN_INFO_PTR(arg);
+ xf86DrvMsg(scrn->scrnIndex, X_INFO, "using %s\n",
+ path ? path : "default device");
+ }
- return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
+ return scrn != NULL;
}
static Bool
-CloseScreen(CLOSE_SCREEN_ARGS_DECL)
+TegraProbe(DriverPtr drv, int flags)
{
- ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- modesettingPtr ms = modesettingPTR(pScrn);
+ int i, numDevSections;
+ GDevPtr *devSections;
+ Bool foundScreen = FALSE;
+ const char *dev;
+ ScrnInfoPtr scrn = NULL;
- if (ms->damage) {
- DamageUnregister(&pScreen->GetScreenPixmap(pScreen)->drawable, ms->damage);
- DamageDestroy(ms->damage);
- ms->damage = NULL;
- }
+ /* For now, just bail out for PROBE_DETECT. */
+ if (flags & PROBE_DETECT)
+ return FALSE;
- if (ms->drmmode.shadow_enable) {
- shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
- free(ms->drmmode.shadow_fb);
- ms->drmmode.shadow_fb = NULL;
- }
- drmmode_uevent_fini(pScrn, &ms->drmmode);
+ /*
+ * Find the config file Device sections that match this
+ * driver, and return if there are none.
+ */
+ if ((numDevSections = xf86MatchDevice("opentegra", &devSections)) <= 0)
+ return FALSE;
- drmmode_free_bos(pScrn, &ms->drmmode);
+ for (i = 0; i < numDevSections; i++) {
+ dev = xf86FindOptionValue(devSections[i]->options, "device");
+ if (TegraProbeHardware(dev)) {
+ int entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
+ scrn = xf86ConfigFbEntity(scrn, 0, entity, NULL, NULL, NULL,
+ NULL);
+ }
- if (pScrn->vtSema) {
- LeaveVT(VT_FUNC_ARGS);
+ if (scrn) {
+ foundScreen = TRUE;
+ scrn->driverVersion = 1;
+ scrn->driverName = "opentegra";
+ scrn->name = "opentegra";
+ scrn->Probe = TegraProbe;
+ scrn->PreInit = TegraPreInit;
+ scrn->ScreenInit = TegraScreenInit;
+ scrn->SwitchMode = TegraSwitchMode;
+ scrn->AdjustFrame = TegraAdjustFrame;
+ scrn->EnterVT = TegraEnterVT;
+ scrn->LeaveVT = TegraLeaveVT;
+ scrn->FreeScreen = TegraFreeScreen;
+ scrn->ValidMode = TegraValidMode;
+
+ xf86DrvMsg(scrn->scrnIndex, X_INFO, "using %s\n",
+ dev ? dev : "default device");
+ }
}
- pScreen->CreateScreenResources = ms->createScreenResources;
- pScreen->BlockHandler = ms->BlockHandler;
+ free(devSections);
- pScrn->vtSema = FALSE;
- pScreen->CloseScreen = ms->CloseScreen;
- return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
+ return foundScreen;
}
-static ModeStatus
-ValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
+_X_EXPORT DriverRec tegra = {
+ 1,
+ "opentegra",
+ TegraIdentify,
+ TegraProbe,
+ TegraAvailableOptions,
+ NULL,
+ 0,
+ TegraDriverFunc,
+ NULL,
+ NULL,
+ TegraPlatformProbe,
+};
+
+static MODULESETUPPROTO(Setup);
+
+static pointer
+Setup(pointer module, pointer opts, int *errmaj, int *errmin)
{
- return MODE_OK;
+ static Bool setupDone = 0;
+
+ /*
+ * This module should be loaded only once, but check to be sure.
+ */
+ if (!setupDone) {
+ setupDone = 1;
+ xf86AddDriver(&tegra, module, HaveDriverFuncs);
+
+ /*
+ * The return value must be non-NULL on success even though there
+ * is no TearDownProc.
+ */
+ return (pointer)1;
+ } else {
+ if (errmaj)
+ *errmaj = LDR_ONCEONLY;
+
+ return NULL;
+ }
}
+
+static XF86ModuleVersionInfo VersRec = {
+ "opentegra",
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+ XORG_VERSION_CURRENT,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
+ ABI_CLASS_VIDEODRV,
+ ABI_VIDEODRV_VERSION,
+ MOD_CLASS_VIDEODRV,
+ { 0, 0, 0, 0 }
+};
+
+_X_EXPORT XF86ModuleData opentegraModuleData = { &VersRec, Setup, NULL };
diff --git a/src/driver.h b/src/driver.h
index 79561c8..c4797fa 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -33,7 +33,6 @@
#include <damage.h>
#include "drmmode_display.h"
-#define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg);
typedef struct
{
@@ -43,7 +42,7 @@ typedef struct
ScrnInfoPtr pScrn_2;
} EntRec, *EntPtr;
-typedef struct _modesettingRec
+typedef struct _TegraRec
{
int fd;
@@ -51,12 +50,6 @@ typedef struct _modesettingRec
int Chipset;
EntityInfoPtr pEnt;
-#if XSERVER_LIBPCIACCESS
- struct pci_device *PciInfo;
-#else
- pciVideoPtr PciInfo;
- PCITAG PciTag;
-#endif
Bool noAccel;
Bool SWCursor;
@@ -76,6 +69,6 @@ typedef struct _modesettingRec
DamagePtr damage;
Bool dirty_enabled;
-} modesettingRec, *modesettingPtr;
+} TegraRec, *TegraPtr;
-#define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate))
+#define TegraPTR(p) ((TegraPtr)((p)->driverPrivate))
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 42cd5ac..7311a1b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -52,62 +52,63 @@
#endif
#include "compat-api.h"
-static struct dumb_bo *dumb_bo_create(int fd,
- const unsigned width, const unsigned height,
- const unsigned bpp)
+static struct dumb_bo *
+dumb_bo_create(int fd, const unsigned width, const unsigned height,
+ const unsigned bpp)
{
- struct drm_mode_create_dumb arg;
- struct dumb_bo *bo;
- int ret;
-
- bo = calloc(1, sizeof(*bo));
- if (!bo)
- return NULL;
-
- memset(&arg, 0, sizeof(arg));
- arg.width = width;
- arg.height = height;
- arg.bpp = bpp;
-
- ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
- if (ret)
- goto err_free;
-
- bo->handle = arg.handle;
- bo->size = arg.size;
- bo->pitch = arg.pitch;
-
- return bo;
- err_free:
- free(bo);
- return NULL;
+ struct drm_mode_create_dumb arg;
+ struct dumb_bo *bo;
+ int ret;
+
+ bo = calloc(1, sizeof(*bo));
+ if (!bo)
+ return NULL;
+
+ memset(&arg, 0, sizeof(arg));
+ arg.width = width;
+ arg.height = height;
+ arg.bpp = bpp;
+
+ ret = drmIoctl(fd, DRM_IOCTL_MODE_CREATE_DUMB, &arg);
+ if (ret)
+ goto err_free;
+
+ bo->handle = arg.handle;
+ bo->size = arg.size;
+ bo->pitch = arg.pitch;
+
+ return bo;
+
+err_free:
+ free(bo);
+ return NULL;
}
static int dumb_bo_map(int fd, struct dumb_bo *bo)
{
- struct drm_mode_map_dumb arg;
- int ret;
- void *map;
+ struct drm_mode_map_dumb arg;
+ int ret;
+ void *map;
- if (bo->ptr) {
- bo->map_count++;
- return 0;
- }
+ if (bo->ptr) {
+ bo->map_count++;
+ return 0;
+ }
- memset(&arg, 0, sizeof(arg));
- arg.handle = bo->handle;
+ memset(&arg, 0, sizeof(arg));
+ arg.handle = bo->handle;
- ret = drmIoctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
- if (ret)
- return ret;
+ ret = drmIoctl(fd, DRM_IOCTL_MODE_MAP_DUMB, &arg);
+ if (ret)
+ return ret;
- map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
- fd, arg.offset);
- if (map == MAP_FAILED)
- return -errno;
+ map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd,
+ arg.offset);
+ if (map == MAP_FAILED)
+ return -errno;
- bo->ptr = map;
- return 0;
+ bo->ptr = map;
+ return 0;
}
#if 0
@@ -120,430 +121,374 @@ static int dumb_bo_unmap(int fd, struct dumb_bo *bo)
static int dumb_bo_destroy(int fd, struct dumb_bo *bo)
{
- struct drm_mode_destroy_dumb arg;
- int ret;
-
- if (bo->ptr) {
- munmap(bo->ptr, bo->size);
- bo->ptr = NULL;
- }
-
- memset(&arg, 0, sizeof(arg));
- arg.handle = bo->handle;
- ret = drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
- if (ret)
- return -errno;
-
- free(bo);
- return 0;
+ struct drm_mode_destroy_dumb arg;
+ int ret;
+
+ if (bo->ptr) {
+ munmap(bo->ptr, bo->size);
+ bo->ptr = NULL;
+ }
+
+ memset(&arg, 0, sizeof(arg));
+ arg.handle = bo->handle;
+
+ ret = drmIoctl(fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
+ if (ret)
+ return -errno;
+
+ free(bo);
+ return 0;
}
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
-static struct dumb_bo *dumb_get_bo_from_handle(int fd, int handle, int pitch, int size)
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+static struct dumb_bo *dumb_get_bo_from_handle(int fd, int handle, int pitch,
+ int size)
{
- struct dumb_bo *bo;
- int ret;
-
- bo = calloc(1, sizeof(*bo));
- if (!bo)
- return NULL;
-
- ret = drmPrimeFDToHandle(fd, handle, &bo->handle);
- if (ret) {
- free(bo);
- return NULL;
- }
- bo->pitch = pitch;
- bo->size = size;
- return bo;
+ struct dumb_bo *bo;
+ int ret;
+
+ bo = calloc(1, sizeof(*bo));
+ if (!bo)
+ return NULL;
+
+ ret = drmPrimeFDToHandle(fd, handle, &bo->handle);
+ if (ret) {
+ free(bo);
+ return NULL;
+ }
+
+ bo->pitch = pitch;
+ bo->size = size;
+ return bo;
}
#endif
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
-Bool drmmode_SetSlaveBO(PixmapPtr ppix,
- drmmode_ptr drmmode,
- int fd_handle, int pitch, int size)
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+Bool drmmode_SetSlaveBO(PixmapPtr ppix, drmmode_ptr drmmode, int fd_handle,
+ int pitch, int size)
{
- msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix);
+ TegraPixmapPrivPtr ppriv = TegraGetPixmapPriv(drmmode, ppix);
- ppriv->backing_bo = dumb_get_bo_from_handle(drmmode->fd, fd_handle, pitch, size);
- if (!ppriv->backing_bo)
- return FALSE;
+ ppriv->backing_bo = dumb_get_bo_from_handle(drmmode->fd, fd_handle, pitch, size);
+ if (!ppriv->backing_bo)
+ return FALSE;
- close(fd_handle);
- return TRUE;
+ close(fd_handle);
+ return TRUE;
}
#endif
static void
-drmmode_ConvertFromKMode(ScrnInfoPtr scrn,
- drmModeModeInfo *kmode,
- DisplayModePtr mode)
+drmmode_ConvertFromKMode(ScrnInfoPtr scrn, drmModeModeInfo *kmode,
+ DisplayModePtr mode)
{
- memset(mode, 0, sizeof(DisplayModeRec));
- mode->status = MODE_OK;
-
- mode->Clock = kmode->clock;
-
- mode->HDisplay = kmode->hdisplay;
- mode->HSyncStart = kmode->hsync_start;
- mode->HSyncEnd = kmode->hsync_end;
- mode->HTotal = kmode->htotal;
- mode->HSkew = kmode->hskew;
-
- mode->VDisplay = kmode->vdisplay;
- mode->VSyncStart = kmode->vsync_start;
- mode->VSyncEnd = kmode->vsync_end;
- mode->VTotal = kmode->vtotal;
- mode->VScan = kmode->vscan;
-
- mode->Flags = kmode->flags; //& FLAG_BITS;
- mode->name = strdup(kmode->name);
-
- if (kmode->type & DRM_MODE_TYPE_DRIVER)
- mode->type = M_T_DRIVER;
- if (kmode->type & DRM_MODE_TYPE_PREFERRED)
- mode->type |= M_T_PREFERRED;
- xf86SetModeCrtc (mode, scrn->adjustFlags);
+ memset(mode, 0, sizeof(DisplayModeRec));
+ mode->status = MODE_OK;
+
+ mode->Clock = kmode->clock;
+
+ mode->HDisplay = kmode->hdisplay;
+ mode->HSyncStart = kmode->hsync_start;
+ mode->HSyncEnd = kmode->hsync_end;
+ mode->HTotal = kmode->htotal;
+ mode->HSkew = kmode->hskew;
+
+ mode->VDisplay = kmode->vdisplay;
+ mode->VSyncStart = kmode->vsync_start;
+ mode->VSyncEnd = kmode->vsync_end;
+ mode->VTotal = kmode->vtotal;
+ mode->VScan = kmode->vscan;
+
+ mode->Flags = kmode->flags; //& FLAG_BITS;
+ mode->name = strdup(kmode->name);
+
+ if (kmode->type & DRM_MODE_TYPE_DRIVER)
+ mode->type = M_T_DRIVER;
+
+ if (kmode->type & DRM_MODE_TYPE_PREFERRED)
+ mode->type |= M_T_PREFERRED;
+
+ xf86SetModeCrtc (mode, scrn->adjustFlags);
}
static void
-drmmode_ConvertToKMode(ScrnInfoPtr scrn,
- drmModeModeInfo *kmode,
- DisplayModePtr mode)
+drmmode_ConvertToKMode(ScrnInfoPtr scrn, drmModeModeInfo *kmode,
+ DisplayModePtr mode)
{
- memset(kmode, 0, sizeof(*kmode));
-
- kmode->clock = mode->Clock;
- kmode->hdisplay = mode->HDisplay;
- kmode->hsync_start = mode->HSyncStart;
- kmode->hsync_end = mode->HSyncEnd;
- kmode->htotal = mode->HTotal;
- kmode->hskew = mode->HSkew;
-
- kmode->vdisplay = mode->VDisplay;
- kmode->vsync_start = mode->VSyncStart;
- kmode->vsync_end = mode->VSyncEnd;
- kmode->vtotal = mode->VTotal;
- kmode->vscan = mode->VScan;
-
- kmode->flags = mode->Flags; //& FLAG_BITS;
- if (mode->name)
- strncpy(kmode->name, mode->name, DRM_DISPLAY_MODE_LEN);
- kmode->name[DRM_DISPLAY_MODE_LEN-1] = 0;
+ memset(kmode, 0, sizeof(*kmode));
+
+ kmode->clock = mode->Clock;
+ kmode->hdisplay = mode->HDisplay;
+ kmode->hsync_start = mode->HSyncStart;
+ kmode->hsync_end = mode->HSyncEnd;
+ kmode->htotal = mode->HTotal;
+ kmode->hskew = mode->HSkew;
+
+ kmode->vdisplay = mode->VDisplay;
+ kmode->vsync_start = mode->VSyncStart;
+ kmode->vsync_end = mode->VSyncEnd;
+ kmode->vtotal = mode->VTotal;
+ kmode->vscan = mode->VScan;
+ kmode->flags = mode->Flags; //& FLAG_BITS;
+
+ if (mode->name)
+ strncpy(kmode->name, mode->name, DRM_DISPLAY_MODE_LEN);
+
+ kmode->name[DRM_DISPLAY_MODE_LEN-1] = 0;
}
static void
drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
{
-#if 0
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-// drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-// drmmode_ptr drmmode = drmmode_crtc->drmmode;
-
- /* bonghits in the randr 1.2 - uses dpms to disable crtc - bad buzz */
- if (mode == DPMSModeOff) {
-// drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
-// 0, 0, 0, NULL, 0, NULL);
- }
-#endif
-}
-
-#if 0
-static PixmapPtr
-create_pixmap_for_fbcon(drmmode_ptr drmmode,
- ScrnInfoPtr pScrn, int crtc_id)
-{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- drmmode_crtc_private_ptr drmmode_crtc;
- ScreenPtr pScreen = pScrn->pScreen;
- PixmapPtr pixmap;
- struct radeon_bo *bo;
- drmModeFBPtr fbcon;
- struct drm_gem_flink flink;
-
- drmmode_crtc = xf86_config->crtc[crtc_id]->driver_private;
-
- fbcon = drmModeGetFB(drmmode->fd, drmmode_crtc->mode_crtc->buffer_id);
- if (fbcon == NULL)
- return NULL;
-
- flink.handle = fbcon->handle;
- if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Couldn't flink fbcon handle\n");
- return NULL;
- }
-
- bo = radeon_bo_open(drmmode->bufmgr, flink.name, 0, 0, 0, 0);
- if (bo == NULL) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Couldn't allocate bo for fbcon handle\n");
- return NULL;
- }
-
- pixmap = drmmode_create_bo_pixmap(pScreen, fbcon->width, fbcon->height,
- fbcon->depth, fbcon->bpp,
- fbcon->pitch, bo);
- if (!pixmap)
- return NULL;
-
- radeon_bo_unref(bo);
- drmModeFreeFB(fbcon);
- return pixmap;
}
-#endif
-
static Bool
drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
- Rotation rotation, int x, int y)
+ Rotation rotation, int x, int y)
{
- ScrnInfoPtr pScrn = crtc->scrn;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
- int saved_x, saved_y;
- Rotation saved_rotation;
- DisplayModeRec saved_mode;
- uint32_t *output_ids;
- int output_count = 0;
- Bool ret = TRUE;
- int i;
- uint32_t fb_id;
- drmModeModeInfo kmode;
- int height;
-
- height = pScrn->virtualY;
-
- if (drmmode->fb_id == 0) {
- ret = drmModeAddFB(drmmode->fd,
- pScrn->virtualX, height,
- pScrn->depth, pScrn->bitsPerPixel,
- drmmode->front_bo->pitch,
- drmmode->front_bo->handle,
- &drmmode->fb_id);
- if (ret < 0) {
- ErrorF("failed to add fb %d\n", ret);
- return FALSE;
- }
+ ScrnInfoPtr pScrn = crtc->scrn;
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ int saved_x, saved_y;
+ Rotation saved_rotation;
+ DisplayModeRec saved_mode;
+ uint32_t *output_ids;
+ int output_count = 0;
+ Bool ret = TRUE;
+ int i;
+ uint32_t fb_id;
+ drmModeModeInfo kmode;
+ int height;
+
+ height = pScrn->virtualY;
+
+ if (drmmode->fb_id == 0) {
+ ret = drmModeAddFB(drmmode->fd, pScrn->virtualX, height, pScrn->depth,
+ pScrn->bitsPerPixel, drmmode->front_bo->pitch,
+ drmmode->front_bo->handle, &drmmode->fb_id);
+ if (ret < 0) {
+ ErrorF("failed to add fb %d\n", ret);
+ return FALSE;
}
+ }
- saved_mode = crtc->mode;
- saved_x = crtc->x;
- saved_y = crtc->y;
- saved_rotation = crtc->rotation;
+ saved_mode = crtc->mode;
+ saved_x = crtc->x;
+ saved_y = crtc->y;
+ saved_rotation = crtc->rotation;
- if (mode) {
- crtc->mode = *mode;
- crtc->x = x;
- crtc->y = y;
- crtc->rotation = rotation;
+ if (mode) {
+ crtc->mode = *mode;
+ crtc->x = x;
+ crtc->y = y;
+ crtc->rotation = rotation;
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,99,0,0)
- crtc->transformPresent = FALSE;
+ crtc->transformPresent = FALSE;
#endif
- }
-
- output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
- if (!output_ids) {
- ret = FALSE;
- goto done;
- }
-
- if (mode) {
- for (i = 0; i < xf86_config->num_output; i++) {
- xf86OutputPtr output = xf86_config->output[i];
- drmmode_output_private_ptr drmmode_output;
-
- if (output->crtc != crtc)
- continue;
-
- drmmode_output = output->driver_private;
- output_ids[output_count] = drmmode_output->mode_output->connector_id;
- output_count++;
- }
-
- if (!xf86CrtcRotate(crtc)) {
- goto done;
- }
+ }
+
+ output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
+ if (!output_ids) {
+ ret = FALSE;
+ goto done;
+ }
+
+ if (mode) {
+ for (i = 0; i < xf86_config->num_output; i++) {
+ xf86OutputPtr output = xf86_config->output[i];
+ drmmode_output_private_ptr drmmode_output;
+
+ if (output->crtc != crtc)
+ continue;
+
+ drmmode_output = output->driver_private;
+ output_ids[output_count] = drmmode_output->mode_output->connector_id;
+ output_count++;
+ }
+
+ if (!xf86CrtcRotate(crtc))
+ goto done;
+
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,0,0,0)
- crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
- crtc->gamma_blue, crtc->gamma_size);
+ crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+ crtc->gamma_blue, crtc->gamma_size);
#endif
-
- drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
-
- fb_id = drmmode->fb_id;
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
- if (crtc->randr_crtc->scanout_pixmap) {
- msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, crtc->randr_crtc->scanout_pixmap);
- fb_id = ppriv->fb_id;
- x = y = 0;
- } else
+
+ drmmode_ConvertToKMode(crtc->scrn, &kmode, mode);
+
+ fb_id = drmmode->fb_id;
+
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+ if (crtc->randr_crtc->scanout_pixmap) {
+ TegraPixmapPrivPtr ppriv = TegraGetPixmapPriv(drmmode, crtc->randr_crtc->scanout_pixmap);
+ fb_id = ppriv->fb_id;
+ x = y = 0;
+ } else
#endif
- if (drmmode_crtc->rotate_fb_id) {
- fb_id = drmmode_crtc->rotate_fb_id;
- x = y = 0;
- }
- ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
- fb_id, x, y, output_ids, output_count, &kmode);
- if (ret)
- xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
- "failed to set mode: %s", strerror(-ret));
- else
- ret = TRUE;
-
- if (crtc->scrn->pScreen)
- xf86CrtcSetScreenSubpixelOrder(crtc->scrn->pScreen);
- /* go through all the outputs and force DPMS them back on? */
- for (i = 0; i < xf86_config->num_output; i++) {
- xf86OutputPtr output = xf86_config->output[i];
-
- if (output->crtc != crtc)
- continue;
-
- output->funcs->dpms(output, DPMSModeOn);
- }
- }
+ if (drmmode_crtc->rotate_fb_id) {
+ fb_id = drmmode_crtc->rotate_fb_id;
+ x = y = 0;
+ }
+
+ ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
+ fb_id, x, y, output_ids, output_count, &kmode);
+ if (ret)
+ xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
+ "failed to set mode: %s", strerror(-ret));
+ else
+ ret = TRUE;
+
+ if (crtc->scrn->pScreen)
+ xf86CrtcSetScreenSubpixelOrder(crtc->scrn->pScreen);
+
+ /* go through all the outputs and force DPMS them back on? */
+ for (i = 0; i < xf86_config->num_output; i++) {
+ xf86OutputPtr output = xf86_config->output[i];
+
+ if (output->crtc != crtc)
+ continue;
+
+ output->funcs->dpms(output, DPMSModeOn);
+ }
+ }
#if 0
- if (pScrn->pScreen &&
- !xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE))
- xf86_reload_cursors(pScrn->pScreen);
+ if (pScrn->pScreen &&
+ !xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE))
+ xf86_reload_cursors(pScrn->pScreen);
#endif
done:
- if (!ret) {
- crtc->x = saved_x;
- crtc->y = saved_y;
- crtc->rotation = saved_rotation;
- crtc->mode = saved_mode;
- }
+ if (!ret) {
+ crtc->x = saved_x;
+ crtc->y = saved_y;
+ crtc->rotation = saved_rotation;
+ crtc->mode = saved_mode;
+ }
#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3
- else
- crtc->active = TRUE;
+ else
+ crtc->active = TRUE;
#endif
- return ret;
+ return ret;
}
static void
-drmmode_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg)
+drmmode_set_cursor_colors(xf86CrtcPtr crtc, int bg, int fg)
{
-
}
static void
-drmmode_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
+drmmode_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
{
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
- drmModeMoveCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, x, y);
+ drmModeMoveCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, x, y);
}
static void
-drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
+drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
{
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- int i;
- uint32_t *ptr;
- uint32_t handle = drmmode_crtc->cursor_bo->handle;
- int ret;
- /* cursor should be mapped already */
- ptr = (uint32_t *)(drmmode_crtc->cursor_bo->ptr);
-
- for (i = 0; i < 64 * 64; i++)
- ptr[i] = image[i];// cpu_to_le32(image[i]);
-
- ret = drmModeSetCursor(drmmode_crtc->drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, 64, 64);
- if (ret) {
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
- xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
-
- cursor_info->MaxWidth = cursor_info->MaxHeight = 0;
- drmmode_crtc->drmmode->sw_cursor = TRUE;
- /* fallback to swcursor */
- }
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ int i;
+ uint32_t *ptr;
+ uint32_t handle = drmmode_crtc->cursor_bo->handle;
+ int ret;
+
+ /* cursor should be mapped already */
+ ptr = (uint32_t *)(drmmode_crtc->cursor_bo->ptr);
+
+ for (i = 0; i < 64 * 64; i++)
+ ptr[i] = image[i];// cpu_to_le32(image[i]);
+
+ ret = drmModeSetCursor(drmmode_crtc->drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, 64, 64);
+ if (ret) {
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
+ xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+
+ cursor_info->MaxWidth = cursor_info->MaxHeight = 0;
+ drmmode_crtc->drmmode->sw_cursor = TRUE;
+ /* fallback to swcursor */
+ }
}
static void
-drmmode_hide_cursor (xf86CrtcPtr crtc)
+drmmode_hide_cursor(xf86CrtcPtr crtc)
{
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
-
- drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, 0, 64, 64);
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, 0, 64, 64);
}
static void
-drmmode_show_cursor (xf86CrtcPtr crtc)
+drmmode_show_cursor(xf86CrtcPtr crtc)
{
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
- uint32_t handle = drmmode_crtc->cursor_bo->handle;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ uint32_t handle = drmmode_crtc->cursor_bo->handle;
- drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, 64, 64);
+ drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, 64, 64);
}
static void
drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green,
- uint16_t *blue, int size)
+ uint16_t *blue, int size)
{
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
- drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
- size, red, green, blue);
+ drmModeCrtcSetGamma(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
+ size, red, green, blue);
}
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
static Bool
drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
{
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
- msPixmapPrivPtr ppriv;
- void *ptr;
-
- if (!ppix) {
- if (crtc->randr_crtc->scanout_pixmap) {
- ppriv = msGetPixmapPriv(drmmode, crtc->randr_crtc->scanout_pixmap);
- drmModeRmFB(drmmode->fd, ppriv->fb_id);
- }
- if (drmmode_crtc->slave_damage) {
- DamageUnregister(&crtc->randr_crtc->scanout_pixmap->drawable,
- drmmode_crtc->slave_damage);
- drmmode_crtc->slave_damage = NULL;
- }
- return TRUE;
- }
-
- ppriv = msGetPixmapPriv(drmmode, ppix);
- if (!drmmode_crtc->slave_damage) {
- drmmode_crtc->slave_damage = DamageCreate(NULL, NULL,
- DamageReportNone,
- TRUE,
- crtc->randr_crtc->pScreen,
- NULL);
- }
- ptr = drmmode_map_slave_bo(drmmode, ppriv);
- ppix->devPrivate.ptr = ptr;
- DamageRegister(&ppix->drawable, drmmode_crtc->slave_damage);
-
- if (ppriv->fb_id == 0) {
- int r;
- r = drmModeAddFB(drmmode->fd, ppix->drawable.width,
- ppix->drawable.height,
- ppix->drawable.depth,
- ppix->drawable.bitsPerPixel,
- ppix->devKind,
- ppriv->backing_bo->handle,
- &ppriv->fb_id);
- }
- return TRUE;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ TegraPixmapPrivPtr ppriv;
+ void *ptr;
+
+ if (!ppix) {
+ if (crtc->randr_crtc->scanout_pixmap) {
+ ppriv = TegraGetPixmapPriv(drmmode, crtc->randr_crtc->scanout_pixmap);
+ drmModeRmFB(drmmode->fd, ppriv->fb_id);
+ }
+
+ if (drmmode_crtc->slave_damage) {
+ DamageUnregister(&crtc->randr_crtc->scanout_pixmap->drawable,
+ drmmode_crtc->slave_damage);
+ drmmode_crtc->slave_damage = NULL;
+ }
+
+ return TRUE;
+ }
+
+ ppriv = TegraGetPixmapPriv(drmmode, ppix);
+
+ if (!drmmode_crtc->slave_damage)
+ drmmode_crtc->slave_damage = DamageCreate(NULL, NULL,
+ DamageReportNone, TRUE,
+ crtc->randr_crtc->pScreen,
+ NULL);
+
+ ptr = drmmode_map_slave_bo(drmmode, ppriv);
+ ppix->devPrivate.ptr = ptr;
+
+ DamageRegister(&ppix->drawable, drmmode_crtc->slave_damage);
+
+ if (ppriv->fb_id == 0) {
+ drmModeAddFB(drmmode->fd, ppix->drawable.width, ppix->drawable.height,
+ ppix->drawable.depth, ppix->drawable.bitsPerPixel,
+ ppix->devKind, ppriv->backing_bo->handle, &ppriv->fb_id);
+ }
+
+ return TRUE;
}
#endif
@@ -558,7 +503,7 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
.gamma_set = drmmode_crtc_gamma_set,
.destroy = NULL, /* XXX */
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
.set_scanout_pixmap = drmmode_set_scanout_pixmap,
#endif
};
@@ -566,146 +511,159 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
static void
drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
{
- xf86CrtcPtr crtc;
- drmmode_crtc_private_ptr drmmode_crtc;
+ xf86CrtcPtr crtc;
+ drmmode_crtc_private_ptr drmmode_crtc;
- crtc = xf86CrtcCreate(pScrn, &drmmode_crtc_funcs);
- if (crtc == NULL)
- return;
+ crtc = xf86CrtcCreate(pScrn, &drmmode_crtc_funcs);
+ if (crtc == NULL)
+ return;
- drmmode_crtc = xnfcalloc(sizeof(drmmode_crtc_private_rec), 1);
- drmmode_crtc->mode_crtc = drmModeGetCrtc(drmmode->fd, drmmode->mode_res->crtcs[num]);
- drmmode_crtc->drmmode = drmmode;
- crtc->driver_private = drmmode_crtc;
+ drmmode_crtc = xnfcalloc(sizeof(drmmode_crtc_private_rec), 1);
+ drmmode_crtc->mode_crtc = drmModeGetCrtc(drmmode->fd, drmmode->mode_res->crtcs[num]);
+ drmmode_crtc->drmmode = drmmode;
+ crtc->driver_private = drmmode_crtc;
}
static xf86OutputStatus
drmmode_output_detect(xf86OutputPtr output)
{
- /* go to the hw and retrieve a new output struct */
- drmmode_output_private_ptr drmmode_output = output->driver_private;
- drmmode_ptr drmmode = drmmode_output->drmmode;
- xf86OutputStatus status;
- drmModeFreeConnector(drmmode_output->mode_output);
-
- drmmode_output->mode_output = drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
- if (!drmmode_output->mode_output)
- return XF86OutputStatusDisconnected;
-
- switch (drmmode_output->mode_output->connection) {
- case DRM_MODE_CONNECTED:
- status = XF86OutputStatusConnected;
- break;
- case DRM_MODE_DISCONNECTED:
- status = XF86OutputStatusDisconnected;
- break;
- default:
- case DRM_MODE_UNKNOWNCONNECTION:
- status = XF86OutputStatusUnknown;
- break;
- }
- return status;
+ /* go to the hw and retrieve a new output struct */
+ drmmode_output_private_ptr drmmode_output = output->driver_private;
+ drmmode_ptr drmmode = drmmode_output->drmmode;
+ xf86OutputStatus status;
+
+ drmModeFreeConnector(drmmode_output->mode_output);
+
+ drmmode_output->mode_output = drmModeGetConnector(drmmode->fd,
+ drmmode_output->output_id);
+ if (!drmmode_output->mode_output)
+ return XF86OutputStatusDisconnected;
+
+ switch (drmmode_output->mode_output->connection) {
+ case DRM_MODE_CONNECTED:
+ status = XF86OutputStatusConnected;
+ break;
+
+ case DRM_MODE_DISCONNECTED:
+ status = XF86OutputStatusDisconnected;
+ break;
+
+ default:
+ case DRM_MODE_UNKNOWNCONNECTION:
+ status = XF86OutputStatusUnknown;
+ break;
+ }
+
+ return status;
}
static Bool
drmmode_output_mode_valid(xf86OutputPtr output, DisplayModePtr pModes)
{
- return MODE_OK;
+ return MODE_OK;
}
static DisplayModePtr
drmmode_output_get_modes(xf86OutputPtr output)
{
- drmmode_output_private_ptr drmmode_output = output->driver_private;
- drmModeConnectorPtr koutput = drmmode_output->mode_output;
- drmmode_ptr drmmode = drmmode_output->drmmode;
- int i;
- DisplayModePtr Modes = NULL, Mode;
- drmModePropertyPtr props;
- xf86MonPtr mon = NULL;
-
- /* look for an EDID property */
- for (i = 0; i < koutput->count_props; i++) {
- props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
- if (props && (props->flags & DRM_MODE_PROP_BLOB)) {
- if (!strcmp(props->name, "EDID")) {
- if (drmmode_output->edid_blob)
- drmModeFreePropertyBlob(drmmode_output->edid_blob);
- drmmode_output->edid_blob = drmModeGetPropertyBlob(drmmode->fd, koutput->prop_values[i]);
- }
- drmModeFreeProperty(props);
- }
- }
-
- if (drmmode_output->edid_blob) {
- mon = xf86InterpretEDID(output->scrn->scrnIndex,
- drmmode_output->edid_blob->data);
- if (mon && drmmode_output->edid_blob->length > 128)
- mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
- }
- xf86OutputSetEDID(output, mon);
-
- /* modes should already be available */
- for (i = 0; i < koutput->count_modes; i++) {
- Mode = xnfalloc(sizeof(DisplayModeRec));
-
- drmmode_ConvertFromKMode(output->scrn, &koutput->modes[i], Mode);
- Modes = xf86ModesAdd(Modes, Mode);
-
- }
- return Modes;
+ drmmode_output_private_ptr drmmode_output = output->driver_private;
+ drmModeConnectorPtr koutput = drmmode_output->mode_output;
+ drmmode_ptr drmmode = drmmode_output->drmmode;
+ int i;
+ DisplayModePtr Modes = NULL, Mode;
+ drmModePropertyPtr props;
+ xf86MonPtr mon = NULL;
+
+ /* look for an EDID property */
+ for (i = 0; i < koutput->count_props; i++) {
+ props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
+ if (props && (props->flags & DRM_MODE_PROP_BLOB)) {
+ if (!strcmp(props->name, "EDID")) {
+ if (drmmode_output->edid_blob)
+ drmModeFreePropertyBlob(drmmode_output->edid_blob);
+
+ drmmode_output->edid_blob = drmModeGetPropertyBlob(drmmode->fd, koutput->prop_values[i]);
+ }
+
+ drmModeFreeProperty(props);
+ }
+ }
+
+ if (drmmode_output->edid_blob) {
+ mon = xf86InterpretEDID(output->scrn->scrnIndex,
+ drmmode_output->edid_blob->data);
+ if (mon && drmmode_output->edid_blob->length > 128)
+ mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
+ }
+
+ xf86OutputSetEDID(output, mon);
+
+ /* modes should already be available */
+ for (i = 0; i < koutput->count_modes; i++) {
+ Mode = xnfalloc(sizeof(DisplayModeRec));
+
+ drmmode_ConvertFromKMode(output->scrn, &koutput->modes[i], Mode);
+ Modes = xf86ModesAdd(Modes, Mode);
+
+ }
+
+ return Modes;
}
static void
drmmode_output_destroy(xf86OutputPtr output)
{
- drmmode_output_private_ptr drmmode_output = output->driver_private;
- int i;
-
- if (drmmode_output->edid_blob)
- drmModeFreePropertyBlob(drmmode_output->edid_blob);
- for (i = 0; i < drmmode_output->num_props; i++) {
- drmModeFreeProperty(drmmode_output->props[i].mode_prop);
- free(drmmode_output->props[i].atoms);
- }
- for (i = 0; i < drmmode_output->mode_output->count_encoders; i++) {
- drmModeFreeEncoder(drmmode_output->mode_encoders[i]);
- free(drmmode_output->mode_encoders);
- }
- free(drmmode_output->props);
- drmModeFreeConnector(drmmode_output->mode_output);
- free(drmmode_output);
- output->driver_private = NULL;
+ drmmode_output_private_ptr drmmode_output = output->driver_private;
+ int i;
+
+ if (drmmode_output->edid_blob)
+ drmModeFreePropertyBlob(drmmode_output->edid_blob);
+
+ for (i = 0; i < drmmode_output->num_props; i++) {
+ drmModeFreeProperty(drmmode_output->props[i].mode_prop);
+ free(drmmode_output->props[i].atoms);
+ }
+
+ for (i = 0; i < drmmode_output->mode_output->count_encoders; i++) {
+ drmModeFreeEncoder(drmmode_output->mode_encoders[i]);
+ free(drmmode_output->mode_encoders);
+ }
+
+ free(drmmode_output->props);
+ drmModeFreeConnector(drmmode_output->mode_output);
+
+ free(drmmode_output);
+ output->driver_private = NULL;
}
static void
drmmode_output_dpms(xf86OutputPtr output, int mode)
{
- drmmode_output_private_ptr drmmode_output = output->driver_private;
- drmModeConnectorPtr koutput = drmmode_output->mode_output;
- drmmode_ptr drmmode = drmmode_output->drmmode;
+ drmmode_output_private_ptr drmmode_output = output->driver_private;
+ drmModeConnectorPtr koutput = drmmode_output->mode_output;
+ drmmode_ptr drmmode = drmmode_output->drmmode;
- if (!koutput)
- return;
+ if (!koutput)
+ return;
- drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id,
- drmmode_output->dpms_enum_id, mode);
- return;
+ drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id,
+ drmmode_output->dpms_enum_id, mode);
+ return;
}
-
static Bool
drmmode_property_ignore(drmModePropertyPtr prop)
{
if (!prop)
- return TRUE;
+ return TRUE;
+
/* ignore blob prop */
if (prop->flags & DRM_MODE_PROP_BLOB)
- return TRUE;
+ return TRUE;
+
/* ignore standard property */
- if (!strcmp(prop->name, "EDID") ||
- !strcmp(prop->name, "DPMS"))
- return TRUE;
+ if (!strcmp(prop->name, "EDID") || !strcmp(prop->name, "DPMS"))
+ return TRUE;
return FALSE;
}
@@ -721,126 +679,140 @@ drmmode_output_create_resources(xf86OutputPtr output)
drmmode_output->props = calloc(mode_output->count_props, sizeof(drmmode_prop_rec));
if (!drmmode_output->props)
- return;
-
+ return;
+
drmmode_output->num_props = 0;
+
for (i = 0, j = 0; i < mode_output->count_props; i++) {
- drmmode_prop = drmModeGetProperty(drmmode->fd, mode_output->props[i]);
- if (drmmode_property_ignore(drmmode_prop)) {
- drmModeFreeProperty(drmmode_prop);
- continue;
- }
- drmmode_output->props[j].mode_prop = drmmode_prop;
- drmmode_output->props[j].value = mode_output->prop_values[i];
- drmmode_output->num_props++;
- j++;
+ drmmode_prop = drmModeGetProperty(drmmode->fd, mode_output->props[i]);
+
+ if (drmmode_property_ignore(drmmode_prop)) {
+ drmModeFreeProperty(drmmode_prop);
+ continue;
+ }
+
+ drmmode_output->props[j].mode_prop = drmmode_prop;
+ drmmode_output->props[j].value = mode_output->prop_values[i];
+ drmmode_output->num_props++;
+ j++;
}
for (i = 0; i < drmmode_output->num_props; i++) {
- drmmode_prop_ptr p = &drmmode_output->props[i];
- drmmode_prop = p->mode_prop;
-
- if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) {
- INT32 range[2];
- INT32 value = p->value;
-
- p->num_atoms = 1;
- p->atoms = calloc(p->num_atoms, sizeof(Atom));
- if (!p->atoms)
- continue;
- p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
- range[0] = drmmode_prop->values[0];
- range[1] = drmmode_prop->values[1];
- err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
- FALSE, TRUE,
- drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
- 2, range);
- if (err != 0) {
- xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
- "RRConfigureOutputProperty error, %d\n", err);
- }
- err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
- XA_INTEGER, 32, PropModeReplace, 1, &value, FALSE, TRUE);
- if (err != 0) {
- xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
- "RRChangeOutputProperty error, %d\n", err);
- }
- } else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) {
- p->num_atoms = drmmode_prop->count_enums + 1;
- p->atoms = calloc(p->num_atoms, sizeof(Atom));
- if (!p->atoms)
- continue;
- p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
- for (j = 1; j <= drmmode_prop->count_enums; j++) {
- struct drm_mode_property_enum *e = &drmmode_prop->enums[j-1];
- p->atoms[j] = MakeAtom(e->name, strlen(e->name), TRUE);
- }
- err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
- FALSE, FALSE,
- drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
- p->num_atoms - 1, (INT32 *)&p->atoms[1]);
- if (err != 0) {
- xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
- "RRConfigureOutputProperty error, %d\n", err);
- }
- for (j = 0; j < drmmode_prop->count_enums; j++)
- if (drmmode_prop->enums[j].value == p->value)
- break;
- /* there's always a matching value */
- err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
- XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, TRUE);
- if (err != 0) {
- xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
- "RRChangeOutputProperty error, %d\n", err);
- }
- }
+ drmmode_prop_ptr p = &drmmode_output->props[i];
+ drmmode_prop = p->mode_prop;
+
+ if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) {
+ INT32 range[2], value = p->value;
+
+ p->num_atoms = 1;
+ p->atoms = calloc(p->num_atoms, sizeof(Atom));
+
+ if (!p->atoms)
+ continue;
+
+ p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
+ range[0] = drmmode_prop->values[0];
+ range[1] = drmmode_prop->values[1];
+
+ err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
+ FALSE, TRUE,
+ drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
+ 2, range);
+ if (err != 0)
+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+ "RRConfigureOutputProperty error, %d\n", err);
+
+ err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
+ XA_INTEGER, 32, PropModeReplace, 1,
+ &value, FALSE, TRUE);
+ if (err != 0)
+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+ "RRChangeOutputProperty error, %d\n", err);
+ } else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) {
+ p->num_atoms = drmmode_prop->count_enums + 1;
+
+ p->atoms = calloc(p->num_atoms, sizeof(Atom));
+ if (!p->atoms)
+ continue;
+
+ p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
+
+ for (j = 1; j <= drmmode_prop->count_enums; j++) {
+ struct drm_mode_property_enum *e = &drmmode_prop->enums[j - 1];
+ p->atoms[j] = MakeAtom(e->name, strlen(e->name), TRUE);
+ }
+
+ err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
+ FALSE, FALSE,
+ drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
+ p->num_atoms - 1, (INT32 *)&p->atoms[1]);
+ if (err != 0)
+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+ "RRConfigureOutputProperty error, %d\n", err);
+
+ for (j = 0; j < drmmode_prop->count_enums; j++)
+ if (drmmode_prop->enums[j].value == p->value)
+ break;
+
+ /* there's always a matching value */
+ err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
+ XA_ATOM, 32, PropModeReplace, 1,
+ &p->atoms[j+1], FALSE, TRUE);
+ if (err != 0)
+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+ "RRChangeOutputProperty error, %d\n", err);
+ }
}
}
static Bool
drmmode_output_set_property(xf86OutputPtr output, Atom property,
- RRPropertyValuePtr value)
+ RRPropertyValuePtr value)
{
drmmode_output_private_ptr drmmode_output = output->driver_private;
drmmode_ptr drmmode = drmmode_output->drmmode;
int i;
for (i = 0; i < drmmode_output->num_props; i++) {
- drmmode_prop_ptr p = &drmmode_output->props[i];
-
- if (p->atoms[0] != property)
- continue;
-
- if (p->mode_prop->flags & DRM_MODE_PROP_RANGE) {
- uint32_t val;
-
- if (value->type != XA_INTEGER || value->format != 32 ||
- value->size != 1)
- return FALSE;
- val = *(uint32_t *)value->data;
-
- drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id,
- p->mode_prop->prop_id, (uint64_t)val);
- return TRUE;
- } else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) {
- Atom atom;
- const char *name;
- int j;
-
- if (value->type != XA_ATOM || value->format != 32 || value->size != 1)
- return FALSE;
- memcpy(&atom, value->data, 4);
- name = NameForAtom(atom);
-
- /* search for matching name string, then set its value down */
- for (j = 0; j < p->mode_prop->count_enums; j++) {
- if (!strcmp(p->mode_prop->enums[j].name, name)) {
- drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id,
- p->mode_prop->prop_id, p->mode_prop->enums[j].value);
- return TRUE;
- }
- }
- }
+ drmmode_prop_ptr p = &drmmode_output->props[i];
+
+ if (p->atoms[0] != property)
+ continue;
+
+ if (p->mode_prop->flags & DRM_MODE_PROP_RANGE) {
+ uint32_t val;
+
+ if (value->type != XA_INTEGER || value->format != 32 ||
+ value->size != 1)
+ return FALSE;
+
+ val = *(uint32_t *)value->data;
+
+ drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id,
+ p->mode_prop->prop_id, (uint64_t)val);
+
+ return TRUE;
+ } else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) {
+ Atom atom;
+ const char *name;
+ int j;
+
+ if (value->type != XA_ATOM || value->format != 32 || value->size != 1)
+ return FALSE;
+
+ memcpy(&atom, value->data, 4);
+ name = NameForAtom(atom);
+
+ /* search for matching name string, then set its value down */
+ for (j = 0; j < p->mode_prop->count_enums; j++) {
+ if (!strcmp(p->mode_prop->enums[j].name, name)) {
+ drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id,
+ p->mode_prop->prop_id,
+ p->mode_prop->enums[j].value);
+ return TRUE;
+ }
+ }
+ }
}
return TRUE;
@@ -866,395 +838,410 @@ static const xf86OutputFuncsRec drmmode_output_funcs = {
.destroy = drmmode_output_destroy
};
-static int subpixel_conv_table[7] = { 0, SubPixelUnknown,
- SubPixelHorizontalRGB,
- SubPixelHorizontalBGR,
- SubPixelVerticalRGB,
- SubPixelVerticalBGR,
- SubPixelNone };
-
-const char *output_names[] = { "None",
- "VGA",
- "DVI",
- "DVI",
- "DVI",
- "Composite",
- "S-video",
- "LVDS",
- "CTV",
- "DIN",
- "DisplayPort",
- "HDMI",
- "HDMI",
- "TV",
- "eDP",
- "Virtual"
+static int subpixel_conv_table[7] = {
+ 0,
+ SubPixelUnknown,
+ SubPixelHorizontalRGB,
+ SubPixelHorizontalBGR,
+ SubPixelVerticalRGB,
+ SubPixelVerticalBGR,
+ SubPixelNone
+};
+
+const char *output_names[] = {
+ "None",
+ "VGA",
+ "DVI",
+ "DVI",
+ "DVI",
+ "Composite",
+ "S-video",
+ "LVDS",
+ "CTV",
+ "DIN",
+ "DisplayPort",
+ "HDMI",
+ "HDMI",
+ "TV",
+ "eDP",
+ "Virtual"
};
static void
drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dvi, int *num_hdmi)
{
- xf86OutputPtr output;
- drmModeConnectorPtr koutput;
- drmModeEncoderPtr *kencoders = NULL;
- drmmode_output_private_ptr drmmode_output;
- drmModePropertyPtr props;
- char name[32];
- int i;
-
- koutput = drmModeGetConnector(drmmode->fd, drmmode->mode_res->connectors[num]);
- if (!koutput)
- return;
-
- kencoders = calloc(sizeof(drmModeEncoderPtr), koutput->count_encoders);
- if (!kencoders) {
- goto out_free_encoders;
- }
-
- for (i = 0; i < koutput->count_encoders; i++) {
- kencoders[i] = drmModeGetEncoder(drmmode->fd, koutput->encoders[i]);
- if (!kencoders[i]) {
- goto out_free_encoders;
- }
- }
-
- /* need to do smart conversion here for compat with non-kms ATI driver */
- if (koutput->connector_type >= MS_ARRAY_SIZE(output_names))
- snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1);
- else
- snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1);
-
- output = xf86OutputCreate (pScrn, &drmmode_output_funcs, name);
- if (!output) {
- goto out_free_encoders;
- }
-
- drmmode_output = calloc(sizeof(drmmode_output_private_rec), 1);
- if (!drmmode_output) {
- xf86OutputDestroy(output);
- goto out_free_encoders;
- }
-
- drmmode_output->output_id = drmmode->mode_res->connectors[num];
- drmmode_output->mode_output = koutput;
- drmmode_output->mode_encoders = kencoders;
- drmmode_output->drmmode = drmmode;
- output->mm_width = koutput->mmWidth;
- output->mm_height = koutput->mmHeight;
-
- output->subpixel_order = subpixel_conv_table[koutput->subpixel];
- output->interlaceAllowed = TRUE;
- output->doubleScanAllowed = TRUE;
- output->driver_private = drmmode_output;
-
- output->possible_crtcs = 0x7f;
- for (i = 0; i < koutput->count_encoders; i++) {
- output->possible_crtcs &= kencoders[i]->possible_crtcs;
- }
- /* work out the possible clones later */
- output->possible_clones = 0;
-
- for (i = 0; i < koutput->count_props; i++) {
- props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
- if (props && (props->flags & DRM_MODE_PROP_ENUM)) {
- if (!strcmp(props->name, "DPMS")) {
- drmmode_output->dpms_enum_id = koutput->props[i];
- drmModeFreeProperty(props);
- break;
- }
- drmModeFreeProperty(props);
- }
- }
-
- return;
+ xf86OutputPtr output;
+ drmModeConnectorPtr koutput;
+ drmModeEncoderPtr *kencoders = NULL;
+ drmmode_output_private_ptr drmmode_output;
+ drmModePropertyPtr props;
+ char name[32];
+ int i;
+
+ koutput = drmModeGetConnector(drmmode->fd, drmmode->mode_res->connectors[num]);
+ if (!koutput)
+ return;
+
+ kencoders = calloc(sizeof(drmModeEncoderPtr), koutput->count_encoders);
+ if (!kencoders)
+ goto out_free_encoders;
+
+ for (i = 0; i < koutput->count_encoders; i++) {
+ kencoders[i] = drmModeGetEncoder(drmmode->fd, koutput->encoders[i]);
+
+ if (!kencoders[i])
+ goto out_free_encoders;
+ }
+
+ /* need to do smart conversion here for compat with non-kms ATI driver */
+ if (koutput->connector_type >= ARRAY_SIZE(output_names))
+ snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1);
+ else
+ snprintf(name, 32, "%s-%d", output_names[koutput->connector_type],
+ koutput->connector_type_id - 1);
+
+ output = xf86OutputCreate (pScrn, &drmmode_output_funcs, name);
+ if (!output)
+ goto out_free_encoders;
+
+ drmmode_output = calloc(sizeof(drmmode_output_private_rec), 1);
+ if (!drmmode_output) {
+ xf86OutputDestroy(output);
+ goto out_free_encoders;
+ }
+
+ drmmode_output->output_id = drmmode->mode_res->connectors[num];
+ drmmode_output->mode_output = koutput;
+ drmmode_output->mode_encoders = kencoders;
+ drmmode_output->drmmode = drmmode;
+ output->mm_width = koutput->mmWidth;
+ output->mm_height = koutput->mmHeight;
+
+ output->subpixel_order = subpixel_conv_table[koutput->subpixel];
+ output->interlaceAllowed = TRUE;
+ output->doubleScanAllowed = TRUE;
+ output->driver_private = drmmode_output;
+
+ output->possible_crtcs = 0x7f;
+
+ for (i = 0; i < koutput->count_encoders; i++)
+ output->possible_crtcs &= kencoders[i]->possible_crtcs;
+
+ /* work out the possible clones later */
+ output->possible_clones = 0;
+
+ for (i = 0; i < koutput->count_props; i++) {
+ props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
+
+ if (props && (props->flags & DRM_MODE_PROP_ENUM)) {
+ if (!strcmp(props->name, "DPMS")) {
+ drmmode_output->dpms_enum_id = koutput->props[i];
+ drmModeFreeProperty(props);
+ break;
+ }
+
+ drmModeFreeProperty(props);
+ }
+ }
+
+ return;
+
out_free_encoders:
- if (kencoders){
- for (i = 0; i < koutput->count_encoders; i++)
- drmModeFreeEncoder(kencoders[i]);
- free(kencoders);
- }
- drmModeFreeConnector(koutput);
-
+ if (kencoders){
+ for (i = 0; i < koutput->count_encoders; i++)
+ drmModeFreeEncoder(kencoders[i]);
+
+ free(kencoders);
+ }
+
+ drmModeFreeConnector(koutput);
}
static uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
{
- drmmode_output_private_ptr drmmode_output = output->driver_private, clone_drmout;
- int i;
- xf86OutputPtr clone_output;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- int index_mask = 0;
-
- if (drmmode_output->enc_clone_mask == 0)
- return index_mask;
-
- for (i = 0; i < xf86_config->num_output; i++) {
- clone_output = xf86_config->output[i];
- clone_drmout = clone_output->driver_private;
- if (output == clone_output)
- continue;
-
- if (clone_drmout->enc_mask == 0)
- continue;
- if (drmmode_output->enc_clone_mask == clone_drmout->enc_mask)
- index_mask |= (1 << i);
- }
- return index_mask;
-}
+ drmmode_output_private_ptr drmmode_output = output->driver_private, clone_drmout;
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ xf86OutputPtr clone_output;
+ int index_mask = 0, i;
+ if (drmmode_output->enc_clone_mask == 0)
+ return index_mask;
+
+ for (i = 0; i < xf86_config->num_output; i++) {
+ clone_output = xf86_config->output[i];
+ clone_drmout = clone_output->driver_private;
+
+ if (output == clone_output)
+ continue;
+
+ if (clone_drmout->enc_mask == 0)
+ continue;
+
+ if (drmmode_output->enc_clone_mask == clone_drmout->enc_mask)
+ index_mask |= (1 << i);
+ }
+
+ return index_mask;
+}
static void
drmmode_clones_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{
- int i, j;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-
- for (i = 0; i < xf86_config->num_output; i++) {
- xf86OutputPtr output = xf86_config->output[i];
- drmmode_output_private_ptr drmmode_output;
-
- drmmode_output = output->driver_private;
- drmmode_output->enc_clone_mask = 0xff;
- /* and all the possible encoder clones for this output together */
- for (j = 0; j < drmmode_output->mode_output->count_encoders; j++)
- {
- int k;
- for (k = 0; k < drmmode->mode_res->count_encoders; k++) {
- if (drmmode->mode_res->encoders[k] == drmmode_output->mode_encoders[j]->encoder_id)
- drmmode_output->enc_mask |= (1 << k);
- }
-
- drmmode_output->enc_clone_mask &= drmmode_output->mode_encoders[j]->possible_clones;
- }
- }
-
- for (i = 0; i < xf86_config->num_output; i++) {
- xf86OutputPtr output = xf86_config->output[i];
- output->possible_clones = find_clones(scrn, output);
- }
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ int i, j, k;
+
+ for (i = 0; i < xf86_config->num_output; i++) {
+ xf86OutputPtr output = xf86_config->output[i];
+ drmmode_output_private_ptr drmmode_output;
+
+ drmmode_output = output->driver_private;
+ drmmode_output->enc_clone_mask = 0xff;
+
+ /* and all the possible encoder clones for this output together */
+ for (j = 0; j < drmmode_output->mode_output->count_encoders; j++)
+ {
+ for (k = 0; k < drmmode->mode_res->count_encoders; k++) {
+ if (drmmode->mode_res->encoders[k] == drmmode_output->mode_encoders[j]->encoder_id)
+ drmmode_output->enc_mask |= (1 << k);
+ }
+
+ drmmode_output->enc_clone_mask &= drmmode_output->mode_encoders[j]->possible_clones;
+ }
+ }
+
+ for (i = 0; i < xf86_config->num_output; i++) {
+ xf86OutputPtr output = xf86_config->output[i];
+ output->possible_clones = find_clones(scrn, output);
+ }
}
static Bool
-drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
+drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- drmmode_crtc_private_ptr
- drmmode_crtc = xf86_config->crtc[0]->driver_private;
- drmmode_ptr drmmode = drmmode_crtc->drmmode;
- struct dumb_bo *old_front = NULL;
- Bool ret;
- ScreenPtr screen = xf86ScrnToScreen(scrn);
- uint32_t old_fb_id;
- int i, pitch, old_width, old_height, old_pitch;
- int cpp = (scrn->bitsPerPixel + 7) / 8;
- PixmapPtr ppix = screen->GetScreenPixmap(screen);
- void *new_pixels;
-
- if (scrn->virtualX == width && scrn->virtualY == height)
- return TRUE;
-
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "Allocate new frame buffer %dx%d stride\n",
- width, height);
-
- old_width = scrn->virtualX;
- old_height = scrn->virtualY;
- old_pitch = drmmode->front_bo->pitch;
- old_fb_id = drmmode->fb_id;
- old_front = drmmode->front_bo;
-
- drmmode->front_bo = dumb_bo_create(drmmode->fd, width, height, scrn->bitsPerPixel);
- if (!drmmode->front_bo)
- goto fail;
-
- pitch = drmmode->front_bo->pitch;
-
- scrn->virtualX = width;
- scrn->virtualY = height;
- scrn->displayWidth = pitch / cpp;
-
- ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth,
- scrn->bitsPerPixel, pitch,
- drmmode->front_bo->handle,
- &drmmode->fb_id);
- if (ret)
- goto fail;
-
- new_pixels = drmmode_map_front_bo(drmmode);
- if (!new_pixels)
- goto fail;
-
- if (!drmmode->shadow_enable)
- screen->ModifyPixmapHeader(ppix, width, height, -1, -1,
- pitch, new_pixels);
- else {
- void *new_shadow;
- uint32_t size = scrn->displayWidth * scrn->virtualY *
- ((scrn->bitsPerPixel + 7) >> 3);
- new_shadow = calloc(1, size);
- if (new_shadow == NULL)
- goto fail;
- free(drmmode->shadow_fb);
- drmmode->shadow_fb = new_shadow;
- screen->ModifyPixmapHeader(ppix, width, height, -1, -1,
- pitch, drmmode->shadow_fb);
- }
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ drmmode_crtc_private_ptr drmmode_crtc = xf86_config->crtc[0]->driver_private;
+ drmmode_ptr drmmode = drmmode_crtc->drmmode;
+ struct dumb_bo *old_front = NULL;
+ Bool ret;
+ ScreenPtr screen = xf86ScrnToScreen(scrn);
+ uint32_t old_fb_id;
+ int i, pitch, old_width, old_height, old_pitch;
+ int cpp = (scrn->bitsPerPixel + 7) / 8;
+ PixmapPtr ppix = screen->GetScreenPixmap(screen);
+ void *new_pixels;
+
+ if (scrn->virtualX == width && scrn->virtualY == height)
+ return TRUE;
+
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
+ "Allocate new frame buffer %dx%d stride\n",
+ width, height);
+
+ old_width = scrn->virtualX;
+ old_height = scrn->virtualY;
+ old_pitch = drmmode->front_bo->pitch;
+ old_fb_id = drmmode->fb_id;
+ old_front = drmmode->front_bo;
+
+ drmmode->front_bo = dumb_bo_create(drmmode->fd, width, height, scrn->bitsPerPixel);
+ if (!drmmode->front_bo)
+ goto fail;
+
+ pitch = drmmode->front_bo->pitch;
+
+ scrn->virtualX = width;
+ scrn->virtualY = height;
+ scrn->displayWidth = pitch / cpp;
+
+ ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth,
+ scrn->bitsPerPixel, pitch, drmmode->front_bo->handle,
+ &drmmode->fb_id);
+ if (ret)
+ goto fail;
+
+ new_pixels = drmmode_map_front_bo(drmmode);
+ if (!new_pixels)
+ goto fail;
+
+ if (!drmmode->shadow_enable)
+ screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
+ new_pixels);
+ else {
+ uint32_t size = scrn->displayWidth * scrn->virtualY *
+ ((scrn->bitsPerPixel + 7) >> 3);
+ void *new_shadow;
+
+ new_shadow = calloc(1, size);
+ if (new_shadow == NULL)
+ goto fail;
+
+ free(drmmode->shadow_fb);
+ drmmode->shadow_fb = new_shadow;
+ screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
+ drmmode->shadow_fb);
+ }
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0)
- scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
+ scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
#endif
- for (i = 0; i < xf86_config->num_crtc; i++) {
- xf86CrtcPtr crtc = xf86_config->crtc[i];
+ for (i = 0; i < xf86_config->num_crtc; i++) {
+ xf86CrtcPtr crtc = xf86_config->crtc[i];
- if (!crtc->enabled)
- continue;
+ if (!crtc->enabled)
+ continue;
+
+ drmmode_set_mode_major(crtc, &crtc->mode, crtc->rotation, crtc->x,
+ crtc->y);
+ }
- drmmode_set_mode_major(crtc, &crtc->mode,
- crtc->rotation, crtc->x, crtc->y);
- }
+ if (old_fb_id) {
+ drmModeRmFB(drmmode->fd, old_fb_id);
+ dumb_bo_destroy(drmmode->fd, old_front);
+ }
- if (old_fb_id) {
- drmModeRmFB(drmmode->fd, old_fb_id);
- dumb_bo_destroy(drmmode->fd, old_front);
- }
+ return TRUE;
- return TRUE;
+fail:
+ if (drmmode->front_bo)
+ dumb_bo_destroy(drmmode->fd, drmmode->front_bo);
- fail:
- if (drmmode->front_bo)
- dumb_bo_destroy(drmmode->fd, drmmode->front_bo);
- drmmode->front_bo = old_front;
- scrn->virtualX = old_width;
- scrn->virtualY = old_height;
- scrn->displayWidth = old_pitch / cpp;
- drmmode->fb_id = old_fb_id;
+ drmmode->front_bo = old_front;
+ scrn->virtualX = old_width;
+ scrn->virtualY = old_height;
+ scrn->displayWidth = old_pitch / cpp;
+ drmmode->fb_id = old_fb_id;
- return FALSE;
+ return FALSE;
}
static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
- drmmode_xf86crtc_resize
+ drmmode_xf86crtc_resize
};
Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
{
- int i, num_dvi = 0, num_hdmi = 0;
- int ret;
- uint64_t value = 0;
+ int i, num_dvi = 0, num_hdmi = 0;
+ int ret;
+ uint64_t value = 0;
+
+ /* check for dumb capability */
+ ret = drmGetCap(drmmode->fd, DRM_CAP_DUMB_BUFFER, &value);
+ if (ret > 0 || value != 1) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "KMS doesn't support dumb interface\n");
+ return FALSE;
+ }
+
+ xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
- /* check for dumb capability */
- ret = drmGetCap(drmmode->fd, DRM_CAP_DUMB_BUFFER, &value);
- if (ret > 0 || value != 1) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "KMS doesn't support dumb interface\n");
- return FALSE;
- }
+ drmmode->scrn = pScrn;
+ drmmode->cpp = cpp;
+ drmmode->mode_res = drmModeGetResources(drmmode->fd);
- xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
+ if (!drmmode->mode_res)
+ return FALSE;
- drmmode->scrn = pScrn;
- drmmode->cpp = cpp;
- drmmode->mode_res = drmModeGetResources(drmmode->fd);
- if (!drmmode->mode_res)
- return FALSE;
+ xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
+ drmmode->mode_res->max_height);
- xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width, drmmode->mode_res->max_height);
- for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
- if (!xf86IsEntityShared(pScrn->entityList[0]) || pScrn->confScreen->device->screen == i)
- drmmode_crtc_init(pScrn, drmmode, i);
+ for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
+ if (!xf86IsEntityShared(pScrn->entityList[0]) || pScrn->confScreen->device->screen == i)
+ drmmode_crtc_init(pScrn, drmmode, i);
- for (i = 0; i < drmmode->mode_res->count_connectors; i++)
- drmmode_output_init(pScrn, drmmode, i, &num_dvi, &num_hdmi);
+ for (i = 0; i < drmmode->mode_res->count_connectors; i++)
+ drmmode_output_init(pScrn, drmmode, i, &num_dvi, &num_hdmi);
- /* workout clones */
- drmmode_clones_init(pScrn, drmmode);
+ /* workout clones */
+ drmmode_clones_init(pScrn, drmmode);
#if XF86_CRTC_VERSION >= 5
- xf86ProviderSetup(pScrn, NULL, "modesetting");
+ xf86ProviderSetup(pScrn, NULL, "opentegra");
#endif
- xf86InitialConfiguration(pScrn, TRUE);
+ xf86InitialConfiguration(pScrn, TRUE);
- return TRUE;
+ return TRUE;
}
void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y, int flags)
{
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- xf86OutputPtr output = config->output[config->compat_output];
- xf86CrtcPtr crtc = output->crtc;
-
- if (crtc && crtc->enabled) {
- drmmode_set_mode_major(crtc, &crtc->mode, crtc->rotation,
- x, y);
- }
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86OutputPtr output = config->output[config->compat_output];
+ xf86CrtcPtr crtc = output->crtc;
+
+ if (crtc && crtc->enabled)
+ drmmode_set_mode_major(crtc, &crtc->mode, crtc->rotation, x, y);
}
Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- int c;
-
- for (c = 0; c < config->num_crtc; c++) {
- xf86CrtcPtr crtc = config->crtc[c];
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- xf86OutputPtr output = NULL;
- int o;
-
- /* Skip disabled CRTCs */
- if (!crtc->enabled) {
- drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
- 0, 0, 0, NULL, 0, NULL);
- continue;
- }
-
- if (config->output[config->compat_output]->crtc == crtc)
- output = config->output[config->compat_output];
- else
- {
- for (o = 0; o < config->num_output; o++)
- if (config->output[o]->crtc == crtc)
- {
- output = config->output[o];
- break;
- }
- }
- /* paranoia */
- if (!output)
- continue;
-
- /* Mark that we'll need to re-set the mode for sure */
- memset(&crtc->mode, 0, sizeof(crtc->mode));
- if (!crtc->desiredMode.CrtcHDisplay)
- {
- DisplayModePtr mode = xf86OutputFindClosestMode (output, pScrn->currentMode);
-
- if (!mode)
- return FALSE;
- crtc->desiredMode = *mode;
- crtc->desiredRotation = RR_Rotate_0;
- crtc->desiredX = 0;
- crtc->desiredY = 0;
- }
-
- if (!crtc->funcs->set_mode_major(crtc, &crtc->desiredMode, crtc->desiredRotation,
- crtc->desiredX, crtc->desiredY))
- return FALSE;
- }
- return TRUE;
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ int c;
+
+ for (c = 0; c < config->num_crtc; c++) {
+ xf86CrtcPtr crtc = config->crtc[c];
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ xf86OutputPtr output = NULL;
+ int o;
+
+ /* Skip disabled CRTCs */
+ if (!crtc->enabled) {
+ drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
+ 0, 0, 0, NULL, 0, NULL);
+ continue;
+ }
+
+ if (config->output[config->compat_output]->crtc == crtc)
+ output = config->output[config->compat_output];
+ else
+ {
+ for (o = 0; o < config->num_output; o++)
+ if (config->output[o]->crtc == crtc) {
+ output = config->output[o];
+ break;
+ }
+ }
+
+ /* paranoia */
+ if (!output)
+ continue;
+
+ /* Mark that we'll need to re-set the mode for sure */
+ memset(&crtc->mode, 0, sizeof(crtc->mode));
+ if (!crtc->desiredMode.CrtcHDisplay)
+ {
+ DisplayModePtr mode = xf86OutputFindClosestMode (output, pScrn->currentMode);
+
+ if (!mode)
+ return FALSE;
+
+ crtc->desiredMode = *mode;
+ crtc->desiredRotation = RR_Rotate_0;
+ crtc->desiredX = 0;
+ crtc->desiredY = 0;
+ }
+
+ if (!crtc->funcs->set_mode_major(crtc, &crtc->desiredMode,
+ crtc->desiredRotation,
+ crtc->desiredX, crtc->desiredY))
+ return FALSE;
+ }
+
+ return TRUE;
}
static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
int *indices, LOCO *colors, VisualPtr pVisual)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- uint16_t lut_r[256], lut_g[256], lut_b[256];
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ uint16_t lut_r[256], lut_g[256], lut_b[256];
int index, j, i;
int c;
for (c = 0; c < xf86_config->num_crtc; c++) {
xf86CrtcPtr crtc = xf86_config->crtc[c];
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
for (i = 0 ; i < 256; i++) {
lut_r[i] = drmmode_crtc->lut_r[i] << 6;
@@ -1273,6 +1260,7 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
}
}
break;
+
case 16:
for (i = 0; i < numColors; i++) {
index = indices[i];
@@ -1288,7 +1276,8 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
lut_g[index * 4 + j] = colors[index].green << 6;
}
}
- break;
+ break;
+
default:
for (i = 0; i < numColors; i++) {
index = indices[i];
@@ -1299,8 +1288,8 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
break;
}
- /* Make the change through RandR */
#ifdef RANDR_12_INTERFACE
+ /* Make the change through RandR */
if (crtc->randr_crtc)
RRCrtcGammaSet(crtc->randr_crtc, lut_r, lut_g, lut_b);
else
@@ -1312,18 +1301,20 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
{
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
- "Initializing kms color map\n");
+ "Initializing kms color map\n");
+
if (!miCreateDefColormap(pScreen))
return FALSE;
+
/* all radeons support 10 bit CLUTs */
- if (!xf86HandleColormaps(pScreen, 256, 10,
- drmmode_load_palette, NULL,
+ if (!xf86HandleColormaps(pScreen, 256, 10, drmmode_load_palette, NULL,
CMAP_PALETTED_TRUECOLOR
#if 0 /* This option messes up text mode! (eich@suse.de) */
| CMAP_LOAD_EVEN_IF_OFFSCREEN
#endif
| CMAP_RELOAD_ON_MODE_SWITCH))
return FALSE;
+
return TRUE;
}
@@ -1331,109 +1322,109 @@ Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
static void
drmmode_handle_uevents(int fd, void *closure)
{
- drmmode_ptr drmmode = closure;
- ScrnInfoPtr scrn = drmmode->scrn;
- struct udev_device *dev;
- dev = udev_monitor_receive_device(drmmode->uevent_monitor);
- if (!dev)
- return;
-
- RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
- udev_device_unref(dev);
+ drmmode_ptr drmmode = closure;
+ ScrnInfoPtr scrn = drmmode->scrn;
+ struct udev_device *dev;
+
+ dev = udev_monitor_receive_device(drmmode->uevent_monitor);
+ if (!dev)
+ return;
+
+ RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
+ udev_device_unref(dev);
}
#endif
void drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{
#ifdef HAVE_UDEV
- struct udev *u;
- struct udev_monitor *mon;
-
- u = udev_new();
- if (!u)
- return;
- mon = udev_monitor_new_from_netlink(u, "udev");
- if (!mon) {
- udev_unref(u);
- return;
- }
-
- if (udev_monitor_filter_add_match_subsystem_devtype(mon,
- "drm",
- "drm_minor") < 0 ||
- udev_monitor_enable_receiving(mon) < 0) {
- udev_monitor_unref(mon);
- udev_unref(u);
- return;
- }
-
- drmmode->uevent_handler =
- xf86AddGeneralHandler(udev_monitor_get_fd(mon),
- drmmode_handle_uevents,
- drmmode);
-
- drmmode->uevent_monitor = mon;
+ struct udev *u;
+ struct udev_monitor *mon;
+
+ u = udev_new();
+ if (!u)
+ return;
+
+ mon = udev_monitor_new_from_netlink(u, "udev");
+ if (!mon) {
+ udev_unref(u);
+ return;
+ }
+
+ if (udev_monitor_filter_add_match_subsystem_devtype(mon, "drm", "drm_minor") < 0 ||
+ udev_monitor_enable_receiving(mon) < 0) {
+ udev_monitor_unref(mon);
+ udev_unref(u);
+ return;
+ }
+
+ drmmode->uevent_handler = xf86AddGeneralHandler(udev_monitor_get_fd(mon),
+ drmmode_handle_uevents,
+ drmmode);
+ drmmode->uevent_monitor = mon;
#endif
}
void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{
#ifdef HAVE_UDEV
- if (drmmode->uevent_handler) {
- struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
- xf86RemoveGeneralHandler(drmmode->uevent_handler);
+ if (drmmode->uevent_handler) {
+ struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
+ xf86RemoveGeneralHandler(drmmode->uevent_handler);
- udev_monitor_unref(drmmode->uevent_monitor);
- udev_unref(u);
- }
+ udev_monitor_unref(drmmode->uevent_monitor);
+ udev_unref(u);
+ }
#endif
}
/* create front and cursor BOs */
Bool drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- int width;
- int height;
- int bpp = pScrn->bitsPerPixel;
- int i;
- int cpp = (bpp + 7) / 8;
-
- width = pScrn->virtualX;
- height = pScrn->virtualY;
-
- drmmode->front_bo = dumb_bo_create(drmmode->fd, width, height, bpp);
- if (!drmmode->front_bo)
- return FALSE;
- pScrn->displayWidth = drmmode->front_bo->pitch / cpp;
-
- width = height = 64;
- bpp = 32;
- for (i = 0; i < xf86_config->num_crtc; i++) {
- xf86CrtcPtr crtc = xf86_config->crtc[i];
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- drmmode_crtc->cursor_bo = dumb_bo_create(drmmode->fd, width, height, bpp);
- }
- return TRUE;
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ int width;
+ int height;
+ int bpp = pScrn->bitsPerPixel;
+ int i;
+ int cpp = (bpp + 7) / 8;
+
+ width = pScrn->virtualX;
+ height = pScrn->virtualY;
+
+ drmmode->front_bo = dumb_bo_create(drmmode->fd, width, height, bpp);
+ if (!drmmode->front_bo)
+ return FALSE;
+
+ pScrn->displayWidth = drmmode->front_bo->pitch / cpp;
+
+ width = height = 64;
+ bpp = 32;
+
+ for (i = 0; i < xf86_config->num_crtc; i++) {
+ xf86CrtcPtr crtc = xf86_config->crtc[i];
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmmode_crtc->cursor_bo = dumb_bo_create(drmmode->fd, width, height, bpp);
+ }
+
+ return TRUE;
}
void *drmmode_map_front_bo(drmmode_ptr drmmode)
{
- int ret;
+ int ret;
- if (drmmode->front_bo->ptr)
- return drmmode->front_bo->ptr;
+ if (drmmode->front_bo->ptr)
+ return drmmode->front_bo->ptr;
- ret = dumb_bo_map(drmmode->fd, drmmode->front_bo);
- if (ret)
- return NULL;
+ ret = dumb_bo_map(drmmode->fd, drmmode->front_bo);
+ if (ret)
+ return NULL;
- return drmmode->front_bo->ptr;
-
+ return drmmode->front_bo->ptr;
}
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
-void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv)
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+void *drmmode_map_slave_bo(drmmode_ptr drmmode, TegraPixmapPrivPtr ppriv)
{
int ret;
@@ -1444,91 +1435,98 @@ void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv)
if (ret)
return NULL;
- return ppriv->backing_bo->ptr;
+ return ppriv->backing_bo->ptr;
}
#endif
Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- int i, ret;
- for (i = 0; i < xf86_config->num_crtc; i++) {
- xf86CrtcPtr crtc = xf86_config->crtc[i];
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- ret = dumb_bo_map(drmmode->fd, drmmode_crtc->cursor_bo);
- if (ret)
- return FALSE;
- }
- return TRUE;
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ int i, ret;
+
+ for (i = 0; i < xf86_config->num_crtc; i++) {
+ xf86CrtcPtr crtc = xf86_config->crtc[i];
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+
+ ret = dumb_bo_map(drmmode->fd, drmmode_crtc->cursor_bo);
+ if (ret)
+ return FALSE;
+ }
+
+ return TRUE;
}
void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- int i;
-
- if (drmmode->fb_id) {
- drmModeRmFB(drmmode->fd, drmmode->fb_id);
- drmmode->fb_id = 0;
- }
-
- dumb_bo_destroy(drmmode->fd, drmmode->front_bo);
- drmmode->front_bo = NULL;
-
- for (i = 0; i < xf86_config->num_crtc; i++) {
- xf86CrtcPtr crtc = xf86_config->crtc[i];
- drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
- dumb_bo_destroy(drmmode->fd, drmmode_crtc->cursor_bo);
- }
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ int i;
+
+ if (drmmode->fb_id) {
+ drmModeRmFB(drmmode->fd, drmmode->fb_id);
+ drmmode->fb_id = 0;
+ }
+
+ dumb_bo_destroy(drmmode->fd, drmmode->front_bo);
+ drmmode->front_bo = NULL;
+
+ for (i = 0; i < xf86_config->num_crtc; i++) {
+ xf86CrtcPtr crtc = xf86_config->crtc[i];
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ dumb_bo_destroy(drmmode->fd, drmmode_crtc->cursor_bo);
+ }
}
/* ugly workaround to see if we can create 32bpp */
void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int *depth, int *bpp)
{
- drmModeResPtr mode_res;
- uint64_t value;
- struct dumb_bo *bo;
- uint32_t fb_id;
- int ret;
-
- /* 16 is fine */
- ret = drmGetCap(drmmode->fd, DRM_CAP_DUMB_PREFERRED_DEPTH, &value);
- if (!ret && (value == 16 || value == 8)) {
- *depth = value;
- *bpp = value;
- return;
- }
-
- *depth = 24;
- mode_res = drmModeGetResources(drmmode->fd);
- if (!mode_res)
- return;
-
- if (mode_res->min_width == 0)
- mode_res->min_width = 1;
- if (mode_res->min_height == 0)
- mode_res->min_height = 1;
- /*create a bo */
- bo = dumb_bo_create(drmmode->fd, mode_res->min_width, mode_res->min_height, 32);
- if (!bo) {
- *bpp = 24;
- goto out;
- }
-
- ret = drmModeAddFB(drmmode->fd, mode_res->min_width, mode_res->min_height,
- 24, 32, bo->pitch, bo->handle, &fb_id);
-
- if (ret) {
- *bpp = 24;
- dumb_bo_destroy(drmmode->fd, bo);
- goto out;
- }
-
- drmModeRmFB(drmmode->fd, fb_id);
- *bpp = 32;
-
- dumb_bo_destroy(drmmode->fd, bo);
-out:
- drmModeFreeResources(mode_res);
- return;
+ drmModeResPtr mode_res;
+ uint64_t value;
+ struct dumb_bo *bo;
+ uint32_t fb_id;
+ int ret;
+
+ /* 16 is fine */
+ ret = drmGetCap(drmmode->fd, DRM_CAP_DUMB_PREFERRED_DEPTH, &value);
+ if (!ret && (value == 16 || value == 8)) {
+ *depth = value;
+ *bpp = value;
+ return;
+ }
+
+ *depth = 24;
+
+ mode_res = drmModeGetResources(drmmode->fd);
+ if (!mode_res)
+ return;
+
+ if (mode_res->min_width == 0)
+ mode_res->min_width = 1;
+
+ if (mode_res->min_height == 0)
+ mode_res->min_height = 1;
+
+ /*create a bo */
+ bo = dumb_bo_create(drmmode->fd, mode_res->min_width,
+ mode_res->min_height, 32);
+ if (!bo) {
+ *bpp = 24;
+ goto out;
+ }
+
+ ret = drmModeAddFB(drmmode->fd, mode_res->min_width, mode_res->min_height,
+ 24, 32, bo->pitch, bo->handle, &fb_id);
+ if (ret) {
+ *bpp = 24;
+ dumb_bo_destroy(drmmode->fd, bo);
+ goto out;
+ }
+
+ drmModeRmFB(drmmode->fd, fb_id);
+ *bpp = 32;
+
+ dumb_bo_destroy(drmmode->fd, bo);
+
+out:
+ drmModeFreeResources(mode_res);
+ return;
}
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index 1d5522b..de01e92 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -24,6 +24,7 @@
* Dave Airlie <airlied@redhat.com>
*
*/
+
#ifndef DRMMODE_DISPLAY_H
#define DRMMODE_DISPLAY_H
@@ -33,8 +34,12 @@
#endif
/* the perfect storm */
-#if XF86_CRTC_VERSION >= 5 && defined(HAVE_DRMPRIMEFDTOHANDLE) && HAVE_SCREEN_SPECIFIC_PRIVATE_KEYS
-#define MODESETTING_OUTPUT_SLAVE_SUPPORT 1
+#if XF86_CRTC_VERSION >= 5
+# if defined(HAVE_DRMPRIMEFDTOHANDLE)
+# if HAVE_SCREEN_SPECIFIC_PRIVATE_KEYS
+# define TEGRA_OUTPUT_SLAVE_SUPPORT 1
+# endif
+# endif
#endif
struct dumb_bo {
@@ -85,7 +90,6 @@ typedef struct {
Atom *atoms;
} drmmode_prop_rec, *drmmode_prop_ptr;
-
typedef struct {
drmmode_ptr drmmode;
int output_id;
@@ -99,19 +103,18 @@ typedef struct {
int enc_clone_mask;
} drmmode_output_private_rec, *drmmode_output_private_ptr;
-#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
-typedef struct _msPixmapPriv {
+#ifdef TEGRA_OUTPUT_SLAVE_SUPPORT
+typedef struct _TegraPixmapPriv {
uint32_t fb_id;
struct dumb_bo *backing_bo; /* if this pixmap is backed by a dumb bo */
-} msPixmapPrivRec, *msPixmapPrivPtr;
+} TegraPixmapPrivRec, *TegraPixmapPrivPtr;
+extern DevPrivateKeyRec TegraPixmapPrivateKeyRec;
+#define TegraPixmapPrivateKey (&TegraPixmapPrivateKeyRec)
-extern DevPrivateKeyRec msPixmapPrivateKeyRec;
-#define msPixmapPrivateKey (&msPixmapPrivateKeyRec)
+#define TegraGetPixmapPriv(drmmode, p) ((TegraPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec))
-#define msGetPixmapPriv(drmmode, p) ((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec))
-
-void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv);
+void *drmmode_map_slave_bo(drmmode_ptr drmmode, TegraPixmapPrivPtr ppriv);
Bool drmmode_SetSlaveBO(PixmapPtr ppix,
drmmode_ptr drmmode,
int fd_handle, int pitch, int size);
@@ -131,15 +134,12 @@ Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth, int *bpp);
-
#ifndef DRM_CAP_DUMB_PREFERRED_DEPTH
#define DRM_CAP_DUMB_PREFERRED_DEPTH 3
#endif
+
#ifndef DRM_CAP_DUMB_PREFER_SHADOW
#define DRM_CAP_DUMB_PREFER_SHADOW 4
#endif
-#define MS_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
-
-
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 21:58:09 +0000