1. 16 1月, 2012 2 次提交
  2. 06 1月, 2012 4 次提交
    • H
      [media] pwc: Remove software emulation of arbritary resolutions · 795e6eb3
      Hans de Goede 提交于
      The pwc driver claims to support any resolution between 160x120
      and 640x480, but emulates this by simply drawing a black border
      around the image. Userspace can draw its own black border if it
      really wants one.
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      795e6eb3
    • H
      [media] pwc: Remove driver specific ioctls · a08d2c72
      Hans de Goede 提交于
      This stems from the v4l1 era, with v4l2 everything can be done with
      standardized v4l2 API calls.
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      a08d2c72
    • H
      [media] pwc: Remove dead snapshot code · dc8a7e83
      Hans de Goede 提交于
      The in kernel version of the pwc driver has never supported snapshot
      mode, and now that we no longer support the pixfmt.priv abuse there also
      no longer is a way for userspace to request it, rendering all the code in
      question dead (never called), so remove it.
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      dc8a7e83
    • H
      [media] pwc: Rework locking · c20d78cd
      Hans de Goede 提交于
      While testing gtk-v4l's new ctrl event code, I hit the following deadlock
      in the pwc driver:
      
      Thread 1:
      -Does a VIDIOC_G_CTRL
      -video2_ioctl takes the modlock
      -video2_ioctl calls v4l2_g_ctrl
      -v4l2_g_ctrl takes the ctrl_handler lock
      -v4l2_g_ctrl calls pwc_g_volatile_ctrl
      -pwc_g_volatile_ctrl releases the modlock as the usb transfer can take a
       significant amount of time and we don't want to block DQBUF / QBUF too long
      Thread 2:
      -Does a VIDIOC_FOO_CTRL
      -video2_ioctl takes the modlock
      -video2_ioctl calls v4l2_foo_ctrl
      -v4l2_foo_ctrl blocks while trying to take the ctrl_handler lock
      Thread 1:
      -Blocks while trying to re-take the modlock, as its caller will eventually
       unlock that
      
      Now we have thread 1 waiting for the modlock while holding the ctrl_handler
      lock and thread 2 waiting for the ctrl_handler lock while holding the
      modlock -> deadlock.
      
      Conclusion:
      1) We cannot unlock modlock from pwc_s_ctrl / pwc_g_volatile_ctrl,
         but this can cause QBUF / DQBUF to block for up to a full second
      2) After evaluating various option I came to the conclusion that pwc should
         stop using the v4l2 core locking, and instead do its own locking
      
      Thus this patch stops pwc using the v4l2 core locking, and replaces that with
      it doing its own locking where necessary.
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      c20d78cd
  3. 28 7月, 2011 1 次提交
  4. 30 3月, 2010 1 次提交
    • T
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking... · 5a0e3ad6
      Tejun Heo 提交于
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      
      percpu.h is included by sched.h and module.h and thus ends up being
      included when building most .c files.  percpu.h includes slab.h which
      in turn includes gfp.h making everything defined by the two files
      universally available and complicating inclusion dependencies.
      
      percpu.h -> slab.h dependency is about to be removed.  Prepare for
      this change by updating users of gfp and slab facilities include those
      headers directly instead of assuming availability.  As this conversion
      needs to touch large number of source files, the following script is
      used as the basis of conversion.
      
        http://userweb.kernel.org/~tj/misc/slabh-sweep.py
      
      The script does the followings.
      
      * Scan files for gfp and slab usages and update includes such that
        only the necessary includes are there.  ie. if only gfp is used,
        gfp.h, if slab is used, slab.h.
      
      * When the script inserts a new include, it looks at the include
        blocks and try to put the new include such that its order conforms
        to its surrounding.  It's put in the include block which contains
        core kernel includes, in the same order that the rest are ordered -
        alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
        doesn't seem to be any matching order.
      
      * If the script can't find a place to put a new include (mostly
        because the file doesn't have fitting include block), it prints out
        an error message indicating which .h file needs to be added to the
        file.
      
      The conversion was done in the following steps.
      
      1. The initial automatic conversion of all .c files updated slightly
         over 4000 files, deleting around 700 includes and adding ~480 gfp.h
         and ~3000 slab.h inclusions.  The script emitted errors for ~400
         files.
      
      2. Each error was manually checked.  Some didn't need the inclusion,
         some needed manual addition while adding it to implementation .h or
         embedding .c file was more appropriate for others.  This step added
         inclusions to around 150 files.
      
      3. The script was run again and the output was compared to the edits
         from #2 to make sure no file was left behind.
      
      4. Several build tests were done and a couple of problems were fixed.
         e.g. lib/decompress_*.c used malloc/free() wrappers around slab
         APIs requiring slab.h to be added manually.
      
      5. The script was run on all .h files but without automatically
         editing them as sprinkling gfp.h and slab.h inclusions around .h
         files could easily lead to inclusion dependency hell.  Most gfp.h
         inclusion directives were ignored as stuff from gfp.h was usually
         wildly available and often used in preprocessor macros.  Each
         slab.h inclusion directive was examined and added manually as
         necessary.
      
      6. percpu.h was updated not to include slab.h.
      
      7. Build test were done on the following configurations and failures
         were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
         distributed build env didn't work with gcov compiles) and a few
         more options had to be turned off depending on archs to make things
         build (like ipr on powerpc/64 which failed due to missing writeq).
      
         * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
         * powerpc and powerpc64 SMP allmodconfig
         * sparc and sparc64 SMP allmodconfig
         * ia64 SMP allmodconfig
         * s390 SMP allmodconfig
         * alpha SMP allmodconfig
         * um on x86_64 SMP allmodconfig
      
      8. percpu.h modifications were reverted so that it could be applied as
         a separate patch and serve as bisection point.
      
      Given the fact that I had only a couple of failures from tests on step
      6, I'm fairly confident about the coverage of this conversion patch.
      If there is a breakage, it's likely to be something in one of the arch
      headers which should be easily discoverable easily on most builds of
      the specific arch.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Guess-its-ok-by: NChristoph Lameter <cl@linux-foundation.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
      5a0e3ad6
  5. 25 6月, 2006 3 次提交