rpms/kernel/devel drm-connection-cache.patch,1.1,1.2

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6980

Modified Files:
	drm-connection-cache.patch 
Log Message:
more hacking

drm-connection-cache.patch:
 linux-2.6.30.noarch/drivers/gpu/drm/drm_crtc_helper.c |   12 ++++++++++++
 linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c |    9 ++++++++-
 linux-2.6.30.noarch/include/drm/drm_crtc.h            |    1 +
 linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c        |    3 ++-
 4 files changed, 23 insertions(+), 2 deletions(-)

Index: drm-connection-cache.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-connection-cache.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-connection-cache.patch	9 Sep 2009 14:03:43 -0000	1.1
+++ drm-connection-cache.patch	9 Sep 2009 19:33:12 -0000	1.2
@@ -20,19 +20,6 @@ diff -up linux-2.6.30.noarch/drivers/gpu
  	if (connector->status == connector_status_disconnected) {
  		DRM_DEBUG_KMS("%s is disconnected\n",
  			  drm_get_connector_name(connector));
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_crt.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_crt.c
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_dp.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_dp.c
-diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h
---- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h.jx	2009-09-09 08:57:40.000000000 -0400
-+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_drv.h	2009-09-09 09:56:19.000000000 -0400
-@@ -107,6 +107,7 @@ struct intel_output {
- 	void (*hot_plug)(struct intel_output *);
- 	int crtc_mask;
- 	int clone_mask;
-+	bool cached;
- };
- 
- struct intel_crtc {
 diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c
 --- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c.jx	2009-09-09 08:57:39.000000000 -0400
 +++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_lvds.c	2009-09-09 09:56:18.000000000 -0400
@@ -63,3 +50,16 @@ diff -up linux-2.6.30.noarch/include/drm
  };
  
  enum subpixel_order {
+diff -up linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c.jx linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c
+--- linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c.jx	2009-09-09 10:10:44.000000000 -0400
++++ linux-2.6.30.x86_64/drivers/gpu/drm/drm_crtc.c	2009-09-09 11:23:14.000000000 -0400
+@@ -185,7 +185,8 @@ EXPORT_SYMBOL(drm_get_connector_name);
+ 
+ char *drm_get_connector_status_name(enum drm_connector_status status)
+ {
+-	if (status == connector_status_connected)
++	if (status == connector_status_connected ||
++	    status == connector_status_cached)
+ 		return "connected";
+ 	else if (status == connector_status_disconnected)
+ 		return "disconnected";