summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2013-06-30 19:15:38 +0100
committerRussell King <rmk@arm.linux.org.uk>2013-06-30 19:17:49 +0100
commitb506ee1fc7b7d0a2c8823f96255dccd6173bfa06 (patch)
treee42b9800afabffd770e2ab261bae6b711bd54bf2
parent34f5b8545ae69ad2606bc4a9cde3f22f973aac2d (diff)
downloadxf86-video-armada-b506ee1fc7b7d0a2c8823f96255dccd6173bfa06.tar.gz
xf86-video-armada-b506ee1fc7b7d0a2c8823f96255dccd6173bfa06.tar.xz
Default to no bus id
This allows the X server to find any armada-drm interface, rather than using a fixed bus-id. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--src/armada_drm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/armada_drm.c b/src/armada_drm.c
index 78797e6..0ad8fbb 100644
--- a/src/armada_drm.c
+++ b/src/armada_drm.c
@@ -36,7 +36,7 @@
#define CURSOR_MAX_HEIGHT 32
#define DRM_MODULE_NAME "armada-drm"
-#define DRM_DEFAULT_BUS_ID "platform:armada-drm:00"
+#define DRM_DEFAULT_BUS_ID NULL
const OptionInfoRec armada_drm_options[] = {
{ OPTION_HW_CURSOR, "HWcursor", OPTV_BOOLEAN, {0}, FALSE },
@@ -1401,7 +1401,9 @@ static Bool armada_drm_open_master(ScrnInfoPtr pScrn)
free(pEnt);
}
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using BusID \"%s\"\n", busid);
+ if (busid)
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using BusID \"%s\"\n",
+ busid);
drm = calloc(1, sizeof *drm);
if (!drm)