Patchwork Lucid pull request, lp564559 SRU

login
register
mail settings
Submitter Tim Gardner
Date April 20, 2010, 5:04 p.m.
Message ID <20100420170425.17E3FF899A@sepang.rtg.net>
Download mbox | patch
Permalink /patch/50551/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Tim Gardner - April 20, 2010, 5:04 p.m.
The following changes since commit f5b688618eeb76b4047091723c6a456a991ce862:
  Andy Whitcroft (1):
        UBUNTU: Start new release

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp564559

Alex Deucher (1):
      UBUNTU: SAUCE: drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0

 drivers/gpu/drm/radeon/radeon_encoders.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
From e98da83b6ec9ea6cef29393a97dd813f7d2c18a8 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Thu, 15 Apr 2010 16:54:38 -0400
Subject: [PATCH] UBUNTU: SAUCE: drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0

This is a partial backport of upstream commit b317a9ce2259e64258a802a5ca70dec45ac15dda.

BugLink: http://bugs.launchpad.net/bugs/564559
Backported-by: http://launchpad.net/~ancoron
http://launchpadlibrarian.net/44573476/duallink-fix.patch

------

Got broken during the evergreen merge.

Fixes fdo bug 27001.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/gpu/drm/radeon/radeon_encoders.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Andy Whitcroft - April 20, 2010, 6:51 p.m.
On Tue, Apr 20, 2010 at 11:04:25AM -0600, Tim Gardner wrote:
> The following changes since commit f5b688618eeb76b4047091723c6a456a991ce862:
>   Andy Whitcroft (1):
>         UBUNTU: Start new release
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp564559
> 
> Alex Deucher (1):
>       UBUNTU: SAUCE: drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0
> 
>  drivers/gpu/drm/radeon/radeon_encoders.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> From e98da83b6ec9ea6cef29393a97dd813f7d2c18a8 Mon Sep 17 00:00:00 2001
> From: Alex Deucher <alexdeucher@gmail.com>
> Date: Thu, 15 Apr 2010 16:54:38 -0400
> Subject: [PATCH] UBUNTU: SAUCE: drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0
> 
> This is a partial backport of upstream commit b317a9ce2259e64258a802a5ca70dec45ac15dda.
> 
> BugLink: http://bugs.launchpad.net/bugs/564559
> Backported-by: http://launchpad.net/~ancoron
> http://launchpadlibrarian.net/44573476/duallink-fix.patch
> 
> ------
> 
> Got broken during the evergreen merge.
> 
> Fixes fdo bug 27001.
> 
> Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  drivers/gpu/drm/radeon/radeon_encoders.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
> index 3c91724..99ee225 100644
> --- a/drivers/gpu/drm/radeon/radeon_encoders.c
> +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
> @@ -847,6 +847,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
>  		else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {
>  			if (dig->coherent_mode)
>  				args.v2.acConfig.fCoherentMode = 1;
> +			if (radeon_encoder->pixel_clock > 165000)
> +				args.v2.acConfig.fDualLinkConnector = 1;
>  		}
>  	} else {

This looks to be a sensible subset of the upstream commit.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Andy Whitcroft - April 21, 2010, 9:59 a.m.
Applied to Lucid.

-apw
Ancoron Luciferis - May 1, 2010, 1:04 a.m.
On 04/21/2010 11:59 AM, Andy Whitcroft wrote:
> Applied to Lucid.
>
> -apw
>

With what kernel version will this be released? Or is it in some backports?

Thanx,

Ancoron
Andy Whitcroft - May 6, 2010, 12:32 p.m.
On Sat, May 01, 2010 at 03:04:36AM +0200, Ancoron Luciferis wrote:
> On 04/21/2010 11:59 AM, Andy Whitcroft wrote:
> > Applied to Lucid.
> >
> > -apw
> >
> 
> With what kernel version will this be released? Or is it in some backports?

This would imply its in the next planned upload.  Unless of course there
is a security upload pending.  The key is that when it is uploaded the
bug will automatically be updated (if there is one) by the Janitor, to
let you know to test.

-apw

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 3c91724..99ee225 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -847,6 +847,8 @@  atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t
 		else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) {
 			if (dig->coherent_mode)
 				args.v2.acConfig.fCoherentMode = 1;
+			if (radeon_encoder->pixel_clock > 165000)
+				args.v2.acConfig.fDualLinkConnector = 1;
 		}
 	} else {