xserver-xorg-video-modesetting: Changes to 'upstream-unstable'
src/drmmode_display.c | 13 -
1 file changed, 13 deletions(-)
New commits:
commit 91571cce03adc58a10b5d76307629efc7c994c3e
Author: Rob Clark robdcl...@gmail.com
Date: Tue Aug 26 17:31:26 2014 -0400
modesetting: Don't pretend to support rotation
It only ends in tears
Signed-off-by: Rob Clark robdcl...@gmail.com
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index c533324..12aa987 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -568,17 +568,6 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr
ppix)
}
#endif
-static void *drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
-{
- return NULL;
-}
-
-static PixmapPtr drmmode_shadow_create(xf86CrtcPtr crtc, void *data, int width,
- int height)
-{
- return NULL;
-}
-
static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
.dpms = drmmode_crtc_dpms,
.set_mode_major = drmmode_set_mode_major,
@@ -593,8 +582,6 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
.set_scanout_pixmap = drmmode_set_scanout_pixmap,
#endif
-.shadow_allocate = drmmode_shadow_allocate,
-.shadow_create = drmmode_shadow_create,
};
static void
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1zcwzy-00064c...@moszumanska.debian.org
xserver-xorg-video-modesetting: Changes to 'upstream-unstable'
configure.ac |4 -
src/driver.c | 110 --
src/driver.h |2
src/drmmode_display.c | 40 ++
4 files changed, 125 insertions(+), 31 deletions(-)
New commits:
commit 1e4cb922617990a3005ac23b0c90f89147c3564b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Thu Jun 26 10:37:19 2014 +0200
bump to 0.9.0
diff --git a/configure.ac b/configure.ac
index 0ec8e18..1c1a36d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-modesetting],
-[0.8.1],
+[0.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-modesetting])
AC_CONFIG_SRCDIR([Makefile.am])
commit d1c6e27759ea1d2c30cabc62ff2bc315bbbec5fc
Author: Adam Jackson a...@redhat.com
Date: Wed May 21 10:16:39 2014 -0400
Use own thunk function instead of shadowUpdatePackedWeak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/driver.c b/src/driver.c
index 21274a9..d99b027 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -810,6 +810,12 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32
offset, int mode,
return ((uint8_t *)ms-drmmode.front_bo-ptr + row * stride + offset);
}
+static void
+msUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
static Bool
CreateScreenResources(ScreenPtr pScreen)
{
@@ -842,7 +848,7 @@ CreateScreenResources(ScreenPtr pScreen)
FatalError(Couldn't adjust screen pixmap\n);
if (ms-drmmode.shadow_enable) {
- if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(),
+ if (!shadowAdd(pScreen, rootPixmap, msUpdatePacked,
msShadowWindow, 0, 0))
return FALSE;
}
commit 07c5d9cb782fde2a073efdc437489d6c4b432d46
Author: Dave Airlie airl...@redhat.com
Date: Fri May 2 13:16:05 2014 +1000
modesetting: fix build regression against older servers.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/driver.c b/src/driver.c
index b5fcdaf..21274a9 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -217,7 +217,7 @@ static Bool probe_hw(const char *dev, struct
xf86_platform_device *platform_dev)
{
int fd;
-#if XSERVER_PLATFORM_BUS
+#if XF86_PDEV_SERVER_FD
if (platform_dev (platform_dev-flags XF86_PDEV_SERVER_FD)) {
fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD,
-1);
if (fd == -1)
commit 32fb5f2d821e5e13038eab7db35c5048ad807ccc
Author: Dave Airlie airl...@redhat.com
Date: Fri May 2 13:14:30 2014 +1000
modesetting: fix use after free.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 28a4abb..c533324 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -778,11 +778,11 @@ drmmode_output_destroy(xf86OutputPtr output)
drmModeFreeProperty(drmmode_output-props[i].mode_prop);
free(drmmode_output-props[i].atoms);
}
+ free(drmmode_output-props);
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);
+ free(drmmode_output-mode_encoders);
drmModeFreeConnector(drmmode_output-mode_output);
free(drmmode_output);
output-driver_private = NULL;
commit 509dbe8cab339e44b02fed3728bbef7de5c60d05
Author: Hans de Goede hdego...@redhat.com
Date: Tue Mar 18 15:48:22 2014 +0100
Add support for server managed fds
Signed-off-by: Hans de Goede hdego...@redhat.com
diff --git a/src/driver.c b/src/driver.c
index 0f9190a..b5fcdaf 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -213,9 +213,20 @@ static int check_outputs(int fd)
return ret;
}
-static Bool probe_hw(const char *dev)
+static Bool probe_hw(const char *dev, struct xf86_platform_device
*platform_dev)
{
-int fd = open_hw(dev);
+int fd;
+
+#if XSERVER_PLATFORM_BUS
+if (platform_dev (platform_dev-flags XF86_PDEV_SERVER_FD)) {
+fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD,
-1);
+if (fd == -1)
+return FALSE;
+return check_outputs(fd);
+}
+#endif
+
+fd = open_hw(dev);
if (fd != -1) {
int ret = check_outputs(fd);
close(fd);
@@ -283,6 +294,10 @@ ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op, void
*data)
flag = (CARD32 *)data;
(*flag) = 0;
return TRUE;
+#if XORG_VERSION_CURRENT = XORG_VERSION_NUMERIC(1,15,99,902,0)
+case SUPPORTS_SERVER_FDS:
+return TRUE;
+#endif
default:
return FALSE;
}
@@ -341,7 +356,7 @@
xserver-xorg-video-modesetting: Changes to 'upstream-unstable'
configure.ac |2 -
src/driver.c | 16 +++--
src/drmmode_display.c | 60 ++
src/drmmode_display.h |4 +++
4 files changed, 46 insertions(+), 36 deletions(-)
New commits:
commit da64ee70f96fcac32c08128559b293732b318a00
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Dec 3 17:01:28 2013 +0100
bump to 0.8.1
diff --git a/configure.ac b/configure.ac
index 6f7a7be..0b04923 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-modesetting],
-[0.8.0],
+[0.8.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-modesetting])
AC_CONFIG_SRCDIR([Makefile.am])
commit c9f899bf34530d54eb96dda9f5e7d9135967fc11
Author: Thierry Reding thierry.red...@gmail.com
Date: Tue Nov 26 17:08:03 2013 +0100
Properly identify DSI outputs
Newer Linux kernels support DSI outputs. To be able to identify them
properly, add DSI to the list of output names.
Reviewed-by: Aaron Plattner aplatt...@nvidia.com
Signed-off-by: Thierry Reding tred...@nvidia.com
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index a343778..25641ce 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -977,6 +977,7 @@ static const char * const output_names[] = { None,
TV,
eDP,
Virtual,
+DSI,
};
static void
commit d2403d5a1fb17f925e907296398ba14e8b104e89
Author: Thierry Reding thierry.red...@gmail.com
Date: Tue Nov 26 17:08:02 2013 +0100
Staticise and constify output names
This array isn't used anywhere outside this file, so it can be made
static. While at it, make the array const as well.
Signed-off-by: Thierry Reding tred...@nvidia.com
Reviewed-by: Aaron Plattner aplatt...@nvidia.com
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 773ec4c..a343778 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -961,22 +961,22 @@ static int subpixel_conv_table[7] = { 0, SubPixelUnknown,
SubPixelVerticalBGR,
SubPixelNone };
-const char *output_names[] = { None,
- VGA,
- DVI,
- DVI,
- DVI,
- Composite,
- S-video,
- LVDS,
- CTV,
- DIN,
- DisplayPort,
- HDMI,
- HDMI,
- TV,
- eDP,
- Virtual
+static const char * const output_names[] = { None,
+VGA,
+DVI,
+DVI,
+DVI,
+Composite,
+S-video,
+LVDS,
+CTV,
+DIN,
+DisplayPort,
+HDMI,
+HDMI,
+TV,
+eDP,
+Virtual,
};
static void
commit beca4dfb0e4d11d3729214967a1fe56ee5669831
Author: Keith Packard kei...@keithp.com
Date: Fri Nov 15 13:39:52 2013 +0900
Handle new DamageUnregister API which has only one argument
API change in 1.15
Signed-off-by: Keith Packard kei...@keithp.com
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index adf4b99..745c484 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -37,6 +37,10 @@
#define MODESETTING_OUTPUT_SLAVE_SUPPORT 1
#endif
+#if XORG_VERSION_CURRENT = XORG_VERSION_NUMERIC(1,14,99,2,0)
+#define DamageUnregister(d, dd) DamageUnregister(dd)
+#endif
+
struct dumb_bo {
uint32_t handle;
uint32_t size;
commit 75e6ae5de483bad6bfdea0ec1d9030bb44af335f
Author: Keith Packard kei...@keithp.com
Date: Fri Nov 15 13:26:36 2013 +0900
Clean up compiler warnings.
Add const to any immutable string pointers.
Rename 'range' to 'prop_range' to avoid redefined warning.
Eliminate some unused return values.
Signed-off-by: Keith Packard kei...@keithp.com
diff --git a/src/driver.c b/src/driver.c
index cc526f6..b84624e 100644
---
xserver-xorg-video-modesetting: Changes to 'upstream-unstable'
Makefile.am |2
autogen.sh|5
configure.ac | 11 +
src/Makefile.am |1
src/compat-api.h | 94
src/driver.c | 383 +-
src/drmmode_display.c | 233 +-
src/drmmode_display.h | 31 +++-
8 files changed, 654 insertions(+), 106 deletions(-)
New commits:
commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Wed Jun 12 14:11:53 2013 +0200
bump to 0.8.0
Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
diff --git a/configure.ac b/configure.ac
index f0c267f..6f7a7be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-modesetting],
-[0.7.0],
+[0.8.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-modesetting])
AC_CONFIG_SRCDIR([Makefile.am])
commit a299400b8404f935e5e2bc6a5b9c17821844bd0d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Wed Jun 12 14:05:19 2013 +0200
modesetting: probe only succeeds if connectors are detected
This will prevent modesetting being used for outputless intel or nvidia
cards.
Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
diff --git a/src/driver.c b/src/driver.c
index c3d78be..cc526f6 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -201,12 +201,25 @@ static int open_hw(char *dev)
return fd;
}
+static int check_outputs(int fd)
+{
+drmModeResPtr res = drmModeGetResources(fd);
+int ret;
+
+if (!res)
+return FALSE;
+ret = res-count_connectors 0;
+drmModeFreeResources(res);
+return ret;
+}
+
static Bool probe_hw(char *dev)
{
int fd = open_hw(dev);
if (fd != -1) {
+int ret = check_outputs(fd);
close(fd);
-return TRUE;
+return ret;
}
return FALSE;
}
@@ -226,7 +239,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev)
static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
{
-int fd = open_hw(dev);
+int ret = FALSE, fd = open_hw(dev);
char *id, *devid;
drmSetVersion sv;
@@ -247,13 +260,12 @@ static Bool probe_hw_pci(char *dev, struct pci_device
*pdev)
devid = ms_DRICreatePCIBusID(pdev);
close(fd);
-if (!id || !devid)
- return FALSE;
-
-if (!strcmp(id, devid))
- return TRUE;
+if (id devid !strcmp(id, devid))
+ret = check_outputs(fd);
-return FALSE;
+free(id);
+free(devid);
+return ret;
}
static const OptionInfoRec *
AvailableOptions(int chipid, int busid)
commit a62d5e60896166be88fcf3778921b8d10baec2c1
Author: Dave Airlie airl...@redhat.com
Date: Tue Jun 11 10:29:25 2013 +1000
modesetting: fix adjust frame crash
When SDL called this it was totally broken, actually hook
up to the underlying drmmode function.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64808
Thanks to Peter Wu lekenst...@gmail.com for harassing me.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/src/driver.c b/src/driver.c
index 742aadd..c3d78be 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -956,16 +956,9 @@ static void
AdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
SCRN_INFO_PTR(arg);
-xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-xf86OutputPtr output = config-output[config-compat_output];
-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;
-}
+modesettingPtr ms = modesettingPTR(pScrn);
+
+drmmode_adjust_frame(pScrn, ms-drmmode, x, y);
}
static void
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2dc7576..ce90cea 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1267,7 +1267,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr
drmmode, int cpp)
return TRUE;
}
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int
y, int flags)
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr output = config-output[config-compat_output];
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index 1d5522b..adf4b99 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -118,7 +118,7 @@ Bool drmmode_SetSlaveBO(PixmapPtr ppix,
#endif
extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp);
-void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int
y, int flags);
+void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int
y);
extern
xserver-xorg-video-modesetting: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 65890bd37d66043c970893e1f1bebb81a5a7398c Author: Dave Airlie airl...@redhat.com Date: Wed May 9 09:33:54 2012 +0100 bump version to 0.3.0 commit ff16713c53bcb750cab723ba3314d9188d23e7e0 Author: Matt Turner matts...@gmail.com Date: Wed May 9 00:26:29 2012 -0400 configure.ac: remove DRI and RENDER Driver doesn't support either of these. Signed-off-by: Matt Turner matts...@gmail.com Signed-off-by: Dave Airlie airl...@redhat.com commit 0ecfdf19a9745ad4a0c8680b6dae542f50d3a212 Author: Dave Airlie airl...@redhat.com Date: Wed May 9 09:32:05 2012 +0100 modesetting: make sure the pci device corresponds to the drm device If we get asked to pci open a device with a kms path override, make sure they match, otherwise this driver can steal the primary device binding for a usb adaptor. The driver should fallback to the old probe entry point in this case. Signed-off-by: Dave Airlie airl...@redhat.com commit d12d9ac5cae7a4287e7ba1f137209574bc0c5b17 Author: Dave Airlie airl...@redhat.com Date: Tue May 1 17:12:29 2012 +0100 modesetting: attempt to work out if we want 24 or 32bpp the cirrus driver presents certain challenges, and this is a workaround, until we can possibly agree some sane interface for exposing this information. Signed-off-by: Dave Airlie airl...@redhat.com commit 288d197f706804194ef9977baa50d566142e2acc Author: Dave Airlie airl...@redhat.com Date: Tue May 1 16:52:18 2012 +0100 modesetting: move opening kernel device to before setting depth due to interaction between option handling and set depth, we need to what fbdev does to get the device path early. Signed-off-by: Dave Airlie airl...@redhat.com commit 296d08ef590063fcc6f268778bc012df2d0243c4 Author: Dave Airlie airl...@redhat.com Date: Tue Apr 17 11:50:40 2012 +0100 modesetting: add set/drop master around VT switch commit d0db3b74acad13106cac19199da115b78a29207b Author: Dave Airlie airl...@redhat.com Date: Tue Apr 17 11:48:03 2012 +0100 cursor: hide cursors on LeaveVT commit a9e49bd15bb5e525e64f95b1531975ad1997eafb Author: Dave Airlie airl...@redhat.com Date: Sat Apr 14 19:21:47 2012 +0100 dirty: check malloc return Suggested by keithp. Signed-off-by: Dave Airlie airl...@redhat.com commit 87ddde9511d01138a10f38356545923d758e5408 Author: Dave Airlie airl...@redhat.com Date: Sat Apr 14 15:01:16 2012 +0100 drop use of alloca, just use malloc/free Reported-by: Alan Coopersmith alan.coopersm...@oracle.com Signed-off-by: Dave Airlie airl...@redhat.com commit 6760dfc692dd4d3f662cc82e5b7610f8ec2ebdc0 Author: Dave Airlie airl...@redhat.com Date: Fri Mar 23 14:54:05 2012 + modesetting: fix build against older Xext commit 3b5fded4dc0c1c77bdd105b104dcb6ba21864d5c Author: Sascha Hauer s.ha...@pengutronix.de Date: Sat Mar 3 14:09:25 2012 +0100 make busID non mandatory Currently the driver only probes a device when it has a busID. The busID is optional so don't depend on it. Signed-off-by: Sascha Hauer s.ha...@pengutronix.de Signed-off-by: Dave Airlie airl...@redhat.com commit e4dba8dabeb3a87a092eefde836e611dbe07b697 Author: Sascha Hauer s.ha...@pengutronix.de Date: Sat Mar 3 14:09:27 2012 +0100 do not bail out on non pci devices To make the driver work on nin PCI devices we shouldn't bail out in this case. Signed-off-by: Sascha Hauer s.ha...@pengutronix.de Signed-off-by: Dave Airlie airl...@redhat.com commit a9bc885e92ac1c34d6630e2331c4fbfb8876b09f Author: Sascha Hauer s.ha...@pengutronix.de Date: Sat Mar 3 14:09:26 2012 +0100 Fix non PCI device probing When no devicename is found in the option then the driver probes by PciInfo no matter if it's valid or not. Instead of doing this use PciInfo only when it's valid and fall back to the devicename otherwise. With devicename probing use open_hw() to fall back on the KMSDEVICE environment variable or to the default device. Signed-off-by: Sascha Hauer s.ha...@pengutronix.de Signed-off-by: Dave Airlie airl...@redhat.com commit 90caeb0839a7bd0f0e49e6ad0d8bd948e1fd9faa Author: Sascha Hauer s.ha...@pengutronix.de Date: Sat Mar 3 14:09:24 2012 +0100 introduce open_hw() function probe_hw opens the hardware in the order we want it: first try devname, if this is NULL then try the KMSDEVICE environment variable and as a last fallback use /dev/dri/card0. Instead of implementing the same code again when really opening the device move the code to a open_hw() function and let probe_hw use it. Signed-off-by: Sascha Hauer s.ha...@pengutronix.de Signed-off-by: Dave Airlie airl...@redhat.com commit 2c2a3743347652a964315a91b1e7d066e90bfc6a Author: Sascha Hauer s.ha...@pengutronix.de Date:
