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

Commit 0bdf9dc2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: take connector reference from conn state"

parents 7c35b3da b2c4fd66

drivers/gpu/drm/msm/sde/sde_connector.c

+6 −2
Original line number Diff line number Diff line
@@ -588,6 +588,8 @@ static void sde_connector_atomic_destroy_state(struct drm_connector *connector, 
	if (c_state->out_fb)

		_sde_connector_destroy_fb(c_conn, c_state);



	__drm_atomic_helper_connector_destroy_state(&c_state->base);



	if (!c_conn) {

		kfree(c_state);

	} else {
@@ -625,8 +627,7 @@ static void sde_connector_atomic_reset(struct drm_connector *connector) 
			&c_state->property_state,

			c_state->property_values);



	c_state->base.connector = connector;

	connector->state = &c_state->base;

	__drm_atomic_helper_connector_reset(connector, &c_state->base);

}



static struct drm_connector_state *
@@ -653,6 +654,9 @@ sde_connector_atomic_duplicate_state(struct drm_connector *connector) 
			c_oldstate, c_state,

			&c_state->property_state, c_state->property_values);



	__drm_atomic_helper_connector_duplicate_state(connector,

			&c_state->base);



	/* additional handling for drm framebuffer objects */

	if (c_state->out_fb)

		drm_framebuffer_reference(c_state->out_fb);