summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/gt/intel_gt_regs.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2024-09-11 09:11:53 +1000
committerDave Airlie <airlied@redhat.com>2024-09-11 09:11:54 +1000
commit32bd3eb5fbab954e68adba8c0b6a43cf03605c93 (patch)
tree5facb502814a252578673e7c42caeee1f0e22b29 /drivers/gpu/drm/i915/gt/intel_gt_regs.h
parent2ef8d63da81d9e89cbc1eb4867d638f88bf5dc78 (diff)
parent596a7f1084e49cc65072c458c348861e9b9ceab9 (diff)
downloadlinux-32bd3eb5fbab954e68adba8c0b6a43cf03605c93.tar.gz
linux-32bd3eb5fbab954e68adba8c0b6a43cf03605c93.tar.bz2
linux-32bd3eb5fbab954e68adba8c0b6a43cf03605c93.zip
Merge tag 'drm-intel-gt-next-2024-09-06' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
Driver Changes: - Expose fan speed via hwmon (Raag) - Correction to Wa_14019159160 on ARL (John H) - Whitelist COMMON_SLICE_CHICKEN1 for UMD access on DG2/MTL/ARL (Dnyaneshwar) - Do not attempt to load the GSC multiple times to avoid hanging GSC HW (Daniele) - Populate /sys/class/drm/cardX/engines/ even if one engine fails (Andi) - Use kmemdup_array instead of kmemdup for multiple allocation (Yu) - Remove extra unlikely() (Hongbo) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/Ztrfr_Wuurfa-3Rv@jlahtine-mobl.ger.corp.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_gt_regs.h')
-rw-r--r--drivers/gpu/drm/i915/gt/intel_gt_regs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index e42b3a5d4e63..57a3c83d3655 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -1553,6 +1553,8 @@
#define VLV_RENDER_C0_COUNT _MMIO(0x138118)
#define VLV_MEDIA_C0_COUNT _MMIO(0x13811c)
+#define PCU_PWM_FAN_SPEED _MMIO(0x138140)
+
#define GEN12_RPSTAT1 _MMIO(0x1381b4)
#define GEN12_VOLTAGE_MASK REG_GENMASK(10, 0)
#define GEN12_CAGF_MASK REG_GENMASK(19, 11)