1. 20 Apr, 2015 2 commits
  2. 15 Apr, 2015 5 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2015-04-15' of... · aa219a0d
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2015-04-15' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      Misc i915 fixes.
      
      * tag 'drm-intel-next-fixes-2015-04-15' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Dont enable CS_PARSER_ERROR interrupts at all
        drm/i915: Move drm_framebuffer_unreference out of struct_mutex for takeover
        drm/i915: Allocate connector state together with the connectors
        drm/i915/chv: Remove DPIO force latency causing interpair skew issue
        drm/i915: Don't cancel DRRS worker synchronously for flush/invalidate
        drm/i915: Fix locking in DRRS flush/invalidate hooks
      aa219a0d
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-04-15' of git://anongit.freedesktop.org/drm-intel into drm-next · 4a112488
      Dave Airlie authored
      One more drm-misch pull for 4.1 with mostly simple stuff and boring
      refactoring. Even the cursor fix from Matt is just to make a really anal
      igt happy.
      
      * tag 'topic/drm-misc-2015-04-15' of git://anongit.freedesktop.org/drm-intel:
        drm: fix trivial typo mistake
        drm: Make integer overflow checking cover universal cursor updates (v2)
        drm: make crtc/encoder/connector/plane helper_private a const pointer
        drm/armada: constify struct drm_encoder_helper_funcs pointer
        drm/radeon: constify more struct drm_*_helper funcs pointers
        drm/edid: add #defines for ELD versions
        drm/atomic: Add for_each_{connector,crtc,plane}_in_state helper macros
        drm: Use kref_put_mutex in drm_gem_object_unreference_unlocked
        drm/drm: constify all struct drm_*_helper funcs pointers
        drm/qxl: constify all struct drm_*_helper funcs pointers
        drm/nouveau: constify all struct drm_*_helper funcs pointers
        drm/radeon: constify all struct drm_*_helper funcs pointers
        drm/gma500: constify all struct drm_*_helper funcs pointers
        drm/mgag200: constify all struct drm_*_helper funcs pointers
        drm/exynos: constify all struct drm_*_helper funcs pointers
        drm: Fix some typos
      4a112488
    • Dave Airlie's avatar
      Merge branch 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · 52139bde
      Dave Airlie authored
      This set of patches adjust the setup of the HDMI CTS/N values for audio
      support to be compliant with the work-around given in the iMX6 errata
      documentation as part of the preparation for integrating audio support
      for this driver, and also update the HDMI phy configuration for Rockchip
      devices to improve the HDMI eye pattern.
      
      * 'drm-dwhdmi-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm: rockchip/dw_hdmi-rockchip: improve for HDMI electrical test
        drm: bridge/dw_hdmi: separate VLEVCTRL settting into platform driver
        drm: bridge/dw_hdmi: fixed codec style
        drm: bridge/dw_hdmi: adjust n/cts setting order
        drm: bridge/dw_hdmi: protect n/cts setting with a mutex
        drm: bridge/dw_hdmi: combine hdmi_set_clock_regenerator_n() and hdmi_regenerate_cts()
      
      Conflicts:
      	drivers/gpu/drm/imx/dw_hdmi-imx.c
      52139bde
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-next · fc16fc4d
      Dave Airlie authored
      Some final bits for 4.1.  Some fixes for userptrs and allow a new
      packet for VCE to enable some new features in mesa.
      
      * 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: allow creating overlapping userptrs
        drm/radeon: add userptr config option
        drm/radeon: add video usability info support for VCE
      fc16fc4d
    • Dave Airlie's avatar
      Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next · 665ae581
      Dave Airlie authored
      - gk20a iommu support
      - gm107 graphics support without needing proprietary ucode
      - various random fixes
      - more gm20x bring-up, fifo/ce are ok, gr is mostly complete with the
      exception of ctxsw ucode.. nvidia aren't playing nice yet so there's
      not much more that can be done at this point...
      
      I spent a lot of time trying to find a viable way of doing gr ctxsw
      without signed firmware, but the "security" restrictions on the
      fecs/gpccs falcons are excessive and go beyond what'd be necessary to
      protect the host from malicious firmware.  This newer nvidia hw is
      VERY open-source unfriendly.
      
      I have some experimental host-based ctxsw work that could be a viable
      (albeit unsatisfactory and slow) workaround in the meantime, but it
      needs some more work and i'd like to get the 3d driver working
      properly before i commit to pushing it.
      
      * 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (40 commits)
        drm/nouveau/bios: fix fetching from acpi on certain systems
        drm/nouveau/gr/gm206: initial init+ctx code
        drm/nouveau/ce/gm206: enable support via gm204 code
        drm/nouveau/fifo/gm206: enable support via gm204 code
        drm/nouveau/gr/gm204: initial init+ctx code
        drm/nouveau: support for buffer moves via MaxwellDmaCopyA
        drm/nouveau/ce/gm204: initial support
        drm/nouveau: add support for gm20x fifo channels
        drm/nouveau/fifo/gm204: initial support
        drm/nouveau/gr/gk104-: prevent reading non-existent regs in intr handler
        drm/nouveau/gr/gm107: very slightly demagic part of attrib cb setup
        drm/nouveau/gr/gk104-: correct crop/zrop num_active_fbps setting
        drm/nouveau/gr/gf100-: add symbolic names for classes
        drm/nouveau/gr/gm107: support tpc "strand" ctxsw in gpccs ucode
        drm/nouveau/gr/gf100-: support mmio access with gpc offset from gpccs ucode
        drm/nouveau/gr: fix engine name, cosmetic search+replace mistake
        drm/nouveau/pmu/gk20a: add some missing statics
        drm/nouveau/platform: fix probe error path
        drm/nouveau/platform: release IOMMU's mm upon exit
        drm/nouveau/gr/gk104-gk20a: call pmu to disable any power-gating before ctor()
        ...
      665ae581
  3. 14 Apr, 2015 33 commits