drm/i915/lvds: Move the acpi_lid_notifier from drm_i915_private to the connector

Based on earlier work by Chris Wilson <chris@chris-wilson.co.uk>

CC: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d478bd484807ecabbcfb5689d86f5013ad814308..9cdd653708102020f416542e1f4cadf677fd1a5e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -507,8 +507,6 @@ typedef struct drm_i915_private {
        } edp;
        bool no_aux_handshake;
 
-       struct notifier_block lid_notifier;
-
        int crt_ddc_pin;
        struct drm_i915_fence_reg fence_regs[I915_MAX_NUM_FENCES]; /* assume 965 */
        int fence_reg_start; /* 4 if userland hasn't ioctl'd us yet */

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index b47b00534b2e543de89e322a9c2f8d210e41adde..6cb5fc6121f98bc747577586423f99c0db98b7a3 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -42,6 +42,8 @@
 /* Private structure for the integrated LVDS support */
 struct intel_lvds_connector {
        struct intel_connector base;
+
+       struct notifier_block lid_notifier;
 };
 
 struct intel_lvds_encoder {
@@ -505,10 +507,11 @@ static const struct dmi_system_id intel_no_modeset_on_lid[] = {
 static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
                            void *unused)
 {
-       struct drm_i915_private *dev_priv =
-               container_of(nb, struct drm_i915_private, lid_notifier);
-       struct drm_device *dev = dev_priv->dev;
-       struct drm_connector *connector = dev_priv->int_lvds_connector;
+       struct intel_lvds_connector *lvds_connector =
+               container_of(nb, struct intel_lvds_connector, lid_notifier);
+       struct drm_connector *connector = &lvds_connector->base.base;
+       struct drm_device *dev = connector->dev;
+       struct drm_i915_private *dev_priv = dev->dev_private;
 
        if (dev->switch_power_state != DRM_SWITCH_POWER_ON)
                return NOTIFY_OK;
@@ -517,9 +520,7 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
         * check and update the status of LVDS connector after receiving
         * the LID nofication event.
         */
-       if (connector)
-               connector->status = connector->funcs->detect(connector,
-                                                            false);
+       connector->status = connector->funcs->detect(connector, false);
 
        /* Don't force modeset on machines where it causes a GPU lockup */
        if (dmi_check_system(intel_no_modeset_on_lid))
@@ -550,13 +551,14 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
  */
 static void intel_lvds_destroy(struct drm_connector *connector)
 {
-       struct drm_device *dev = connector->dev;
-       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct intel_lvds_connector *lvds_connector =
+               to_lvds_connector(connector);
+
+       if (lvds_connector->lid_notifier.notifier_call)
+               acpi_lid_notifier_unregister(&lvds_connector->lid_notifier);
 
-       intel_panel_destroy_backlight(dev);
+       intel_panel_destroy_backlight(connector->dev);
 
-       if (dev_priv->lid_notifier.notifier_call)
-               acpi_lid_notifier_unregister(&dev_priv->lid_notifier);
        drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
        kfree(connector);
@@ -1096,10 +1098,10 @@ out:
                I915_WRITE(PP_CONTROL,
                           I915_READ(PP_CONTROL) | PANEL_UNLOCK_REGS);
        }
-       dev_priv->lid_notifier.notifier_call = intel_lid_notify;
-       if (acpi_lid_notifier_register(&dev_priv->lid_notifier)) {
+       lvds_connector->lid_notifier.notifier_call = intel_lid_notify;
+       if (acpi_lid_notifier_register(&lvds_connector->lid_notifier)) {
                DRM_DEBUG_KMS("lid notifier registration failed\n");
-               dev_priv->lid_notifier.notifier_call = NULL;
+               lvds_connector->lid_notifier.notifier_call = NULL;
        }
        /* keep the LVDS connector */
        dev_priv->int_lvds_connector = connector;