* [PATCH] drm/i915: fix non-DP-D eDP backlight cleanup and module reload
@ 2012-10-12 7:33 Jani Nikula
2012-10-12 7:48 ` Mika Kuoppala
2012-10-12 7:50 ` Imre Deak
0 siblings, 2 replies; 4+ messages in thread
From: Jani Nikula @ 2012-10-12 7:33 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Backlight is initialized for eDP, but cleaned up only for eDP on DP-D
port. This leaves behind a dangling backlight interface on module unload on
machines that have eDP connected to something other than DP-D, and breaks
the backlight interface for subsequent module reloads. Fix the cleanup, and
thus module reload on affected machines.
Reported-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_dp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index fcce392..6dfe5dd 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2386,8 +2386,9 @@ static void
intel_dp_destroy(struct drm_connector *connector)
{
struct drm_device *dev = connector->dev;
+ struct intel_dp *intel_dp = intel_attached_dp(connector);
- if (intel_dpd_is_edp(dev))
+ if (is_edp(intel_dp))
intel_panel_destroy_backlight(dev);
drm_sysfs_connector_remove(connector);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: fix non-DP-D eDP backlight cleanup and module reload
2012-10-12 7:33 [PATCH] drm/i915: fix non-DP-D eDP backlight cleanup and module reload Jani Nikula
@ 2012-10-12 7:48 ` Mika Kuoppala
2012-10-12 8:25 ` Daniel Vetter
2012-10-12 7:50 ` Imre Deak
1 sibling, 1 reply; 4+ messages in thread
From: Mika Kuoppala @ 2012-10-12 7:48 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
On Fri, 12 Oct 2012 10:33:05 +0300, Jani Nikula <jani.nikula@intel.com> wrote:
> Backlight is initialized for eDP, but cleaned up only for eDP on DP-D
> port. This leaves behind a dangling backlight interface on module unload on
> machines that have eDP connected to something other than DP-D, and breaks
> the backlight interface for subsequent module reloads. Fix the cleanup, and
> thus module reload on affected machines.
>
> Reported-by: Imre Deak <imre.deak@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: fix non-DP-D eDP backlight cleanup and module reload
2012-10-12 7:33 [PATCH] drm/i915: fix non-DP-D eDP backlight cleanup and module reload Jani Nikula
2012-10-12 7:48 ` Mika Kuoppala
@ 2012-10-12 7:50 ` Imre Deak
1 sibling, 0 replies; 4+ messages in thread
From: Imre Deak @ 2012-10-12 7:50 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, 2012-10-12 at 10:33 +0300, Jani Nikula wrote:
> Backlight is initialized for eDP, but cleaned up only for eDP on DP-D
> port. This leaves behind a dangling backlight interface on module unload on
> machines that have eDP connected to something other than DP-D, and breaks
> the backlight interface for subsequent module reloads. Fix the cleanup, and
> thus module reload on affected machines.
>
> Reported-by: Imre Deak <imre.deak@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Can't reproduce the problem with this:
Tested-by: Imre Deak <imre.deak@intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index fcce392..6dfe5dd 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2386,8 +2386,9 @@ static void
> intel_dp_destroy(struct drm_connector *connector)
> {
> struct drm_device *dev = connector->dev;
> + struct intel_dp *intel_dp = intel_attached_dp(connector);
>
> - if (intel_dpd_is_edp(dev))
> + if (is_edp(intel_dp))
> intel_panel_destroy_backlight(dev);
>
> drm_sysfs_connector_remove(connector);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: fix non-DP-D eDP backlight cleanup and module reload
2012-10-12 7:48 ` Mika Kuoppala
@ 2012-10-12 8:25 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2012-10-12 8:25 UTC (permalink / raw)
To: Mika Kuoppala; +Cc: Jani Nikula, intel-gfx
On Fri, Oct 12, 2012 at 10:48:20AM +0300, Mika Kuoppala wrote:
> On Fri, 12 Oct 2012 10:33:05 +0300, Jani Nikula <jani.nikula@intel.com> wrote:
> > Backlight is initialized for eDP, but cleaned up only for eDP on DP-D
> > port. This leaves behind a dangling backlight interface on module unload on
> > machines that have eDP connected to something other than DP-D, and breaks
> > the backlight interface for subsequent module reloads. Fix the cleanup, and
> > thus module reload on affected machines.
> >
> > Reported-by: Imre Deak <imre.deak@intel.com>
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Picked up for -fixes, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-12 8:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-12 7:33 [PATCH] drm/i915: fix non-DP-D eDP backlight cleanup and module reload Jani Nikula
2012-10-12 7:48 ` Mika Kuoppala
2012-10-12 8:25 ` Daniel Vetter
2012-10-12 7:50 ` Imre Deak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox