From patchwork Thu Dec 3 13:47:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 11948849 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53A37C64E8A for ; Thu, 3 Dec 2020 13:47:12 +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 A5F87206D8 for ; Thu, 3 Dec 2020 13:47:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5F87206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0304A6E9B8; Thu, 3 Dec 2020 13:47:09 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D8886E0C6; Thu, 3 Dec 2020 13:47:07 +0000 (UTC) IronPort-SDR: Q/XjP2j90MhnwoKteiWUk8UZ+QJNceGkmgmgha9wDP533xTkNFUBlRdPN3ATJHzWvWROb3uVFB XfzCwfupncUA== X-IronPort-AV: E=McAfee;i="6000,8403,9823"; a="191423565" X-IronPort-AV: E=Sophos;i="5.78,389,1599548400"; d="scan'208";a="191423565" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2020 05:47:07 -0800 IronPort-SDR: V6nooksqB85zL8OhDDjZez9e2+sodtVNFUUHz09vMLDhy4HIcQ269ykdaC+zuvNsCqjindO7pY KtA6FLYDqvfw== X-IronPort-AV: E=Sophos;i="5.78,389,1599548400"; d="scan'208";a="435393736" Received: from snaskar-mobl.amr.corp.intel.com (HELO intel.com) ([10.212.71.168]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2020 05:47:06 -0800 Date: Thu, 3 Dec 2020 05:47:05 -0800 From: Rodrigo Vivi To: Dave Airlie , Daniel Vetter Subject: [PULL] drm-intel-fixes v2 Message-ID: <20201203134705.GA1575873@intel.com> MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dim-tools@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi , Sean Paul , intel-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dave and Daniel, Please ignore the pull request I had sent yesterday and use only this one. I had missed one patch: 14d1eaf08845 ("drm/i915/gt: Protect context lifetime with RCU"). Also, please notice that the commit 6db58901c2aa ("drm/i915/display: return earlier from +intel_modeset_init() without display") was not actually a crucial fix, but it +allowed a clean pick of the use-after-free one. Here goes drm-intel-fixes-2020-12-03: Fixes for GPU hang, null dereference, suspend-resume, power consumption, and use-after-free. - Program mocs:63 for cache eviction on gen9 (Chris) - Protect context lifetime with RCU (Chris) - Split the breadcrumb spinlock between global and contexts (Chris) - Retain default context state across shrinking (Venkata) - Limit frequency drop to RPe on parking (Chris) - Return earlier from intel_modeset_init() without display (Jani) - Defer initial modeset until after GGTT is initialized (Chris) Thanks, Rodrigo. The following changes since commit b65054597872ce3aefbc6a666385eabdf9e288da: Linux 5.10-rc6 (2020-11-29 15:50:50 -0800) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2020-12-03 for you to fetch changes up to ccc9e67ab26feda7e62749bb54c05d7abe07dca9: drm/i915/display: Defer initial modeset until after GGTT is initialised (2020-12-02 17:05:58 -0800) ---------------------------------------------------------------- Fixes for GPU hang, null dereference, suspend-resume, power consumption, and use-after-free. - Program mocs:63 for cache eviction on gen9 (Chris) - Protect context lifetime with RCU (Chris) - Split the breadcrumb spinlock between global and contexts (Chris) - Retain default context state across shrinking (Venkata) - Limit frequency drop to RPe on parking (Chris) - Return earlier from intel_modeset_init() without display (Jani) - Defer initial modeset until after GGTT is initialized (Chris) ---------------------------------------------------------------- Chris Wilson (5): drm/i915/gt: Program mocs:63 for cache eviction on gen9 drm/i915/gt: Protect context lifetime with RCU drm/i915/gt: Split the breadcrumb spinlock between global and contexts drm/i915/gt: Limit frequency drop to RPe on parking drm/i915/display: Defer initial modeset until after GGTT is initialised Jani Nikula (1): drm/i915/display: return earlier from intel_modeset_init() without display Venkata Ramana Nayana (1): drm/i915/gt: Retain default context state across shrinking drivers/gpu/drm/i915/display/intel_display.c | 24 ++-- drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 168 ++++++++++------------ drivers/gpu/drm/i915/gt/intel_breadcrumbs_types.h | 6 +- drivers/gpu/drm/i915/gt/intel_context.c | 15 +- drivers/gpu/drm/i915/gt/intel_context_types.h | 23 ++- drivers/gpu/drm/i915/gt/intel_mocs.c | 14 +- drivers/gpu/drm/i915/gt/intel_rps.c | 4 + drivers/gpu/drm/i915/gt/shmem_utils.c | 7 +- drivers/gpu/drm/i915/i915_request.h | 6 +- 9 files changed, 143 insertions(+), 124 deletions(-)