3.4-stable patches

added patches:
	drm-don-t-add-inferred-modes-for-monitors-that-don-t-support-them.patch
	drm-fill-depth-bits_per_pixel-for-c8-format.patch
	drm-usb-bind-driver-to-correct-device.patch
	drm-use-c8-instead-of-rgb332-when-determining-the-format-from-depth-bpp.patch

diff --git a/queue-3.4/drm-don-t-add-inferred-modes-for-monitors-that-don-t-support-them.patch b/queue-3.4/drm-don-t-add-inferred-modes-for-monitors-that-don-t-support-them.patch
new file mode 100644 (file)
index 0000000..ee3ba36
--- /dev/null
+++ b/queue-3.4/drm-don-t-add-inferred-modes-for-monitors-that-don-t-support-them.patch
@@ -0,0 +1,42 @@
+From 196e077dc165a307efbd9e7569f81bbdbcf18f65 Mon Sep 17 00:00:00 2001
+From: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Date: Fri, 15 Feb 2013 13:36:27 -0200
+Subject: drm: don't add inferred modes for monitors that don't support them
+
+From: Paulo Zanoni <paulo.r.zanoni@intel.com>
+
+commit 196e077dc165a307efbd9e7569f81bbdbcf18f65 upstream.
+
+If bit 0 of the features byte (0x18) is set to 0, then, according to
+the EDID spec, "the display is non-continuous frequency (multi-mode)
+and is only specified to accept the video timing formats that are
+listed in Base EDID and certain Extension Blocks".
+
+For more information, please see the EDID spec, check the notes of the
+table that explains the "Feature Support" byte (18h) and also the
+notes on the tables of the section that explains "Display Range Limits
+& Additional Timing Description Definition (tag #FDh)".
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45729
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_edid.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -1769,7 +1769,8 @@ int drm_add_edid_modes(struct drm_connec
+       num_modes += add_cvt_modes(connector, edid);
+       num_modes += add_standard_modes(connector, edid);
+       num_modes += add_established_modes(connector, edid);
+-      num_modes += add_inferred_modes(connector, edid);
++      if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
++              num_modes += add_inferred_modes(connector, edid);
+       num_modes += add_cea_modes(connector, edid);
+ 
+       if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))

diff --git a/queue-3.4/drm-fill-depth-bits_per_pixel-for-c8-format.patch b/queue-3.4/drm-fill-depth-bits_per_pixel-for-c8-format.patch
new file mode 100644 (file)
index 0000000..3b37f82
--- /dev/null
+++ b/queue-3.4/drm-fill-depth-bits_per_pixel-for-c8-format.patch
@@ -0,0 +1,30 @@
+From c51a6bc5f6d328926a9a4a1247c5030faf190a80 Mon Sep 17 00:00:00 2001
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Date: Thu, 31 Jan 2013 19:43:37 +0200
+Subject: drm: Fill depth/bits_per_pixel for C8 format
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+commit c51a6bc5f6d328926a9a4a1247c5030faf190a80 upstream.
+
+Set depth/bits_per_pixel to 8 for C8 format.
+
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Acked-by: Dave Airlie <airlied@gmail.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_crtc.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -3409,6 +3409,7 @@ void drm_fb_get_bpp_depth(uint32_t forma
+                         int *bpp)
+ {
+       switch (format) {
++      case DRM_FORMAT_C8:
+       case DRM_FORMAT_RGB332:
+       case DRM_FORMAT_BGR233:
+               *depth = 8;

diff --git a/queue-3.4/drm-usb-bind-driver-to-correct-device.patch b/queue-3.4/drm-usb-bind-driver-to-correct-device.patch
new file mode 100644 (file)
index 0000000..f2b863e
--- /dev/null
+++ b/queue-3.4/drm-usb-bind-driver-to-correct-device.patch
@@ -0,0 +1,32 @@
+From 9f23de52b64f7fb801fd76f3dd8651a0dc89187b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 7 Feb 2013 10:10:04 +1000
+Subject: drm/usb: bind driver to correct device
+
+From: Dave Airlie <airlied@redhat.com>
+
+commit 9f23de52b64f7fb801fd76f3dd8651a0dc89187b upstream.
+
+While looking at plymouth on udl I noticed that plymouth was trying
+to use its fb plugin not its drm one, it was trying to drmOpen a driver called
+usb not udl, noticed that we actually had out driver pointing at the wrong
+device.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_usb.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/drm_usb.c
++++ b/drivers/gpu/drm/drm_usb.c
+@@ -18,7 +18,7 @@ int drm_get_usb_dev(struct usb_interface
+ 
+       usbdev = interface_to_usbdev(interface);
+       dev->usbdev = usbdev;
+-      dev->dev = &usbdev->dev;
++      dev->dev = &interface->dev;
+ 
+       mutex_lock(&drm_global_mutex);
+ 

diff --git a/queue-3.4/drm-use-c8-instead-of-rgb332-when-determining-the-format-from-depth-bpp.patch b/queue-3.4/drm-use-c8-instead-of-rgb332-when-determining-the-format-from-depth-bpp.patch
new file mode 100644 (file)
index 0000000..d1ced12
--- /dev/null
+++ b/queue-3.4/drm-use-c8-instead-of-rgb332-when-determining-the-format-from-depth-bpp.patch
@@ -0,0 +1,38 @@
+From d84f031bd230fdf9c3b7734940c859bf28b90219 Mon Sep 17 00:00:00 2001
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Date: Thu, 31 Jan 2013 19:43:38 +0200
+Subject: drm: Use C8 instead of RGB332 when determining the format from depth/bpp
+
+From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+
+commit d84f031bd230fdf9c3b7734940c859bf28b90219 upstream.
+
+Support for real RGB332 is a rarity, most hardware only really support
+C8. So use C8 instead of RGB332 when determining the format based on
+depth/bpp.
+
+This fixes 8bpp fbcon on i915, since i915 will only accept C8 and not
+RGB332.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59572
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Acked-by: Dave Airlie <airlied@gmail.com>
+Tested-by: mlsemon35@gmail.com
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_crtc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -2023,7 +2023,7 @@ uint32_t drm_mode_legacy_fb_format(uint3
+ 
+       switch (bpp) {
+       case 8:
+-              fmt = DRM_FORMAT_RGB332;
++              fmt = DRM_FORMAT_C8;
+               break;
+       case 16:
+               if (depth == 15)

diff --git a/queue-3.4/series b/queue-3.4/series
index 92accbeaac39cd6f022796058c224f9472368003..1a156b0368cfb6b1b73dac97488a56cd97c5c318 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -44,3 +44,7 @@ drm-radeon-dce6-fix-display-powergating.patch
 drm-udl-make-usage-as-a-console-safer.patch
 drm-udl-disable-fb_defio-by-default.patch
 vgacon-vt-clear-buffer-attributes-when-we-load-a-512-character-font-v2.patch
+drm-don-t-add-inferred-modes-for-monitors-that-don-t-support-them.patch
+drm-fill-depth-bits_per_pixel-for-c8-format.patch
+drm-use-c8-instead-of-rgb332-when-determining-the-format-from-depth-bpp.patch
+drm-usb-bind-driver-to-correct-device.patch