From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915/sdvo: Include YRPB as an additional TV output type Date: Sat, 31 Mar 2012 17:23:42 +0200 Message-ID: <20120331151307.GA4796@phenom.ffwll.local> References: <1317419801-12146-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 7345B9E797 for ; Sat, 31 Mar 2012 08:23:03 -0700 (PDT) Received: by wgbdr12 with SMTP id dr12so1115403wgb.12 for ; Sat, 31 Mar 2012 08:23:02 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1317419801-12146-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Sep 30, 2011 at 10:56:41PM +0100, Chris Wilson wrote: > Reported-and-tested-by: Bo Wang < bo.b.wang@intel.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36997 > Signed-off-by: Chris Wilson I've noticed this old patch while strowling through bugzilla, and it still applies. Queued for next, thanks for the patch! -Daniel > --- > drivers/gpu/drm/i915/intel_sdvo.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c > index 30fe554..3684c22 100644 > --- a/drivers/gpu/drm/i915/intel_sdvo.c > +++ b/drivers/gpu/drm/i915/intel_sdvo.c > @@ -40,7 +40,7 @@ > #define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1) > #define SDVO_RGB_MASK (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1) > #define SDVO_LVDS_MASK (SDVO_OUTPUT_LVDS0 | SDVO_OUTPUT_LVDS1) > -#define SDVO_TV_MASK (SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_SVID0) > +#define SDVO_TV_MASK (SDVO_OUTPUT_CVBS0 | SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_YPRPB0) > > #define SDVO_OUTPUT_MASK (SDVO_TMDS_MASK | SDVO_RGB_MASK | SDVO_LVDS_MASK |\ > SDVO_TV_MASK) > @@ -1376,8 +1376,7 @@ intel_sdvo_detect(struct drm_connector *connector, bool force) > return connector_status_unknown; > > /* add 30ms delay when the output type might be TV */ > - if (intel_sdvo->caps.output_flags & > - (SDVO_OUTPUT_SVID0 | SDVO_OUTPUT_CVBS0)) > + if (intel_sdvo->caps.output_flags & SDVO_TV_MASK) > mdelay(30); > > if (!intel_sdvo_read_response(intel_sdvo, &response, 2)) > @@ -2218,6 +2217,10 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, uint16_t flags) > if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_CVBS0)) > return false; > > + if (flags & SDVO_OUTPUT_YPRPB0) > + if (!intel_sdvo_tv_init(intel_sdvo, SDVO_OUTPUT_YPRPB0)) > + return false; > + > if (flags & SDVO_OUTPUT_RGB0) > if (!intel_sdvo_analog_init(intel_sdvo, 0)) > return false; > -- > 1.7.5.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48