Eric Lee / smarc-fsl-linux-kernel

18 Dec, 2015

2 commits

  • d6dd645ea   [media] media: videobuf2: Move timestamp to vb2_buffer ... Browse Code »

    Move timestamp from struct vb2_v4l2_buffer to struct vb2_buffer
    for common use, and change its type to u64 in order to handling
    y2038 problem. This patch also includes all device drivers' changes related to
    this restructuring.

    Signed-off-by: Junghak Sung
    Signed-off-by: Geunyoung Kim
    Acked-by: Seung-Woo Kim
    Acked-by: Inki Dae
    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Junghak Sung
     
  • df9ecb0ca   [media] vb2: drop v4l2_format argument from queue_setup ... Browse Code »

    The queue_setup callback has a void pointer that is just for V4L2
    and is the pointer to the v4l2_format struct that was passed to
    VIDIOC_CREATE_BUFS. The idea was that drivers would use the information
    from that struct to buffers suitable for the requested format.

    After the vb2 split series this pointer is now a void pointer,
    which is ugly, and the reality is that all existing drivers will
    effectively just look at the sizeimage field of v4l2_format.

    To make this more generic the queue_setup callback is changed:
    the void pointer is dropped, instead if the *num_planes argument
    is 0, then use the current format size, if it is non-zero, then
    it contains the number of requested planes and the sizes array
    contains the requested sizes. If either is unsupported, then return
    -EINVAL, otherwise use the requested size(s).

    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     

17 Nov, 2015

