1. 02 4月, 2014 2 次提交
    • M
      drm: Replace crtc fb with primary plane fb (v3) · f4510a27
      Matt Roper 提交于
      Now that CRTC's have a primary plane, there's no need to track the
      framebuffer in the CRTC.  Replace all references to the CRTC fb with the
      primary plane's fb.
      
      This patch was generated by the Coccinelle semantic patching tool using
      the following rules:
      
              @@ struct drm_crtc C; @@
              -   (C).fb
              +   C.primary->fb
      
              @@ struct drm_crtc *C; @@
              -   (C)->fb
              +   C->primary->fb
      
      v3: Generate patch via coccinelle.  Actual removal of crtc->fb has been
          moved to a subsequent patch.
      
      v2: Fixup several lingering crtc->fb instances that were missed in the
          first patch iteration.  [Rob Clark]
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      f4510a27
    • M
      drm/msm: Switch to universal plane API's · 2d82d188
      Matt Roper 提交于
      Use drm_universal_plane_init() and drm_crtc_init_with_planes() rather
      than the legacy drm_plane_init() / drm_crtc_init().  This will ensure
      that the proper primary plane is registered with the DRM (and eventually
      exposed to userspace in future patches).
      
      Cc: Rob Clark <robdclark@gmail.com>
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      2d82d188
  2. 31 3月, 2014 1 次提交
  3. 06 2月, 2014 4 次提交
    • R
      drm/msm/mdp4: cursor fixes · aa1b0e59
      Rob Clark 提交于
      It seems we need to update all cursor registers from vblank.  This
      appears to be the cause of intermittent underflows when enabling/
      disabling cursor.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      aa1b0e59
    • R
      drm/msm/mdp4: pageflip fixes · b69720c0
      Rob Clark 提交于
      Backport a few fixes found in the course of getting mdp5 working.
      There is a window of time after pageflip is requested, before we
      start scanning out the new fb (ie. while we are waiting for gpu).
      During that time we need to continue holding a reference to the
      still-current scanout fb, to avoid the backing gem bo's from being
      destroyed.
      
      Possibly a common mdp_crtc parent class could be useful to share
      some of this logic between mdp4_crtc and mdp5_crtc.  OTOH, this
      all can be removed from the driver once atomic is in place, as
      plane/crtc updates get deferred until all fb's are ready before
      calling in to .page_flip(), etc.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      b69720c0
    • R
      drm/msm/mdp5: fix ref leaks in error paths · 37033a76
      Rob Clark 提交于
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      37033a76
    • R
      drm/msm: fix inconsequential typo · 7896052d
      Rob Clark 提交于
      Small typo I noticed in the mdp4_plane code.. no consequence because
      PIPE_SRC_XY and PIPE_DST_XY have same register layout.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      7896052d
  4. 10 1月, 2014 7 次提交
    • R
      drm/msm: add mdp5/apq8x74 · 06c0dd96
      Rob Clark 提交于
      Add support for the new MDP5 display controller block.  The mapping
      between parts of the display controller and KMS is:
      
        plane   -> PIPE{RGBn,VIGn}             \
        crtc    -> LM (layer mixer)            |-> MDP "device"
        encoder -> INTF                        /
        connector -> HDMI/DSI/eDP/etc          --> other device(s)
      
      Unlike MDP4, it appears we can get by with a single encoder, rather
      than needing a different implementation for DTV, DSI, etc.  (Ie. the
      register interface is same, just different bases.)
      
      Also unlike MDP4, all the IRQs for other blocks (HDMI, DSI, etc) are
      routed through MDP.
      
      And finally, MDP5 has this "Shared Memory Pool" (called "SMP"), from
      which blocks need to be allocated to the active pipes based on fetch
      stride.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      06c0dd96
    • R
      drm/msm: add hdmi support for apq8x74/mdp5 · dada25bd
      Rob Clark 提交于
      The HDMI block is basically the same between older SoC's with mdp4
      display controller, and newer ones with mdp5.
      
      So mostly this consists of better abstracting out the different sets of
      regulators, clks, etc.  In particular, for regulators and clks we can
      split it up by what is needed for hot plug detect to work, and what is
      needed to light up the display.
      
      Also, 8x74 has a new phy.. a very simple one, but split out into a
      different mmio space.  And with mdp5, the irq is shared with mdp, so we
      don't directly register our own irq handler.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      dada25bd
    • R
      drm/msm: move irq utils to mdp_kms · 9e0efa63
      Rob Clark 提交于
      We'll want basically the same thing for mdp5, so refactor it out so it
      can be shared.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      9e0efa63
    • R
      drm/msm: split out msm_kms.h · dd2da6e3
      Rob Clark 提交于
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      dd2da6e3
    • R
      drm/msm: mdp4_format -> mdp_format · 10a02eb6
      Rob Clark 提交于
      This can be shared between mdp4 and mdp5.  Both use the same set of
      parameters to describe the format to the hw.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      10a02eb6
    • R
      drm/msm: resync generated headers · facb4f4e
      Rob Clark 提交于
      resync to latest envytools db, add mdp5 registers
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      facb4f4e
    • R
      drm/msm: move mdp4 -> mdp/mdp4 · 2e54a92f
      Rob Clark 提交于
      There are some little bits and pieces that mdp4 and mdp5 can share, so
      move things around so that we can have both in a common parent
      directory.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      2e54a92f