1. 05 5月, 2014 9 次提交
  2. 01 5月, 2014 5 次提交
    • D
      Merge branch 'drm-init-cleanup' of git://people.freedesktop.org/~danvet/drm into drm-next · 444c9a08
      Dave Airlie 提交于
      Next pull request, this time more of the drm de-midlayering work. The big
      thing is that his patch series here removes everything from drm_bus except
      the set_busid callback. Thierry has a few more patches on top of this to
      make that one optional to.
      
      With that we can ditch all the non-pci drm_bus implementations, which
      Thierry has already done for the fake tegra host1x drm_bus.
      
      Reviewed by Thierry, Laurent and David and now also survived some testing
      on my intel boxes to make sure the irq fumble is fixed correctly ;-) The
      last minute rebase was just to add the r-b tags from Thierry for the 2
      patches I've redone.
      
      * 'drm-init-cleanup' of git://people.freedesktop.org/~danvet/drm:
        drm/<drivers>: don't set driver->dev_priv_size to 0
        drm: Remove dev->kdriver
        drm: remove drm_bus->get_name
        drm: rip out dev->devname
        drm: inline drm_pci_set_unique
        drm: remove bus->get_irq implementations
        drm: pass the irq explicitly to drm_irq_install
        drm/irq: Look up the pci irq directly in the drm_control ioctl
        drm/irq: track the irq installed in drm_irq_install in dev->irq
        drm: rename dev->count_lock to dev->buf_lock
        drm: Rip out totally bogus vga_switcheroo->can_switch locking
        drm: kill drm_bus->bus_type
        drm: remove drm_dev_to_irq from drivers
        drm/irq: remove cargo-culted locking from irq_install/uninstall
        drm/irq: drm_control is a legacy ioctl, so pci devices only
        drm/pci: fold in irq_by_busid support
        drm/irq: simplify irq checks in drm_wait_vblank
      444c9a08
    • D
      Merge branch 'drm-coverity-fixes' of git://people.freedesktop.org/~danvet/drm into drm-next · 7e9ab408
      Dave Airlie 提交于
      bunch of coverity fixes all minor.
      
      * 'drm-coverity-fixes' of git://people.freedesktop.org/~danvet/drm:
        drm: Fix error handling in drm_master_create
        drm/i2c/tda998x: Fix signed overflow issue
        drm/bochs: Remove unecessary NULL check in gem_free
        drm/bochs: Remove unnecessary NULL check in bo_unref
        drm/udl: Initialize ret in udl_driver_load
        drm/via: Remove unecessary NULL check
        drm/ast: Remove unecessary NULL check in gem_free
        drm/ast: Remove unnecessary NULL check in bo_unref
        drm/cirrus: Remove unecessary NULL check in gem_free
        drm/cirrus: Remove unnecessary NULL check in bo_unref
        drm/mgag200: Remove unecessary NULL check in gem_free
        drm/mgag200: Remove unecessary NULL check in bo_unref
      7e9ab408
    • C
      drm: qxl: Remove unused device pointer · 2c9b25c5
      Christian Engelmayer 提交于
      Remove occurrences of unused struct qxl_device pointer in functions
      qxl_ttm_fault() and qxl_init_mem_type().
      
      Detected by Coverity: CID 1019128, CID 1019129.
      Signed-off-by: NChristian Engelmayer <cengelma@gmx.at>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      2c9b25c5
    • D
      drm: try harder to avoid regression when merging mode bits · b87577b7
      Dave Airlie 提交于
      For QXL hw we really want the bits to be replaced as we change
      the preferred mode on the fly, and the same goes for virgl when
      I get to it, however the original fix for this seems to have caused
      a wierd regression on Intel G33 that in a stunning display of failure
      at opposition to his normal self, Daniel failed to diagnose.
      
      So we are left doing this, ugly ugly ugly ugly, Daniel you fixed
      that G33 yet?, ugly, ugly.
      Tested-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      b87577b7
    • D
      Merge tag 'drm-intel-next-2014-04-16' of git://anongit.freedesktop.org/drm-intel into drm-next · 885ac04a
      Dave Airlie 提交于
      drm-intel-next-2014-04-16:
      - vlv infoframe fixes from Jesse
      - dsi/mipi fixes from Shobhit
      - gen8 pageflip fixes for LRI/SRM from Damien
      - cmd parser fixes from Brad Volkin
      - some prep patches for CHV, DRRS, ...
      - and tons of little things all over
      drm-intel-next-2014-04-04:
      - cmd parser for gen7 but only in enforcing and not yet granting mode - the
        batch copying stuff is still missing. Also performance is a bit ... rough
        (Brad Volkin + OACONTROL fix from Ken).
      - deprecate UMS harder (i.e. CONFIG_BROKEN)
      - interrupt rework from Paulo Zanoni
      - runtime PM support for bdw and snb, again from Paulo
      - a pile of refactorings from various people all over the place to prep for new
        stuff (irq reworks, power domain polish, ...)
      
      drm-intel-next-2014-04-04:
      - cmd parser for gen7 but only in enforcing and not yet granting mode - the
        batch copying stuff is still missing. Also performance is a bit ... rough
        (Brad Volkin + OACONTROL fix from Ken).
      - deprecate UMS harder (i.e. CONFIG_BROKEN)
      - interrupt rework from Paulo Zanoni
      - runtime PM support for bdw and snb, again from Paulo
      - a pile of refactorings from various people all over the place to prep for new
        stuff (irq reworks, power domain polish, ...)
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_gem_context.c
      885ac04a
  3. 30 4月, 2014 9 次提交
  4. 29 4月, 2014 4 次提交
    • L
      Merge tag 'trace-fixes-v3.15-rc2' of... · 2aafe1a4
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull ftrace bugfix from Steven Rostedt:
       "Takao Indoh reported that he was able to cause a ftrace bug while
        loading a module and enabling function tracing at the same time.
      
        He uncovered a race where the module when loaded will convert the
        calls to mcount into nops, and expects the module's text to be RW.
        But when function tracing is enabled, it will convert all kernel text
        (core and module) from RO to RW to convert the nops to calls to ftrace
        to record the function.  After the convertion, it will convert all the
        text back from RW to RO.
      
        The issue is, it will also convert the module's text that is loading.
        If it converts it to RO before ftrace does its conversion, it will
        cause ftrace to fail and require a reboot to fix it again.
      
        This patch moves the ftrace module update that converts calls to
        mcount into nops to be done when the module state is still
        MODULE_STATE_UNFORMED.  This will ignore the module when the text is
        being converted from RW back to RO"
      
      * tag 'trace-fixes-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace/module: Hardcode ftrace_module_init() call into load_module()
      2aafe1a4
    • L
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · 87c7662b
      Linus Torvalds 提交于
      Pull devicetree bug fixes from Grant Likely:
       "These are some important bug fixes that need to get into v3.15.
      
        This branch contains a pair of important bug fixes for the DT code:
      
         - Fix some incorrect binding property names before they enter common
           usage
      
         - Fix bug where some platform devices will be unable to get their
           interrupt number when they depend on an interrupt controller that
           is not available at device creation time.  This is a problem
           causing mainline to fail on a number of ARM platforms"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        of/irq: do irq resolution in platform_get_irq
        of: selftest: add deferred probe interrupt test
        dt: Fix binding typos in clock-names and interrupt-names
      87c7662b
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 838b4c02
      Linus Torvalds 提交于
      Pull powerpc fixes from Ben Herrenschmidt:
       "Here is a bunch of post-merge window fixes that have been accumulating
        in patchwork while I was on vacation or buried under other stuff last
        week.
      
        We have the now usual batch of LE fixes from Anton (sadly some new
        stuff that went into this merge window had endian issues, we'll try to
        make sure we do better next time)
      
        Some fixes and cleanups to the new 24x7 performance monitoring stuff
        (mostly typos and cleaning up printk's)
      
        A series of fixes for an issue with our runlatch bit, which wasn't set
        properly for offlined threads/cores and under KVM, causing potentially
        some counters to misbehave along with possible power management
        issues.
      
        A fix for kexec nasty race where the new kernel wouldn't "see" the
        secondary processors having reached back into firmware in time.
      
        And finally a few other misc (and pretty simple) bug fixes"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (33 commits)
        powerpc/4xx: Fix section mismatch in ppc4xx_pci.c
        ppc/kvm: Clear the runlatch bit of a vcpu before napping
        ppc/kvm: Set the runlatch bit of a CPU just before starting guest
        ppc/powernv: Set the runlatch bits correctly for offline cpus
        powerpc/pseries: Protect remove_memory() with device hotplug lock
        powerpc: Fix error return in rtas_flash module init
        powerpc: Bump BOOT_COMMAND_LINE_SIZE to 2048
        powerpc: Bump COMMAND_LINE_SIZE to 2048
        powerpc: Rename duplicate COMMAND_LINE_SIZE define
        powerpc/perf/hv-24x7: Catalog version number is be64, not be32
        powerpc/perf/hv-24x7: Remove [static 4096], sparse chokes on it
        powerpc/perf/hv-24x7: Use (unsigned long) not (u32) values when calling plpar_hcall_norets()
        powerpc/perf/hv-gpci: Make device attr static
        powerpc/perf/hv_gpci: Probe failures use pr_debug(), and padding reduced
        powerpc/perf/hv_24x7: Probe errors changed to pr_debug(), padding fixed
        powerpc/mm: Fix tlbie to add AVAL fields for 64K pages
        powerpc/powernv: Fix little endian issues in OPAL dump code
        powerpc/powernv: Create OPAL sglist helper functions and fix endian issues
        powerpc/powernv: Fix little endian issues in OPAL error log code
        powerpc/powernv: Fix little endian issues with opal_do_notifier calls
        ...
      838b4c02
    • L
      mm: don't pointlessly use BUG_ON() for sanity check · 50f5aa8a
      Linus Torvalds 提交于
      BUG_ON() is a big hammer, and should be used _only_ if there is some
      major corruption that you cannot possibly recover from, making it
      imperative that the current process (and possibly the whole machine) be
      terminated with extreme prejudice.
      
      The trivial sanity check in the vmacache code is *not* such a fatal
      error.  Recovering from it is absolutely trivial, and using BUG_ON()
      just makes it harder to debug for no actual advantage.
      
      To make matters worse, the placement of the BUG_ON() (only if the range
      check matched) actually makes it harder to hit the sanity check to begin
      with, so _if_ there is a bug (and we just got a report from Srivatsa
      Bhat that this can indeed trigger), it is harder to debug not just
      because the machine is possibly dead, but because we don't have better
      coverage.
      
      BUG_ON() must *die*.  Maybe we should add a checkpatch warning for it,
      because it is simply just about the worst thing you can ever do if you
      hit some "this cannot happen" situation.
      Reported-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Cc: Davidlohr Bueso <davidlohr@hp.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      50f5aa8a
  5. 28 4月, 2014 13 次提交