Merge tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[platform/kernel/linux-starfive.git] / drivers / media / usb / uvc / uvc_driver.c
index 744051b..215fb48 100644 (file)
@@ -20,6 +20,7 @@
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-uvc.h>
 
 #include "uvcvideo.h"
 
@@ -35,198 +36,6 @@ unsigned int uvc_dbg_param;
 unsigned int uvc_timeout_param = UVC_CTRL_STREAMING_TIMEOUT;
 
 /* ------------------------------------------------------------------------
- * Video formats
- */
-
-static struct uvc_format_desc uvc_fmts[] = {
-       {
-               .name           = "YUV 4:2:2 (YUYV)",
-               .guid           = UVC_GUID_FORMAT_YUY2,
-               .fcc            = V4L2_PIX_FMT_YUYV,
-       },
-       {
-               .name           = "YUV 4:2:2 (YUYV)",
-               .guid           = UVC_GUID_FORMAT_YUY2_ISIGHT,
-               .fcc            = V4L2_PIX_FMT_YUYV,
-       },
-       {
-               .name           = "YUV 4:2:0 (NV12)",
-               .guid           = UVC_GUID_FORMAT_NV12,
-               .fcc            = V4L2_PIX_FMT_NV12,
-       },
-       {
-               .name           = "MJPEG",
-               .guid           = UVC_GUID_FORMAT_MJPEG,
-               .fcc            = V4L2_PIX_FMT_MJPEG,
-       },
-       {
-               .name           = "YVU 4:2:0 (YV12)",
-               .guid           = UVC_GUID_FORMAT_YV12,
-               .fcc            = V4L2_PIX_FMT_YVU420,
-       },
-       {
-               .name           = "YUV 4:2:0 (I420)",
-               .guid           = UVC_GUID_FORMAT_I420,
-               .fcc            = V4L2_PIX_FMT_YUV420,
-       },
-       {
-               .name           = "YUV 4:2:0 (M420)",
-               .guid           = UVC_GUID_FORMAT_M420,
-               .fcc            = V4L2_PIX_FMT_M420,
-       },
-       {
-               .name           = "YUV 4:2:2 (UYVY)",
-               .guid           = UVC_GUID_FORMAT_UYVY,
-               .fcc            = V4L2_PIX_FMT_UYVY,
-       },
-       {
-               .name           = "Greyscale 8-bit (Y800)",
-               .guid           = UVC_GUID_FORMAT_Y800,
-               .fcc            = V4L2_PIX_FMT_GREY,
-       },
-       {
-               .name           = "Greyscale 8-bit (Y8  )",
-               .guid           = UVC_GUID_FORMAT_Y8,
-               .fcc            = V4L2_PIX_FMT_GREY,
-       },
-       {
-               .name           = "Greyscale 8-bit (D3DFMT_L8)",
-               .guid           = UVC_GUID_FORMAT_D3DFMT_L8,
-               .fcc            = V4L2_PIX_FMT_GREY,
-       },
-       {
-               .name           = "IR 8-bit (L8_IR)",
-               .guid           = UVC_GUID_FORMAT_KSMEDIA_L8_IR,
-               .fcc            = V4L2_PIX_FMT_GREY,
-       },
-       {
-               .name           = "Greyscale 10-bit (Y10 )",
-               .guid           = UVC_GUID_FORMAT_Y10,
-               .fcc            = V4L2_PIX_FMT_Y10,
-       },
-       {
-               .name           = "Greyscale 12-bit (Y12 )",
-               .guid           = UVC_GUID_FORMAT_Y12,
-               .fcc            = V4L2_PIX_FMT_Y12,
-       },
-       {
-               .name           = "Greyscale 16-bit (Y16 )",
-               .guid           = UVC_GUID_FORMAT_Y16,
-               .fcc            = V4L2_PIX_FMT_Y16,
-       },
-       {
-               .name           = "BGGR Bayer (BY8 )",
-               .guid           = UVC_GUID_FORMAT_BY8,
-               .fcc            = V4L2_PIX_FMT_SBGGR8,
-       },
-       {
-               .name           = "BGGR Bayer (BA81)",
-               .guid           = UVC_GUID_FORMAT_BA81,
-               .fcc            = V4L2_PIX_FMT_SBGGR8,
-       },
-       {
-               .name           = "GBRG Bayer (GBRG)",
-               .guid           = UVC_GUID_FORMAT_GBRG,
-               .fcc            = V4L2_PIX_FMT_SGBRG8,
-       },
-       {
-               .name           = "GRBG Bayer (GRBG)",
-               .guid           = UVC_GUID_FORMAT_GRBG,
-               .fcc            = V4L2_PIX_FMT_SGRBG8,
-       },
-       {
-               .name           = "RGGB Bayer (RGGB)",
-               .guid           = UVC_GUID_FORMAT_RGGB,
-               .fcc            = V4L2_PIX_FMT_SRGGB8,
-       },
-       {
-               .name           = "RGB565",
-               .guid           = UVC_GUID_FORMAT_RGBP,
-               .fcc            = V4L2_PIX_FMT_RGB565,
-       },
-       {
-               .name           = "BGR 8:8:8 (BGR3)",
-               .guid           = UVC_GUID_FORMAT_BGR3,
-               .fcc            = V4L2_PIX_FMT_BGR24,
-       },
-       {
-               .name           = "H.264",
-               .guid           = UVC_GUID_FORMAT_H264,
-               .fcc            = V4L2_PIX_FMT_H264,
-       },
-       {
-               .name           = "H.265",
-               .guid           = UVC_GUID_FORMAT_H265,
-               .fcc            = V4L2_PIX_FMT_HEVC,
-       },
-       {
-               .name           = "Greyscale 8 L/R (Y8I)",
-               .guid           = UVC_GUID_FORMAT_Y8I,
-               .fcc            = V4L2_PIX_FMT_Y8I,
-       },
-       {
-               .name           = "Greyscale 12 L/R (Y12I)",
-               .guid           = UVC_GUID_FORMAT_Y12I,
-               .fcc            = V4L2_PIX_FMT_Y12I,
-       },
-       {
-               .name           = "Depth data 16-bit (Z16)",
-               .guid           = UVC_GUID_FORMAT_Z16,
-               .fcc            = V4L2_PIX_FMT_Z16,
-       },
-       {
-               .name           = "Bayer 10-bit (SRGGB10P)",
-               .guid           = UVC_GUID_FORMAT_RW10,
-               .fcc            = V4L2_PIX_FMT_SRGGB10P,
-       },
-       {
-               .name           = "Bayer 16-bit (SBGGR16)",
-               .guid           = UVC_GUID_FORMAT_BG16,
-               .fcc            = V4L2_PIX_FMT_SBGGR16,
-       },
-       {
-               .name           = "Bayer 16-bit (SGBRG16)",
-               .guid           = UVC_GUID_FORMAT_GB16,
-               .fcc            = V4L2_PIX_FMT_SGBRG16,
-       },
-       {
-               .name           = "Bayer 16-bit (SRGGB16)",
-               .guid           = UVC_GUID_FORMAT_RG16,
-               .fcc            = V4L2_PIX_FMT_SRGGB16,
-       },
-       {
-               .name           = "Bayer 16-bit (SGRBG16)",
-               .guid           = UVC_GUID_FORMAT_GR16,
-               .fcc            = V4L2_PIX_FMT_SGRBG16,
-       },
-       {
-               .name           = "Depth data 16-bit (Z16)",
-               .guid           = UVC_GUID_FORMAT_INVZ,
-               .fcc            = V4L2_PIX_FMT_Z16,
-       },
-       {
-               .name           = "Greyscale 10-bit (Y10 )",
-               .guid           = UVC_GUID_FORMAT_INVI,
-               .fcc            = V4L2_PIX_FMT_Y10,
-       },
-       {
-               .name           = "IR:Depth 26-bit (INZI)",
-               .guid           = UVC_GUID_FORMAT_INZI,
-               .fcc            = V4L2_PIX_FMT_INZI,
-       },
-       {
-               .name           = "4-bit Depth Confidence (Packed)",
-               .guid           = UVC_GUID_FORMAT_CNF4,
-               .fcc            = V4L2_PIX_FMT_CNF4,
-       },
-       {
-               .name           = "HEVC",
-               .guid           = UVC_GUID_FORMAT_HEVC,
-               .fcc            = V4L2_PIX_FMT_HEVC,
-       },
-};
-
-/* ------------------------------------------------------------------------
  * Utility functions
  */
 
