* [PATCH] drm/i915: Fix cmdparser STORE/LOAD command descriptors
@ 2015-09-02 11:29 Chris Wilson
2015-09-03 10:06 ` Arun Siluvery
0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2015-09-02 11:29 UTC (permalink / raw)
To: intel-gfx; +Cc: Mika Kuoppala, Daniel Vetter
Fixes regression from
commit f1afe24f0e736b9d7f2275e2b1504af3fe612f2a
Author: Arun Siluvery <arun.siluvery@linux.intel.com>
Date: Tue Aug 4 16:22:20 2015 +0100
drm/i915: Change SRM, LRM instructions to use correct length
which forgot to account for the length bias when declaring the fixed
length.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91844
Reported-by: Andreas Reis <andreas.reis@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index ad7d7ab76d3f..09932cab1a3f 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = {
CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ),
CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W,
.reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ),
- CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B,
+ CMD( MI_STORE_REGISTER_MEM, SMI, F, 3, W | B,
.reg = { .offset = 1, .mask = 0x007FFFFC },
.bits = {{
.offset = 0,
.mask = MI_GLOBAL_GTT,
.expected = 0,
}}, ),
- CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B,
+ CMD( MI_LOAD_REGISTER_MEM, SMI, F, 3, W | B,
.reg = { .offset = 1, .mask = 0x007FFFFC },
.bits = {{
.offset = 0,
--
2.5.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Fix cmdparser STORE/LOAD command descriptors
2015-09-02 11:29 [PATCH] drm/i915: Fix cmdparser STORE/LOAD command descriptors Chris Wilson
@ 2015-09-03 10:06 ` Arun Siluvery
2015-09-03 12:10 ` Mika Kuoppala
2015-09-04 8:43 ` Daniel Vetter
0 siblings, 2 replies; 4+ messages in thread
From: Arun Siluvery @ 2015-09-03 10:06 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Daniel Vetter, Mika Kuoppala
On 02/09/2015 12:29, Chris Wilson wrote:
> Fixes regression from
> commit f1afe24f0e736b9d7f2275e2b1504af3fe612f2a
> Author: Arun Siluvery <arun.siluvery@linux.intel.com>
> Date: Tue Aug 4 16:22:20 2015 +0100
>
> drm/i915: Change SRM, LRM instructions to use correct length
>
> which forgot to account for the length bias when declaring the fixed
> length.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91844
> Reported-by: Andreas Reis <andreas.reis@gmail.com>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Dave Gordon <david.s.gordon@intel.com>
> Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
> index ad7d7ab76d3f..09932cab1a3f 100644
> --- a/drivers/gpu/drm/i915/i915_cmd_parser.c
> +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
> @@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = {
> CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ),
> CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W,
> .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ),
> - CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B,
> + CMD( MI_STORE_REGISTER_MEM, SMI, F, 3, W | B,
> .reg = { .offset = 1, .mask = 0x007FFFFC },
> .bits = {{
> .offset = 0,
> .mask = MI_GLOBAL_GTT,
> .expected = 0,
> }}, ),
> - CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B,
> + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 3, W | B,
> .reg = { .offset = 1, .mask = 0x007FFFFC },
> .bits = {{
> .offset = 0,
>
My mistake, I should have verified on Gen7 hw.
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
regards
Arun
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Fix cmdparser STORE/LOAD command descriptors
2015-09-03 10:06 ` Arun Siluvery
@ 2015-09-03 12:10 ` Mika Kuoppala
2015-09-04 8:43 ` Daniel Vetter
1 sibling, 0 replies; 4+ messages in thread
From: Mika Kuoppala @ 2015-09-03 12:10 UTC (permalink / raw)
To: Arun Siluvery, Chris Wilson, intel-gfx; +Cc: Daniel Vetter
Arun Siluvery <arun.siluvery@linux.intel.com> writes:
> On 02/09/2015 12:29, Chris Wilson wrote:
>> Fixes regression from
>> commit f1afe24f0e736b9d7f2275e2b1504af3fe612f2a
>> Author: Arun Siluvery <arun.siluvery@linux.intel.com>
>> Date: Tue Aug 4 16:22:20 2015 +0100
>>
>> drm/i915: Change SRM, LRM instructions to use correct length
>>
>> which forgot to account for the length bias when declaring the fixed
>> length.
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91844
>> Reported-by: Andreas Reis <andreas.reis@gmail.com>
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Dave Gordon <david.s.gordon@intel.com>
>> Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
>> Cc: Mika Kuoppala <mika.kuoppala@intel.com>
>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>> ---
>> drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
>> index ad7d7ab76d3f..09932cab1a3f 100644
>> --- a/drivers/gpu/drm/i915/i915_cmd_parser.c
>> +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
>> @@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = {
>> CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ),
>> CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W,
>> .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ),
>> - CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B,
>> + CMD( MI_STORE_REGISTER_MEM, SMI, F, 3, W | B,
>> .reg = { .offset = 1, .mask = 0x007FFFFC },
>> .bits = {{
>> .offset = 0,
>> .mask = MI_GLOBAL_GTT,
>> .expected = 0,
>> }}, ),
>> - CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B,
>> + CMD( MI_LOAD_REGISTER_MEM, SMI, F, 3, W | B,
>> .reg = { .offset = 1, .mask = 0x007FFFFC },
>> .bits = {{
>> .offset = 0,
>>
> My mistake, I should have verified on Gen7 hw.
Review is for mistakes, and review failed.
-Mika
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Fix cmdparser STORE/LOAD command descriptors
2015-09-03 10:06 ` Arun Siluvery
2015-09-03 12:10 ` Mika Kuoppala
@ 2015-09-04 8:43 ` Daniel Vetter
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-09-04 8:43 UTC (permalink / raw)
To: Arun Siluvery; +Cc: Daniel Vetter, intel-gfx, Mika Kuoppala
On Thu, Sep 03, 2015 at 11:06:38AM +0100, Arun Siluvery wrote:
> On 02/09/2015 12:29, Chris Wilson wrote:
> >Fixes regression from
> >commit f1afe24f0e736b9d7f2275e2b1504af3fe612f2a
> >Author: Arun Siluvery <arun.siluvery@linux.intel.com>
> >Date: Tue Aug 4 16:22:20 2015 +0100
> >
> > drm/i915: Change SRM, LRM instructions to use correct length
> >
> >which forgot to account for the length bias when declaring the fixed
> >length.
> >
> >Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91844
> >Reported-by: Andreas Reis <andreas.reis@gmail.com>
> >Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >Cc: Dave Gordon <david.s.gordon@intel.com>
> >Cc: Arun Siluvery <arun.siluvery@linux.intel.com>
> >Cc: Mika Kuoppala <mika.kuoppala@intel.com>
> >Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> >---
> > drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
> >index ad7d7ab76d3f..09932cab1a3f 100644
> >--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
> >+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
> >@@ -124,14 +124,14 @@ static const struct drm_i915_cmd_descriptor common_cmds[] = {
> > CMD( MI_STORE_DWORD_INDEX, SMI, !F, 0xFF, R ),
> > CMD( MI_LOAD_REGISTER_IMM(1), SMI, !F, 0xFF, W,
> > .reg = { .offset = 1, .mask = 0x007FFFFC, .step = 2 } ),
> >- CMD( MI_STORE_REGISTER_MEM, SMI, F, 1, W | B,
> >+ CMD( MI_STORE_REGISTER_MEM, SMI, F, 3, W | B,
> > .reg = { .offset = 1, .mask = 0x007FFFFC },
> > .bits = {{
> > .offset = 0,
> > .mask = MI_GLOBAL_GTT,
> > .expected = 0,
> > }}, ),
> >- CMD( MI_LOAD_REGISTER_MEM, SMI, F, 1, W | B,
> >+ CMD( MI_LOAD_REGISTER_MEM, SMI, F, 3, W | B,
> > .reg = { .offset = 1, .mask = 0x007FFFFC },
> > .bits = {{
> > .offset = 0,
> >
> My mistake, I should have verified on Gen7 hw.
> Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-04 8:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-02 11:29 [PATCH] drm/i915: Fix cmdparser STORE/LOAD command descriptors Chris Wilson
2015-09-03 10:06 ` Arun Siluvery
2015-09-03 12:10 ` Mika Kuoppala
2015-09-04 8:43 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox