diff options
| author | Dave Airlie <[email protected]> | 2016-04-27 01:27:39 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-05-05 02:52:05 +0000 |
| commit | d2307dea14a4f14a4b5db01b6d40a30fa6117e6c (patch) | |
| tree | e9aa6cf0376a35ab1f19fd4c0e31aa4491433cd5 /drivers/gpu/drm/drm_atomic_helper.c | |
| parent | drm/crtc: take references to connectors used in a modeset. (v2) (diff) | |
| download | kernel-d2307dea14a4f14a4b5db01b6d40a30fa6117e6c.tar.gz kernel-d2307dea14a4f14a4b5db01b6d40a30fa6117e6c.zip | |
drm/atomic: use connector references (v3)
Take a reference when setting a crtc on a connecter,
also take one when duplicating if a crtc is set,
and drop one on destroy if a crtc is set.
v2: take Daniel Stone's advice and simplify the
ref/unref dances, also take care of NULL as connector
to state reset.
v3: remove need for connector NULL check.
Reviewed-by: Daniel Stone <[email protected]>
Reviewed-by: Daniel Vetter <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 92e11a2b83c8..997fd21e5388 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2762,6 +2762,8 @@ __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector, struct drm_connector_state *state) { memcpy(state, connector->state, sizeof(*state)); + if (state->crtc) + drm_connector_reference(connector); } EXPORT_SYMBOL(__drm_atomic_helper_connector_duplicate_state); @@ -2889,6 +2891,8 @@ __drm_atomic_helper_connector_destroy_state(struct drm_connector *connector, * state will automatically do the right thing if code is ever added * to this function. */ + if (state->crtc) + drm_connector_unreference(state->connector); } EXPORT_SYMBOL(__drm_atomic_helper_connector_destroy_state); |