linux/drivers/gpu/drm/exynos
Linus Torvalds 033d9959ed Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue changes from Tejun Heo:
 "This is workqueue updates for v3.7-rc1.  A lot of activities this
  round including considerable API and behavior cleanups.

   * delayed_work combines a timer and a work item.  The handling of the
     timer part has always been a bit clunky leading to confusing
     cancelation API with weird corner-case behaviors.  delayed_work is
     updated to use new IRQ safe timer and cancelation now works as
     expected.

   * Another deficiency of delayed_work was lack of the counterpart of
     mod_timer() which led to cancel+queue combinations or open-coded
     timer+work usages.  mod_delayed_work[_on]() are added.

     These two delayed_work changes make delayed_work provide interface
     and behave like timer which is executed with process context.

   * A work item could be executed concurrently on multiple CPUs, which
     is rather unintuitive and made flush_work() behavior confusing and
     half-broken under certain circumstances.  This problem doesn't
     exist for non-reentrant workqueues.  While non-reentrancy check
     isn't free, the overhead is incurred only when a work item bounces
     across different CPUs and even in simulated pathological scenario
     the overhead isn't too high.

     All workqueues are made non-reentrant.  This removes the
     distinction between flush_[delayed_]work() and
     flush_[delayed_]_work_sync().  The former is now as strong as the
     latter and the specified work item is guaranteed to have finished
     execution of any previous queueing on return.

   * In addition to the various bug fixes, Lai redid and simplified CPU
     hotplug handling significantly.

   * Joonsoo introduced system_highpri_wq and used it during CPU
     hotplug.

  There are two merge commits - one to pull in IRQ safe timer from
  tip/timers/core and the other to pull in CPU hotplug fixes from
  wq/for-3.6-fixes as Lai's hotplug restructuring depended on them."

Fixed a number of trivial conflicts, but the more interesting conflicts
were silent ones where the deprecated interfaces had been used by new
code in the merge window, and thus didn't cause any real data conflicts.

Tejun pointed out a few of them, I fixed a couple more.

* 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)
  workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()
  workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()
  workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()
  workqueue: remove @delayed from cwq_dec_nr_in_flight()
  workqueue: fix possible stall on try_to_grab_pending() of a delayed work item
  workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()
  workqueue: use __cpuinit instead of __devinit for cpu callbacks
  workqueue: rename manager_mutex to assoc_mutex
  workqueue: WORKER_REBIND is no longer necessary for idle rebinding
  workqueue: WORKER_REBIND is no longer necessary for busy rebinding
  workqueue: reimplement idle worker rebinding
  workqueue: deprecate __cancel_delayed_work()
  workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()
  workqueue: use mod_delayed_work() instead of __cancel + queue
  workqueue: use irqsafe timer for delayed_work
  workqueue: clean up delayed_work initializers and add missing one
  workqueue: make deferrable delayed_work initializer names consistent
  workqueue: cosmetic whitespace updates for macro definitions
  workqueue: deprecate system_nrt[_freezable]_wq
  workqueue: deprecate flush[_delayed]_work_sync()
  ...
