From abdd041f77943096a24802e68c9460779c02ff68 Mon Sep 17 00:00:00 2001
From: John Fredriksson <john.xj.fredriksson@stericsson.com>
Date: Tue, 18 Oct 2011 13:28:26 +0200
Subject: Add udev rules and xorg.conf.

Udev rules for changing permissions to device files to make them
accessible for ordinary users is included in the debian package.
---
 10-ste_mali.rules |  2 ++
 99-ste_mali.conf  | 18 ++++++++++++++++++
 debian/rules      |  4 ++++
 xorg.conf         | 21 ---------------------
 4 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 10-ste_mali.rules
 create mode 100644 99-ste_mali.conf
 delete mode 100644 xorg.conf

diff --git a/10-ste_mali.rules b/10-ste_mali.rules
new file mode 100644
index 0000000..21a3fe8
--- /dev/null
+++ b/10-ste_mali.rules
@@ -0,0 +1,2 @@
+KERNEL=="mali",SUBSYSTEM=="mali",MODE="0777",GROUP="video"
+KERNEL=="hwmem",SUBSYSTEM=="misc",MODE="0777",GROUP="video"
diff --git a/99-ste_mali.conf b/99-ste_mali.conf
new file mode 100644
index 0000000..9451dda
--- /dev/null
+++ b/99-ste_mali.conf
@@ -0,0 +1,18 @@
+Section "Device"
+        Identifier "Mali FBDEV"
+        Driver  "mali"
+        Option  "fbdev"            "/dev/fb0"
+        Option  "DRI2"             "true"
+        Option  "DRI2"             "true"
+        Option  "DRI2_PAGE_FLIP"   "true"
+        Option  "DRI2_WAIT_VSYNC"  "false"
+EndSection
+
+Section "Screen"
+        Identifier      "Mali Screen"
+        Device          "Mali FBDEV"
+EndSection
+
+Section "DRI"
+        Mode 0666
+EndSection 
diff --git a/debian/rules b/debian/rules
index d999a07..f358dc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,10 @@ install: build
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/xf86-video-mali install
+	mkdir -p $(CURDIR)/debian/xf86-video-mali/usr/share/X11/xorg.conf.d
+	cp $(CURDIR)/99-ste_mali.conf  $(CURDIR)/debian/xf86-video-mali/usr/share/X11/xorg.conf.d/
+	mkdir -p $(CURDIR)/debian/xf86-video-mali/etc/udev/rules.d
+	cp $(CURDIR)/10-ste_mali.rules $(CURDIR)/debian/xf86-video-mali/etc/udev/rules.d/
 
 
 # Build architecture-independent files here.
diff --git a/xorg.conf b/xorg.conf
deleted file mode 100644
index 9b2cb32..0000000
--- a/xorg.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# X.Org X server configuration file for xfree86-video-mali
-
-Section "Device"
-	Identifier "Mali FBDEV"
-	Driver	"mali"
-	Option	"fbdev"            "/dev/fb0"
-	Option	"DRI2"             "true"
-	Option	"DRI2"             "true"
-	Option	"DRI2_PAGE_FLIP"   "true"
-	Option	"DRI2_WAIT_VSYNC"  "false"
-EndSection
-
-Section "Screen"
-	Identifier 	"Mali Screen"
-	Device     	"Mali FBDEV"
-	DefaultDepth 	24
-EndSection
-
-Section "DRI"
-	Mode 0666
-EndSection
-- 
cgit v1.2.3