[PATCH 1/1] [media] uvcvideo: quirk PROBE_DEF for Alienware X51 OmniVision webcam

[PATCH 1/1] [media] uvcvideo: quirk PROBE_DEF for Alienware X51 OmniVision webcam

[joseph.salisbury]

From: Joseph Salisbury <joseph.salisbury@canonical.com>

BugLink: http://bugs.launchpad.net/bugs/1180409

OminiVision webcam 0x05a9:0x2643 needs the same UVC_QUIRK_PROBE_DEF as other OmniVision models to work properly.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: linux-media@vger.kernel.org
Cc: stable@vger.kernel.org
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 drivers/media/usb/uvc/uvc_driver.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 5dbefa6..411682c 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2163,6 +2163,15 @@ static struct usb_device_id uvc_ids[] = {
 	  .bInterfaceSubClass	= 1,
 	  .bInterfaceProtocol	= 0,
 	  .driver_info 		= UVC_QUIRK_PROBE_DEF },
+ 	/* Alienware X51*/
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x05a9,
+          .idProduct            = 0x2643,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_PROBE_DEF },
 	/* Apple Built-In iSight */
 	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
 				| USB_DEVICE_ID_MATCH_INT_INFO,
-- 
1.7.9.5

Re: [PATCH 1/1] [media] uvcvideo: quirk PROBE_DEF for Alienware X51 OmniVision webcam

[Laurent Pinchart]

Hi Joseph,

Thank you for the patch.

On Wednesday 15 May 2013 16:38:48 joseph.salisbury@canonical.com wrote:
> From: Joseph Salisbury <joseph.salisbury@canonical.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1180409
> 
> OminiVision webcam 0x05a9:0x2643 needs the same UVC_QUIRK_PROBE_DEF as other
> OmniVision models to work properly.
> 
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> Cc: linux-media@vger.kernel.org
> Cc: stable@vger.kernel.org
> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>

There's already a 05a9:2643 webcam model, found in a Dell monitor, that has 
been reported to work properly without the UVC_QUIRK_PROBE_DEF. Enabling the 
quirk shouldn't hurt, but I'd like to check differences between the two 
devices. Could you please send me the output of

lsusb -v -d 05a9:2643

(running as root if possible) ?

> ---
>  drivers/media/usb/uvc/uvc_driver.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/media/usb/uvc/uvc_driver.c
> b/drivers/media/usb/uvc/uvc_driver.c index 5dbefa6..411682c 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -2163,6 +2163,15 @@ static struct usb_device_id uvc_ids[] = {
>  	  .bInterfaceSubClass	= 1,
>  	  .bInterfaceProtocol	= 0,
>  	  .driver_info 		= UVC_QUIRK_PROBE_DEF },
> + 	/* Alienware X51*/
> +        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
> +                                | USB_DEVICE_ID_MATCH_INT_INFO,
> +          .idVendor             = 0x05a9,
> +          .idProduct            = 0x2643,
> +          .bInterfaceClass      = USB_CLASS_VIDEO,
> +          .bInterfaceSubClass   = 1,
> +          .bInterfaceProtocol   = 0,
> +          .driver_info          = UVC_QUIRK_PROBE_DEF },

Your mailer messed up formatting. As the patch is small I've fixed it 
manually, but please make sure to use a proper mail client next time. I advise 
using git-send-email to send patches.

>  	/* Apple Built-In iSight */
>  	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
> 
>  				| USB_DEVICE_ID_MATCH_INT_INFO,
-- 
Regards,

Laurent Pinchart

Re: [PATCH 1/1] [media] uvcvideo: quirk PROBE_DEF for Alienware X51 OmniVision webcam

[Joseph Salisbury]

On 05/16/2013 08:03 AM, Laurent Pinchart wrote:
> Hi Joseph,
>
> Thank you for the patch.
Thanks for the feedback.

>
> On Wednesday 15 May 2013 16:38:48 joseph.salisbury@canonical.com wrote:
>> From: Joseph Salisbury <joseph.salisbury@canonical.com>
>>
>> BugLink: http://bugs.launchpad.net/bugs/1180409
>>
>> OminiVision webcam 0x05a9:0x2643 needs the same UVC_QUIRK_PROBE_DEF as other
>> OmniVision models to work properly.
>>
>> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>> Cc: linux-media@vger.kernel.org
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
> There's already a 05a9:2643 webcam model, found in a Dell monitor, that has 
> been reported to work properly without the UVC_QUIRK_PROBE_DEF. Enabling the 
> quirk shouldn't hurt, but I'd like to check differences between the two 
> devices. Could you please send me the output of
>
> lsusb -v -d 05a9:2643
>
> (running as root if possible) ?
The lsusb output can be seen at:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1180409/comments/10/+download

I can also send this to you as an attachment if needed.

