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 v3 14/33] drm/i915: Move backlight setup to connector registration
Date: Fri,  3 Jun 2016 15:36:57 +0100	[thread overview]
Message-ID: <1464964636-3877-15-git-send-email-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <1464964636-3877-1-git-send-email-chris@chris-wilson.co.uk>

Centralise backlight setup in the connector registration callback.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h      | 1 +
 drivers/gpu/drm/i915/intel_crt.c     | 1 +
 drivers/gpu/drm/i915/intel_display.c | 6 ++++++
 drivers/gpu/drm/i915/intel_dp.c      | 6 +++++-
 drivers/gpu/drm/i915/intel_dp_mst.c  | 1 +
 drivers/gpu/drm/i915/intel_dsi.c     | 3 +--
 drivers/gpu/drm/i915/intel_dvo.c     | 1 +
 drivers/gpu/drm/i915/intel_hdmi.c    | 1 +
 drivers/gpu/drm/i915/intel_lvds.c    | 3 +--
 drivers/gpu/drm/i915/intel_sdvo.c    | 5 +++++
 drivers/gpu/drm/i915/intel_tv.c      | 1 +
 11 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c2e443455485..6616b70c3a34 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3673,6 +3673,7 @@ extern void intel_modeset_init_hw(struct drm_device *dev);
 extern void intel_modeset_init(struct drm_device *dev);
 extern void intel_modeset_gem_init(struct drm_device *dev);
 extern void intel_modeset_cleanup(struct drm_device *dev);