2012-10-02 09:54:49 -07:00
..
exynos_ddc.c drm/exynos: remove module of exynos drm subdrv 2012-03-20 09:40:23 +00:00
exynos_drm_buf.c drm/exynos: added drm prime feature. 2012-05-08 18:46:32 +09:00
exynos_drm_buf.h drm/exynos: update gem and buffer framework. 2012-03-20 09:40:21 +00:00
exynos_drm_connector.c drm/exynos: Add missing static storage class specifier 2012-07-27 11:13:54 +09:00
exynos_drm_connector.h DRM: add DRM Driver for Samsung SoC EXYNOS4210. 2011-10-05 10:27:31 +01:00
exynos_drm_core.c drm/exynos: removed unnecessary variable 2012-07-27 11:13:57 +09:00
exynos_drm_crtc.c drm/exynos: add property for crtc mode 2012-07-27 11:13:54 +09:00
exynos_drm_crtc.h drm/exynos: update overlay via plane from crtc 2012-07-27 11:13:53 +09:00
exynos_drm_dmabuf.c drm/exynos: add dummy support for dmabuf-mmap 2012-09-13 12:38:09 +09:00
exynos_drm_dmabuf.h drm/exynos: added drm prime feature. 2012-05-08 18:46:32 +09:00
exynos_drm_drv.c drm/exynos: fix double call of drm_prime_(init/destroy)_file_private 2012-09-13 12:38:09 +09:00
exynos_drm_drv.h drm/exynos: add property for crtc mode 2012-07-27 11:13:54 +09:00
exynos_drm_encoder.c drm/exynos: add plane enable/disable 2012-07-27 11:13:54 +09:00
exynos_drm_encoder.h drm/exynos: add plane enable/disable 2012-07-27 11:13:54 +09:00
exynos_drm_fb.c drm/exynos: Keep a reference to frame buffer GEM objects 2012-06-05 11:53:58 +09:00
exynos_drm_fb.h drm/exynos: Use DRM_FORMAT_{NV12, YUV420} instead of DRM_FORMAT_{NV12M, YUV420M} 2012-06-05 11:51:43 +09:00
exynos_drm_fbdev.c drm/exynos: remove module of exynos drm subdrv 2012-03-20 09:40:23 +00:00
exynos_drm_fbdev.h DRM: add DRM Driver for Samsung SoC EXYNOS4210. 2011-10-05 10:27:31 +01:00
exynos_drm_fimd.c drm/exynos: Remove redundant check in exynos_drm_fimd.c file 2012-09-13 12:38:07 +09:00
exynos_drm_g2d.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
exynos_drm_g2d.h drm/exynos: add G2D driver 2012-05-17 20:14:48 +09:00
exynos_drm_gem.c drm/exynos: fixed page align bug. 2012-09-13 12:38:08 +09:00
exynos_drm_gem.h drm/exynos: fixed a comment to gem size. 2012-07-27 11:13:57 +09:00
exynos_drm_hdmi.c drm/exynos: Use devm_kzalloc in exynos_drm_hdmi.c file 2012-09-13 12:38:08 +09:00
exynos_drm_hdmi.h drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
exynos_drm_plane.c drm/exynos: remove DRM_FORMAT_NV12M from plane module 2012-09-13 12:38:10 +09:00
exynos_drm_plane.h drm/exynos: add plane enable/disable 2012-07-27 11:13:54 +09:00
exynos_drm_vidi.c drm/exynos: Use devm_kzalloc in exynos_drm_vidi.c file 2012-09-13 12:38:07 +09:00
exynos_drm_vidi.h drm/exynos: added virtual display driver. 2012-03-21 10:15:49 +00:00
exynos_hdmi.c drm/exynos: Add missing braces around sizeof in exynos_hdmi.c 2012-09-13 12:38:09 +09:00
exynos_hdmi.h drm/exynos: cleanup exynos_hdmi.h 2012-03-20 09:41:45 +00:00
exynos_hdmiphy.c drm/exynos: added hdmi display support 2011-12-29 11:21:42 +09:00
exynos_mixer.c drm/exynos: Add missing braces around sizeof in exynos_mixer.c 2012-09-13 12:38:09 +09:00
Kconfig drm/exynos: Add dependency for G2D in Kconfig 2012-09-13 12:38:08 +09:00
Makefile drm/exynos: add G2D driver 2012-05-17 20:14:48 +09:00
regs-hdmi.h drm/exynos: enable dvi mode for dvi monitor 2012-05-17 20:14:25 +09:00
regs-mixer.h drm/exynos: added hdmi display support 2011-12-29 11:21:42 +09:00
regs-vp.h drm/exynos: added hdmi display support 2011-12-29 11:21:42 +09:00