public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org,
	Thierry Reding <thierry.reding@gmail.com>
Subject: [PATCH 3/3] drm/tegra: Use __drm_atomic_helper_reset_connector for subclassing connector state.
Date: Tue, 24 Nov 2015 14:35:34 +0100	[thread overview]
Message-ID: <1448372134-26367-3-git-send-email-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <1448372134-26367-1-git-send-email-maarten.lankhorst@linux.intel.com>

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/tegra/dsi.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index f0a138ef68ce..33ad50487f2e 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -745,14 +745,11 @@ 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;
+	struct tegra_dsi_state *state =
+		kzalloc(sizeof(*state), GFP_KERNEL);
 
 	kfree(connector->state);
-	connector->state = NULL;
-
-	state = kzalloc(sizeof(*state), GFP_KERNEL);
-	if (state)
-		connector->state = &state->base;
+	__drm_atomic_helper_connector_reset(connector, &state->base);
 }
 
 static struct drm_connector_state *
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2015-11-24 13:35 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-24  9:34 [PATCH 0/9] drm/atomic: Add encoder_mask and connector_mask to crtc_state Maarten Lankhorst
2015-11-24  9:34 ` [PATCH 1/9] drm/i915: Set connector_state->connector correctly Maarten Lankhorst
2015-11-24  9:34 ` [PATCH 2/9] drm/tegra: Assign conn_state->connector when allocating connector state Maarten Lankhorst
2015-11-24  9:37   ` Thierry Reding
2015-11-24 10:37   ` Daniel Vetter
2015-11-24 10:51     ` Thierry Reding
2015-11-24 11:26       ` Maarten Lankhorst
2015-11-24 13:35       ` [PATCH 1/3] drm/i915: Set connector_state->connector using the helper Maarten Lankhorst
2015-11-24 13:35         ` [PATCH 2/3] drm/atomic: Add __drm_atomic_helper_connector_reset Maarten Lankhorst
2015-12-07  9:58           ` Thierry Reding
2015-12-07  9:58           ` Thierry Reding
2015-11-24 13:35         ` Maarten Lankhorst [this message]
2015-12-07 10:02           ` [PATCH 3/3] drm/tegra: Use __drm_atomic_helper_reset_connector for subclassing connector state Thierry Reding
2015-12-08  8:13             ` Maarten Lankhorst
2015-11-24  9:34 ` [PATCH 3/9] drm/core: Add drm_encoder_index Maarten Lankhorst
2015-11-24  9:34 ` [PATCH 4/9] drm/core: Add drm_for_each_encoder_mask Maarten Lankhorst
2015-11-24 18:00   ` [Intel-gfx] " Jani Nikula
2015-11-24 18:07     ` David Herrmann
2015-11-24  9:34 ` [PATCH 5/9] drm/atomic: add connector mask to drm_crtc_state Maarten Lankhorst
2015-12-07 10:24   ` Thierry Reding
2015-11-24  9:34 ` [PATCH 6/9] drm/i915: Update connector_mask during readout Maarten Lankhorst
2015-11-24 10:38   ` Daniel Vetter
2015-11-24 11:30     ` [Intel-gfx] " Maarten Lankhorst
2015-12-07 10:36   ` Thierry Reding
2015-11-24  9:34 ` [PATCH 7/9] drm/atomic: Small documentation fix Maarten Lankhorst
2015-11-24 10:48   ` Daniel Vetter
2015-11-24  9:34 ` [PATCH 8/9] drm/atomic: Remove drm_atomic_connectors_for_crtc Maarten Lankhorst
2015-12-07 10:34   ` Thierry Reding
2015-12-08  8:30     ` Maarten Lankhorst
2015-11-24  9:34 ` [PATCH 9/9] drm/atomic: Add encoder_mask to crtc_state Maarten Lankhorst
2015-12-03  9:53   ` [Intel-gfx] " Daniel Vetter
2015-12-03 11:01     ` Maarten Lankhorst
2015-12-04  8:12       ` [Intel-gfx] " Daniel Vetter
2015-12-14 12:06         ` Maarten Lankhorst
2015-12-15  9:17           ` Daniel Vetter
2015-12-17  9:06             ` Maarten Lankhorst
2015-12-17  9:52               ` [Intel-gfx] " Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448372134-26367-3-git-send-email-maarten.lankhorst@linux.intel.com \
    --to=maarten.lankhorst@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox