Prev: pull request: wireless-2.6 2010-07-26
Next: [PATCH v3] ath5k: disable ASPM
From: Linus Torvalds on 26 Jul 2010 16:20
On Mon, Jul 26, 2010 at 12:13 PM, Eric Anholt <eric(a)anholt.net> wrote:
> The following changes since commit 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78:
>
> �Linux 2.6.35-rc4 (2010-07-04 20:22:50 -0700)
>
> are available in the git repository at:
> �git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel for-linus

Hmm. This seems to introduce a new warning:

drivers/gpu/drm/i915/intel_dp.c:744: warning:
�ironlake_edp_panel_off� defined but not used

when I pulled it.

And the warning appears to be due to a real bug: instead of calling
ironlake_edp_panel_off(), the code calls ironlake_edp_backlight_off()
twice. I assume that the _intention_ was to call both the backlight
and panel "off" routines, rather than making doubly sure that just the
backlight is off by turning it off twice.

Tssk, tssk. Sadly, I noticed this too late, so now it's pulled and pushed out.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jesse Barnes on 26 Jul 2010 16:40
On Mon, 26 Jul 2010 13:19:14 -0700
Linus Torvalds <torvalds(a)linux-foundation.org> wrote:

> On Mon, Jul 26, 2010 at 12:13 PM, Eric Anholt <eric(a)anholt.net> wrote:
> > The following changes since commit 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78:
> >
> >  Linux 2.6.35-rc4 (2010-07-04 20:22:50 -0700)
> >
> > are available in the git repository at:
> >  git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel for-linus
>
> Hmm. This seems to introduce a new warning:
>
> drivers/gpu/drm/i915/intel_dp.c:744: warning:
> 'ironlake_edp_panel_off' defined but not used
>
> when I pulled it.
>
> And the warning appears to be due to a real bug: instead of calling
> ironlake_edp_panel_off(), the code calls ironlake_edp_backlight_off()
> twice. I assume that the _intention_ was to call both the backlight
> and panel "off" routines, rather than making doubly sure that just the
> backlight is off by turning it off twice.
>
> Tssk, tssk. Sadly, I noticed this too late, so now it's pulled and pushed out.

Arg. Well at least the patch has been tested and is confirmed
working. Fix for the warning on its way now (just going to test it to
make extra sure it still works when the panel actually gets shut off!)

--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jesse Barnes on 26 Jul 2010 17:00
Here you go. Tested on the problem machine, works fine.

From a9daaec5a40d572d11f689edac5cb1710c998b1e Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes(a)virtuousgeek.org>
Date: Mon, 26 Jul 2010 13:51:22 -0700
Subject: [PATCH] drm/i915: make sure we shut off the panel in eDP configs

Merge error from the last pull request. Making sure we shut the panel
off is more correct and saves power.

Signed-off-by: Jesse Barnes <jbarnes(a)virtuousgeek.org>
---
drivers/gpu/drm/i915/intel_dp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5d42661..5dde80f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -798,7 +798,7 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
intel_dp_link_down(intel_encoder, dp_priv->DP);
if (IS_eDP(intel_encoder)) {
ironlake_edp_backlight_off(dev);
- ironlake_edp_backlight_off(dev);
+ ironlake_edp_panel_off(dev);
}
}
} else {
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Eric Anholt on 26 Jul 2010 17:00
On Mon, 26 Jul 2010 13:19:14 -0700, Linus Torvalds <torvalds(a)linux-foundation.org> wrote:
> On Mon, Jul 26, 2010 at 12:13 PM, Eric Anholt <eric(a)anholt.net> wrote:
> > The following changes since commit 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78:
> >
> >  Linux 2.6.35-rc4 (2010-07-04 20:22:50 -0700)
> >
> > are available in the git repository at:
> >  git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel for-linus
>
> Hmm. This seems to introduce a new warning:
>
> drivers/gpu/drm/i915/intel_dp.c:744: warning:
> ‘ironlake_edp_panel_off’ defined but not used
>
> when I pulled it.
>
> And the warning appears to be due to a real bug: instead of calling
> ironlake_edp_panel_off(), the code calls ironlake_edp_backlight_off()
> twice. I assume that the _intention_ was to call both the backlight
> and panel "off" routines, rather than making doubly sure that just the
> backlight is off by turning it off twice.
>
> Tssk, tssk. Sadly, I noticed this too late, so now it's pulled and pushed out.

And I managed to botch that while hand-resolving the patch that was sent
against the wrong tree instead of bouncing it. I'm going to be more
strict on that in the future.
 | 
Pages: 1
Prev: pull request: wireless-2.6 2010-07-26
Next: [PATCH v3] ath5k: disable ASPM