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

Commit c34ee77b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: fix null pointer in sde connector atomic check"

parents 3064162e e107dbe7

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

+10 −8
Original line number Diff line number Diff line
@@ -1864,11 +1864,12 @@ static int sde_connector_atomic_check(struct drm_connector *connector, 
		return -EINVAL;

	}



	if (new_conn_state->crtc) {

		c_conn = to_sde_connector(connector);

		c_state = to_sde_connector_state(new_conn_state);



	crtc_state = drm_atomic_get_new_crtc_state(new_conn_state->state,

						   new_conn_state->crtc);

		crtc_state = drm_atomic_get_new_crtc_state(

			new_conn_state->state, new_conn_state->crtc);



		qsync_dirty = msm_property_is_dirty(&c_conn->property_info,

					&c_state->property_state,
@@ -1878,6 +1879,7 @@ static int sde_connector_atomic_check(struct drm_connector *connector, 
			SDE_ERROR("invalid qsync update during modeset\n");

			return -EINVAL;

		}

	}



	if (c_conn->ops.atomic_check)

		return c_conn->ops.atomic_check(connector,