1. 17 7月, 2014 4 次提交
  2. 05 7月, 2014 3 次提交
  3. 25 5月, 2014 5 次提交
  4. 24 5月, 2014 3 次提交
  5. 23 5月, 2014 3 次提交
    • H
      [media] v4l2-ioctl: drop spurious newline in string · a112fbaf
      Hans Verkuil 提交于
      The message logged by v4l_print_cropcap should be a single line withouti
      linebreaks, just like all the other v4l_print_<ioctl> functions.
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      a112fbaf
    • M
      [media] videobuf-dma-contig: fix incorrect argument to vm_iomap_memory() call · 29f1cdb0
      Ma Haijun 提交于
      The second argument should be physical address rather than virtual address.
      Signed-off-by: NMa Haijun <mahaijuns@gmail.com>
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      29f1cdb0
    • R
      [media] videobuf2-dma-sg: Fix NULL pointer dereference BUG · 227ae227
      Ricardo Ribalda 提交于
      vb2_get_vma() copy the content of the vma to a new structure but set
      some of its pointers to NULL.
      
      One of this pointer is used by follow_pte() called by follow_pfn()
      on io memory.
      
      This can lead to a NULL pointer derreference.
      
      The version of vma that has not been cleared must be used.
      
      [  406.143320] BUG: unable to handle kernel NULL pointer dereference at 0000000000000040
      [  406.143427] IP: [<ffffffff8115204c>] follow_pfn+0x2c/0x70
      [  406.143491] PGD 6c3f0067 PUD 6c3ef067 PMD 0
      [  406.143546] Oops: 0000 [#1] SMP
      [  406.143587] Modules linked in: qtec_mem qt5023_video qtec_testgen qtec_xform videobuf2_core gpio_xilinx videobuf2_vmalloc videobuf2_dma_sg qtec_cmosis videobuf2_memops qtec_pcie qtec_white fglrx(PO) qt5023 spi_xilinx spi_bitbang
      [  406.143852] CPU: 0 PID: 299 Comm: tracker Tainted: P           O 3.13.0-qtec-standard #10
      [  406.143927] Hardware name: QTechnology QT5022/QT5022, BIOS PM_2.1.0.309 X64 04/04/2013
      [  406.144000] task: ffff880085c82d60 ti: ffff880085abe000 task.ti: ffff880085abe000
      [  406.144067] RIP: 0010:[<ffffffff8115204c>]  [<ffffffff8115204c>] follow_pfn+0x2c/0x70
      [  406.144145] RSP: 0018:ffff880085abf888  EFLAGS: 00010296
      [  406.144195] RAX: 0000000000000000 RBX: ffff880085abf8e0 RCX: ffff880085abf888
      [  406.144260] RDX: ffff880085abf890 RSI: 00007fc52e173000 RDI: ffff8800863cbe40
      [  406.144325] RBP: ffff880085abf8a8 R08: 0000000000000018 R09: ffff8800863cbf00
      [  406.144388] R10: ffff880086703b80 R11: 00000000000001e0 R12: 0000000000018000
      [  406.144452] R13: 0000000000000000 R14: ffffea0000000000 R15: ffff88015922fea0
      [  406.144517] FS:  00007fc536e7c740(0000) GS:ffff88015ec00000(0000) knlGS:0000000000000000
      [  406.144591] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [  406.144644] CR2: 0000000000000040 CR3: 0000000066c9d000 CR4: 00000000000007f0
      [  406.144708] Stack:
      [  406.144731]  0000000000018000 00007fc52e18b000 0000000000000000 00007fc52e173000
      [  406.144813]  ffff880085abf918 ffffffffa083b2fd ffff880085ab1ba8 0000000000000000
      [  406.144894]  0000000000000000 0000000100000000 ffff880085abf928 ffff880159a20800
      [  406.144976] Call Trace:
      [  406.145011]  [<ffffffffa083b2fd>] vb2_dma_sg_get_userptr+0x14d/0x310 [videobuf2_dma_sg]
      [  406.145089]  [<ffffffffa08507df>] __qbuf_userptr+0xbf/0x3e0 [videobuf2_core]
      [  406.147229]  [<ffffffffa0041454>] ? mc_heap_lock_memory+0x1f4/0x490 [fglrx]
      [  406.149234]  [<ffffffff813428f3>] ? cpumask_next_and+0x23/0x50
      [  406.151223]  [<ffffffff810b2e38>] ? enqueue_task_fair+0x658/0xde0
      [  406.153199]  [<ffffffff81061888>] ? native_smp_send_reschedule+0x48/0x60
      [  406.155184]  [<ffffffff815836b9>] ? get_ctrl+0xa9/0xd0
      [  406.157161]  [<ffffffff8116f4e4>] ? __kmalloc+0x1a4/0x1b0
      [  406.159135]  [<ffffffffa0850b9c>] ? __vb2_queue_alloc+0x9c/0x4a0 [videobuf2_core]
      [  406.161130]  [<ffffffffa0852d08>] __buf_prepare+0x1a8/0x210 [videobuf2_core]
      [  406.163171]  [<ffffffffa0854c57>] __vb2_qbuf+0x27/0xcc [videobuf2_core]
      [  406.165229]  [<ffffffffa0851dfd>] vb2_queue_or_prepare_buf+0x1ed/0x270 [videobuf2_core]
      [  406.167325]  [<ffffffffa0854c30>] ? vb2_ioctl_querybuf+0x30/0x30 [videobuf2_core]
      [  406.169419]  [<ffffffffa0851e9c>] vb2_qbuf+0x1c/0x20 [videobuf2_core]
      [  406.171508]  [<ffffffffa0851ef8>] vb2_ioctl_qbuf+0x58/0x70 [videobuf2_core]
      [  406.173604]  [<ffffffff8157d3a8>] v4l_qbuf+0x48/0x60
      [  406.175681]  [<ffffffff8157b29c>] __video_do_ioctl+0x2bc/0x340
      [  406.177779]  [<ffffffff8116f43c>] ? __kmalloc+0xfc/0x1b0
      [  406.179883]  [<ffffffff8157cd0e>] ? video_usercopy+0x7e/0x470
      [  406.181961]  [<ffffffff8157ce81>] video_usercopy+0x1f1/0x470
      [  406.184021]  [<ffffffff8157afe0>] ? v4l_printk_ioctl+0xb0/0xb0
      [  406.186085]  [<ffffffff810ae1ed>] ? account_system_time+0x8d/0x190
      [  406.188149]  [<ffffffff8157d115>] video_ioctl2+0x15/0x20
      [  406.190216]  [<ffffffff815781b3>] v4l2_ioctl+0x123/0x160
      [  406.192251]  [<ffffffff810ce415>] ? rcu_eqs_enter+0x65/0xa0
      [  406.194256]  [<ffffffff81186b28>] do_vfs_ioctl+0x88/0x560
      [  406.196258]  [<ffffffff810ae145>] ? account_user_time+0x95/0xb0
      [  406.198262]  [<ffffffff810ae6a4>] ? vtime_account_user+0x44/0x70
      [  406.200215]  [<ffffffff81187091>] SyS_ioctl+0x91/0xb0
      [  406.202107]  [<ffffffff817be109>] tracesys+0xd0/0xd5
      [  406.203946] Code: 66 66 66 90 48 f7 47 50 00 44 00 00 b8 ea ff ff ff 74 52 55 48 89 e5 53 48 89 d3 48 8d 4d e0 48 8d 55 e8 48 83 ec 18 48 8b 47 40 <48> 8b 78 40 e8 8b fe ff ff 85 c0 75 27 48 8b 55 e8 48 b9 00 f0
      [  406.208011] RIP  [<ffffffff8115204c>] follow_pfn+0x2c/0x70
      [  406.209908]  RSP <ffff880085abf888>
      [  406.211760] CR2: 0000000000000040
      [  406.213676] ---[ end trace 996d9f64e6739a04 ]---
      Signed-off-by: NRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
      Acked-by: NMarek Szyprowski <m.szyprowski@samsung.com>
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      227ae227
  6. 14 5月, 2014 4 次提交
  7. 23 4月, 2014 2 次提交
    • H
      [media] vb2: fix compiler warning · ce9c2244
      Hans Verkuil 提交于
      When compiling this for older kernels using the compatibility build
      the compiler complains about uninitialized variables:
      
      In file included from include/linux/kernel.h:20:0,
                       from include/linux/cache.h:4,
                       from include/linux/time.h:7,
                       from include/linux/input.h:13,
                       from /home/hans/work/build/media_build/v4l/compat.h:9,
                       from <command-line>:0:
      /home/hans/work/build/media_build/v4l/videobuf2-core.c: In function 'vb2_mmap':
      include/linux/dynamic_debug.h:60:9: warning: 'plane' may be used uninitialized in this function [-Wmaybe-uninitialized]
         printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);  \
               ^
      /home/hans/work/build/media_build/v4l/videobuf2-core.c:2381:23: note: 'plane' was declared here
        unsigned int buffer, plane;
                             ^
      In file included from include/linux/kernel.h:20:0,
                       from include/linux/cache.h:4,
                       from include/linux/time.h:7,
                       from include/linux/input.h:13,
                       from /home/hans/work/build/media_build/v4l/compat.h:9,
                       from <command-line>:0:
      include/linux/dynamic_debug.h:60:9: warning: 'buffer' may be used uninitialized in this function [-Wmaybe-uninitialized]
         printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__);  \
               ^
      /home/hans/work/build/media_build/v4l/videobuf2-core.c:2381:15: note: 'buffer' was declared here
        unsigned int buffer, plane;
                     ^
      
      While these warnings are bogus (the call to __find_plane_by_offset will
      set buffer and plane), it doesn't hurt to initialize these variables.
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      ce9c2244
    • H
      [media] vb2: stop_streaming should return void · e37559b2
      Hans Verkuil 提交于
      The vb2 core ignores any return code from the stop_streaming op.
      And there really isn't anything it can do anyway in case of an error.
      So change the return type to void and update any drivers that implement it.
      
      The int return gave drivers the idea that this operation could actually
      fail, but that's really not the case.
      
      The pwc amd sdr-msi3101 drivers both had this construction:
      
              if (mutex_lock_interruptible(&s->v4l2_lock))
                      return -ERESTARTSYS;
      
      This has been updated to just call mutex_lock(). The stop_streaming op
      expects this to really stop streaming and I very much doubt this will
      work reliably if stop_streaming just returns without really stopping the
      DMA.
      Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
      Acked-by: NPawel Osciak <pawel@osciak.com>
      Acked-by: NSakari Ailus <sakari.ailus@linux.intel.com>
      Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
      e37559b2
  8. 17 4月, 2014 15 次提交
  9. 29 3月, 2014 1 次提交