Commit cc4ceb48 authored by Daniel Vetter's avatar Daniel Vetter

drm: Global atomic state handling

Some differences compared to Rob's patches again:
- Dropped the committed and checked booleans. Checking will be
  internally enforced by always calling ->atomic_check before
  ->atomic_commit. And async handling needs to be solved differently
  because the current scheme completely side-steps ww mutex deadlock
  avoidance (and so either reinvents a new deadlock avoidance wheel or
  like the current code just deadlocks).

- State for connectors needed to be added, since now they have a
  full-blown drm_connector_state (so that drivers have something to
  attach their own stuff to).

- Refcounting is gone. I plane to solve async updates differently,
  since the lock-passing scheme doesn't cut it (since it abuses ww
  mutexes). Essentially what we need for async is a simple ownership
  transfer from the caller to the driver. That doesn't need full-blown
  refcounting.

- The acquire ctx is a pointer. Real atomic callers should have that
  on their stack, legacy entry points need to put the right one
  (obtained by drm_modeset_legacy_acuire_ctx) in there.

- I've dropped all hooks except check/commit. All the begin/end
  handling is done by core functions and is the same.

- commit/check are just thin wrappers that ensure that ->check is
  always called.

- To help out with locking in the legacy implementations I've added a
  helper to just grab all locks in the backoff case.

v2: Add notices that check/commit can fail with EDEADLK.

v3:
- More consistent naming for state_alloc.
- Add state_clear which is needed for backoff and retry.

v4: Planes/connectors can switch between crtcs, and we need to be
careful that we grab the state (and locks) for both the old and new
crtc. Improve the interface functions to ensure this.

v5: Add functions to grab affected connectors for a crtc and to recompute
the crtc->enable state. This is useful for both helper and atomic ioctl
code when e.g. removing a connector.

v6: Squash in fixup from Fengguang to use ERR_CAST.

v7: Add debug output.

v8: Make checkpatch happy about kcalloc argument ordering.

v9: Improve kerneldoc in drm_crtc.h

v10:
- Fix another kcalloc argument misorder I've missed.
- More polish for kerneldoc.

v11: Clarify the ownership rules for the state object. The new rule is
that a successful drm_atomic_commit (whether synchronous or asnyc)
always inherits the state and is responsible for the clean-up. That
way async and sync ->commit functions are more similar.

v12: A few bugfixes:
- Assign state->state pointers correctly when grabbing state objects -
  we need to link them up with the global state.
- Handle a NULL crtc in set_crtc_for_plane to simplify code flow a bit
  for the callers of this function.

v13: Review from Sean:
- kerneldoc spelling fixes
- Don't overallocate states->planes.
- Handle NULL crtc in set_crtc_for_connector.

v14: Sprinkle __must_check over all functions which do wait/wound
locking to make sure callers don't forget this. Since I have ;-)

v15: Be more explicit in the kerneldoc when functions can return
-EDEADLK what to do. And that every other -errno is fatal.

v16: Indent with tabs instead of space, spotted by Ander.

