From mboxrd@z Thu Jan 1 00:00:00 1970 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 2CE78EC1E82 for ; Thu, 5 Feb 2026 09:28:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E5C910E844; Thu, 5 Feb 2026 09:28:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YmbK0C1+"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id D805B10E84F; Thu, 5 Feb 2026 09:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1770283711; x=1801819711; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9Oj4R4dYnVgdOurSf/83zsxmGzfe0jJEBcvOpywKcXw=; b=YmbK0C1+Rc5C1IOcWaHz8cnhcPv7gD9Ntwl8qHvupRbOiWFopjRG+zpf JsGZksAx0/3WSLSfsV91orQSrL4kIsSdRYDKymuuCQg6Z0qsPBzjQGLZL SagV7Vb2GVXjm3vJiDY3QqjIYB4gVLGy/as3M3SWW93xyNgp3R3VvbvY8 oSV7f85pZDfz0hp6Sz3/8Ckf+NYZC/SCcT+6bP5Ow/SYluUV9Aqu05/LE KScllBGFPK8eyj76jjEmWxoGcA6MlKm6S9qPlKplAWhyMhzb6OFYzmYaH HpTVgqhmfT2oonElOrQdYWIoplGUiaNiYVISmC2XBTu6bwRjdyN26QeHm Q==; X-CSE-ConnectionGUID: hRJ6tPObQn6EVueEuXLDWA== X-CSE-MsgGUID: hDQyq1fXTxia8gFm9Vrm6w== X-IronPort-AV: E=McAfee;i="6800,10657,11691"; a="89060143" X-IronPort-AV: E=Sophos;i="6.21,274,1763452800"; d="scan'208";a="89060143" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2026 01:28:30 -0800 X-CSE-ConnectionGUID: 4vvo+VnwSHSFCWWAnvbVgg== X-CSE-MsgGUID: S3t6TXDNRFSXtwwnuQnevA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,274,1763452800"; d="scan'208";a="209807815" Received: from cfl-desktop.iind.intel.com ([10.190.239.20]) by fmviesa007.fm.intel.com with ESMTP; 05 Feb 2026 01:28:29 -0800 From: Uma Shankar To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, ville.syrjala@linux.intel.com, Uma Shankar Subject: [v4 18/20] drm/i915: Remove i915_reg.h from intel_display_power_well.c Date: Thu, 5 Feb 2026 15:13:39 +0530 Message-ID: <20260205094341.1882816-19-uma.shankar@intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260205094341.1882816-1-uma.shankar@intel.com> References: <20260205094341.1882816-1-uma.shankar@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Make intel_display_power_well.c free from including i915_reg.h. v3: Separate bit field for VLV (Ville) v2: Include specific pcode header, drop common header (Jani) Signed-off-by: Uma Shankar --- drivers/gpu/drm/i915/display/intel_display_power_well.c | 3 +-- drivers/gpu/drm/i915/display/intel_display_regs.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c index 45c4313e6900..9c8d29839caf 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c @@ -8,7 +8,6 @@ #include #include -#include "i915_reg.h" #include "intel_backlight_regs.h" #include "intel_combo_phy.h" #include "intel_combo_phy_regs.h" @@ -1277,7 +1276,7 @@ static void vlv_init_display_clock_gating(struct intel_display *display) * Disable trickle feed and enable pnd deadline calculation */ intel_de_write(display, MI_ARB_VLV, - MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE); + MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE_VLV); intel_de_write(display, CBR1_VLV, 0); drm_WARN_ON(display->drm, DISPLAY_RUNTIME_INFO(display)->rawclk_freq == 0); diff --git a/drivers/gpu/drm/i915/display/intel_display_regs.h b/drivers/gpu/drm/i915/display/intel_display_regs.h index 1c77a7de2d6e..d661385a1edd 100644 --- a/drivers/gpu/drm/i915/display/intel_display_regs.h +++ b/drivers/gpu/drm/i915/display/intel_display_regs.h @@ -350,6 +350,7 @@ #define FW_CSPWRDWNEN (1 << 15) #define MI_ARB_VLV _MMIO(VLV_DISPLAY_BASE + 0x6504) +#define MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE_VLV (1 << 2) #define CZCLK_CDCLK_FREQ_RATIO _MMIO(VLV_DISPLAY_BASE + 0x6508) #define CDCLK_FREQ_SHIFT 4 -- 2.50.1