From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 03/10] drm/i915/lvds: Move the acpi_lid_notifier from drm_i915_private to the connector Date: Fri, 19 Oct 2012 09:48:55 -0700 Message-ID: <20121019094855.0bafe16b@jbarnes-desktop> References: <2be782145196cee838ff0d188671c72db3c27340.1350644022.git.jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy9.bluehost.com (oproxy9.bluehost.com [69.89.24.6]) by gabe.freedesktop.org (Postfix) with SMTP id 86A469E747 for ; Fri, 19 Oct 2012 09:48:00 -0700 (PDT) In-Reply-To: <2be782145196cee838ff0d188671c72db3c27340.1350644022.git.jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, 19 Oct 2012 14:51:45 +0300 Jani Nikula wrote: > Based on earlier work by Chris Wilson > > CC: Chris Wilson > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_drv.h | 2 -- > drivers/gpu/drm/i915/intel_lvds.c | 32 +++++++++++++++++--------------- > 2 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 4728d30..f63ae1c 100644 > --- 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 4a2f6fa..f3edbf6 100644 > --- a/drivers/gpu/drm/i915/intel_lvds.c > +++ b/drivers/gpu/drm/i915/intel_lvds.c > @@ -43,6 +43,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 { > @@ -506,10 +508,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; > @@ -518,9 +521,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)) > @@ -551,13 +552,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); > @@ -1097,10 +1099,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; Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center