All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 10/21] drm/i915: Move backlight unregistration to connector unregistration
Date: Mon, 30 May 2016 09:38:28 +0100	[thread overview]
Message-ID: <1464597519-16659-11-git-send-email-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <1464597519-16659-1-git-send-email-chris@chris-wilson.co.uk>

Currently the backlight is being unregistered in the unload phase (after
the display and its objects are unregistered). Move the backlight
unregistration into the analogous phase by performing it from the
connector unregistration, just prior to its deletion.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_display.c |  5 +++--
 drivers/gpu/drm/i915/intel_drv.h     |  9 ++++++++-
 drivers/gpu/drm/i915/intel_panel.c   | 13 +------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 110154fec80f..dfa73c815dfa 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -16200,6 +16200,9 @@ void intel_modeset_gem_init(struct drm_device *dev)
 
 void intel_connector_unregister(struct drm_connector *connector)
 {
+	struct intel_connector *intel_connector = to_intel_connector(connector);
+
+	intel_backlight_device_unregister(intel_connector);
 	intel_panel_destroy_backlight(connector);
 }
 
@@ -16209,8 +16212,6 @@ void intel_modeset_cleanup(struct drm_device *dev)
 
 	intel_disable_gt_powersave(dev_priv);
 
-	intel_backlight_unregister(dev);
-
 	/*
 	 * Interrupts and polling as the first thing to avoid creating havoc.
 	 * Too much stuff here (turning of connectors, ...) would
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a054676ff420..86ac7eca0f5a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1492,7 +1492,14 @@ extern struct drm_display_mode *intel_find_panel_downclock(
 				struct drm_display_mode *fixed_mode,
 				struct drm_connector *connector);
 void intel_backlight_register(struct drm_device *dev);
-void intel_backlight_unregister(struct drm_device *dev);
+
+#if IS_ENABLED(CONFIG_BACKLIGHT_CLASS_DEVICE)
+void intel_backlight_device_unregister(struct intel_connector *connector);
+#else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
+static inline void intel_backlight_device_unregister(struct intel_connector *connector)
+{
+}
+#endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
 
 
 /* intel_psr.c */
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index c64aae6b673a..d541e4300fee 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1216,7 +1216,7 @@ static int intel_backlight_device_register(struct intel_connector *connector)
 	return 0;
 }
 
-static void intel_backlight_device_unregister(struct intel_connector *connector)
+void intel_backlight_device_unregister(struct intel_connector *connector)
 {
 	struct intel_panel *panel = &connector->panel;
 
@@ -1230,9 +1230,6 @@ static int intel_backlight_device_register(struct intel_connector *connector)
 {
 	return 0;
 }
-static void intel_backlight_device_unregister(struct intel_connector *connector)
-{
-}
 #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */
 
 /*
@@ -1824,11 +1821,3 @@ void intel_backlight_register(struct drm_device *dev)
 	for_each_intel_connector(dev, connector)
 		intel_backlight_device_register(connector);
 }
-
-void intel_backlight_unregister(struct drm_device *dev)
-{
-	struct intel_connector *connector;
-
-	for_each_intel_connector(dev, connector)
-		intel_backlight_device_unregister(connector);
-}
-- 
2.8.1

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

  parent reply	other threads:[~2016-05-30  8:39 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-30  8:38 Reordering debugfs registration vs driver loader, take 2 Chris Wilson
2016-05-30  8:38 ` [PATCH v2 01/21] drm: Export drm_dev_init() for subclassing Chris Wilson
2016-06-01 10:01   ` Daniel Vetter
2016-06-01 10:07     ` Daniel Vetter
2016-06-01 10:29     ` Chris Wilson
2016-05-30  8:38 ` [PATCH v2 02/21] drm: Add a callback from connector registering Chris Wilson
2016-06-01  9:57   ` Daniel Vetter
2016-06-01 10:38     ` Chris Wilson
2016-06-01 14:42       ` Daniel Vetter
2016-05-30  8:38 ` [PATCH v2 03/21] drm: Make drm_connector_register() safe against multiple calls Chris Wilson
2016-06-01  9:45   ` Daniel Vetter
2016-05-30  8:38 ` [PATCH v2 04/21] drm: Automatically unregister the connector during cleanup Chris Wilson
2016-06-01  9:45   ` Daniel Vetter
2016-05-30  8:38 ` [PATCH v2 05/21] drm: Minimally initialise drm_dp_aux Chris Wilson
2016-06-01  9:49   ` Daniel Vetter
2016-06-01  9:54     ` Chris Wilson
2016-05-30  8:38 ` [PATCH v2 06/21] drm/i915: Perform async fbdev initialisation much later Chris Wilson
2016-05-30  8:38 ` [PATCH v2 07/21] drm/i915: Make panel/backlight safe to setup/cleanup multiple times Chris Wilson
2016-05-30  8:38 ` [PATCH v2 08/21] drm/i915: Move panel's pipe from backlight setup to init Chris Wilson
2016-05-30  8:38 ` [PATCH v2 09/21] drm/i915: Move intel_connector->unregister to connector->early_unregister Chris Wilson
2016-05-30  8:38 ` Chris Wilson [this message]
2016-05-30  8:38 ` [PATCH v2 11/21] drm/i915: Move registration actions to connector->late_register Chris Wilson
2016-05-30  8:38 ` [PATCH v2 12/21] drm/i915: Move backlight setup to connector registration Chris Wilson
2016-05-30  8:38 ` [PATCH v2 13/21] drm/i915: Move backlight registration " Chris Wilson
2016-05-30  8:38 ` [PATCH v2 14/21] drm/i915: Move connector registration to driver registration Chris Wilson
2016-05-30  8:38 ` [PATCH v2 15/21] drm/i915: Register debugfs interface last Chris Wilson
2016-05-30  8:38 ` [PATCH v2 16/21] drm/i915: Demidlayer driver loading Chris Wilson
2016-05-30  8:38 ` [PATCH v2 17/21] drm/i915: Demidlayer driver unloading Chris Wilson
2016-05-30  8:38 ` [PATCH v2 18/21] drm/i915: Start exploiting drm_device subclassing Chris Wilson
2016-05-30 10:38   ` Joonas Lahtinen
2016-05-30  8:38 ` [PATCH v2 19/21] drm/i915: Merge i915_dma.c into i915_drv.c Chris Wilson
2016-05-30  8:38 ` [PATCH v2 20/21] drm/i915: Split out the PCI driver interface to i915_pci.c Chris Wilson
2016-05-30  8:38 ` [PATCH v2 21/21] drm/i915: Move module init/exit " Chris Wilson
2016-05-30  8:51 ` ✓ Ro.CI.BAT: success for series starting with [v2,01/21] drm: Export drm_dev_init() for subclassing Patchwork

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=1464597519-16659-11-git-send-email-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.