* [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting
@ 2012-05-13 20:08 Daniel Vetter
2012-05-13 20:12 ` Chris Wilson
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2012-05-13 20:08 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Daniel Vetter, the regression was Cc: stable, too
... we need it later on in the function to clean up pipe <-> plane
associations. This regression has been introduced in
commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Mar 22 15:00:50 2012 +0000
drm/i915: Sanitize BIOS debugging bits from PIPECONF
Spotted by staring at debug output of an (as it turns out) totally
unrelated bug.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org (the regression was Cc: stable, too)
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index fb05d9d..525dc65 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6257,9 +6257,10 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 reg, val;
+ int i;
/* Clear any frame start delays used for debugging left by the BIOS */
- for_each_pipe(pipe) {
+ for_each_pipe(i) {
reg = PIPECONF(pipe);
I915_WRITE(reg, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
}
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting
2012-05-13 20:08 [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting Daniel Vetter
@ 2012-05-13 20:12 ` Chris Wilson
2012-05-13 20:29 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2012-05-13 20:12 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Daniel Vetter, the regression was Cc: stable, too
On Sun, 13 May 2012 22:08:14 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> ... we need it later on in the function to clean up pipe <-> plane
> associations. This regression has been introduced in
>
> commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date: Thu Mar 22 15:00:50 2012 +0000
>
> drm/i915: Sanitize BIOS debugging bits from PIPECONF
>
> Spotted by staring at debug output of an (as it turns out) totally
> unrelated bug.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org (the regression was Cc: stable, too)
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Note this will also explain some of the bogosity with
https://bugs.freedesktop.org/show_bug.cgi?id=49838 on dinq.
> ---
> drivers/gpu/drm/i915/intel_display.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index fb05d9d..525dc65 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6257,9 +6257,10 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> u32 reg, val;
> + int i;
>
> /* Clear any frame start delays used for debugging left by the BIOS */
> - for_each_pipe(pipe) {
> + for_each_pipe(i) {
> reg = PIPECONF(pipe);
s/pipe/i/
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting
2012-05-13 20:12 ` Chris Wilson
@ 2012-05-13 20:29 ` Daniel Vetter
2012-05-13 20:33 ` Chris Wilson
2012-05-13 23:41 ` Eugeni Dodonov
0 siblings, 2 replies; 6+ messages in thread
From: Daniel Vetter @ 2012-05-13 20:29 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Daniel Vetter, the regression was Cc: stable, too
... we need it later on in the function to clean up pipe <-> plane
associations. This regression has been introduced in
commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Mar 22 15:00:50 2012 +0000
drm/i915: Sanitize BIOS debugging bits from PIPECONF
Spotted by staring at debug output of an (as it turns out) totally
unrelated bug.
v2: I've totally failed to do the s/pipe/i/ correctly, spotted by
Chris Wilson.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org (the regression was Cc: stable, too)
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index fb05d9d..f4692f8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6257,10 +6257,11 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 reg, val;
+ int i;
/* Clear any frame start delays used for debugging left by the BIOS */
- for_each_pipe(pipe) {
- reg = PIPECONF(pipe);
+ for_each_pipe(i) {
+ reg = PIPECONF(i);
I915_WRITE(reg, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
}
--
1.7.10
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting
2012-05-13 20:29 ` Daniel Vetter
@ 2012-05-13 20:33 ` Chris Wilson
2012-05-19 20:47 ` Daniel Vetter
2012-05-13 23:41 ` Eugeni Dodonov
1 sibling, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2012-05-13 20:33 UTC (permalink / raw)
To: Intel Graphics Development
Cc: Daniel Vetter, the regression was Cc: stable, too
On Sun, 13 May 2012 22:29:25 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> ... we need it later on in the function to clean up pipe <-> plane
> associations. This regression has been introduced in
>
> commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date: Thu Mar 22 15:00:50 2012 +0000
>
> drm/i915: Sanitize BIOS debugging bits from PIPECONF
>
> Spotted by staring at debug output of an (as it turns out) totally
> unrelated bug.
>
> v2: I've totally failed to do the s/pipe/i/ correctly, spotted by
> Chris Wilson.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org (the regression was Cc: stable, too)
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting
2012-05-13 20:33 ` Chris Wilson
@ 2012-05-19 20:47 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2012-05-19 20:47 UTC (permalink / raw)
To: Chris Wilson
Cc: Daniel Vetter, Intel Graphics Development,
the regression was Cc: stable, too
On Sun, May 13, 2012 at 09:33:42PM +0100, Chris Wilson wrote:
> On Sun, 13 May 2012 22:29:25 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > ... we need it later on in the function to clean up pipe <-> plane
> > associations. This regression has been introduced in
> >
> > commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
> > Author: Chris Wilson <chris@chris-wilson.co.uk>
> > Date: Thu Mar 22 15:00:50 2012 +0000
> >
> > drm/i915: Sanitize BIOS debugging bits from PIPECONF
> >
> > Spotted by staring at debug output of an (as it turns out) totally
> > unrelated bug.
> >
> > v2: I've totally failed to do the s/pipe/i/ correctly, spotted by
> > Chris Wilson.
> >
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: stable@kernel.org (the regression was Cc: stable, too)
> > Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Queued for -next, thanks for the review.
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting
2012-05-13 20:29 ` Daniel Vetter
2012-05-13 20:33 ` Chris Wilson
@ 2012-05-13 23:41 ` Eugeni Dodonov
1 sibling, 0 replies; 6+ messages in thread
From: Eugeni Dodonov @ 2012-05-13 23:41 UTC (permalink / raw)
To: Daniel Vetter
Cc: Intel Graphics Development, the regression was Cc: stable, too
On Sun, May 13, 2012 at 5:29 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> ... we need it later on in the function to clean up pipe <-> plane
> associations. This regression has been introduced in
>
> commit f47166d2b0001fcb752b40c5a2d4db986dfbea68
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date: Thu Mar 22 15:00:50 2012 +0000
>
> drm/i915: Sanitize BIOS debugging bits from PIPECONF
>
> Spotted by staring at debug output of an (as it turns out) totally
> unrelated bug.
>
> v2: I've totally failed to do the s/pipe/i/ correctly, spotted by
> Chris Wilson.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: stable@kernel.org (the regression was Cc: stable, too)
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
--
Eugeni Dodonov
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-19 20:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-13 20:08 [PATCH] drm/i915: don't clobber the pipe param in sanitize_modesetting Daniel Vetter
2012-05-13 20:12 ` Chris Wilson
2012-05-13 20:29 ` Daniel Vetter
2012-05-13 20:33 ` Chris Wilson
2012-05-19 20:47 ` Daniel Vetter
2012-05-13 23:41 ` Eugeni Dodonov
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.