* [PATCH] drm/i915: fix per-pipe reads after "cleanup"
@ 2011-02-17 18:40 Jesse Barnes
2011-02-17 21:08 ` Chris Wilson
2011-02-17 22:03 ` Alexey Fisher
0 siblings, 2 replies; 6+ messages in thread
From: Jesse Barnes @ 2011-02-17 18:40 UTC (permalink / raw)
To: intel-gfx
In a few places I replaced reads of per-pipe registers with the actual
register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
Alexey caught this on his 9xx machine because the cursor control write
was affected. A quick audit showed a few more places where I'd borked
a read, so here's a patch to fix things up.
Reported-by: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0dc5c6f..eadb4b8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5291,7 +5291,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
bool visible = base != 0;
if (intel_crtc->cursor_visible != visible) {
- uint32_t cntl = CURCNTR(pipe);
+ uint32_t cntl = I915_READ(CURCNTR(pipe));
if (base) {
cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
@@ -5661,7 +5661,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int pipe = intel_crtc->pipe;
- u32 dpll = DPLL(pipe);
+ u32 dpll = I915_READ(DPLL(pipe));
u32 fp;
intel_clock_t clock;
@@ -5749,10 +5749,10 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int pipe = intel_crtc->pipe;
struct drm_display_mode *mode;
- int htot = HTOTAL(pipe);
- int hsync = HSYNC(pipe);
- int vtot = VTOTAL(pipe);
- int vsync = VSYNC(pipe);
+ int htot = I915_READ(HTOTAL(pipe));
+ int hsync = I915_READ(HSYNC(pipe));
+ int vtot = I915_READ(VTOTAL(pipe));
+ int vsync = I915_READ(VSYNC(pipe));
mode = kzalloc(sizeof(*mode), GFP_KERNEL);
if (!mode)
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: fix per-pipe reads after "cleanup"
2011-02-17 18:40 [PATCH] drm/i915: fix per-pipe reads after "cleanup" Jesse Barnes
@ 2011-02-17 21:08 ` Chris Wilson
2011-02-17 21:33 ` Alexey Fisher
2011-02-17 22:03 ` Alexey Fisher
1 sibling, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2011-02-17 21:08 UTC (permalink / raw)
To: Jesse Barnes, intel-gfx
On Thu, 17 Feb 2011 10:40:53 -0800, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> In a few places I replaced reads of per-pipe registers with the actual
> register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
> Alexey caught this on his 9xx machine because the cursor control write
> was affected. A quick audit showed a few more places where I'd borked
> a read, so here's a patch to fix things up.
Shoot the reviewer. Thanks for finding those needles in the haystack,
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: fix per-pipe reads after "cleanup"
2011-02-17 21:08 ` Chris Wilson
@ 2011-02-17 21:33 ` Alexey Fisher
2011-02-17 21:36 ` Jesse Barnes
0 siblings, 1 reply; 6+ messages in thread
From: Alexey Fisher @ 2011-02-17 21:33 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
Am Donnerstag, den 17.02.2011, 21:08 +0000 schrieb Chris Wilson:
> On Thu, 17 Feb 2011 10:40:53 -0800, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > In a few places I replaced reads of per-pipe registers with the actual
> > register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
> > Alexey caught this on his 9xx machine because the cursor control write
> > was affected. A quick audit showed a few more places where I'd borked
> > a read, so here's a patch to fix things up.
>
> Shoot the reviewer. Thanks for finding those needles in the haystack,
> -Chris
>
I get compile error:
/home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c: In function
‘intel_crtc_mode_get’:
/home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
‘dev_priv’ undeclared (first use in this function)
/home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
(Each undeclared identifier is reported only once
/home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
for each function it appears in.)
The patch is on the top of 9035a97a32836d0e456ddafaaf249a844e6e4b5e
(current drm-next)
--
Regards,
Alexey
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: fix per-pipe reads after "cleanup"
2011-02-17 21:33 ` Alexey Fisher
@ 2011-02-17 21:36 ` Jesse Barnes
2011-02-17 22:02 ` Alexey Fisher
0 siblings, 1 reply; 6+ messages in thread
From: Jesse Barnes @ 2011-02-17 21:36 UTC (permalink / raw)
To: Alexey Fisher; +Cc: intel-gfx
On Thu, 17 Feb 2011 22:33:38 +0100
Alexey Fisher <bug-track@fisher-privat.net> wrote:
> Am Donnerstag, den 17.02.2011, 21:08 +0000 schrieb Chris Wilson:
> > On Thu, 17 Feb 2011 10:40:53 -0800, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > > In a few places I replaced reads of per-pipe registers with the actual
> > > register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
> > > Alexey caught this on his 9xx machine because the cursor control write
> > > was affected. A quick audit showed a few more places where I'd borked
> > > a read, so here's a patch to fix things up.
> >
> > Shoot the reviewer. Thanks for finding those needles in the haystack,
> > -Chris
> >
>
> I get compile error:
>
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c: In function
> ‘intel_crtc_mode_get’:
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> ‘dev_priv’ undeclared (first use in this function)
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> (Each undeclared identifier is reported only once
> /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> for each function it appears in.)
>
> The patch is on the top of 9035a97a32836d0e456ddafaaf249a844e6e4b5e
> (current drm-next)
Huh, I compiled it but I must have mixed in some other changes. You'll
need this piece too.
--
Jesse Barnes, Intel Open Source Technology Center
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_d
index eadb4b8..2eb251a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5746,6 +5746,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, st
struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
struct drm_crtc *crtc)
{
+ drm_i915_private_t *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int pipe = intel_crtc->pipe;
struct drm_display_mode *mode;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/i915: fix per-pipe reads after "cleanup"
2011-02-17 21:36 ` Jesse Barnes
@ 2011-02-17 22:02 ` Alexey Fisher
0 siblings, 0 replies; 6+ messages in thread
From: Alexey Fisher @ 2011-02-17 22:02 UTC (permalink / raw)
To: Jesse Barnes; +Cc: intel-gfx
Am Donnerstag, den 17.02.2011, 13:36 -0800 schrieb Jesse Barnes:
> On Thu, 17 Feb 2011 22:33:38 +0100
> Alexey Fisher <bug-track@fisher-privat.net> wrote:
>
> > Am Donnerstag, den 17.02.2011, 21:08 +0000 schrieb Chris Wilson:
> > > On Thu, 17 Feb 2011 10:40:53 -0800, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > > > In a few places I replaced reads of per-pipe registers with the actual
> > > > register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
> > > > Alexey caught this on his 9xx machine because the cursor control write
> > > > was affected. A quick audit showed a few more places where I'd borked
> > > > a read, so here's a patch to fix things up.
> > >
> > > Shoot the reviewer. Thanks for finding those needles in the haystack,
> > > -Chris
> > >
> >
> > I get compile error:
> >
> > /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c: In function
> > ‘intel_crtc_mode_get’:
> > /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> > ‘dev_priv’ undeclared (first use in this function)
> > /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> > (Each undeclared identifier is reported only once
> > /home/src/linux-2.6/drivers/gpu/drm/i915/intel_display.c:5718: error:
> > for each function it appears in.)
> >
> > The patch is on the top of 9035a97a32836d0e456ddafaaf249a844e6e4b5e
> > (current drm-next)
>
> Huh, I compiled it but I must have mixed in some other changes. You'll
> need this piece too.
works fine.
--
Regards,
Alexey
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: fix per-pipe reads after "cleanup"
2011-02-17 18:40 [PATCH] drm/i915: fix per-pipe reads after "cleanup" Jesse Barnes
2011-02-17 21:08 ` Chris Wilson
@ 2011-02-17 22:03 ` Alexey Fisher
1 sibling, 0 replies; 6+ messages in thread
From: Alexey Fisher @ 2011-02-17 22:03 UTC (permalink / raw)
To: Jesse Barnes; +Cc: intel-gfx
Am Donnerstag, den 17.02.2011, 10:40 -0800 schrieb Jesse Barnes:
> In a few places I replaced reads of per-pipe registers with the actual
> register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
> Alexey caught this on his 9xx machine because the cursor control write
> was affected. A quick audit showed a few more places where I'd borked
> a read, so here's a patch to fix things up.
Tested-by: Alexey Fisher <bug-track@fisher-privat.net>
> Reported-by: Alexey Fisher <bug-track@fisher-privat.net>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0dc5c6f..eadb4b8 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5291,7 +5291,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
> bool visible = base != 0;
>
> if (intel_crtc->cursor_visible != visible) {
> - uint32_t cntl = CURCNTR(pipe);
> + uint32_t cntl = I915_READ(CURCNTR(pipe));
> if (base) {
> cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
> cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
> @@ -5661,7 +5661,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> int pipe = intel_crtc->pipe;
> - u32 dpll = DPLL(pipe);
> + u32 dpll = I915_READ(DPLL(pipe));
> u32 fp;
> intel_clock_t clock;
>
> @@ -5749,10 +5749,10 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> int pipe = intel_crtc->pipe;
> struct drm_display_mode *mode;
> - int htot = HTOTAL(pipe);
> - int hsync = HSYNC(pipe);
> - int vtot = VTOTAL(pipe);
> - int vsync = VSYNC(pipe);
> + int htot = I915_READ(HTOTAL(pipe));
> + int hsync = I915_READ(HSYNC(pipe));
> + int vtot = I915_READ(VTOTAL(pipe));
> + int vsync = I915_READ(VSYNC(pipe));
>
> mode = kzalloc(sizeof(*mode), GFP_KERNEL);
> if (!mode)
--
Regards,
Alexey
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-02-17 22:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17 18:40 [PATCH] drm/i915: fix per-pipe reads after "cleanup" Jesse Barnes
2011-02-17 21:08 ` Chris Wilson
2011-02-17 21:33 ` Alexey Fisher
2011-02-17 21:36 ` Jesse Barnes
2011-02-17 22:02 ` Alexey Fisher
2011-02-17 22:03 ` Alexey Fisher
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.