1. 01 May, 2015 2 commits
  2. 16 Apr, 2015 2 commits
  3. 12 Apr, 2015 12 commits
  4. 11 Apr, 2015 5 commits
  5. 08 Apr, 2015 1 commit
  6. 03 Apr, 2015 8 commits
  7. 02 Apr, 2015 3 commits
  8. 17 Mar, 2015 2 commits
  9. 03 Mar, 2015 2 commits
    • Linus Torvalds's avatar
      Linux 4.0-rc2 · 13a7a6ac
      Linus Torvalds authored
    • Daniel Vetter's avatar
      drm/i915: Fix modeset state confusion in the load detect code · 9128b040
      Daniel Vetter authored
      This is a tricky story of the new atomic state handling and the legacy
      code fighting over each another. The bug at hand is an underrun of the
      framebuffer reference with subsequent hilarity caused by the load
      detect code. Which is peculiar since the the exact same code works
      fine as the implementation of the legacy setcrtc ioctl.
      Let's look at the ingredients:
      - Currently our code is a crazy mix of legacy modeset interfaces to
        set the parameters and half-baked atomic state tracking underneath.
        While this transition is going we're using the transitional plane
        helpers to update the atomic side (drm_plane_helper_disable/update
        and friends), i.e. plane->state->fb. Since the state structure owns
        the fb those functions take care of that themselves.
        The legacy state (specifically crtc->primary->fb) is still managed
        by the old code (and mostly by the drm core), with the fb reference
        counting done by callers (core drm for the ioctl or the i915 load
        detect code). The relevant commit is
        commit ea2c67bb
        Author: Matt Roper <[email protected]>
        Date:   Tue Dec 23 10:41:52 2014 -0800
            drm/i915: Move to atomic plane helpers (v9)
      - drm_plane_helper_disable has special code to handle multiple calls
        in a row - it checks plane->crtc == NULL and bails out. This is to
        match the proper atomic implementation which needs the crtc to get
        at the implied locking context atomic updates always need. See
        commit acf24a39
        Author: Daniel Vetter <[email protected]>
        Date:   Tue Jul 29 15:33:05 2014 +0200
            drm/plane-helper: transitional atomic plane helpers
      - The universal plane code split out the implicit primary plane from
        the CRTC into it's own full-blown drm_plane object. As part of that
        the setcrtc ioctl (which updated both the crtc mode and primary
        plane) learned to set crtc->primary->crtc on modeset to make sure
        the plane->crtc assignments statate up to date in
        commit e13161af
        Author: Matt Roper <[email protected]>
        Date:   Tue Apr 1 15:22:38 2014 -0700
            drm: Add drm_crtc_init_with_planes() (v2)
        Unfortunately we've forgotten to update the load detect code. Which
        wasn't a problem since the load detect modeset is temporary and
        always undone before we drop the locks.
      - Finally there is a organically grown history (i.e. don't ask) around
        who sets the legacy plane->fb for the various driver entry points.
        Originally updating that was the drivers duty, but for almost all
        places we've moved that (plus updating the refcounts) into the core.
        Again the exception is the load detect code.
      Taking all together the following happens:
      - The load detect code doesn't set crtc->primary->crtc. This is only
        really an issue on crtcs never before used or when userspace
        explicitly disabled the primary plane.
      - The plane helper glue code short-circuits because of that and leaves
        a non-NULL fb behind in plane->state->fb and plane->fb. The state
        fb isn't a real problem (it's properly refcounted on its own), it's
        just the canary.
      - Load detect code drops the reference for that fb, but doesn't set
        plane->fb = NULL. This is ok since it's still living in that old
        world where drivers had to clear the pointer but the core/callers
        handled the refcounting.
      - On the next modeset the drm core notices plane->fb and takes care of
        refcounting it properly by doing another unref. This drops the
        refcount to zero, leaving state->plane now pointing at freed memory.
      - intel_plane_duplicate_state still assume it owns a reference to that
        very state->fb and bad things start to happen.
      Fix this all by applying the same duct-tape as for the legacy setcrtc
      ioctl code and set crtc->primary->crtc properly.
      Cc: Matt Roper <[email protected]>
      Cc: Paul Bolle <[email protected]>
      Cc: Rob Clark <[email protected]>
      Cc: Paulo Zanoni <[email protected]>
      Cc: Sean Paul <[email protected]>
      Cc: Matt Roper <[email protected]>
      Reported-and-tested-by: default avatarLinus Torvalds <[email protected]>
      Reported-by: default avatarPaul Bolle <[email protected]>
      Signed-off-by: default avatarDaniel Vetter <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
  10. 02 Mar, 2015 3 commits
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 023a6007
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "Two GPIO fixes:
         - Fix a translation problem in of_get_named_gpiod_flags()
         - Fix a long standing container_of() mistake in the TPS65912 driver"
      * tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: tps65912: fix wrong container_of arguments
        gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-4.0-rc2' of... · 10d6dfc1
      Linus Torvalds authored
      Merge branch 'fixes-for-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
      Pull thermal management fixes from Eduardo Valentin:
         - Several fixes in tmon tool.
         - Fixes in intel int340x for _ART and _TRT tables.
         - Add id for Avoton SoC into powerclamp driver.
         - Fixes in RCAR thermal driver to remove race conditions and fix fail
         - Fixes in TI thermal driver: removal of unnecessary code and build
           fix if !CONFIG_PM_SLEEP
         - Cleanups in exynos thermal driver
         - Add stubs for include/linux/thermal.h.  Now drivers using thermal
           calls but that also work without CONFIG_THERMAL will be able to
           compile for systems that don't care about thermal.
        Note: I am sending this pull on Rui's behalf while he fixes issues in
        his Linux box"
      * 'fixes-for-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
        thermal: int340x_thermal: Ignore missing _ART, _TRT tables
        thermal/intel_powerclamp: add id for Avoton SoC
        tools/thermal: tmon: silence 'set but not used' warnings
        tools/thermal: tmon: use pkg-config to determine library dependencies
        tools/thermal: tmon: support cross-compiling
        tools/thermal: tmon: add .gitignore
        tools/thermal: tmon: fixup tui windowing calculations
        tools/thermal: tmon: tui: don't hard-code dialog window size assumptions
        tools/thermal: tmon: add min/max macros
        tools/thermal: tmon: add --target-temp parameter
        thermal: exynos: Clean-up code to use oneline entry for exynos compatible table
        thermal: rcar: Make error and remove paths symmetrical with init
        thermal: rcar: Fix race condition between init and interrupt
        thermal: Introduce dummy functions when thermal is not defined
        ti-soc-thermal: Delete an unnecessary check before the function call "cpufreq_cooling_unregister"
        thermal: ti-soc-thermal: bandgap: Fix build warning if !CONFIG_PM_SLEEP
    • Linus Torvalds's avatar
      Merge tag 'md/4.0-fixes' of git://neil.brown.name/md · 1a6f77ab
      Linus Torvalds authored
      Pull md fixes from Neil Brown:
       "Three md fixes:
         - fix a read-balance problem that was reported 2 years ago, but that
           I never noticed the report :-(
         - fix for rare RAID6 problem causing incorrect bitmap updates when
           two devices fail.
         - add __ATTR_PREALLOC annotation now that it is possible"
      * tag 'md/4.0-fixes' of git://neil.brown.name/md:
        md: mark some attributes as pre-alloc
        raid5: check faulty flag for array status during recovery.
        md/raid1: fix read balance when a drive is write-mostly.