rpms/kernel/devel drm-i915-fix-edp-panels.patch, 1.1, 1.2 kernel.spec, 1.2043, 1.2044

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12804

Modified Files:
	drm-i915-fix-edp-panels.patch kernel.spec 
Log Message:
* Mon Jun 28 2010 Dave Airlie <airlied at redhat.com>
- drm-i915-fix-edp-panels.patch: update to newer version


drm-i915-fix-edp-panels.patch:
 intel_dp.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: drm-i915-fix-edp-panels.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-i915-fix-edp-panels.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-i915-fix-edp-panels.patch	25 Jun 2010 08:29:02 -0000	1.1
+++ drm-i915-fix-edp-panels.patch	28 Jun 2010 00:06:09 -0000	1.2
@@ -1,12 +1,34 @@
 diff -up linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_dp.c.dave linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_dp.c
---- linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_dp.c.dave	2010-06-25 16:30:13.000000000 +1000
-+++ linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_dp.c	2010-06-25 16:30:23.000000000 +1000
-@@ -129,7 +129,7 @@ intel_dp_link_required(struct drm_device
- 	struct drm_i915_private *dev_priv = dev->dev_private;
- 
- 	if (IS_eDP(intel_encoder))
--		return (pixel_clock * dev_priv->edp_bpp) / 8;
-+		return (pixel_clock * ALIGN(dev_priv->edp_bpp, 8)) / 8;
- 	else
- 		return pixel_clock * 3;
+--- linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_dp.c.dave	2010-06-28 09:50:36.000000000 +1000
++++ linux-2.6.33.noarch/drivers/gpu/drm/i915/intel_dp.c	2010-06-28 09:53:24.000000000 +1000
+@@ -135,6 +135,12 @@ intel_dp_link_required(struct drm_device
  }
+ 
+ static int
++intel_dp_max_data_rate(int max_link_clock, int max_lanes)
++{
++	return (max_link_clock * max_lanes * 8) / 10;
++}
++
++static int
+ intel_dp_mode_valid(struct drm_connector *connector,
+ 		    struct drm_display_mode *mode)
+ {
+@@ -144,7 +150,7 @@ intel_dp_mode_valid(struct drm_connector
+ 	int max_lanes = intel_dp_max_lane_count(intel_encoder);
+ 
+ 	if (intel_dp_link_required(connector->dev, intel_encoder, mode->clock)
+-			> max_link_clock * max_lanes)
++			> intel_dp_max_data_rate(max_link_clock, max_lanes))
+ 		return MODE_CLOCK_HIGH;
+ 
+ 	if (mode->clock < 10000)
+@@ -505,7 +511,7 @@ intel_dp_mode_fixup(struct drm_encoder *
+ 
+ 	for (lane_count = 1; lane_count <= max_lane_count; lane_count <<= 1) {
+ 		for (clock = 0; clock <= max_clock; clock++) {
+-			int link_avail = intel_dp_link_clock(bws[clock]) * lane_count;
++			int link_avail = intel_dp_max_data_rate(intel_dp_link_clock(bws[clock]), lane_count);
+ 
+ 			if (intel_dp_link_required(encoder->dev, intel_encoder, mode->clock)
+ 					<= link_avail) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2043
retrieving revision 1.2044
diff -u -p -r1.2043 -r1.2044
--- kernel.spec	25 Jun 2010 08:29:03 -0000	1.2043
+++ kernel.spec	28 Jun 2010 00:06:09 -0000	1.2044
@@ -1910,6 +1910,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Mon Jun 28 2010 Dave Airlie <airlied at redhat.com>
+- drm-i915-fix-edp-panels.patch: update to newer version
+
 * Fri Jun 25 2010 Kyle McMartin <kyle at redhat.com>
 - drm-i915-fix-edp-panels.patch: copy from rawhide.