1. 19 9月, 2014 2 次提交
    • V
      drm/i915: Limit the watermark to at least 8 entries on gen2/3 · d6feb196
      Ville Syrjälä 提交于
      830 is very unhappy of the watermark value is too low (indicating a very
      high watermark in fact, ie. memory fetch will occur with an almost full
      FIFO). Limit the watermark value to at least 8 cache lines.
      
      That also matches the burst size we use on most platforms. BSpec seems
      to indicate we should limit the watermark to 'burst size + 1'. But on
      gen4 we already use a hardcoded 8 as the watermark value (as the spec
      says we should), so just use 8 as the limit on gen2/3 as well.
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      d6feb196
    • V
      drm/i915: Fix DVO 2x clock enable on 830M · 1c4e0274
      Ville Syrjälä 提交于
      The spec says:
      "For the correct operation of the muxed DVO pins (GDEVSELB/ I2Cdata,
      GIRDBY/I2CClk) and (GFRAMEB/DVI_Data, GTRDYB/DVI_Clk): Bit 31
      (DPLL VCO Enable) and Bit 30 (2X Clock Enable) must be set to “1” in
      both the DPLL A Control Register (06014h-06017h) and DPLL B Control
      Register (06018h-0601Bh)."
      
      The pipe A and B force quirks take care of DPLL_VCO_ENABLE, so we
      just need a bit of special care to handle DPLL_DVO_2X_MODE.
      
      v2: Recompute num_dvo_pipes on the spot, use PIPE_A/PIPE_B instead
          of pipe/!pipe for the register offsets in disable (Daniel)
          Add a comment about the ordering in enable and another one
          about filtering out the DVO 2x bit in state readout
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Tested-by: Thomas Richter <richter@rus.uni-stuttgart.de> (v1)
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      1c4e0274
  2. 18 9月, 2014 1 次提交
    • D
      Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next · 8337486a
      Dave Airlie 提交于
      Commit "drm/rcar-du: Use struct videomode in platform data" touches board code
      in arch/arm/mach-shmobile. There is, to the best of my knowledge, no risk of
      conflict for v3.18. Simon, are you fine with getting those changes merged
      through Dave's tree (and could you confirm that no conflict should occur) ?
      
      Simon acked the merge:
      Acked-by: NSimon Horman <horms+renesas@verge.net.au>
      
      * 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev:
        drm/rcar-du: Add OF support
        drm/rcar-du: Use struct videomode in platform data
        video: Add DT bindings for the R-Car Display Unit
        video: Add THC63LVDM83D DT bindings documentation
        video: Add ADV7123 DT bindings documentation
        video: Add DT binding documentation for VGA connector
        devicetree: Add vendor prefix "thine" to vendor-prefixes.txt
        devicetree: Add vendor prefix "mitsubishi" to vendor-prefixes.txt
        drm/shmob: Update copyright notice
        drm/rcar-du: Update copyright notice
      8337486a
  3. 17 9月, 2014 9 次提交
  4. 16 9月, 2014 5 次提交
    • D
      Merge tag 'drm-intel-next-2014-09-05' of git://anongit.freedesktop.org/drm-intel into drm-next · 40d201af
      Dave Airlie 提交于
      - final bits (again) for the rotation support (Sonika Jindal)
      - support bl_power in the intel backlight (Jani)
      - vdd handling improvements from Ville
      - i830M fixes from Ville
      - piles of prep work all over to make skl enabling just plug in (Damien, Sonika)
      - rename DP training defines to reflect latest edp standards, this touches all
        drm drivers supporting DP (Sonika Jindal)
      - cache edids during single detect cycle to avoid re-reading it for e.g. audio,
        from Chris
      - move w/a for registers which are stored in the hw context to the context init
        code (Arun&Damien)
      - edp panel power sequencer fixes, helps chv a lot (Ville)
      - piles of other chv fixes all over
      - much more paranoid pageflip handling with stall detection and better recovery
        from Chris
      - small things all over, as usual
      
      * tag 'drm-intel-next-2014-09-05' of git://anongit.freedesktop.org/drm-intel: (114 commits)
        drm/i915: Update DRIVER_DATE to 20140905
        drm/i915: Decouple the stuck pageflip on modeset
        drm/i915: Check for a stalled page flip after each vblank
        drm/i915: Introduce a for_each_plane() macro
        drm/i915: Rewrite ABS_DIFF() in a safer manner
        drm/i915: Add comments explaining the vdd on/off functions
        drm/i915: Move DP port disable to post_disable for pch platforms
        drm/i915: Enable DP port earlier
        drm/i915: Turn on panel power before doing aux transfers
        drm/i915: Be more careful when picking the initial power sequencer pipe
        drm/i915: Reset power sequencer pipe tracking when disp2d is off
        drm/i915: Track which port is using which pipe's power sequencer
        drm/i915: Fix edp vdd locking
        drm/i915: Reset the HEAD pointer for the ring after writing START
        drm/i915: Fix unsafe vma iteration in i915_drop_caches
        drm/i915: init sprites with univeral plane init function
        drm/i915: Check of !HAS_PCH_SPLIT() in PCH transcoder funcs
        drm/i915: Use HAS_GMCH_DISPLAY un underrun reporting code
        drm/i915: Use IS_BROADWELL() instead of IS_GEN8() in forcewake code
        drm/i915: Don't call gen8_fbc_sw_flush() on chv
        ...
      40d201af
    • 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
  5. 15 9月, 2014 23 次提交