No subject
Mon Mar 21 21:14:43 UTC 2011
The latter may break some current kernel command lines, so add a
temporary fix for that.
Added:
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-kms-remove-spaces-from-connector-names-v2.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/x86/i915_gem-return-EFAULT-if-copy_to_user-fails.patch
dists/squeeze/linux-2.6/debian/patches/debian/drm-kms-Temporarily-restore-support-for-name-DisplayPort.patch
Modified:
dists/squeeze/linux-2.6/debian/changelog
dists/squeeze/linux-2.6/debian/patches/series/34
Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog Mon Apr 25 01:44:44 2011 (r17253)
+++ dists/squeeze/linux-2.6/debian/changelog Mon Apr 25 04:01:55 2011 (r17254)
@@ -49,6 +49,10 @@
http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.38
* nfsd: NFSv4: Allow opening existing files with O_CREAT flag in
non-writable directories (Closes: #617508)
+ * Add previously missed drm changes from 2.6.32.y+drm33.z:
+ - i915_gem: Return -EFAULT if copy_to_user fails
+ - drm/kms: Remove spaces from connector names, so they can be named
+ in the 'video' parameter on the kernel command line
-- Ben Hutchings <ben at decadent.org.uk> Fri, 08 Apr 2011 01:13:01 +0100
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-kms-remove-spaces-from-connector-names-v2.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-kms-remove-spaces-from-connector-names-v2.patch Mon Apr 25 04:01:55 2011 (r17254)
@@ -0,0 +1,49 @@
+From afe2c414358ba8e4c5dd21e4819f7e930d3ddc33 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed, 8 Dec 2010 19:09:42 -0500
+Subject: [PATCH] drm/kms: remove spaces from connector names (v2)
+
+commit e76116ca9671e2e5239054a40303b94feab585ad upstream.
+
+Grub doesn't parse spaces in parameters correctly, so
+this makes it impossible to force video= parameters
+for kms on the grub kernel command line.
+
+v2: shorten the names to make them easier to type.
+
+Reported-by: Sergej Pupykin <ml at sergej.pp.ru>
+
+Cc: Sergej Pupykin <ml at sergej.pp.ru>
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
+---
+ drivers/gpu/drm/drm_crtc.c | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
+index d91fb8c..81ba0e6 100644
+--- a/drivers/gpu/drm/drm_crtc.c
++++ b/drivers/gpu/drm/drm_crtc.c
+@@ -153,12 +153,12 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
+ { DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO", 0 },
+ { DRM_MODE_CONNECTOR_LVDS, "LVDS", 0 },
+ { DRM_MODE_CONNECTOR_Component, "Component", 0 },
+- { DRM_MODE_CONNECTOR_9PinDIN, "9-pin DIN", 0 },
+- { DRM_MODE_CONNECTOR_DisplayPort, "DisplayPort", 0 },
+- { DRM_MODE_CONNECTOR_HDMIA, "HDMI Type A", 0 },
+- { DRM_MODE_CONNECTOR_HDMIB, "HDMI Type B", 0 },
++ { DRM_MODE_CONNECTOR_9PinDIN, "DIN", 0 },
++ { DRM_MODE_CONNECTOR_DisplayPort, "DP", 0 },
++ { DRM_MODE_CONNECTOR_HDMIA, "HDMI-A", 0 },
++ { DRM_MODE_CONNECTOR_HDMIB, "HDMI-B", 0 },
+ { DRM_MODE_CONNECTOR_TV, "TV", 0 },
+- { DRM_MODE_CONNECTOR_eDP, "Embedded DisplayPort", 0 },
++ { DRM_MODE_CONNECTOR_eDP, "eDP", 0 },
+ };
+
+ static struct drm_prop_enum_list drm_encoder_enum_list[] =
+--
+1.7.4.4
+
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/x86/i915_gem-return-EFAULT-if-copy_to_user-fails.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/x86/i915_gem-return-EFAULT-if-copy_to_user-fails.patch Mon Apr 25 04:01:55 2011 (r17254)
@@ -0,0 +1,34 @@
+From 707411ceadae9a9364d789707e3a73343ab1ab1b Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <error27 at gmail.com>
+Date: Wed, 23 Jun 2010 19:03:01 +0200
+Subject: [PATCH] i915_gem: return -EFAULT if copy_to_user fails
+
+commit c877cdce93a44eea96f6cf7fc04be7d0372db2be upstream.
+
+copy_to_user() returns the number of bytes remaining to be copied and
+I'm pretty sure we want to return a negative error code here.
+
+Signed-off-by: Dan Carpenter <error27 at gmail.com>
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+(cherry-picked from 2.6.32.22/2.6.35.5)
+Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
+---
+ drivers/gpu/drm/i915/i915_gem.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index 8a41c4e..ad3c4a2 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -3762,6 +3762,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
+ if (ret != 0) {
+ DRM_ERROR("copy %d cliprects failed: %d\n",
+ args->num_cliprects, ret);
++ ret = -EFAULT;
+ goto pre_mutex_err;
+ }
+ }
+--
+1.7.4.4
+
Added: dists/squeeze/linux-2.6/debian/patches/debian/drm-kms-Temporarily-restore-support-for-name-DisplayPort.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/drm-kms-Temporarily-restore-support-for-name-DisplayPort.patch Mon Apr 25 04:01:55 2011 (r17254)
@@ -0,0 +1,51 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 25 Apr 2011 04:39:09 +0100
+Subject: [PATCH] drm/kms: Temporarily restore support for connector type name
+ 'DisplayPort'
+
+Commit e76116ca9671e2e5239054a40303b94feab585ad removed spaces from
+connector names, which is fine. But it also arbitrarily abbreviated
+'DisplayPort' to 'DP', which could invalidate some working command
+lines. We should continue to support the old names during the
+lifetime of 'squeeze', but warn about the name change.
+---
+ drivers/gpu/drm/drm_fb_helper.c | 20 ++++++++++++++++++--
+ 1 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
+index 0f9e905..4ff4e5e 100644
+--- a/drivers/gpu/drm/drm_fb_helper.c
++++ b/drivers/gpu/drm/drm_fb_helper.c
+@@ -222,11 +222,27 @@ int drm_fb_helper_parse_command_line(struct drm_device *dev)
+ struct drm_connector *connector;
+
+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
++ char *name;
++ char old_name[32];
+ char *option = NULL;
+
+ /* do something on return - turn off connector maybe */
+- if (fb_get_options(drm_get_connector_name(connector), &option))
+- continue;
++ name = drm_get_connector_name(connector);
++ if (fb_get_options(name, &option)) {
++ /* Temporary backward compatibility: 'DP-<n>'
++ * used to be named 'DisplayPort-<n>'.
++ */
++ if (connector->connector_type !=
++ DRM_MODE_CONNECTOR_DisplayPort)
++ continue;
++ snprintf(old_name, sizeof(old_name), "DisplayPort-%d",
++ connector->connector_type_id);
++ if (fb_get_options(old_name, &option))
++ continue;
++ DRM_ERROR("Connector '%s' is now named '%s' - kernel "
++ "command line should be updated\n",
++ old_name, name);
++ }
+
+ drm_fb_helper_connector_parse_command_line(connector, option);
+ }
+--
+1.7.4.4
+
Modified: dists/squeeze/linux-2.6/debian/patches/series/34
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/34 Mon Apr 25 01:44:44 2011 (r17253)
+++ dists/squeeze/linux-2.6/debian/patches/series/34 Mon Apr 25 04:01:55 2011 (r17254)
@@ -34,3 +34,6 @@
+ debian/exec-Get-rid-of-linux_binprm-vma_pages.patch
+ bugfix/all/CVE-2010-3865.patch
+ bugfix/all/nfsd-Open-with-O_CREAT-flag-set-fails-to-open-existing.patch
++ bugfix/x86/i915_gem-return-EFAULT-if-copy_to_user-fails.patch
++ bugfix/all/drm-kms-remove-spaces-from-connector-names-v2.patch
++ debian/drm-kms-Temporarily-restore-support-for-name-DisplayPort.patch
More information about the Kernel-svn-changes
mailing list