3.16.60-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Brad Volkin bradley.d.volkin@intel.com
commit 00caf0199f66871b0e2c28d7c2079de0ce1d646c upstream.
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 Signed-off-by: Daniel Vetter daniel.vetter@ffwll.ch Signed-off-by: Ben Hutchings ben@decadent.org.uk --- drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@ -887,8 +887,10 @@ static bool check_cmd(const struct intel * 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);