[patch for 2.6.35? 1/1] acpi: video: fix acpi_backlight=video

[patch for 2.6.35? 1/1] acpi: video: fix acpi_backlight=video

[akpm]

From: Kamal Mostafa <kamal@canonical.com>

Make "acpi_backlight=video" param enable ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO
as intended, instead of incorrectly enabling video output switching.

Addresses http://bugs.launchpad.net/bugs/573120

Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: Thomas Renninger <trenn@suse.de>
Cc: Thomas Renninger <trenn@suse.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/acpi/video_detect.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video drivers/acpi/video_detect.c
--- a/drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video
+++ a/drivers/acpi/video_detect.c
@@ -266,7 +266,7 @@ static int __init acpi_display_output(ch
 				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
 		if (!strcmp("video", str))
 			acpi_video_support |=
-				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
+				ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO;
 	}
 	return 1;
 }
_

Re: [patch for 2.6.35? 1/1] acpi: video: fix acpi_backlight=video

[Andrew Morton]

On Mon, 24 May 2010 20:53:51 -0400 (EDT) Len Brown <lenb@kernel.org> wrote:

> 
> On Mon, 24 May 2010, akpm@linux-foundation.org wrote:
> 
> > From: Kamal Mostafa <kamal@canonical.com>
> > 
> > Make "acpi_backlight=video" param enable ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO
> > as intended, instead of incorrectly enabling video output switching.
> > 
> > Addresses http://bugs.launchpad.net/bugs/573120
> > 
> > Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> > Cc: Len Brown <lenb@kernel.org>
> > Cc: Zhang Rui <rui.zhang@intel.com>
> > Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
> > Cc: Jiri Kosina <jkosina@suse.cz>
> > Acked-by: Thomas Renninger <trenn@suse.de>
> > Cc: Thomas Renninger <trenn@suse.de>
> > Cc: <stable@kernel.org>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> > ---
> > 
> >  drivers/acpi/video_detect.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff -puN drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video drivers/acpi/video_detect.c
> > --- a/drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video
> > +++ a/drivers/acpi/video_detect.c
> > @@ -266,7 +266,7 @@ static int __init acpi_display_output(ch
> >  				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
> >  		if (!strcmp("video", str))
> >  			acpi_video_support |=
> > -				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
> > +				ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO;
> >  	}
> >  	return 1;
> >  }
>
> yes, it is in acpi-test and linux-next, do you pull those into mm still?
> 

(top-posting repaired!)

linux-next changes acpi_backlight().  In my tree patch(1) decided to
migrate the hunk into acpi_display_output().

Please check that acpi_display_output() didn't need the same change.

I'll drop the patch, thanks.

Re: [patch for 2.6.35? 1/1] acpi: video: fix acpi_backlight=video

[Len Brown]

yes, it is in acpi-test and linux-next, do you pull those into mm still?

thanks,
Len Brown, Intel Open Source Technology Center

On Mon, 24 May 2010, akpm@linux-foundation.org wrote:

> From: Kamal Mostafa <kamal@canonical.com>
> 
> Make "acpi_backlight=video" param enable ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO
> as intended, instead of incorrectly enabling video output switching.
> 
> Addresses http://bugs.launchpad.net/bugs/573120
> 
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> Cc: Len Brown <lenb@kernel.org>
> Cc: Zhang Rui <rui.zhang@intel.com>
> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
> Cc: Jiri Kosina <jkosina@suse.cz>
> Acked-by: Thomas Renninger <trenn@suse.de>
> Cc: Thomas Renninger <trenn@suse.de>
> Cc: <stable@kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/acpi/video_detect.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video drivers/acpi/video_detect.c
> --- a/drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video
> +++ a/drivers/acpi/video_detect.c
> @@ -266,7 +266,7 @@ static int __init acpi_display_output(ch
>  				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
>  		if (!strcmp("video", str))
>  			acpi_video_support |=
> -				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
> +				ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO;
>  	}
>  	return 1;
>  }
> _
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [patch for 2.6.35? 1/1] acpi: video: fix acpi_backlight=video

[Len Brown]

> > > diff -puN drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video drivers/acpi/video_detect.c
> > > --- a/drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video
> > > +++ a/drivers/acpi/video_detect.c
> > > @@ -266,7 +266,7 @@ static int __init acpi_display_output(ch
> > >  				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
> > >  		if (!strcmp("video", str))
> > >  			acpi_video_support |=
> > > -				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
> > > +				ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO;
> > >  	}
> > >  	return 1;


> linux-next changes acpi_backlight().  In my tree patch(1) decided to
> migrate the hunk into acpi_display_output().

I think the hunk got mis-relocated in your tree,
and that the correct patch is included in the acpi tree.

> Please check that acpi_display_output() didn't need the same change.

It looks okay.

> I'll drop the patch, thanks.

thanks,
-Len