1. 05 5月, 2014 34 次提交
  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 1 次提交
    • V
      ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe · 8aa9e85a
      Vineet Gupta 提交于
      There was a very small race window where resume to kernel mode from a
      Exception Path (or pure kernel mode which is true for most of ARC
      exceptions anyways), was not disabling interrupts in restore_regs,
      clobbering the exception regs
      
      Anton found the culprit call flow (after many sleepless nights)
      
      | 1. we got a Trap from user land
      | 2. started to service it.
      | 3. While doing some stuff on user-land memory (I think it is padzero()),
      |     we got a DataTlbMiss
      | 4. On return from it we are taking "resume_kernel_mode" path
      | 5. NEED_RESHED is not set, so we go to "return from exception" path in
      |     restore regs.
      | 6. there seems to be IRQ happening
      Signed-off-by: NVineet Gupta <vgupta@synopsys.com>
      Cc: <stable@vger.kernel.org>   #3.10, 3.12, 3.13, 3.14
      Cc: Anton Kolesov <Anton.Kolesov@synopsys.com>
      Cc: Francois Bedard <Francois.Bedard@synopsys.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8aa9e85a