v17: Review from Thierry, small kerneldoc and other naming polish.

Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 144ecb97
...@@ -994,6 +994,10 @@ int max_width, max_height;</synopsis> ...@@ -994,6 +994,10 @@ int max_width, max_height;</synopsis>
<title>Display Modes Function Reference</title> <title>Display Modes Function Reference</title>
!Iinclude/drm/drm_modes.h !Iinclude/drm/drm_modes.h
!Edrivers/gpu/drm/drm_modes.c !Edrivers/gpu/drm/drm_modes.c
</sect2>
<sect2>
<title>Atomic Mode Setting Function Reference</title>
!Edrivers/gpu/drm/drm_atomic.c
</sect2> </sect2>
<sect2> <sect2>
<title>Frame Buffer Creation</title> <title>Frame Buffer Creation</title>
......
...@@ -14,7 +14,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ ...@@ -14,7 +14,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
drm_info.o drm_debugfs.o drm_encoder_slave.o \ drm_info.o drm_debugfs.o drm_encoder_slave.o \
drm_trace_points.o drm_global.o drm_prime.o \ drm_trace_points.o drm_global.o drm_prime.o \
drm_rect.o drm_vma_manager.o drm_flip_work.o \ drm_rect.o drm_vma_manager.o drm_flip_work.o \
drm_modeset_lock.o drm_modeset_lock.o drm_atomic.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_COMPAT) += drm_ioc32.o
drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
......
This diff is collapsed.
/*
* Copyright (C) 2014 Red Hat
* Copyright (C) 2014 Intel Corp.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
* Rob Clark <robdclark@gmail.com>
* Daniel Vetter <daniel.vetter@ffwll.ch>
*/
#ifndef DRM_ATOMIC_H_
#define DRM_ATOMIC_H_
struct drm_atomic_state * __must_check
drm_atomic_state_alloc(struct drm_device *dev);
void drm_atomic_state_clear(struct drm_atomic_state *state);
void drm_atomic_state_free(struct drm_atomic_state *state);
struct drm_crtc_state * __must_check
drm_atomic_get_crtc_state(struct drm_atomic_state *state,
struct drm_crtc *crtc);
struct drm_plane_state * __must_check
drm_atomic_get_plane_state(struct drm_atomic_state *state,
struct drm_plane *plane);
struct drm_connector_state * __must_check
drm_atomic_get_connector_state(struct drm_atomic_state *state,
struct drm_connector *connector);
int __must_check
drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
struct drm_crtc *crtc);
int __must_check
drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,
struct drm_crtc *crtc);
int __must_check
drm_atomic_add_affected_connectors(struct drm_atomic_state *state,
struct drm_crtc *crtc);
int
drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,
struct drm_crtc *crtc);
void drm_atomic_legacy_backoff(struct drm_atomic_state *state);
int __must_check drm_atomic_check_only(struct drm_atomic_state *state);
int __must_check drm_atomic_commit(struct drm_atomic_state *state);
int __must_check drm_atomic_async_commit(struct drm_atomic_state *state);
#endif /* DRM_ATOMIC_H_ */
...@@ -227,7 +227,7 @@ struct drm_bridge; ...@@ -227,7 +227,7 @@ struct drm_bridge;
struct drm_atomic_state; struct drm_atomic_state;
/** /**
* struct drm_crtc_state - mutable crtc state * struct drm_crtc_state - mutable CRTC state
* @enable: whether the CRTC should be enabled, gates all other state * @enable: whether the CRTC should be enabled, gates all other state
* @mode: current mode timings * @mode: current mode timings
* @event: optional pointer to a DRM event to signal upon completion of the * @event: optional pointer to a DRM event to signal upon completion of the
...@@ -235,7 +235,7 @@ struct drm_atomic_state; ...@@ -235,7 +235,7 @@ struct drm_atomic_state;
* @state: backpointer to global drm_atomic_state * @state: backpointer to global drm_atomic_state
*/ */
struct drm_crtc_state { struct drm_crtc_state {
bool enable : 1; bool enable;
struct drm_display_mode mode; struct drm_display_mode mode;
...@@ -314,7 +314,7 @@ struct drm_crtc_funcs { ...@@ -314,7 +314,7 @@ struct drm_crtc_funcs {
/* atomic update handling */ /* atomic update handling */
struct drm_crtc_state *(*atomic_duplicate_state)(struct drm_crtc *crtc); struct drm_crtc_state *(*atomic_duplicate_state)(struct drm_crtc *crtc);
void (*atomic_destroy_state)(struct drm_crtc *crtc, void (*atomic_destroy_state)(struct drm_crtc *crtc,
struct drm_crtc_state *cstate); struct drm_crtc_state *state);
int (*atomic_set_property)(struct drm_crtc *crtc, int (*atomic_set_property)(struct drm_crtc *crtc,
struct drm_crtc_state *state, struct drm_crtc_state *state,
struct drm_property *property, struct drm_property *property,
...@@ -417,7 +417,7 @@ struct drm_crtc { ...@@ -417,7 +417,7 @@ struct drm_crtc {
/** /**
* struct drm_connector_state - mutable connector state * struct drm_connector_state - mutable connector state
* @crtc: crtc to connect connector to, NULL if disabled * @crtc: CRTC to connect connector to, NULL if disabled
* @state: backpointer to global drm_atomic_state * @state: backpointer to global drm_atomic_state
*/ */
struct drm_connector_state { struct drm_connector_state {
...@@ -441,7 +441,6 @@ struct drm_connector_state { ...@@ -441,7 +441,6 @@ struct drm_connector_state {
* @atomic_destroy_state: destroy an atomic state for this connector * @atomic_destroy_state: destroy an atomic state for this connector
* @atomic_set_property: set a property on an atomic state for this connector * @atomic_set_property: set a property on an atomic state for this connector
* *
*
* Each CRTC may have one or more connectors attached to it. The functions * Each CRTC may have one or more connectors attached to it. The functions
* below allow the core DRM code to control connectors, enumerate available modes, * below allow the core DRM code to control connectors, enumerate available modes,
* etc. * etc.
...@@ -469,7 +468,7 @@ struct drm_connector_funcs { ...@@ -469,7 +468,7 @@ struct drm_connector_funcs {
/* atomic update handling */ /* atomic update handling */
struct drm_connector_state *(*atomic_duplicate_state)(struct drm_connector *connector); struct drm_connector_state *(*atomic_duplicate_state)(struct drm_connector *connector);
void (*atomic_destroy_state)(struct drm_connector *connector, void (*atomic_destroy_state)(struct drm_connector *connector,
struct drm_connector_state *cstate); struct drm_connector_state *state);
int (*atomic_set_property)(struct drm_connector *connector, int (*atomic_set_property)(struct drm_connector *connector,
struct drm_connector_state *state, struct drm_connector_state *state,
struct drm_property *property, struct drm_property *property,
...@@ -640,7 +639,7 @@ struct drm_connector { ...@@ -640,7 +639,7 @@ struct drm_connector {
/** /**
* struct drm_plane_state - mutable plane state * struct drm_plane_state - mutable plane state
* @crtc: currently bound CRTC, NULL if disabled * @crtc: currently bound CRTC, NULL if disabled
* @fb: currently bound fb * @fb: currently bound framebuffer
* @crtc_x: left position of visible portion of plane on crtc * @crtc_x: left position of visible portion of plane on crtc
* @crtc_y: upper position of visible portion of plane on crtc * @crtc_y: upper position of visible portion of plane on crtc
* @crtc_w: width of visible portion of plane on crtc * @crtc_w: width of visible portion of plane on crtc
...@@ -697,7 +696,7 @@ struct drm_plane_funcs { ...@@ -697,7 +696,7 @@ struct drm_plane_funcs {
/* atomic update handling */ /* atomic update handling */
struct drm_plane_state *(*atomic_duplicate_state)(struct drm_plane *plane); struct drm_plane_state *(*atomic_duplicate_state)(struct drm_plane *plane);
void (*atomic_destroy_state)(struct drm_plane *plane, void (*atomic_destroy_state)(struct drm_plane *plane,
struct drm_plane_state *cstate); struct drm_plane_state *state);
int (*atomic_set_property)(struct drm_plane *plane, int (*atomic_set_property)(struct drm_plane *plane,
struct drm_plane_state *state, struct drm_plane_state *state,
struct drm_property *property, struct drm_property *property,
...@@ -793,6 +792,32 @@ struct drm_bridge { ...@@ -793,6 +792,32 @@ struct drm_bridge {
void *driver_private; void *driver_private;
}; };
/**
* struct struct drm_atomic_state - the global state object for atomic updates
* @dev: parent DRM device
* @flags: state flags like async update
* @planes: pointer to array of plane pointers
* @plane_states: pointer to array of plane states pointers
* @crtcs: pointer to array of CRTC pointers
* @crtc_states: pointer to array of CRTC states pointers
* @connectors: pointer to array of connector pointers
* @connector_states: pointer to array of connector states pointers
* @acquire_ctx: acquire context for this atomic modeset state update
*/
struct drm_atomic_state {
struct drm_device *dev;
uint32_t flags;
struct drm_plane **planes;
struct drm_plane_state **plane_states;
struct drm_crtc **crtcs;
struct drm_crtc_state **crtc_states;
struct drm_connector **connectors;
struct drm_connector_state **connector_states;
struct drm_modeset_acquire_ctx *acquire_ctx;
};
/** /**
* struct drm_mode_set - new values for a CRTC config change * struct drm_mode_set - new values for a CRTC config change
* @fb: framebuffer to use for new config * @fb: framebuffer to use for new config
...@@ -824,6 +849,9 @@ struct drm_mode_set { ...@@ -824,6 +849,9 @@ struct drm_mode_set {
* struct drm_mode_config_funcs - basic driver provided mode setting functions * struct drm_mode_config_funcs - basic driver provided mode setting functions
* @fb_create: create a new framebuffer object * @fb_create: create a new framebuffer object
* @output_poll_changed: function to handle output configuration changes * @output_poll_changed: function to handle output configuration changes
* @atomic_check: check whether a give atomic state update is possible
* @atomic_commit: commit an atomic state update previously verified with
* atomic_check()
* *
* Some global (i.e. not per-CRTC, connector, etc) mode setting functions that * Some global (i.e. not per-CRTC, connector, etc) mode setting functions that
* involve drivers. * involve drivers.
...@@ -833,6 +861,12 @@ struct drm_mode_config_funcs { ...@@ -833,6 +861,12 @@ struct drm_mode_config_funcs {
struct drm_file *file_priv, struct drm_file *file_priv,
struct drm_mode_fb_cmd2 *mode_cmd); struct drm_mode_fb_cmd2 *mode_cmd);
void (*output_poll_changed)(struct drm_device *dev); void (*output_poll_changed)(struct drm_device *dev);
int (*atomic_check)(struct drm_device *dev,
struct drm_atomic_state *a);
int (*atomic_commit)(struct drm_device *dev,
struct drm_atomic_state *a,
bool async);
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment