configure.ac | 2 -
debian/changelog | 6 +++++
src/driver.c | 16 +++++++------
src/drmmode_display.c | 60 ++++++++++++++++++++++++++------------------------
src/drmmode_display.h | 4 +++
5 files changed, 52 insertions(+), 36 deletions(-)
New commits:
commit 6371d4ae4225fc746e197b4a692116f34cddc7b5
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Tue Dec 3 17:11:53 2013 +0100
release to unstable
diff --git a/debian/changelog b/debian/changelog
index f7501fd..42b6709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-modesetting (0.8.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-modesetting (0.8.1-1) unstable; urgency=low
* New upstream release.
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 03 Dec 2013
17:08:12 +0100
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 03 Dec 2013
17:11:43 +0100
xserver-xorg-video-modesetting (0.8.0-1) unstable; urgency=low
commit a237e36a3f25b4266674ef79fd73a9813de53290
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Tue Dec 3 17:09:16 2013 +0100
bump changelog
diff --git a/debian/changelog b/debian/changelog
index 614a04e..f7501fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-modesetting (0.8.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 03 Dec 2013
17:08:12 +0100
+
xserver-xorg-video-modesetting (0.8.0-1) unstable; urgency=low
[ Maarten Lankhorst ]
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
--- a/src/driver.c
+++ b/src/driver.c
@@ -183,7 +183,7 @@ Identify(int flags)
Chipsets);
}
-static int open_hw(char *dev)
+static int open_hw(const char *dev)
{
int fd;
if (dev)
@@ -213,7 +213,7 @@ static int check_outputs(int fd)
return ret;
}
-static Bool probe_hw(char *dev)
+static Bool probe_hw(const char *dev)
{
int fd = open_hw(dev);
if (fd != -1) {
@@ -237,7 +237,7 @@ ms_DRICreatePCIBusID(const struct pci_device *dev)
}
-static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
+static Bool probe_hw_pci(const char *dev, struct pci_device *pdev)
{
int ret = FALSE, fd = open_hw(dev);
char *id, *devid;
@@ -298,7 +298,7 @@ ms_pci_probe(DriverPtr driver,
scrn = xf86ConfigPciEntity(scrn, 0, entity_num, NULL,
NULL, NULL, NULL, NULL, NULL);
if (scrn) {
- char *devpath;
+ const char *devpath;
GDevPtr devSection = xf86GetDevFromEntity(scrn->entityList[0],
scrn->entityInstanceList[0]);
@@ -335,7 +335,7 @@ ms_platform_probe(DriverPtr driver,
int entity_num, int flags, struct xf86_platform_device *dev,
intptr_t match_data)
{
ScrnInfoPtr scrn = NULL;
- char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
+ const char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
int scr_flags = 0;
if (flags & PLATFORM_PROBE_GPU_SCREEN)
@@ -369,7 +369,7 @@ Probe(DriverPtr drv, int flags)
int i, numDevSections;
GDevPtr *devSections;
Bool foundScreen = FALSE;
- char *dev;
+ const char *dev;
ScrnInfoPtr scrn = NULL;
/* For now, just bail out for PROBE_DETECT. */
@@ -559,6 +559,7 @@ FreeRec(ScrnInfoPtr pScrn)
ret = drmClose(ms->fd);
else
ret = close(ms->fd);
+ (void) ret;
}
free(ms->Options);
free(ms);
@@ -572,7 +573,8 @@ PreInit(ScrnInfoPtr pScrn, int flags)
rgb defaultWeight = { 0, 0, 0 };
EntityInfoPtr pEnt;
EntPtr msEnt = NULL;
- char *BusID = NULL, *devicename;
+ char *BusID = NULL;
+ const char *devicename;
Bool prefer_shadow = TRUE;
uint64_t value = 0;
int ret;
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 4fb4d21..773ec4c 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -534,14 +534,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr
ppix)
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);
+ 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;
}
@@ -830,7 +829,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
drmmode_prop = p->mode_prop;
if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) {
- INT32 range[2];
+ INT32 prop_range[2];
INT32 value = p->value;
p->num_atoms = 1;
@@ -838,12 +837,12 @@ drmmode_output_create_resources(xf86OutputPtr output)
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];
+ prop_range[0] = drmmode_prop->values[0];
+ prop_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);
+ 2, prop_range);
if (err != 0) {
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
"RRConfigureOutputProperty error, %d\n", err);
commit e8bd7c2dc3329fa0da3078b6d2cc0ffa43b428e5
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Jul 31 11:24:48 2013 +1000
modesetting: change output names for secondary GPUs
if we are a secondary GPU modify the output name to avoid clashes.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ce90cea..4fb4d21 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1010,6 +1010,10 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr
drmmode, int num, int *num_dv
/* 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);
+#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+ else if (pScrn->is_gpu)
+ snprintf(name, 32, "%s-%d-%d",
output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET +
1, koutput->connector_type_id - 1);
+#endif
else
snprintf(name, 32, "%s-%d",
output_names[koutput->connector_type], koutput->connector_type_id - 1);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vnske-0002nq...@moszumanska.debian.org
