On Fri, Sep 30, 2011 at 10:56:41PM +0100, Chris Wilson wrote: > Reported-and-tested-by: Bo Wang < bo.b.wang at intel.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36997 > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk> 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 at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel at ffwll.ch Mobile: +41 (0)79 365 57 48