@@ -245,19 +54,6 @@ struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts,
        return NULL;
 }
 
-static struct uvc_format_desc *uvc_format_by_guid(const u8 guid[16])
-{
-       unsigned int len = ARRAY_SIZE(uvc_fmts);
-       unsigned int i;
-
-       for (i = 0; i < len; ++i) {
-               if (memcmp(guid, uvc_fmts[i].guid, 16) == 0)
-                       return &uvc_fmts[i];
-       }
-
-       return NULL;
-}
-
 static enum v4l2_colorspace uvc_colorspace(const u8 primaries)
 {
        static const enum v4l2_colorspace colorprimaries[] = {
@@ -329,90 +125,6 @@ static enum v4l2_ycbcr_encoding uvc_ycbcr_enc(const u8 matrix_coefficients)
        return V4L2_YCBCR_ENC_DEFAULT;  /* Reserved */
 }
 
-/*
- * Simplify a fraction using a simple continued fraction decomposition. The
- * idea here is to convert fractions such as 333333/10000000 to 1/30 using
- * 32 bit arithmetic only. The algorithm is not perfect and relies upon two
- * arbitrary parameters to remove non-significative terms from the simple
- * continued fraction decomposition. Using 8 and 333 for n_terms and threshold
- * respectively seems to give nice results.
- */
-void uvc_simplify_fraction(u32 *numerator, u32 *denominator,
-               unsigned int n_terms, unsigned int threshold)
-{
-       u32 *an;
-       u32 x, y, r;
-       unsigned int i, n;
-
-       an = kmalloc_array(n_terms, sizeof(*an), GFP_KERNEL);
-       if (an == NULL)
-               return;
-
-       /*
-        * Convert the fraction to a simple continued fraction. See
-        * https://en.wikipedia.org/wiki/Continued_fraction
-        * Stop if the current term is bigger than or equal to the given
-        * threshold.
-        */
-       x = *numerator;
-       y = *denominator;
-
-       for (n = 0; n < n_terms && y != 0; ++n) {
-               an[n] = x / y;
-               if (an[n] >= threshold) {
-                       if (n < 2)
-                               n++;
-                       break;
-               }
-
-               r = x - an[n] * y;
-               x = y;
-               y = r;
-       }
-
-       /* Expand the simple continued fraction back to an integer fraction. */
-       x = 0;
-       y = 1;
-
-       for (i = n; i > 0; --i) {
-               r = y;
-               y = an[i-1] * y + x;
-               x = r;
-       }
-
-       *numerator = y;
-       *denominator = x;
-       kfree(an);
-}
-
-/*
- * Convert a fraction to a frame interval in 100ns multiples. The idea here is
- * to compute numerator / denominator * 10000000 using 32 bit fixed point
- * arithmetic only.
- */
-u32 uvc_fraction_to_interval(u32 numerator, u32 denominator)
-{
-       u32 multiplier;
-
-       /* Saturate the result if the operation would overflow. */
-       if (denominator == 0 ||
-           numerator/denominator >= ((u32)-1)/10000000)
-               return (u32)-1;
-
-       /*
-        * Divide both the denominator and the multiplier by two until
-        * numerator * multiplier doesn't overflow. If anyone knows a better
-        * algorithm please let me know.
-        */
-       multiplier = 10000000;
-       while (numerator > ((u32)-1)/multiplier) {
-               multiplier /= 2;
-               denominator /= 2;
-       }
-
-       return denominator ? numerator * multiplier / denominator : 0;
-}
-
 /* ------------------------------------------------------------------------
  * Terminal and unit management
  */