--- /dev/null
+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
+@@ -2020,7 +2020,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))
--- /dev/null
+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
+@@ -3702,6 +3702,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;
--- /dev/null
+From f934ec8c34b9dcefb5a4f35b0bda33bca289cbe6 Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Tue, 29 Jan 2013 14:27:39 +0100
+Subject: drm: shut up invalid edid messages
+
+From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+
+commit f934ec8c34b9dcefb5a4f35b0bda33bca289cbe6 upstream.
+
+My cheapo monitor has an invalid block 1, resulting in a lot of dmesg spam every few seconds.
+
+I get it the first time that the entire block is all 0xff..
+
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/drm_edid.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -357,10 +357,14 @@ drm_do_get_edid(struct drm_connector *co
+ break;
+ }
+ }
+- if (i == 4)
++
++ if (i == 4 && print_bad_edid) {
+ dev_warn(connector->dev->dev,
+ "%s: Ignoring invalid EDID block %d.\n",
+ drm_get_connector_name(connector), j);
++
++ connector->bad_edid_counter++;
++ }
+ }
+
+ if (valid_extensions != block[0x7e]) {
--- /dev/null
+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);
+
--- /dev/null
+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
+@@ -2089,7 +2089,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)
--- /dev/null
+From 969daa349f4821a02936af7202b51a9affc7b6da Mon Sep 17 00:00:00 2001
+From: Alex Williamson <alex.williamson@redhat.com>
+Date: Thu, 14 Feb 2013 11:35:42 -0700
+Subject: PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
+
+From: Alex Williamson <alex.williamson@redhat.com>
+
+commit 969daa349f4821a02936af7202b51a9affc7b6da upstream.
+
+PCI_EXP_FLAGS_TYPE is a mask, not an offset. Fix it.
+
+Previously, pcie_capability_read_word(..., PCI_EXP_FLAGS, ...) would
+fail.
+
+[bhelgaas: tweak changelog]
+Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/pci/access.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pci/access.c
++++ b/drivers/pci/access.c
+@@ -515,7 +515,7 @@ static bool pcie_capability_reg_implemen
+ return false;
+
+ switch (pos) {
+- case PCI_EXP_FLAGS_TYPE:
++ case PCI_EXP_FLAGS:
+ return true;
+ case PCI_EXP_DEVCAP:
+ case PCI_EXP_DEVCTL:
--- /dev/null
+From db3985e5ca8f50fc17606855ba394783d11683a5 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Wed, 13 Feb 2013 20:37:48 +1000
+Subject: Revert "drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S"
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit db3985e5ca8f50fc17606855ba394783d11683a5 upstream.
+
+This reverts commit 6f33814bd4d9cfe76033a31b1c0c76c960cd8e4b.
+
+The quirk cause a regression, and it looks like the original bug was
+simply a lack of FIFO bandwidth on the i915G of the reporter. Which
+should eventually be fixed as soon as we get around to implemented
+DSPARB FIFO reassignment on gen 3.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=52281
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+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, 3 deletions(-)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -87,9 +87,6 @@ static struct edid_quirk {
+ int product_id;
+ u32 quirks;
+ } edid_quirk_list[] = {
+- /* ASUS VW222S */
+- { "ACI", 0x22a2, EDID_QUIRK_FORCE_REDUCED_BLANKING },
+-
+ /* Acer AL1706 */
+ { "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 },
+ /* Acer F51 */
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
+pci-fix-pci-express-capability-accessors-for-pci_exp_flags.patch
+drm-don-t-add-inferred-modes-for-monitors-that-don-t-support-them.patch
+drm-shut-up-invalid-edid-messages.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
+revert-drm-add-edid_quirk_force_reduced_blanking-for-asus-vw222s.patch
+drm-usb-bind-driver-to-correct-device.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