+extern int intel_connector_register(struct drm_connector *);
 extern void intel_connector_unregister(struct drm_connector *);
 extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);
 extern void intel_display_resume(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 51253e9f8a18..7c06173f5f67 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -743,6 +743,7 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = {
 	.dpms = drm_atomic_helper_connector_dpms,
 	.detect = intel_crt_detect,
 	.fill_modes = drm_helper_probe_single_connector_modes,
+	.late_register = intel_connector_register,
 	.early_unregister = intel_connector_unregister,
 	.destroy = intel_crt_destroy,
 	.set_property = intel_crt_set_property,
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2521e8c6fafa..f141c74dac74 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -16217,6 +16217,12 @@ void intel_modeset_gem_init(struct drm_device *dev)
 	intel_backlight_register(dev);
 }
 
+int intel_connector_register(struct drm_connector *connector)
+{
+	intel_panel_setup_backlight(connector);
+	return 0;
+}
+
 void intel_connector_unregister(struct drm_connector *connector)
 {
 	struct intel_connector *intel_connector = to_intel_connector(connector);
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 618997c13ff1..9bbe5d5f759c 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4433,6 +4433,11 @@ static int
 intel_dp_connector_register(struct drm_connector *connector)
 {
 	struct intel_dp *intel_dp = intel_attached_dp(connector);
+	int ret;
+
+	ret = intel_connector_register(connector);
+	if (ret)
+		return ret;
 
 	i915_debugfs_connector_add(connector);
 
@@ -5405,7 +5410,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
 			 fixed_mode, downclock_mode,
 			 pipe);
 	intel_connector->panel.backlight.power = intel_edp_backlight_power;
-	intel_panel_setup_backlight(connector);
 
 	return true;
 }
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 89e7c98f5693..5f88e12575ac 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -336,6 +336,7 @@ static const struct drm_connector_funcs intel_dp_mst_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
 	.set_property = intel_dp_mst_set_property,
 	.atomic_get_property = intel_connector_atomic_get_property,
+	.late_register = intel_connector_register,
 	.early_unregister = intel_connector_unregister,
 	.destroy = intel_dp_mst_connector_destroy,
 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 8cd3e7d4d0c7..54af0a162d20 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1385,6 +1385,7 @@ static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs
 static const struct drm_connector_funcs intel_dsi_connector_funcs = {
 	.dpms = drm_atomic_helper_connector_dpms,
 	.detect = intel_dsi_detect,
+	.late_register = intel_connector_register,
 	.early_unregister = intel_connector_unregister,
 	.destroy = intel_dsi_connector_destroy,
 	.fill_modes = drm_helper_probe_single_connector_modes,
@@ -1589,8 +1590,6 @@ void intel_dsi_init(struct drm_device *dev)
 
 	drm_connector_register(connector);
 
-	intel_panel_setup_backlight(connector);
-
 	return;
 
 err:
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 7402681d4fa1..86dd746d7573 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -341,6 +341,7 @@ static void intel_dvo_destroy(struct drm_connector *connector)
 static const struct drm_connector_funcs intel_dvo_connector_funcs = {
 	.dpms = drm_atomic_helper_connector_dpms,
 	.detect = intel_dvo_detect,
+	.late_register = intel_connector_register,
 	.early_unregister = intel_connector_unregister,
 	.destroy = intel_dvo_destroy,
 	.fill_modes = drm_helper_probe_single_connector_modes,
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index c3112638a53d..2b45132cf1a6 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1774,6 +1774,7 @@ static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
 	.set_property = intel_hdmi_set_property,
 	.atomic_get_property = intel_connector_atomic_get_property,
+	.late_register = intel_connector_register,
 	.early_unregister = intel_connector_unregister,
 	.destroy = intel_hdmi_destroy,
 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index af0f74922bc2..0d5f62063f15 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -556,6 +556,7 @@ static const struct drm_connector_funcs intel_lvds_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
 	.set_property = intel_lvds_set_property,
 	.atomic_get_property = intel_connector_atomic_get_property,
+	.late_register = intel_connector_register,
 	.early_unregister = intel_connector_unregister,
 	.destroy = intel_lvds_destroy,
 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -1135,8 +1136,6 @@ out:
 	}
 	drm_connector_register(connector);
 
-	intel_panel_setup_backlight(connector);
-
 	return;
 
 failed:
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 351cf15a435e..180932e5463f 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2181,6 +2181,11 @@ static int
 intel_sdvo_connector_register(struct drm_connector *connector)
 {
 	struct intel_sdvo *sdvo = intel_attached_sdvo(connector);
+	int ret;
+
+	ret = intel_connector_register(connector);
+	if (ret)
+		return ret;
 
 	return sysfs_create_link(&connector->kdev->kobj,
 				 &sdvo->ddc.dev.kobj,
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index caafccdb865f..3998982c5bfb 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1501,6 +1501,7 @@ out:
 static const struct drm_connector_funcs intel_tv_connector_funcs = {
 	.dpms = drm_atomic_helper_connector_dpms,
 	.detect = intel_tv_detect,
+	.late_register = intel_connector_register,
 	.early_unregister = intel_connector_unregister,
 	.destroy = intel_tv_destroy,
 	.set_property = intel_tv_set_property,
-- 
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-06-03 14:37 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03 14:36 BAT regression bug 95634, take 3 Chris Wilson
2016-06-03 14:36 ` [PATCH v3 01/33] drm: Export drm_dev_init() for subclassing Chris Wilson
2016-06-03 14:36 ` [PATCH v3 02/33] drm: Add a callback from connector registering Chris Wilson
2016-06-03 14:36 ` [PATCH v3 03/33] drm: Make drm_connector_register() safe against multiple calls Chris Wilson
2016-06-03 14:36 ` [PATCH v3 04/33] drm: Automatically unregister the connector during cleanup Chris Wilson
2016-06-03 14:36 ` [PATCH v3 05/33] drm: Pass the drm_dp_aux->hw_mutex to i2c for its locking Chris Wilson
2016-06-03 15:11   ` Ville Syrjälä
2016-06-03 14:36 ` [PATCH v3 06/33] drm: Minimally initialise drm_dp_aux Chris Wilson
2016-06-03 14:59   ` Ville Syrjälä
2016-06-09 20:57     ` Chris Wilson
2016-06-10 10:26       ` Ville Syrjälä
2016-06-10 10:50         ` Chris Wilson
2016-06-03 14:36 ` [PATCH v3 07/33] drm/i915: Perform async fbdev initialisation much later Chris Wilson
2016-06-03 14:36 ` [PATCH v3 08/33] drm/i915: Make panel/backlight safe to setup/cleanup multiple times Chris Wilson
2016-06-03 14:36 ` [PATCH v3 09/33] drm/i915: Move panel's pipe from backlight setup to init Chris Wilson
2016-06-03 15:04   ` Ville Syrjälä
2016-06-03 15:22     ` Chris Wilson
2016-06-03 14:36 ` [PATCH v3 10/33] drm/i915: Move intel_connector->unregister to connector->early_unregister Chris Wilson
2016-06-03 14:36 ` [PATCH v3 11/33] drm/i915: Move backlight unregistration to connector unregistration Chris Wilson
2016-06-03 14:36 ` [PATCH v3 12/33] drm/i915: Move registration actions to connector->late_register Chris Wilson
2016-06-03 14:36 ` [PATCH v3 13/33] drm/i915/dp: Free the drm_dp_aux along with the encoder Chris Wilson
2016-06-03 14:36 ` Chris Wilson [this message]
2016-06-03 14:36 ` [PATCH v3 15/33] drm/i915: Move backlight registration to connector registration Chris Wilson
2016-06-03 14:36 ` [PATCH v3 16/33] drm/i915: Move connector registration to driver registration Chris Wilson
2016-06-03 14:37 ` [PATCH v3 17/33] drm/i915: Register debugfs interface last Chris Wilson
2016-06-03 14:37 ` [PATCH v3 18/33] drm/i915: Demidlayer driver loading Chris Wilson
2016-06-03 14:37 ` [PATCH v3 19/33] drm/i915: Demidlayer driver unloading Chris Wilson
2016-06-03 14:37 ` [PATCH v3 20/33] drm/i915: Start exploiting drm_device subclassing Chris Wilson
2016-06-03 14:37 ` [PATCH v3 21/33] drm/i915: Merge i915_dma.c into i915_drv.c Chris Wilson
2016-06-03 14:37 ` [PATCH v3 22/33] drm/i915: Split out the PCI driver interface to i915_pci.c Chris Wilson
2016-06-03 14:37 ` [PATCH v3 23/33] drm/i915: Move module init/exit " Chris Wilson
2016-06-08  8:57   ` Joonas Lahtinen
2016-06-03 14:37 ` [PATCH v3 24/33] drm/i915: Skip idling an idle engine Chris Wilson
2016-06-03 14:37 ` [PATCH v3 25/33] drm/i915: Move legacy kernel context pinning to intel_ringbuffer.c Chris Wilson
2016-06-03 14:37 ` [PATCH v3 26/33] drm/i915: Treat kernel context as initialised Chris Wilson
2016-06-07  9:23   ` Joonas Lahtinen
2016-06-03 14:37 ` [PATCH v3 27/33] drm/i915: Mark all default contexts as uninitialised after context loss Chris Wilson
2016-06-03 14:37 ` [PATCH v3 28/33] drm/i915: No need to wait for idle on L3 remap Chris Wilson
2016-06-03 14:37 ` [PATCH v3 29/33] drm/i915: Split idling from forcing context switch Chris Wilson
2016-06-08  9:02   ` Joonas Lahtinen
2016-06-08 10:56     ` Chris Wilson
2016-06-03 14:37 ` [PATCH v3 30/33] drm/i915: Only switch to default context when evicting from GGTT Chris Wilson
2016-06-03 14:37 ` [PATCH v3 31/33] drm/i915: Preserve current RPS frequency Chris Wilson
2016-06-03 14:37 ` [PATCH v3 32/33] drm/i915: Remove superfluous powersave work flushing Chris Wilson
2016-06-03 14:37 ` [PATCH v3 33/33] drm/i915: Defer enabling rc6 til after we submit the first batch/context Chris Wilson
2016-06-03 15:17 ` ✗ Ro.CI.BAT: warning for series starting with [v3,01/33] 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=1464964636-3877-15-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.