1. 16 9月, 2014 4 次提交
    • D
      Merge branch 'drm-next-ast-fixes' of ssh://people.freedesktop.org/~/linux into drm-next · 29a7d179
      Dave Airlie 提交于
      Pull in first set of changes from Ben for ast on ppc.
      
      I've done a quick boot test on x86 and it still seems to boot.
      
      * 'drm-next-ast-fixes' of ssh://people.freedesktop.org/~/linux:
        drm/ast: Cleanup analog init code path
        drm/ast: Don't assume DVO enabled means SIL164 on uninitialized chips
        drm/ast: Properly initialize P2A base before using it in ast_init_3rdtx()
        drm/ast: POST chip at probe time if VGA not enabled
        drm/ast: Try to use MMIO registers when PIO isn't supported
      29a7d179
    • Y
      drm/ast: Add reduced blanking modes for wide screen mode · 94d12b13
      Y.C. Chen 提交于
      Signed-off-by: NEgbert Eich <eich@suse.com>
      Tested-by: NSteven You2 Liang <liangyou2@lenovo.com>
      Signed-off-by: NY.C. Chen <yc_chen@aspeedtech.com>
      
      v3: based on [PATCH 1/2] drm/ast: Add missing entry to dclk_table[].
          Add reduced blanking modes, improve mode matching to
          identify these modes by thier sync polarities.
      
      [airlied: argh whitespace damage]
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      94d12b13
    • D
      drm: backmerge tag 'v3.17-rc5' into drm-next · b2efb3f0
      Dave Airlie 提交于
      This is requested to get the fixes for intel and radeon into the
      same tree for future development work.
      
      i915_display.c: fix missing dev_priv conflict.
      b2efb3f0
    • D
      Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next · 4ac07364
      Dave Airlie 提交于
      This is the main merge request for Nouveau 3.18, overview:
      - various bits of roy's gt21x clock work
      - various bits of kepler memory clock work (don't get too excited, there's at least one more major bit left that's busting higher freqs)
      - misc fan control improvements
      - kepler hdmi infoframe fixes
      - dp audio
      - l2 cache + cbc improvements
      
      * 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (68 commits)
        drm/gt214-/disp: enable dp audio
        drm/gt214-/kms: fix hda eld regression
        drm/g94-/disp: calculate some dp audio constants
        drm/gt214-/kms: perform hda codec setup on displayport too
        drm/gk104-/disp: infoframe registers moved yet again on kepler
        drm/nouveau/bios: parse older ramcfg/timing data like we do newer ones
        drm/nva3/fb/ram: Per-partition regs
        drm/nouveau/fb/ram: Support strided regs
        drm/nv50/fb/ram: Store the number of partitions in the designated fields
        drm/nv50/kms: Set VBLANK time in modeset script
        drm/nouveau/bios: Add rammap support for version 1.0
        drm/gf100-/pwr/memx: block host and fifo around reclock
        drm/nouveau/pwr/memx: fix command ordering around block/unblock
        drm/nouveau/pwr/memx: rename fb off/on to block/unblock
        drm/nva3/clk: Pause the GPU before reclocking
        drm/nouveau/gpio: rename g92 class to g94
        drm/gk104-/fb/ram: move fb enable/disable to same place as nvidia
        drm/gk104/fb/ram: twiddle some more bits when reclocking
        drm/nouveau/bios: parse another large chunk of random memory config data
        drm/gk104-/fb/ram: perform certain steps only when bios data differs
        ...
      4ac07364
  2. 15 9月, 2014 36 次提交