| Message ID | 1411082787-30821-2-git-send-email-bradley.d.volkin@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Sep 18, 2014 at 04:26:27PM -0700, bradley.d.volkin@intel.com wrote: > From: Brad Volkin <bradley.d.volkin@intel.com> > > The other paths in the command parser that reject a batch all > log a message indicating the reason. We simply missed this one. > > Signed-off-by: Brad Volkin <bradley.d.volkin@intel.com> Both patches merged to dinq, thanks. -Daniel > --- > drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c > index fb24dae..e1e7d37 100644 > --- a/drivers/gpu/drm/i915/i915_cmd_parser.c > +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c > @@ -886,8 +886,10 @@ static bool check_cmd(const struct intel_engine_cs *ring, > * OACONTROL writes to only MI_LOAD_REGISTER_IMM commands. > */ > if (reg_addr == OACONTROL) { > - if (desc->cmd.value == MI_LOAD_REGISTER_MEM) > + if (desc->cmd.value == MI_LOAD_REGISTER_MEM) { > + DRM_DEBUG_DRIVER("CMD: Rejected LRM to OACONTROL\n"); > return false; > + } > > if (desc->cmd.value == MI_LOAD_REGISTER_IMM(1)) > *oacontrol_set = (cmd[2] != 0); > -- > 1.8.3.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c index fb24dae..e1e7d37 100644 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -886,8 +886,10 @@ static bool check_cmd(const struct intel_engine_cs *ring, * OACONTROL writes to only MI_LOAD_REGISTER_IMM commands. */ if (reg_addr == OACONTROL) { - if (desc->cmd.value == MI_LOAD_REGISTER_MEM) + if (desc->cmd.value == MI_LOAD_REGISTER_MEM) { + DRM_DEBUG_DRIVER("CMD: Rejected LRM to OACONTROL\n"); return false; + } if (desc->cmd.value == MI_LOAD_REGISTER_IMM(1)) *oacontrol_set = (cmd[2] != 0);