On Thu, 19 Mar 2009 17:52:39 -0700
Jesse Barnes <jbar...@virtuousgeek.org> wrote:
> > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> > index a839a28..069b189 100644
> > --- a/drivers/gpu/drm/drm_edid.c
> > +++ b/drivers/gpu/drm/drm_edid.c
> > @@ -588,20 +588,22 @@ static unsigned char *drm_ddc_read(struct
> > i2c_adapter *adapter) {
> > struct i2c_algo_bit_data *algo_data = adapter->algo_data;
> > unsigned char *edid = NULL;
> > + int divider = 5;
> > int i, j;
>
> Not sure about the DDC changes; we already have problems with not
> getting data back on several displays, but I think that problem is
> buried in the actual i2c code, not the delays in this routine.
with this change we try twice. First with divider = 5; if we get
nothing back we try again with divider = 1 (eg old behavior)...
should be ok I hope.
>
> > diff --git a/drivers/gpu/drm/i915/intel_display.c
> > b/drivers/gpu/drm/i915/intel_display.c index a283427..4b88341 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -319,7 +319,7 @@ void
> > intel_wait_for_vblank(struct drm_device *dev)
> > {
> > /* Wait for 20ms, i.e. one cycle at 50hz. */
> > - udelay(20000);
> > + mdelay(20);
> > }
>
> We could probably do this independently. We'll generally be holding
> the struct mutex here, but that should be ok.
well udelay(20000) == mdelay(20) for all intents and purposes; just
minor cleanup
--
Arjan van de Ven Intel Open Source Technology Centre
For development, discussion and tips for power savings,
visit http://www.lesswatts.org
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
