Re: [PATCH] i915: slow acpi_lid_open() causes flickering

[Joe Perches]

On Mon, 2010-02-01 at 14:33 -0800, Andrew Morton wrote:
> On Mon, 01 Feb 2010 19:20:53 +0100
> Thomas Meyer <thomas@xxxxxxxx> wrote:
> > acpi_lid_open() could take up to 10ms on my computer.
> > Some component is calling the drm GETCONNECTOR ioctl many times in a row.
> > This results in flickering (for example, when starting a video).
> > Fix it by assuming an always connected lid status.
> > 
> > This fixes bug http://bugzilla.kernel.org/show_bug.cgi?id=14670
> > 
> > ---
> >  drivers/gpu/drm/i915/intel_lvds.c |   15 ++++++++++++++-
> >  1 files changed, 14 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> > index aa74e59..0f0779c 100644
> > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > +++ b/drivers/gpu/drm/i915/intel_lvds.c
[]
> > @@ -643,7 +655,8 @@ static enum drm_connector_status intel_lvds_detect(struct drm_connector *connect
> >  {
> >  	enum drm_connector_status status = connector_status_connected;
> >  
> > -	if (!acpi_lid_open() && !dmi_check_system(bad_lid_status))
> > +	if (!dmi_check_system(slow_lid_status) && !dmi_check_system(bad_lid_status))
> > +	    if (!acpi_lid_open())
> >  		status = connector_status_disconnected;
> >  
> >  	return status;

Shouldn't this use an && test instead of a 4 space indent of a new statement?

+	if (!dmi_check_system(slow_lid_status) && !dmi_check_system(bad_lid_status) &&
+	    !acpi_lid_open())

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/