Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd39917 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/atomic: Add __drm_atomic_helper_connector_reset, v2. 



This is useful for drivers that subclass connector_state, like tegra.

Changes since v1:
- Docbook updates.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1451908400-25147-2-git-send-email-maarten.lankhorst@linux.intel.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5350a031

drivers/gpu/drm/drm_atomic_helper.c

+26 −4
Original line number Diff line number Diff line
@@ -2605,6 +2605,28 @@ void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, 
}

EXPORT_SYMBOL(drm_atomic_helper_plane_destroy_state);



/**

 * __drm_atomic_helper_connector_reset - reset state on connector

 * @connector: drm connector

 * @conn_state: connector state to assign

 *

 * Initializes the newly allocated @conn_state and assigns it to

 * #connector ->state, usually required when initializing the drivers

 * or when called from the ->reset hook.

 *

 * This is useful for drivers that subclass the connector state.

 */

void

__drm_atomic_helper_connector_reset(struct drm_connector *connector,

				    struct drm_connector_state *conn_state)

{

	if (conn_state)

		conn_state->connector = connector;



	connector->state = conn_state;

}

EXPORT_SYMBOL(__drm_atomic_helper_connector_reset);



/**

 * drm_atomic_helper_connector_reset - default ->reset hook for connectors

 * @connector: drm connector
@@ -2615,11 +2637,11 @@ EXPORT_SYMBOL(drm_atomic_helper_plane_destroy_state); 
 */

void drm_atomic_helper_connector_reset(struct drm_connector *connector)

{

	kfree(connector->state);

	connector->state = kzalloc(sizeof(*connector->state), GFP_KERNEL);

	struct drm_connector_state *conn_state =

		kzalloc(sizeof(*conn_state), GFP_KERNEL);



	if (connector->state)

		connector->state->connector = connector;

	kfree(connector->state);

	__drm_atomic_helper_connector_reset(connector, conn_state);

}

EXPORT_SYMBOL(drm_atomic_helper_connector_reset);

include/drm/drm_atomic_helper.h

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, 
void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,

					  struct drm_plane_state *state);



void __drm_atomic_helper_connector_reset(struct drm_connector *connector,

					 struct drm_connector_state *conn_state);

void drm_atomic_helper_connector_reset(struct drm_connector *connector);

void

__drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector,