drm/tegra: Use __drm_atomic_helper_reset_connector for subclassing connector state...
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 4 Jan 2016 11:53:17 +0000 (12:53 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 5 Jan 2016 08:43:26 +0000 (09:43 +0100)
Changes since v1:
- Do not reset if state allocation fails.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Thierry Reding <treding@nvidia.com> #irc
Link: http://patchwork.freedesktop.org/patch/msgid/1451908400-25147-3-git-send-email-maarten.lankhorst@linux.intel.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/tegra/dsi.c

index 50d46ae..44e1027 100644 (file)
@@ -745,14 +745,13 @@ static void tegra_dsi_soft_reset(struct tegra_dsi *dsi)
 
 static void tegra_dsi_connector_reset(struct drm_connector *connector)
 {
-       struct tegra_dsi_state *state;
-
-       kfree(connector->state);
-       connector->state = NULL;
+       struct tegra_dsi_state *state =
+               kzalloc(sizeof(*state), GFP_KERNEL);
 
-       state = kzalloc(sizeof(*state), GFP_KERNEL);
-       if (state)
-               connector->state = &state->base;
+       if (state) {
+               kfree(connector->state);
+               __drm_atomic_helper_connector_reset(connector, &state->base);
+       }
 }
 
 static struct drm_connector_state *