From patchwork Wed Mar 30 23:28:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 12796483 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 DD870C433F5 for ; Wed, 30 Mar 2022 23:30:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5ACEA891AC; Wed, 30 Mar 2022 23:29:28 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id A43B010E20F; Wed, 30 Mar 2022 23:29:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648682956; x=1680218956; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y0k4BmlzYZnDbfVHpqqrKm1PCCqOWZmggF4shZRZItY=; b=W44yE+mv7Y/eHixAK04HnvmLuN2i6xiv7wcRn/1ge7juU2R213MWQETy 7Ou04GtCUintxFjrw4T6UjU893Wzn8bDapgcK5NWM2I3QAiHRXTqo0FOe nxsh/t0aO+cChprV8YkS5/E4w7IrCwUy1SeRCPTgKES+C8hrMUrE+mtDh nCa33wJNuCN9sGjGrLmyceg9SBWhrvGpWhtLSLZh6rYX2TXEWf2b5isrk tE1+yNDHXAiBWFEUFJQLOzyEIGZcCbHu/Ce+eZoXqs+Gi2aR4mg7jrqT5 BHKh79kLZZxByXMbbSqTvSR0cTQQs6feB+dDUkrtz9biqd6p/e/3hx4Jw g==; X-IronPort-AV: E=McAfee;i="6200,9189,10302"; a="284582509" X-IronPort-AV: E=Sophos;i="5.90,223,1643702400"; d="scan'208";a="284582509" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2022 16:29:16 -0700 X-IronPort-AV: E=Sophos;i="5.90,223,1643702400"; d="scan'208";a="547052003" Received: from mdroper-desk1.fm.intel.com ([10.1.27.134]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2022 16:29:16 -0700 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Wed, 30 Mar 2022 16:28:49 -0700 Message-Id: <20220330232858.3204283-7-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330232858.3204283-1-matthew.d.roper@intel.com> References: <20220330232858.3204283-1-matthew.d.roper@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 06/15] drm/i915: Drop duplicated definition of XEHPSDV_FLAT_CCS_BASE_ADDR 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: dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" When this register was moved to intel_gt_regs.h it wasn't dropped from i915_reg.h; do so now. Signed-off-by: Matt Roper --- drivers/gpu/drm/i915/i915_reg.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index efb81cb4c7c0..062e11289aa0 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -8494,9 +8494,6 @@ enum skl_power_gate { #define XEHPSDV_TILE0_ADDR_RANGE _MMIO(0x4900) #define XEHPSDV_TILE_LMEM_RANGE_SHIFT 8 -#define XEHPSDV_FLAT_CCS_BASE_ADDR _MMIO(0x4910) -#define XEHPSDV_CCS_BASE_SHIFT 8 - /* gamt regs */ #define GEN8_L3_LRA_1_GPGPU _MMIO(0x4dd4) #define GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW 0x67F1427F /* max/min for LRA1/2 */