1 commit

  • d647f0b70   [media] include/media: move driver interface headers to a separate dir ... Browse Code »

    Let's not mix headers used by the core with those headers that
    are needed by some driver-specific interface header.

    The headers used on drivers were manually moved using:
    mkdir include/media/drv-intf/
    git mv include/media/cx2341x.h include/media/cx25840.h \
    include/media/exynos-fimc.h include/media/msp3400.h \
    include/media/s3c_camif.h include/media/saa7146.h \
    include/media/saa7146_vv.h include/media/sh_mobile_ceu.h \
    include/media/sh_mobile_csi2.h include/media/sh_vou.h \
    include/media/si476x.h include/media/soc_mediabus.h \
    include/media/tea575x.h include/media/drv-intf/

    And the references for those headers were corrected using:

    MAIN_DIR="media/"
    PREV_DIR="media/"
    DIRS="drv-intf/"

    echo "Checking affected files" >&2
    for i in $DIRS; do
    for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do
    n=`basename $j`
    git grep -l $n
    done
    done|sort|uniq >files && (
    echo "Handling files..." >&2;
    echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\";
    (
    cd include/$MAIN_DIR;
    for j in $DIRS; do
    for i in $(ls $j); do
    echo "perl -ne 's,(include [\\\"\\&2;
    echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\";
    (
    cd include/$MAIN_DIR;
    for j in $DIRS; do
    for i in $(ls $j); do
    echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\";
    done;
    done;
    echo "cat > a && mv a \$i; done"
    );
    ) >script && . ./script

    Signed-off-by: Mauro Carvalho Chehab
    Acked-by: Arnd Bergmann

    Mauro Carvalho Chehab
     

21 Oct, 2015

1 commit

  • 33119e80c   [media] media: videobuf2: Change queue_setup argument ... Browse Code »

    Replace struct v4l2_format * with void * to make queue_setup()
    for common use.
    And then, modify all device drivers related with this change.

    Signed-off-by: Junghak Sung
    Signed-off-by: Geunyoung Kim
    Acked-by: Seung-Woo Kim
    Acked-by: Inki Dae
    Signed-off-by: Hans Verkuil
    [hans.verkuil@cisco.com: fix missing const in fimc-lite.c]

    Signed-off-by: Mauro Carvalho Chehab

    Junghak Sung
     

01 Oct, 2015

1 commit

  • 2d7007153   [media] media: videobuf2: Restructure vb2_buffer ... Browse Code »

    Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer.

    Add new member variables - bytesused, length, offset, userptr, fd,
    data_offset - to struct vb2_plane in order to cover all information
    of v4l2_plane.
    struct vb2_plane {

    unsigned int bytesused;
    unsigned int length;
    union {
    unsigned int offset;
    unsigned long userptr;
    int fd;
    } m;
    unsigned int data_offset;
    }

    Replace v4l2_buf with new member variables - index, type, memory - which
    are common fields for buffer management.
    struct vb2_buffer {

    unsigned int index;
    unsigned int type;
    unsigned int memory;
    unsigned int num_planes;
    struct vb2_plane planes[VIDEO_MAX_PLANES];

    };

    v4l2 specific fields - flags, field, timestamp, timecode,
    sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c
    struct vb2_v4l2_buffer {
    struct vb2_buffer vb2_buf;

    __u32 flags;
    __u32 field;
    struct timeval timestamp;
    struct v4l2_timecode timecode;
    __u32 sequence;
    };

    Signed-off-by: Junghak Sung
    Signed-off-by: Geunyoung Kim
    Acked-by: Seung-Woo Kim
    Acked-by: Inki Dae
    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Junghak Sung
     

06 Jul, 2015

11 commits

05 Jun, 2015

1 commit

01 May, 2015

1 commit

03 Apr, 2015

1 commit

03 Mar, 2015

1 commit

15 Dec, 2014

1 commit

  • e6b5be2be   Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core ... Browse Code »

    Pull driver core update from Greg KH:
    "Here's the set of driver core patches for 3.19-rc1.

    They are dominated by the removal of the .owner field in platform
    drivers. They touch a lot of files, but they are "simple" changes,
    just removing a line in a structure.

    Other than that, a few minor driver core and debugfs changes. There
    are some ath9k patches coming in through this tree that have been
    acked by the wireless maintainers as they relied on the debugfs
    changes.

    Everything has been in linux-next for a while"

    * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits)
    Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries"
    fs: debugfs: add forward declaration for struct device type
    firmware class: Deletion of an unnecessary check before the function call "vunmap"
    firmware loader: fix hung task warning dump
    devcoredump: provide a one-way disable function
    device: Add dev__once variants
    ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries
    ath: use seq_file api for ath9k debugfs files
    debugfs: add helper function to create device related seq_file
    drivers/base: cacheinfo: remove noisy error boot message
    Revert "core: platform: add warning if driver has no owner"
    drivers: base: support cpu cache information interface to userspace via sysfs
    drivers: base: add cpu_device_create to support per-cpu devices
    topology: replace custom attribute macros with standard DEVICE_ATTR*
    cpumask: factor out show_cpumap into separate helper function
    driver core: Fix unbalanced device reference in drivers_probe
    driver core: fix race with userland in device_add()
    sysfs/kernfs: make read requests on pre-alloc files use the buffer.
    sysfs/kernfs: allow attributes to request write buffer be pre-allocated.
    fs: sysfs: return EGBIG on write if offset is larger than file size
    ...

    Linus Torvalds
     

02 Dec, 2014

1 commit

  • a020c747b   [media] media/platform: fix querycap ... Browse Code »

    Querycap shouldn't set the version field (the core does that for you),
    but it should set the device_caps field.

    Signed-off-by: Hans Verkuil
    Cc: Scott Jiang
    Cc: Gerhard Sittig
    Cc: Jonathan Corbet
    Cc: Guennadi Liakhovetski
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     

15 Nov, 2014

1 commit

  • 27ffaeb0a   [media] platform: Make use of media_bus_format enum ... Browse Code »

    In order to have subsytem agnostic media bus format definitions we've
    moved media bus definition to include/uapi/linux/media-bus-format.h and
    prefixed values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.

    Reference new definitions in all platform drivers.

    Signed-off-by: Boris Brezillon
    Acked-by: Hans Verkuil
    Acked-by: Sakari Ailus
    Acked-by: Sekhar Nori
    Acked-by: Lad, Prabhakar
    Signed-off-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Boris BREZILLON
     

20 Oct, 2014

1 commit

13 Jan, 2014

