From patchwork Thu May 19 05:51:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonas Lahtinen X-Patchwork-Id: 12854530 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 04637C433F5 for ; Thu, 19 May 2022 05:51:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C086011A59A; Thu, 19 May 2022 05:51:33 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5859011A58C; Thu, 19 May 2022 05:51:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652939492; x=1684475492; h=date:from:to:cc:subject:message-id:mime-version; bh=fanG2Gwoafyt4s3gbR1R7KWpo0kbkLYo2jGIYF0qyfc=; b=nWKA9pKzjWAZu5IBez4cByYj68am4SW2o+Xj+Q6gX40o8dlsBB+E96/+ OSjVauFklPNWYNTZbhX6lNzb5LGsATE7zEXpzRX3Sfj146o112vzXVHhO SUiVYeHTgJ+u2LcCU7xo4l4yL65jGEhJyE+RANv10SNirZQPiTXdcZS3+ bG+2eRIGqC8AzAOuBFUhHoaM9Z5gph0SUKp/Gz6EMhC89vMwl6daGfeA8 iyQ3tB92dmI33QsKHBHtRH5uadJCktIwmBUlNtyRUlDNSJv7hXtufzjxs C7fk+hzFm1Zv1gy9tNnyTUZwdLrMLLPwuvMVnWvAEFdQWFFKeRUG0vsrD w==; X-IronPort-AV: E=McAfee;i="6400,9594,10351"; a="269621180" X-IronPort-AV: E=Sophos;i="5.91,236,1647327600"; d="scan'208";a="269621180" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2022 22:51:31 -0700 X-IronPort-AV: E=Sophos;i="5.91,236,1647327600"; d="scan'208";a="598324047" Received: from edgarisx-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.37.58]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2022 22:51:28 -0700 Date: Thu, 19 May 2022 08:51:25 +0300 From: Joonas Lahtinen To: Dave Airlie , Daniel Vetter Subject: [PULL] drm-intel-fixes Message-ID: 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: Tvrtko Ursulin , dim-tools@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann , Rodrigo Vivi , intel-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dave & Daniel, Two final -fixes for v5.18. One is to reject DMC with out-of-spec MMIO (Cc: stable) and another to correctly mark guilty contexts on GuC reset. Regards, Joonas *** drm-intel-fixes-2022-05-19: - Reject DMC firmware with out-of-spec MMIO addresses. - Correctly mark guilty context on GuC reset The following changes since commit 42226c989789d8da4af1de0c31070c96726d990c: Linux 5.18-rc7 (2022-05-15 18:08:58 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2022-05-19 for you to fetch changes up to 89e96d822bd51f7afe2d3e95a34099480b5c3d55: i915/guc/reset: Make __guc_reset_context aware of guilty engines (2022-05-16 10:13:39 +0300) ---------------------------------------------------------------- - Reject DMC firmware with out-of-spec MMIO addresses. - Correctly mark guilty context on GuC reset ---------------------------------------------------------------- Anusha Srivatsa (1): drm/i915/dmc: Add MMIO range restrictions Umesh Nerlige Ramappa (1): i915/guc/reset: Make __guc_reset_context aware of guilty engines drivers/gpu/drm/i915/display/intel_dmc.c | 44 +++++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 16 ++++----- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 2 +- drivers/gpu/drm/i915/i915_reg.h | 16 +++++++++ 7 files changed, 72 insertions(+), 12 deletions(-)