From patchwork Tue Apr 14 12:20:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 11487393 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B0B481 for ; Tue, 14 Apr 2020 12:20:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 631F52075E for ; Tue, 14 Apr 2020 12:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 631F52075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0526D6E0D3; Tue, 14 Apr 2020 12:20:30 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DEC06E0D3 for ; Tue, 14 Apr 2020 12:20:28 +0000 (UTC) IronPort-SDR: l56eim/A4xbR/cjkrcR5dF8FqSbFCphB0gXeesgwFib9RA8YDpFdfo4YQ6IJuyVhnwO/V9OTGm 4WK/TU4MvFJg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2020 05:20:27 -0700 IronPort-SDR: uLuxO1FX+dyWtXZq80GRspn2ZtsebepJDnFw9pGkT7uPmGYXp+sho7CYROViXnhO+SWjiYhStS yEN8AJOkxjuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,382,1580803200"; d="scan'208";a="243798868" Received: from rosetta.fi.intel.com ([10.237.72.194]) by fmsmga007.fm.intel.com with ESMTP; 14 Apr 2020 05:20:26 -0700 Received: by rosetta.fi.intel.com (Postfix, from userid 1000) id 93570843785; Tue, 14 Apr 2020 15:20:03 +0300 (EEST) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Tue, 14 Apr 2020 15:20:00 +0300 Message-Id: <20200414122000.19353-1-mika.kuoppala@linux.intel.com> X-Mailer: git-send-email 2.17.1 Subject: [Intel-gfx] [PATCH] drm/i915: Fix indirect context size calculation X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chris Wilson MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hardware needs cacheline count for indirect context size. Count of zero means that the feature is disabled. If we only divide size with cacheline bytes, we get one cacheline short of execution. Divide by rounding up to a cacheline size so that hardware executes everything intended. Bspec: 11739 Fixes: 17ee950df38b ("drm/i915/gen8: Add infrastructure to initialize WA batch buffers") Cc: Chris Wilson Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/gt/intel_lrc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 6fbad5e2343f..acbb36ad17ff 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -4739,7 +4739,8 @@ static void init_wa_bb_reg_state(u32 * const regs, regs[pos_bb_per_ctx + 2] = (ggtt_offset + wa_ctx->indirect_ctx.offset) | - (wa_ctx->indirect_ctx.size / CACHELINE_BYTES); + DIV_ROUND_UP(wa_ctx->indirect_ctx.size, + CACHELINE_BYTES); regs[pos_bb_per_ctx + 4] = intel_lr_indirect_ctx_offset(engine) << 6;