From patchwork Wed Dec 12 13:40:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonas Lahtinen X-Patchwork-Id: 10726345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7ABC174F for ; Wed, 12 Dec 2018 13:40:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6E822A56D for ; Wed, 12 Dec 2018 13:40:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B48C2AA93; Wed, 12 Dec 2018 13:40:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5E8162A56D for ; Wed, 12 Dec 2018 13:40:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E94FB6E6E4; Wed, 12 Dec 2018 13:40:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id E17F86E6E3; Wed, 12 Dec 2018 13:40:15 +0000 (UTC) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2018 05:40:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,344,1539673200"; d="scan'208";a="282994495" Received: from jlahtine-desk.ger.corp.intel.com (HELO localhost) ([10.251.83.76]) by orsmga005.jf.intel.com with ESMTP; 12 Dec 2018 05:40:11 -0800 Date: Wed, 12 Dec 2018 15:40:10 +0200 From: Joonas Lahtinen To: Dave Airlie Subject: [PULL] drm-intel-fixes Message-ID: <20181212134010.GA18900@jlahtine-desk.ger.corp.intel.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dim-tools@lists.freedesktop.org, Maxime Ripard , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi , Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi Dave, Here's two more GPU hang fixes on top of last week's PR. This also includes stuff from last week that I sent bit late, and was not pulled by you. This is still on top of -rc5 because it includes the GVT merge. Regards, Joonas *** drm-intel-fixes-2018-12-12-1: - Two fixes to avoid GPU hangs (on Braswell and Gen3) The following changes since commit 2595646791c319cadfdbf271563aac97d0843dc7: Linux 4.20-rc5 (2018-12-02 15:07:55 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2018-12-12-1 for you to fetch changes up to 5b2e31201c268c2331a209af799d667619216d40: drm/i915: Flush GPU relocs harder for gen3 (2018-12-12 12:27:44 +0200) ---------------------------------------------------------------- - Two fixes to avoid GPU hangs (on Braswell and Gen3) ---------------------------------------------------------------- Chris Wilson (3): drm/i915/execlists: Apply a full mb before execution for Braswell drm/i915: Allocate a common scratch page drm/i915: Flush GPU relocs harder for gen3 Joonas Lahtinen (1): Merge tag 'gvt-fixes-2018-12-04' of https://github.com/intel/gvt-linux into drm-intel-fixes Tina Zhang (1): drm/i915/gvt: Fix tiled memory decoding bug on BDW Tvrtko Ursulin (2): drm/i915: Record GT workarounds in a list drm/i915: Introduce per-engine workarounds drivers/gpu/drm/i915/gvt/fb_decoder.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 9 + drivers/gpu/drm/i915/i915_gem.c | 54 ++- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 7 +- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 44 +-- drivers/gpu/drm/i915/intel_lrc.c | 30 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 52 ++- drivers/gpu/drm/i915/intel_ringbuffer.h | 7 +- drivers/gpu/drm/i915/intel_workarounds.c | 591 +++++++++++++++++++---------- drivers/gpu/drm/i915/intel_workarounds.h | 26 +- 12 files changed, 524 insertions(+), 301 deletions(-)