1. 05 3月, 2015 5 次提交
    • T
      drm: Pass in new and old plane state to prepare_fb and cleanup_fb · d136dfee
      Tvrtko Ursulin 提交于
      Use cases like rotation require these hooks to have some context so they
      know how to prepare and cleanup the frame buffer correctly.
      
      For i915 specifically, object backing pages need to be mapped differently
      for different rotation modes and the driver needs to know which mapping to
      instantiate and which to tear down when transitioning between them.
      
      v2: Made passed in states const. (Daniel Vetter)
      
      [airlied: add mdp5 and atmel fixups]
      Signed-off-by: NTvrtko Ursulin <tvrtko.ursulin@intel.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: dri-devel@lists.freedesktop.org
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      d136dfee
    • D
      Merge tag 'drm-intel-next-2015-02-14' of git://anongit.freedesktop.org/drm-intel into drm-next · 7547af91
      Dave Airlie 提交于
      - use the atomic helpers for plane_upate/disable hooks (Matt Roper)
      - refactor the initial plane config code (Damien)
      - ppgtt prep patches for dynamic pagetable alloc (Ben Widawsky, reworked and
        rebased by a lot of other people)
      - framebuffer modifier support from Tvrtko Ursulin, drm core code from Rob Clark
      - piles of workaround patches for skl from Damien and Nick Hoath
      - vGPU support for xengt on the client side (Yu Zhang)
      - and the usual smaller things all over
      
      * tag 'drm-intel-next-2015-02-14' of git://anongit.freedesktop.org/drm-intel: (88 commits)
        drm/i915: Update DRIVER_DATE to 20150214
        drm/i915: Remove references to previously removed UMS config option
        drm/i915/skl: Use a LRI for WaDisableDgMirrorFixInHalfSliceChicken5
        drm/i915/skl: Fix always true comparison in a revision id check
        drm/i915/skl: Implement WaEnableLbsSlaRetryTimerDecrement
        drm/i915/skl: Implement WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
        drm/i915: Add process identifier to requests
        drm/i915/skl: Implement WaBarrierPerformanceFixDisable
        drm/i915/skl: Implement WaCcsTlbPrefetchDisable:skl
        drm/i915/skl: Implement WaDisableChickenBitTSGBarrierAckForFFSliceCS
        drm/i915/skl: Implement WaDisableHDCInvalidation
        drm/i915/skl: Implement WaDisableLSQCROPERFforOCL
        drm/i915/skl: Implement WaDisablePartialResolveInVc
        drm/i915/skl: Introduce a SKL specific init_workarounds()
        drm/i915/skl: Document that we implement WaRsClearFWBitsAtReset
        drm/i915/skl: Implement WaSetGAPSunitClckGateDisable
        drm/i915/skl: Make the init clock gating function skylake specific
        drm/i915/skl: Provide a gen9 specific init_render_ring()
        drm/i915/skl: Document the WM read latency W/A with its name
        drm/i915/skl: Also detect eDRAM on SKL
        ...
      7547af91
    • D
      Merge branch 'drm-atmel-hlcdc-devel' of git://github.com/bbrezillon/linux-at91 into drm-next · 87dc8b6c
      Dave Airlie 提交于
      This pull request includes:
      - support for Atomic mode setting
      - the discard area optimization
      - implementation of PM primitives
      
      * 'drm-atmel-hlcdc-devel' of git://github.com/bbrezillon/linux-at91:
        drm: atmel-hlcdc: Add pinctrl PM select sleep,default state in CRTC suspend/resume
        drm: atmel-hlcdc: Add PM suspend/resume support
        drm: atmel-hlcdc: add discard area support
        drm: atmel-hlcdc: Atomic mode-setting conversion
      87dc8b6c
    • D
      Merge branch 'drm/next/atomic' of git://linuxtv.org/pinchartl/fbdev into drm-next · 7e477484
      Dave Airlie 提交于
      rcar-du atomic modesetting support
      * 'drm/next/atomic' of git://linuxtv.org/pinchartl/fbdev: (32 commits)
        drm: rcar-du: Fix race condition in hardware plane allocator
        drm: rcar-du: Move group locking inside rcar_du_crtc_update_planes()
        drm: rcar-du: Move plane commit code from CRTC start to CRTC resume
        drm: rcar-du: Move plane format to plane state
        drm: rcar-du: Remove unneeded rcar_du_crtc plane field
        drm: rcar-du: Replace plane crtc and enabled fields by plane state
        drm: rcar-du: Rework plane setup code
        drm: rcar-du: Switch plane set_property to atomic helpers
        drm: rcar-du: Switch page flip to atomic helpers
        drm: rcar-du: Implement asynchronous commit support
        drm: rcar-du: Replace encoder mode_fixup with atomic_check
        drm: rcar-du: Switch connector DPMS to atomic helpers
        drm: rcar-du: Switch mode config to atomic helpers
        drm: rcar-du: Switch plane update to atomic helpers
        drm: rcar-du: Rework CRTC enable/disable for atomic updates
        drm: rcar-du: Rework HDMI encoder enable/disable for atomic updates
        drm: rcar-du: Rework encoder enable/disable for atomic updates
        drm: rcar-du: Replace LVDS encoder DPMS by enable/disable
        drm: rcar-du: Remove private copy of plane size and position
        drm: rcar-du: Wire up atomic state object scaffolding
        ...
      7e477484
    • D
      Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next · 79d6d942
      Dave Airlie 提交于
      A number of TDA998x updates for the next merge window.  Patches
      included in this set are:
      * adding support for finding the attached CRTCs from DT
      * a fix function name mis-spelling in a dev_err()
      * simplify the EDID reading by using the drm_do_get_edid() function
        instead of coding this ourselves.
      
      * 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/i2c: tda998x: use drm_do_get_edid()
        drm/i2c: tda998x: fix misspelling of current function in string
        drm/i2c: tda998x: add OF support for finding attached CRTCs
      79d6d942
  2. 03 3月, 2015 32 次提交
  3. 26 2月, 2015 1 次提交
    • D
      Merge tag 'topic/drm-misc-2015-02-25' of git://anongit.freedesktop.org/drm-intel into drm-next · 329414c4
      Dave Airlie 提交于
      misc atomic and dp macros
      
      * tag 'topic/drm-misc-2015-02-25' of git://anongit.freedesktop.org/drm-intel:
        drm: Adding edp1.4 specific dpcd macros
        drm/atomic-helpers: make mode_set hooks optional
        drm/atomic-helper: Rename commmit_post/pre_planes
        drm/atomic: Rename drm_atomic_helper_commit_pre_planes() state argument
        drm: If available use atomic state in getcrtc ioctl
        drm: Add DRM_DEBUG_ATOMIC
        drm/atomic-helpers: Fix documentation typos and wrong copy&paste
        drm: Fix the CRTC_STEREO_DOUBLE_ONLY define to include stero modes
        drm: Fix drm_crtc_vblank_get() documentation
      329414c4
  4. 24 2月, 2015 2 次提交