1 commit

  • a622cc518   [media] sh_vou: comment unused vars ... Browse Code »

    Fix two warns below, by commenting the unused code:

    drivers/media/platform/sh_vou.c: In function 'sh_vou_configure_geometry':
    drivers/media/platform/sh_vou.c:446:49: warning: variable 'height_max' set but not used [-Wunused-but-set-variable]
    unsigned int black_left, black_top, width_max, height_max,
    ^
    drivers/media/platform/sh_vou.c: In function 'sh_vou_isr':
    drivers/media/platform/sh_vou.c:1056:13: warning: variable 'side' set but not used [-Wunused-but-set-variable]
    static int side;
    ^

    Cc: Guennadi Liakhovetski
    Cc: Laurent Pinchart
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     

18 Dec, 2013

1 commit

25 Sep, 2013

1 commit

17 Jun, 2013

2 commits

24 Mar, 2013

2 commits

22 Mar, 2013

1 commit

14 Feb, 2013

2 commits

25 Jan, 2013

1 commit

  • a32f7d1ad   Merge branch 'v4l_for_linus' into staging/for_v3.9 ... Browse Code »

    * v4l_for_linus: (464 commits)
    [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures
    [media] uvcvideo: Cleanup leftovers of partial revert
    [media] uvcvideo: Return -EACCES when trying to set a read-only control
    Linux 3.8-rc3
    mm: reinstante dropped pmd_trans_splitting() check
    cred: Remove tgcred pointer from struct cred
    drm/ttm: fix fence locking in ttm_buffer_object_transfer
    ARM: clps711x: Fix bad merge of clockevents setup
    ARM: highbank: save and restore L2 cache and GIC on suspend
    ARM: highbank: add a power request clear
    ARM: highbank: fix secondary boot and hotplug
    ARM: highbank: fix typos with hignbank in power request functions
    ARM: dts: fix highbank cpu mpidr values
    ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
    drm/prime: drop reference on imported dma-buf come from gem
    xen/netfront: improve truesize tracking
    ARM: mx5: Fix MX53 flexcan2 clock
    ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
    sctp: fix Kconfig bug in default cookie hmac selection
    EDAC: Cleanup device deregistering path
    ...

    Conflicts:
    drivers/media/pci/dm1105/dm1105.c
    drivers/media/platform/soc_camera/mx2_camera.c

    Mauro Carvalho Chehab
     

04 Jan, 2013

1 commit

  • 4c62e9764   Drivers: media: remove __dev* attributes. ... Browse Code »

    CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
    markings need to be removed.

    This change removes the use of __devinit, __devexit_p, __devinitdata,
    __devinitconst, and __devexit from these drivers.

    Based on patches originally written by Bill Pemberton, but redone by me
    in order to handle some of the coding style issues better, by hand.

    Cc: Bill Pemberton
    Cc: Mauro Carvalho Chehab
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

21 Dec, 2012

1 commit

05 Dec, 2012

1 commit

22 Nov, 2012

1 commit

27 Sep, 2012

1 commit

  • b6ba418ef   [media] media: sh-vou: fix compilation breakage ... Browse Code »

    A recent commit
    commit f135a8a224294fa0f60ec1b8bc120813b7cfc804
    Author: Hans Verkuil
    [media] sh_vou: remove V4L2_FL_LOCK_ALL_FOPS
    broke compilation of sh_vou.c:
    drivers/media/platform/sh_vou.c: In function 'sh_vou_mmap':
    drivers/media/platform/sh_vou.c:1227: error: 'vdev' undeclared (first use in this function)
    drivers/media/platform/sh_vou.c:1227: error: (Each undeclared identifier is reported only once
    drivers/media/platform/sh_vou.c:1227: error: for each function it appears in.)
    drivers/media/platform/sh_vou.c: In function 'sh_vou_poll':
    drivers/media/platform/sh_vou.c:1242: error: 'vdev' undeclared (first use in this function)
    make[2]: *** [drivers/media/platform/sh_vou.o] Error 1
    Add missing variable definitions.

    Signed-off-by: Guennadi Liakhovetski
    Acked-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Guennadi Liakhovetski