public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Carlos R. Mafra" <crmafra2@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Ma Ling <ling.ma@intel.com>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	Zhao Yakui <yakui.zhao@intel.com>, Eric Anholt <eric@anholt.net>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [Bisected] Output to external monitor is broken (Re: Linux 2.6.31-rc9)
Date: Tue, 8 Sep 2009 11:56:27 +0200	[thread overview]
Message-ID: <20090908095627.GA4094@Pilar.aei.mpg.de> (raw)
In-Reply-To: <20090908065808.GA30390@zhen-devel.sh.intel.com>

On Tue  8.Sep'09 at 14:58:08 +0800, Zhenyu Wang wrote:
> Carlos, I've just taken a look at that one, there're some drawbacks in
> it, but can't understand why it caused break for you. It'll be great if
> you can test with this one. 

Yes, the patch below fixes the problem here.
Thanks everyone and sorry for the delay!

> 
> From f3932299964b2616d42d7fcf734bd880009ab206 Mon Sep 17 00:00:00 2001
> From: Zhenyu Wang <zhenyuw@linux.intel.com>
> Date: Tue, 8 Sep 2009 14:52:25 +0800
> Subject: [PATCH] drm/i915: fix mask bits setting
> 
> eDP is exclusive connector too, and add missing crtc_mask
> setting for TV.
> 
> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c  |    2 +-
>  drivers/gpu/drm/i915/intel_drv.h |    1 +
>  drivers/gpu/drm/i915/intel_tv.c  |    1 +
>  3 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index f2afc4a..2b914d7 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1263,7 +1263,7 @@ intel_dp_init(struct drm_device *dev, int output_reg)
>  
>  	if (IS_eDP(intel_output)) {
>  		intel_output->crtc_mask = (1 << 1);
> -		intel_output->clone_mask = (1 << INTEL_OUTPUT_EDP);
> +		intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT);
>  	} else
>  		intel_output->crtc_mask = (1 << 0) | (1 << 1);
>  	connector->interlace_allowed = true;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 25aa6fa..26a6227 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -74,6 +74,7 @@
>  #define INTEL_LVDS_CLONE_BIT 14
>  #define INTEL_DVO_TMDS_CLONE_BIT 15
>  #define INTEL_DVO_LVDS_CLONE_BIT 16
> +#define INTEL_EDP_CLONE_BIT 17
>  
>  #define INTEL_DVO_CHIP_NONE 0
>  #define INTEL_DVO_CHIP_LVDS 1
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index 2fbe13a..5b1c9e9 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1730,6 +1730,7 @@ intel_tv_init(struct drm_device *dev)
>  	drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
>  	tv_priv = (struct intel_tv_priv *)(intel_output + 1);
>  	intel_output->type = INTEL_OUTPUT_TVOUT;
> +	intel_output->crtc_mask = (1 << 0) | (1 << 1);
>  	intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
>  	intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
>  	intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);
> -- 
> 1.6.3.3
> 
> -- 
> Open Source Technology Center, Intel ltd.
> 
> $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827



  reply	other threads:[~2009-09-08  9:57 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-05 23:54 Linux 2.6.31-rc9 Linus Torvalds
2009-09-06 14:22 ` [Bisected] Output to external monitor is broken (Re: Linux 2.6.31-rc9) Carlos R. Mafra
2009-09-07 18:37   ` Linus Torvalds
2009-09-07 19:12     ` Carlos R. Mafra
2009-09-08  4:59       ` ykzhao
2009-09-08 10:06         ` Carlos R. Mafra
2009-09-08  6:58       ` Zhenyu Wang
2009-09-08  9:56         ` Carlos R. Mafra [this message]
2009-09-08  6:05     ` ykzhao
2009-09-08 11:20 ` Linux 2.6.31-rc9 Ingo Molnar
2009-09-09  0:37   ` Linus Torvalds
2009-09-21  8:36     ` Ingo Molnar
2009-09-21 15:13       ` Linus Torvalds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090908095627.GA4094@Pilar.aei.mpg.de \
    --to=crmafra2@gmail.com \
    --cc=eric@anholt.net \
    --cc=jbarnes@virtuousgeek.org \
    --cc=ling.ma@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=yakui.zhao@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox