From 7d75b92ac3cdabdec06a2a7839e63c9d5d7bef57 Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 18 Jan 2024 07:52:37 +0000 Subject: [PATCH] remove duplicate defines, merge error from local patches --- sys/dev/pci/drm/i915/intel_device_info.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys/dev/pci/drm/i915/intel_device_info.h b/sys/dev/pci/drm/i915/intel_device_info.h index 32272a8561b..dbfe6443457 100644 --- a/sys/dev/pci/drm/i915/intel_device_info.h +++ b/sys/dev/pci/drm/i915/intel_device_info.h @@ -133,17 +133,6 @@ enum intel_platform { #define INTEL_SUBPLATFORM_M 0 #define INTEL_SUBPLATFORM_P 1 -/* ADL */ -#define INTEL_SUBPLATFORM_RPL 0 - -/* ADL-P */ -/* - * As #define INTEL_SUBPLATFORM_RPL 0 will apply - * here too, SUBPLATFORM_N will have different - * bit set - */ -#define INTEL_SUBPLATFORM_N 1 - enum intel_ppgtt_type { INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE, INTEL_PPGTT_ALIASING = I915_GEM_PPGTT_ALIASING, -- 2.20.1