media: cedrus: Add helper for checking capabilities

There is several different Cedrus cores with varying capabilities, so
some operations like listing formats depends on checks if feature is
supported or not.

Currently check for capabilities is only in format handling functions,
but it will be used also elsewhere later. Let's convert this check to
helper and while at it, also simplify it. There is no need to check if
capability mask is zero, condition will still work properly.

No functional changes intended.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
index 93a2196006f7378cc293ea152b5dac5e26aaaa46..f1e659605ab99d7af3247923a6bf1cefc05aa7b9 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -268,6 +268,12 @@ vb2_to_cedrus_buffer(const struct vb2_buffer *p)
        return vb2_v4l2_to_cedrus_buffer(to_vb2_v4l2_buffer(p));
 }
 
+static inline bool
+cedrus_is_capable(struct cedrus_ctx *ctx, unsigned int capabilities)
+{
+       return (ctx->dev->capabilities & capabilities) == capabilities;
+}
+
 void *cedrus_find_control_data(struct cedrus_ctx *ctx, u32 id);
 u32 cedrus_get_num_of_controls(struct cedrus_ctx *ctx, u32 id);
 

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
index ef053986067f9e29fabcd2594b05b864749f981f..77c537e7a2dec7cc4eff5b9f6cb253b855926a83 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -73,8 +73,8 @@ static inline struct cedrus_ctx *cedrus_file2ctx(struct file *file)
        return container_of(file->private_data, struct cedrus_ctx, fh);
 }
 
-static struct cedrus_format *cedrus_find_format(u32 pixelformat, u32 directions,
-                                               unsigned int capabilities)
+static struct cedrus_format *cedrus_find_format(struct cedrus_ctx *ctx,
+                                               u32 pixelformat, u32 directions)
 {
        struct cedrus_format *first_valid_fmt = NULL;
        struct cedrus_format *fmt;
@@ -83,7 +83,7 @@ static struct cedrus_format *cedrus_find_format(u32 pixelformat, u32 directions,
        for (i = 0; i < CEDRUS_FORMATS_COUNT; i++) {
                fmt = &cedrus_formats[i];
 
-               if ((fmt->capabilities & capabilities) != fmt->capabilities ||
+               if (!cedrus_is_capable(ctx, fmt->capabilities) ||
                    !(fmt->directions & directions))
                        continue;
 
@@ -177,19 +177,13 @@ static int cedrus_enum_fmt(struct file *file, struct v4l2_fmtdesc *f,
                           u32 direction)
 {
        struct cedrus_ctx *ctx = cedrus_file2ctx(file);
-       struct cedrus_dev *dev = ctx->dev;
-       unsigned int capabilities = dev->capabilities;
-       struct cedrus_format *fmt;
        unsigned int i, index;
 
        /* Index among formats that match the requested direction. */
        index = 0;
 
        for (i = 0; i < CEDRUS_FORMATS_COUNT; i++) {
-               fmt = &cedrus_formats[i];
-
-               if (fmt->capabilities && (fmt->capabilities & capabilities) !=
-                   fmt->capabilities)
+               if (!cedrus_is_capable(ctx, cedrus_formats[i].capabilities))
                        continue;
 
                if (!(cedrus_formats[i].directions & direction))
@@ -244,10 +238,9 @@ static int cedrus_g_fmt_vid_out(struct file *file, void *priv,
 static int cedrus_try_fmt_vid_cap_p(struct cedrus_ctx *ctx,
                                    struct v4l2_pix_format *pix_fmt)
 {
-       struct cedrus_dev *dev = ctx->dev;
        struct cedrus_format *fmt =
-               cedrus_find_format(pix_fmt->pixelformat, CEDRUS_DECODE_DST,
-                                  dev->capabilities);
+               cedrus_find_format(ctx, pix_fmt->pixelformat,
+                                  CEDRUS_DECODE_DST);
 
        if (!fmt)
                return -EINVAL;
@@ -269,10 +262,9 @@ static int cedrus_try_fmt_vid_cap(struct file *file, void *priv,
 static int cedrus_try_fmt_vid_out_p(struct cedrus_ctx *ctx,
                                    struct v4l2_pix_format *pix_fmt)
 {
-       struct cedrus_dev *dev = ctx->dev;
        struct cedrus_format *fmt =
-               cedrus_find_format(pix_fmt->pixelformat, CEDRUS_DECODE_SRC,
-                                  dev->capabilities);
+               cedrus_find_format(ctx, pix_fmt->pixelformat,
+                                  CEDRUS_DECODE_SRC);
 
        if (!fmt)
                return -EINVAL;