1. 04 4月, 2014 5 次提交
  2. 02 4月, 2014 16 次提交
    • D
      drm/crtc-helper: don't disable disconnected outputs · e3d6ddb3
      Daniel Vetter 提交于
      This is the equivalent change in the crtc helpers as done to the i915
      modeset infrastructure in
      
      commit b0a2658a
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Tue Dec 18 09:37:54 2012 +0100
      
          drm/i915: don't disable disconnected outputs
      
      This was originally introduced to make encoder sharing on radone
      easier for userspace, but:
      
      - It is policy and as such belongs into userspace. E.g. personally I'm
        fairly annoyed that a flaky cable results in permanent changes of
        the desktop layout, so I'll kick out DEs which do this. Worse if the
        kernel also tries to be clever.
      
      - It's inconsistent: We only kill disconnected outputs on setCrtc
        (which userspace might also call when just changing the
        framebuffer), but not when e.g. we receive a hpd event or in the
        output poll worker.
      
      - It's unexpected behaviour for the userspace driver, at least in the
        intel ddx we've had tons of bugs where the driver fell over and
        killed the X session becuase pageflips/vblanks suddenly stopped
        working. We've had to fix this by wrapping every single setCrtc int
        a big "recover kms state from the kernel again" operation.
      
      - It's suprising for the kernel, too: It took a few mails between Rob,
        Matt and me for them to notice that little dragon wreaking havoc
        with the universal plane framebuffer refcounting.
      
      - Userspace can cope with it and e.g. Gnome already kills disconnected
        outputs and reconfigures the desktop automatically. And since there
        have been no regression reports for the i915 change from over 1 year
        ago I think all other DEs are also ready.
      
      Note that the lines removed in this patch go back to
      
      commit a3a0544b
      Author: Dave Airlie <airlied@redhat.com>
      Date:   Mon Aug 31 15:16:30 2009 +1000
      
          drm/kms: add explicit encoder disable function and detach harder.
      
      Unfortunately the patch itself doesn't explain a hole lot about why it
      was added ...
      
      Cc: Matt Roper <matthew.d.roper@intel.com>
      Cc: Rob Clark <robdclark@gmail.com>
      Cc: Dave Airlie <airlied@redhat.com>
      Cc: Alex Deucher <alexdeucher@gmail.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e3d6ddb3
    • D
      drm/crtc-helpers: fix dpms on logic · 177cf92d
      Daniel Vetter 提交于
      This was introduced in
      
      commit 25f397a4
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Fri Jul 19 18:57:11 2013 +0200
      
          drm/crtc-helper: explicit DPMS on after modeset
      
      but due to a bit of rebase fail on my side the patch actually merged
      put one hunk on the wrong side of a break statement. Fix this up.
      Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
      Cc: Dan Carpenter <dan.carpenter@oracle.com>
      Cc: Dave Airlie <airlied@redhat.com>
      Cc: Alex Deucher <alexdeucher@gmail.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      177cf92d
    • M
      drm/qxl: unset a pointer in sync_obj_unref · 41ccec35
      Maarten Lankhorst 提交于
      This fixes a BUG_ON(bo->sync_obj != NULL); in ttm_bo_release_list.
      
      Cc: stable@vger.kernel.org #v3.10+
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      41ccec35
    • D
      drm/nouveau: don't suspend/resume display on runtime s/r · 05c63c2f
      Dave Airlie 提交于
      This should ensure we don't hit a locking problem when someone
      wakes us up via a connector, we should never go into suspend
      while the display is on anyways.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      05c63c2f
    • M
      drm: Allow userspace to ask for universal plane list (v2) · 681e7ec7
      Matt Roper 提交于
      Userspace clients which wish to receive all DRM planes (primary and
      cursor planes in addition to the traditional overlay planes) may set the
      DRM_CLIENT_CAP_UNIVERSAL_PLANES capability.
      
      v2: Hide behind drm.universal_planes module option [suggested by
          Daniel Vetter]
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      681e7ec7
    • 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
    • M
      drm: Add drm_crtc_init_with_planes() (v2) · e13161af
      Matt Roper 提交于
      Add a new drm_crtc_init_with_planes() to allow drivers to provide
      specific primary and cursor planes at CRTC initialization.  The existing
      drm_crtc_init() interface remains to avoid driver churn in existing
      drivers; it will initialize the CRTC with a plane helper-created primary
      plane and no cursor plane.
      
      v2:
        - Move drm_crtc_init() to plane helper file so that nothing in the DRM
          core depends on helpers.  [suggested by Daniel Vetter]
        - Keep cursor parameter to drm_crtc_init_with_planes() a void* until
          we actually add cursor support.  [suggested by Daniel Vetter]
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      e13161af
    • R
      drm: Add plane type property (v2) · 9922ab5a
      Rob Clark 提交于
      Add a plane type property to allow userspace to distinguish plane types.
      
      v2: Driver-specific churn eliminated now that drm_plane_init() and
          drm_universal_plane_init() were separated out in a previous patch.
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      9922ab5a
    • M
      drm: Add drm_universal_plane_init() · dc415ff9
      Matt Roper 提交于
      Add a new plane initialization interface for universal plane support
      that allows a specific plane type (primary, cursor, or overlay) to
      be specified.
      
      drm_plane_init() remains as a compatibility API to reduce churn in
      existing drivers.  The 'bool priv' parameter has been changed to
      'bool is_primary' under the assumption that all existing uses of
      private planes were representing primary planes.
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      dc415ff9
    • M
      drm: Add primary plane helpers (v3) · c103d1cf
      Matt Roper 提交于
      When we expose non-overlay planes to userspace, they will become
      accessible via standard userspace plane API's.  We should be able to
      handle the standard plane operations against primary planes in a generic
      way via the modeset handler.
      
      Drivers that can program primary planes more efficiently, that want to
      use their own primary plane structure to track additional information,
      or that don't have the limitations assumed by the helpers are free to
      provide their own implementation of some or all of these handlers.
      
      v3: Tweak kerneldoc formatting slightly to avoid ugliness
      v2:
       - Move plane helpers to a new file (drm_plane_helper.c)
       - Tighten checks on update handler (check for scaling, CRTC coverage,
         subpixel positioning)
       - Pass proper panning parameters to modeset interface
       - Disallow disabling primary plane (and thus CRTC) if other planes are
         still active on the CRTC.
       - Use a minimal format list that should work on all hardware/drivers.
         Drivers may call this function with a more accurate plane list to
         enable additional formats they can support.
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      c103d1cf
    • M
      drm: Make drm_crtc_check_viewport non-static · af93629d
      Matt Roper 提交于
      This function will be used by the universal plane helpers and may also
      be useful for individual drivers.
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      af93629d
    • M
      drm/shmobile: Restrict plane loops to only operate on legacy planes · 2b79dc13
      Matt Roper 提交于
      Ensure that existing driver loops over all planes do not change behavior
      when we begin adding new types of planes (primary and cursor) to the DRM
      plane list in future patches.
      Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      2b79dc13
    • M
      drm/i915: Restrict plane loops to only operate on overlay planes (v2) · af2b653b
      Matt Roper 提交于
      Ensure that existing driver loops over all planes do not change behavior
      when we begin adding new types of planes (primary and cursor) to the DRM
      plane list in future patches.
      
      v2: Switch to using drm_for_each_legacy_plane()
      
      Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      af2b653b
    • M
      drm/exynos: Restrict plane loops to only operate on overlay planes (v2) · 0886327a
      Matt Roper 提交于
      Ensure that existing driver loops over all planes do not change behavior
      when we begin adding new types of planes (primary and cursor) to the DRM
      plane list in future patches.
      
      v2: Switch to using drm_for_each_legacy_plane()
      
      Cc: Inki Dae <inki.dae@samsung.com>
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      0886327a
    • M
      drm: Add support for multiple plane types (v2) · e27dde3e
      Matt Roper 提交于
      The DRM core currently only tracks "overlay"-style planes.  Start
      refactoring the plane handling to allow other plane types (primary and
      cursor) to also be placed on the DRM plane list.
      
      v2: Add drm_for_each_legacy_plane() iterator to smooth transition
          of drivers with plane loops.
      Signed-off-by: NMatt Roper <matthew.d.roper@intel.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      e27dde3e
  3. 28 3月, 2014 19 次提交