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

Commit 5350a031 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Set connector_state->connector using the helper. 



The atomic helper sets connector_state->connector, which the i915
code didn't. This will become a problem when we start using it.

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


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

drivers/gpu/drm/i915/intel_display.c

+2 −4
Original line number Diff line number Diff line
@@ -6475,13 +6475,11 @@ static void intel_connector_check_state(struct intel_connector *connector) 


int intel_connector_init(struct intel_connector *connector)

{

	struct drm_connector_state *connector_state;

	drm_atomic_helper_connector_reset(&connector->base);



	connector_state = kzalloc(sizeof *connector_state, GFP_KERNEL);

	if (!connector_state)

	if (!connector->base.state)

		return -ENOMEM;



	connector->base.state = connector_state;

	return 0;

}