>
>> ---
>>  drivers/media/usb/uvc/uvc_driver.c |    9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/drivers/media/usb/uvc/uvc_driver.c
>> b/drivers/media/usb/uvc/uvc_driver.c index 5dbefa6..411682c 100644
>> --- a/drivers/media/usb/uvc/uvc_driver.c
>> +++ b/drivers/media/usb/uvc/uvc_driver.c
>> @@ -2163,6 +2163,15 @@ static struct usb_device_id uvc_ids[] = {
>>  	  .bInterfaceSubClass	= 1,
>>  	  .bInterfaceProtocol	= 0,
>>  	  .driver_info 		= UVC_QUIRK_PROBE_DEF },
>> + 	/* Alienware X51*/
>> +        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
>> +                                | USB_DEVICE_ID_MATCH_INT_INFO,
>> +          .idVendor             = 0x05a9,
>> +          .idProduct            = 0x2643,
>> +          .bInterfaceClass      = USB_CLASS_VIDEO,
>> +          .bInterfaceSubClass   = 1,
>> +          .bInterfaceProtocol   = 0,
>> +          .driver_info          = UVC_QUIRK_PROBE_DEF },
> Your mailer messed up formatting. As the patch is small I've fixed it 
> manually, but please make sure to use a proper mail client next time. I advise 
> using git-send-email to send patches.

Thanks.  I did in fact use git-send-email, which is what I use to send
all patches.  Can you point out the bad formatting.  Is it that   '|
USB_DEVICE_ID_MATCH_INT_INFO,' was not indented?  If so, I'll
investigate why that happened.
>
>>  	/* Apple Built-In iSight */
>>  	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
>>
>>  				| USB_DEVICE_ID_MATCH_INT_INFO,

Thanks again for reviewing this patch.

Re: [PATCH 1/1] [media] uvcvideo: quirk PROBE_DEF for Alienware X51 OmniVision webcam

[Laurent Pinchart]

Hi Joseph,

On Thursday 16 May 2013 12:07:54 Joseph Salisbury wrote:
> On 05/16/2013 08:03 AM, Laurent Pinchart wrote:
> > On Wednesday 15 May 2013 16:38:48 joseph.salisbury@canonical.com wrote:
> >> From: Joseph Salisbury <joseph.salisbury@canonical.com>
> >> 
> >> BugLink: http://bugs.launchpad.net/bugs/1180409
> >> 
> >> OminiVision webcam 0x05a9:0x2643 needs the same UVC_QUIRK_PROBE_DEF as
> >> other OmniVision models to work properly.
> >> 
> >> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> >> Cc: linux-media@vger.kernel.org
> >> Cc: stable@vger.kernel.org
> >> Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
> > 
> > There's already a 05a9:2643 webcam model, found in a Dell monitor, that
> > has been reported to work properly without the UVC_QUIRK_PROBE_DEF.
> > Enabling the quirk shouldn't hurt, but I'd like to check differences
> > between the two devices. Could you please send me the output of
> > 
> > lsusb -v -d 05a9:2643
> > 
> > (running as root if possible) ?
> 
> The lsusb output can be seen at:
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1180409/comments/10/+do
> wnload

Thank you. It looks like the two devices are identical. I don't know why the 
PROBE_DEF quirk hasn't been reported as necessary before. Anyway, I've applied 
your patch to my tree.

> I can also send this to you as an attachment if needed.
> 
> >> ---
> >> 
> >>  drivers/media/usb/uvc/uvc_driver.c |    9 +++++++++
> >>  1 file changed, 9 insertions(+)
> >> 
> >> diff --git a/drivers/media/usb/uvc/uvc_driver.c
> >> b/drivers/media/usb/uvc/uvc_driver.c index 5dbefa6..411682c 100644
> >> --- a/drivers/media/usb/uvc/uvc_driver.c
> >> +++ b/drivers/media/usb/uvc/uvc_driver.c
> >> @@ -2163,6 +2163,15 @@ static struct usb_device_id uvc_ids[] = {
> >> 
> >>  	  .bInterfaceSubClass	= 1,
> >>  	  .bInterfaceProtocol	= 0,
> >>  	  .driver_info 		= UVC_QUIRK_PROBE_DEF },
> >> 
> >> + 	/* Alienware X51*/
> >> +        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
> >> +                                | USB_DEVICE_ID_MATCH_INT_INFO,
> >> +          .idVendor             = 0x05a9,
> >> +          .idProduct            = 0x2643,
> >> +          .bInterfaceClass      = USB_CLASS_VIDEO,
> >> +          .bInterfaceSubClass   = 1,
> >> +          .bInterfaceProtocol   = 0,
> >> +          .driver_info          = UVC_QUIRK_PROBE_DEF },
> > 
> > Your mailer messed up formatting. As the patch is small I've fixed it
> > manually, but please make sure to use a proper mail client next time. I
> > advise using git-send-email to send patches.
> 
> Thanks.  I did in fact use git-send-email, which is what I use to send
> all patches.  Can you point out the bad formatting.  Is it that   '|
> USB_DEVICE_ID_MATCH_INT_INFO,' was not indented?  If so, I'll
> investigate why that happened.

Tabs were replaced with spaces, I assumed it was due to a mailer issue.

> >>  	/* Apple Built-In iSight */
> >>  	{ .match_flags		= USB_DEVICE_ID_MATCH_DEVICE
> >>  	
> >>  				| USB_DEVICE_ID_MATCH_INT_INFO,
> 
> Thanks again for reviewing this patch.

-- 
Regards,

Laurent Pinchart