Eric Lee / smarc-fsl-linux-kernel

18 Oct, 2012

1 commit

  • 2c76a12ae   [media] Kconfig: Fix dependencies for driver autoselect options ... Browse Code »

    This option is a merge of both analog TV and DVB CUSTOMISE.

    At the merge, the dependencies were not done right: the menu
    currently appears only for analog TV. It should also be opened
    for digital TV. As there are other I2C devices there (flash
    devices, etc) that aren't related to either one, it is better
    to make it generic enough to open for all media devices with
    video.

    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     

12 Oct, 2012

3 commits

  • 4f1cd9149   Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Browse Code »

    Pull second set of media updates from Mauro Carvalho Chehab:
    "Despite its size, most of the stuff here is trivial. This series
    contains:

    - s5p-mfc: additions at the driver and at the core to support H.264
    hardware codec;
    - Some improvements at s5p and davinci embedded drivers;
    - Some V4L2 compliance fixes applied on a few drivers;
    - Several random trivial patches, including several fixes and a few
    new board support additions;

    Notes:

    1) Some Exynos media patches were dependent on some -arm fixes that
    got merged on changeset 782cd9e. That's why this pull request is
    based that changeset.

    2) As promised, I reviewed the pending VB2 DMABUF series.

    While setting a test environment, it was noticed that the upstream
    support for Samsung Exynos 4 boards (smdk310 and Origen) are
    broken upstream, likely due to regressions: both defconfigs are
    wrong and regulator settings for both boards are broken. That,
    allied with some bug at the dummy regulator driver, causes OOPSes
    during boot time.

    Long story short: even fixing the above, the proposed patches
    OOPSed when running the DMABUF test. Not sure yet if the OOPSes
    are due to some other undetected regressions, or due to some bug
    on the patches.

    Due to the above, DMABUF patches for vb2 got NACKed for 3.7."

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (109 commits)
    [media] m5mols: Add missing #include
    [media] stk1160: Add support for S-Video input
    Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
    [media] dvb: LNA implementation changes
    [media] v4l2-ioctl: fix W=1 warnings
    [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
    [media] omap3isp: Fix compilation error in ispreg.h
    [media] rc-msi-digivox-ii: Add full scan keycodes
    [media] cx25821: testing the wrong variable
    [media] tda18271-common: hold the I2C adapter during write transfers
    [media] ds3000: add module parameter to force firmware upload
    [media] drivers/media: Remove unnecessary semicolon
    [media] winbond: remove space from driver name
    [media] iguanair: cannot send data from the stack
    [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
    [media] dvb-usb: print small buffers via %*ph
    [media] uvc: Add return code check at vb2_queue_init()
    [media] em28xx: Replace memcpy with struct assignment
    [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
    [media] mem2mem_testdev: Use devm_kzalloc() in probe
    ...

    Conflicts:
    arch/arm/mach-davinci/include/mach/da8xx.h

    Linus Torvalds
     
  • 5f76945a9   Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6 ... Browse Code »

    Pull fbdev updates from Florian Tobias Schandinat:
    "This includes:
    - large updates for OMAP
    - basic OMAP5 DSS support for DPI and DSI outputs
    - large cleanups and restructuring
    - some update to Exynos and da8xx-fb
    - removal of the pnx4008 driver (arch removed)
    - various other small patches"

    Fix up some trivial conflicts (mostly just include line changes, but
    also some due to the renaming of the deferred work functions by Tejun).

    * tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6: (193 commits)
    gbefb: fix compile error
    video: mark nuc900fb_map_video_memory as __devinit
    video/mx3fb: set .owner to prevent module unloading while being used
    video: exynos_dp: use clk_prepare_enable and clk_disable_unprepare
    drivers/video/exynos/exynos_mipi_dsi.c: fix error return code
    drivers/video/savage/savagefb_driver.c: fix error return code
    video: s3c-fb: use clk_prepare_enable and clk_disable_unprepare
    da8xx-fb: save and restore LCDC context across suspend/resume cycle
    da8xx-fb: add pm_runtime support
    video/udlfb: fix line counting in fb_write
    OMAPDSS: add missing include for string.h
    OMAPDSS: DISPC: Configure color conversion coefficients for writeback
    OMAPDSS: DISPC: Add manager like functions for writeback
    OMAPDSS: DISPC: Configure writeback FIFOs
    OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
    OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
    OMAPDSS: DISPC: Add function to set channel in for writeback
    OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
    OMAPDSS: DISPC: Downscale chroma if plane is writeback
    OMAPDSS: DISPC: Configure input and output sizes for writeback
    ...

    Linus Torvalds
     
  • bf3b202b4   Merge branch 'staging/for_v3.7' into v4l_for_linus ... Browse Code »

    Applied on the top of changeset 782cd9e, as some of those patches
    depend on some fixes that went via -arm tree.

    * staging/for_v3.7: (109 commits)
    [media] m5mols: Add missing #include
    [media] stk1160: Add support for S-Video input
    Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
    [media] dvb: LNA implementation changes
    [media] v4l2-ioctl: fix W=1 warnings
    [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
    [media] omap3isp: Fix compilation error in ispreg.h
    [media] rc-msi-digivox-ii: Add full scan keycodes
    [media] cx25821: testing the wrong variable
    [media] tda18271-common: hold the I2C adapter during write transfers
    [media] ds3000: add module parameter to force firmware upload
    [media] drivers/media: Remove unnecessary semicolon
    [media] winbond: remove space from driver name
    [media] iguanair: cannot send data from the stack
    [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
    [media] dvb-usb: print small buffers via %*ph
    [media] uvc: Add return code check at vb2_queue_init()
    [media] em28xx: Replace memcpy with struct assignment
    [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
    [media] mem2mem_testdev: Use devm_kzalloc() in probe
    ...

    Mauro Carvalho Chehab
     

10 Oct, 2012

3 commits

09 Oct, 2012

1 commit

  • 314e51b98   mm: kill vma flag VM_RESERVED and mm->reserved_vm counter ... Browse Code »

    A long time ago, in v2.4, VM_RESERVED kept swapout process off VMA,
    currently it lost original meaning but still has some effects:

    | effect | alternative flags
    -+------------------------+---------------------------------------------
    1| account as reserved_vm | VM_IO
    2| skip in core dump | VM_IO, VM_DONTDUMP
    3| do not merge or expand | VM_IO, VM_DONTEXPAND, VM_HUGETLB, VM_PFNMAP
    4| do not mlock | VM_IO, VM_DONTEXPAND, VM_HUGETLB, VM_PFNMAP

    This patch removes reserved_vm counter from mm_struct. Seems like nobody
    cares about it, it does not exported into userspace directly, it only
    reduces total_vm showed in proc.

    Thus VM_RESERVED can be replaced with VM_IO or pair VM_DONTEXPAND | VM_DONTDUMP.

    remap_pfn_range() and io_remap_pfn_range() set VM_IO|VM_DONTEXPAND|VM_DONTDUMP.
    remap_vmalloc_range() set VM_DONTEXPAND | VM_DONTDUMP.

    [akpm@linux-foundation.org: drivers/vfio/pci/vfio_pci.c fixup]
    Signed-off-by: Konstantin Khlebnikov
    Cc: Alexander Viro
    Cc: Carsten Otte
    Cc: Chris Metcalf
    Cc: Cyrill Gorcunov
    Cc: Eric Paris
    Cc: H. Peter Anvin
    Cc: Hugh Dickins
    Cc: Ingo Molnar
    Cc: James Morris
    Cc: Jason Baron
    Cc: Kentaro Takeda
    Cc: Matt Helsley
    Cc: Nick Piggin
    Cc: Oleg Nesterov
    Cc: Peter Zijlstra
    Cc: Robert Richter
    Cc: Suresh Siddha
    Cc: Tetsuo Handa
    Cc: Venkatesh Pallipadi
    Acked-by: Linus Torvalds
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Konstantin Khlebnikov
     

07 Oct, 2012

12 commits

  • 33eebec55   [media] dvb: LNA implementation changes ... Browse Code »

    * use dvb property cache
    * implement get (thus API minor++)
    * PCTV 290e: 1=LNA ON, all the other values LNA OFF
    Also fix PCTV 290e LNA comment, it is disabled by default
    Hans and Mauro proposed use of cache implementation of get as they
    were planning to extend LNA usage for analog side too.

    Reported-by: Hans Verkuil
    Reported-by: Mauro Carvalho Chehab
    Signed-off-by: Antti Palosaari
    Acked-by: Hans Verkuil
    Signed-off-by: Mauro Carvalho Chehab

    Antti Palosaari
     
  • d92462401   [media] v4l2-ioctl: fix W=1 warnings ... Browse Code »

    Since the prt_names() macro is always called with an unsigned index the
    ((a) >= 0) condition is always true and gives a compiler warning when
    compiling with W=1.
    Rewrite the macro to avoid that warning, but cast the index to unsigned
    just in case it is ever called with a signed argument.

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

    Hans Verkuil
     
  • 1b8b10cc7   [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID ... Browse Code »

    The maximum size of an EDID is 32768 bytes, which is 32768 / 128 = 256 blocks.
    Return -EINVAL if blocks > 256 to ensure that the memory allocation is sane.

    Signed-off-by: Hans Verkuil
    Reported-by: Dan Carpenter
    Signed-off-by: Mauro Carvalho Chehab

    Hans Verkuil
     
  • 8a18382c3   [media] omap3isp: Fix compilation error in ispreg.h ... Browse Code »

    Commit c49f34bc ("ARM: OMAP2+ Move SoC specific headers to be local to
    mach-omap2") moved omap34xx.h to mach-omap2. This broke omap3isp, as it
    includes omap34xx.h.
    Instead of moving omap34xx to platform_data, simply add the two
    definitions the driver needs and remove the include altogether.

    Signed-off-by: Ido Yariv
    Acked-by: Tony Lindgren
    Signed-off-by: Mauro Carvalho Chehab

    Ido Yariv
     
  • b45681a60   [media] rc-msi-digivox-ii: Add full scan keycodes ... Browse Code »

    The ir-rc from my MSI DigiVox mini II Version 3 (af9015) will not work since
    kernel 3.2.x.

    sudo ir-keytable -t shows:

    1348890734.303273: event MSC: scancode = 317
    1348890734.303280: event key down: KEY_POWER (0x0074)
    1348890734.303282: event sync
    1348890734.553961: event key up: KEY_POWER (0x0074)
    1348890734.553963: event sync
    1348890741.303451: event MSC: scancode = 30d
    1348890741.303457: event key down: KEY_DOWN (0x006c)
    1348890741.303459: event sync
    1348890741.553956: event key up: KEY_DOWN (0x006c)

    So I changed in rc-msi-digivox-ii.c { 0x0002, KEY_2 }, to { 0x0302, KEY_2 },
    and so on. And now it works well.

    Signed-off-by: Mauro Carvalho Chehab

    Wolfgang Bail
     
  • 546196add   [media] cx25821: testing the wrong variable ... Browse Code »

    ->input_filename could be NULL here. The intent was to test
    ->_filename.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Mauro Carvalho Chehab

    Dan Carpenter
     
  • 78ef81f6e   [media] tda18271-common: hold the I2C adapter during write transfers ... Browse Code »

    The tda18271 datasheet says:
    "The image rejection calibration and RF tracking filter
    calibration must be launched exactly as described in the
    flowchart, otherwise bad calibration or even blocking of the
    TDA18211HD can result making it impossible to communicate
    via the I2C-bus."
    (yeah, tda18271 refers there to tda18211 - likely a typo at their
    datasheets)
    That likely explains why sometimes tda18271 stops answering. That
    is now happening more often on designs with drx-k chips, as the
    firmware is now loaded asyncrousnly there.
    While the above text doesn't explicitly tell that the I2C bus
    couldn't be used by other devices during such initialization,
    that seems to be a requirement there.
    So, let's explicitly use the I2C lock there, avoiding I2C bus
    share during those critical moments.
    Compile-tested only. Please test.

    Acked-by: Michael Krufky
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • 034351ff6   [media] ds3000: add module parameter to force firmware upload ... Browse Code »

    [mchehab@redhat.com: Fix a merge conflict]
    Signed-off-by: Rémi Cardona
    Reviewed-by: Antti Palosaari
    Signed-off-by: Mauro Carvalho Chehab

    Rémi Cardona
     
  • c2c1b4156   [media] drivers/media: Remove unnecessary semicolon ... Browse Code »

    A simplified version of the semantic patch that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)
    //
    @r1@
    statement S;
    position p,p1;
    @@
    S@p1;@p
    @script:python r2@
    p << r1.p;
    p1 << r1.p1;
    @@
    if p[0].line != p1[0].line_end:
    cocci.include_match(False)
    @@
    position r1.p;
    @@
    -;@p
    //

    [mchehab@redhat.com: some hunks got bitroted; applied only the
    ones that succeeds]
    Signed-off-by: Peter Senna Tschudin
    [crope@iki.fi: For my drivers a8293, af9013, af9015, af9035]
    Acked-by: Antti Palosaari
    Reviewed-by: Antti Palosaari
    Signed-off-by: Mauro Carvalho Chehab

    Peter Senna Tschudin
     
  • 54fd321e1   [media] winbond: remove space from driver name ... Browse Code »

    -snip-
    ACTION=add
    DEVPATH=/devices/pnp0/00:04/rc/rc0
    DRV_NAME=Winbond CIR
    NAME=rc-rc6-mce
    SUBSYSTEM=rc
    UDEV_LOG=6
    USEC_INITIALIZED=88135858
    run: '/usr/bin/ir-keytable -a /etc/rc_maps.cfg -s rc0'
    Having a space makes it impossible to match in /etc/rc_maps.cfg.

    [root@pequod ~]# udevadm test /sys/class/rc/rc0
    Signed-off-by: Sean Young
    Signed-off-by: Mauro Carvalho Chehab

    Sean Young
     
  • 48b0fa6af   [media] iguanair: cannot send data from the stack ... Browse Code »

    Note that the firmware already disables the receiver before transmit,
    there is no need to do this from the driver.

    Reported-by: Fengguang Wu
    Signed-off-by: Sean Young
    Signed-off-by: Mauro Carvalho Chehab

    Sean Young
     
  • 0b8e74c6f   Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ... Browse Code »

    Pull media updates from Mauro Carvalho Chehab:
    "The first part of the media updates for Kernel 3.7.

    This series contain:

    - A major tree renaming patch series: now, drivers are organized
    internally by their used bus, instead of by V4L2 and/or DVB API,
    providing a cleaner driver location for hybrid drivers that
    implement both APIs, and allowing to cleanup the Kconfig items and
    make them more intuitive for the end user;

    - Media Kernel developers are typically very lazy with their duties
    of keeping the MAINTAINERS entries for their drivers updated. As
    now the tree is more organized, we're doing an effort to add/update
    those entries for the drivers that aren't currently orphan;

    - Several DVB USB drivers got moved to a new DVB USB v2 core; the new
    core fixes several bugs (as the existing one that got bitroted).
    Now, suspend/resume finally started to work fine (at least with
    some devices - we should expect more work with regards to it);

    - added multistream support for DVB-T2, and unified the API for
    DVB-S2 and ISDB-S. Backward binary support is preserved;

    - as usual, a few new drivers, some V4L2 core improvements and lots
    of drivers improvements and fixes.

    There are some points to notice on this series:

    1) you should expect a trivial merge conflict on your tree, with the
    removal of Documentation/feature-removal-schedule.txt: this series
    would be adding two additional entries there. I opted to not
    rebase it due to this recent change;

    2) With regards to the PCTV 520e udev-related breakage, I opted to
    fix it in a way that the patches can be backported to 3.5 even
    without your firmware fix patch. This way, Greg doesn't need to
    rush backporting your patch (as there are still the firmware cache
    and firmware path customization issues to be addressed there).

    I'll send later a patch (likely after the end of the merge window)
    reverting the rest of the DRX-K async firmware request, fully
    restoring its original behaviour to allow media drivers to
    initialize everything serialized as before for 3.7 and upper.

    3) I'm planning to work on this weekend to test the DMABUF patches
    for V4L2. The patches are on my queue for several Kernel cycles,
    but, up to now, there is/was no way to test the series locally.

    I have some concerns about this particular changeset with regards
    to security issues, and with regards to the replacement of the old
    VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
    GPU drivers change. The Overlay API allows direct PCI2PCI
    transfers from a media capture card into the GPU framebuffer, but
    its API is crappy. Also, the only existing X11 driver that
    implements it requires a XV extension that is not available
    anymore on modern drivers. The DMABUF can do the same thing, but
    with it is promising to be a properly-designed API. If I can
    successfully test this series and be happy with it, I should be
    asking you to pull them next week."

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
    em28xx: regression fix: use DRX-K sync firmware requests on em28xx
    drxk: allow loading firmware synchrousnously
    em28xx: Make all em28xx extensions to be initialized asynchronously
    [media] tda18271: properly report read errors in tda18271_get_id
    [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
    [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
    [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
    [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
    [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
    [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
    [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
    [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
    [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
    [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
    [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
    [media] exynos-gsc: Add missing static storage class specifiers
    [media] exynos-gsc: Remove header file inclusion
    [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
    [media] s5p-tv: Fix potential NULL pointer dereference error
    [media] s5k6aa: Fix possible NULL pointer dereference
    ...

    Linus Torvalds
     

06 Oct, 2012

20 commits