rpms/xorg-x11-drv-intel/devel intel-2.6.0-kms-dpms.patch, NONE, 1.1 xorg-x11-drv-intel.spec, 1.4, 1.5

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11203

Modified Files:
	xorg-x11-drv-intel.spec 
Added Files:
	intel-2.6.0-kms-dpms.patch 
Log Message:
* Mon Mar 02 2009 Adam Jackson <ajax at redhat.com> 2.6.0-11
- intel-2.6.0-kms-dpms.patch: Enable DPMS on KMS outputs.


intel-2.6.0-kms-dpms.patch:

--- NEW FILE intel-2.6.0-kms-dpms.patch ---
diff -up xf86-video-intel-2.6.0/src/drmmode_display.c.dpms xf86-video-intel-2.6.0/src/drmmode_display.c
--- xf86-video-intel-2.6.0/src/drmmode_display.c.dpms	2009-03-02 10:09:52.000000000 -0500
+++ xf86-video-intel-2.6.0/src/drmmode_display.c	2009-03-02 10:12:13.000000000 -0500
@@ -520,7 +520,29 @@ drmmode_output_destroy(xf86OutputPtr out
 static void
 drmmode_output_dpms(xf86OutputPtr output, int mode)
 {
-	return;
+	drmmode_output_private_ptr drmmode_output = output->driver_private;
+	drmModeConnectorPtr koutput = drmmode_output->mode_output;
+	drmmode_ptr drmmode = drmmode_output->drmmode;
+	int i;
+	drmModePropertyPtr props;
+
+	for (i = 0; i < koutput->count_props; i++) {
+		props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
+		if (!props)
+			continue;
+
+		if (!strcmp(props->name, "DPMS")) {
+                        drmModeConnectorSetProperty(drmmode->fd,
+                                drmmode_output->output_id,
+                                props->prop_id,
+                                mode);
+                        drmModeFreeProperty(props);
+                        return;
+		}
+		drmModeFreeProperty(props);
+	}
+	
+        ErrorF("No DPMS property found\n");
 }
 
 static const xf86OutputFuncsRec drmmode_output_funcs = {


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-intel.spec	28 Feb 2009 16:40:34 -0000	1.4
+++ xorg-x11-drv-intel.spec	2 Mar 2009 15:57:40 -0000	1.5
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-intel
 Version:   2.6.0
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -26,6 +26,7 @@
 Patch6: intel-2.5.0-no-gem-legacy-3d.patch
 Patch7: kill-svideo.patch
 Patch8: copy-fb.patch
+Patch9: intel-2.6.0-kms-dpms.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -64,6 +65,7 @@
 %patch6 -p1 -b .nogem3d
 %patch7 -p1 -b .svideo
 %patch8 -p1 -b .copy-fb
+%patch9 -p1 -b .dpms
 
 %build
 
@@ -71,9 +73,6 @@
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
 make
 
-# Build the wrapper driver that lets us load either intel_master or
-# intel_batchbuffer driver as just 'intel'
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -106,6 +105,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Mon Mar 02 2009 Adam Jackson <ajax at redhat.com> 2.6.0-11
+- intel-2.6.0-kms-dpms.patch: Enable DPMS on KMS outputs.
+
 * Sat Feb 28 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-10
 - Update to master again, should fix the 1MB per pixmap problem.
 - Drop no-op intel-2.1.1-fix-xv-reset.patch.