Skip to content

Commit 4cdaba1

Browse files
vsyrjalaAndi Shyti
authored andcommitted
drm/i915: Reoder BDW+ EU/slice fuse bits
We customarily define the bits of a register in big endian order. Reorder the BDW+ fuse bits to match. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250211231941.22769-11-ville.syrjala@linux.intel.com
1 parent d751311 commit 4cdaba1

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

drivers/gpu/drm/i915/gt/intel_gt_regs.h

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,11 @@
515515
#define GEN11_STATE_CACHE_REDIRECT_TO_CS (1 << 11)
516516

517517
#define GEN9_SLICE_PGCTL_ACK(slice) _MMIO(0x804c + (slice) * 0x4)
518+
#define GEN9_PGCTL_SS_ACK(subslice) REG_BIT(2 + (subslice) * 2)
519+
#define GEN9_PGCTL_SLICE_ACK REG_BIT(0)
520+
518521
#define GEN10_SLICE_PGCTL_ACK(slice) _MMIO(0x804c + ((slice) / 3) * 0x34 + \
519522
((slice) % 3) * 0x4)
520-
#define GEN9_PGCTL_SLICE_ACK REG_BIT(0)
521-
#define GEN9_PGCTL_SS_ACK(subslice) REG_BIT(2 + (subslice) * 2)
522523
#define GEN10_PGCTL_VALID_SS_MASK(slice) ((slice) == 0 ? REG_GENMASK(6, 0) : REG_GENMASK(4, 0))
523524

524525
#define GEN9_SS01_EU_PGCTL_ACK(slice) _MMIO(0x805c + (slice) * 0x8)
@@ -527,14 +528,14 @@
527528
#define GEN9_SS23_EU_PGCTL_ACK(slice) _MMIO(0x8060 + (slice) * 0x8)
528529
#define GEN10_SS23_EU_PGCTL_ACK(slice) _MMIO(0x8060 + ((slice) / 3) * 0x30 + \
529530
((slice) % 3) * 0x8)
530-
#define GEN9_PGCTL_SSA_EU08_ACK REG_BIT(0)
531-
#define GEN9_PGCTL_SSA_EU19_ACK REG_BIT(2)
532-
#define GEN9_PGCTL_SSA_EU210_ACK REG_BIT(4)
533-
#define GEN9_PGCTL_SSA_EU311_ACK REG_BIT(6)
534-
#define GEN9_PGCTL_SSB_EU08_ACK REG_BIT(8)
535-
#define GEN9_PGCTL_SSB_EU19_ACK REG_BIT(10)
536-
#define GEN9_PGCTL_SSB_EU210_ACK REG_BIT(12)
537531
#define GEN9_PGCTL_SSB_EU311_ACK REG_BIT(14)
532+
#define GEN9_PGCTL_SSB_EU210_ACK REG_BIT(12)
533+
#define GEN9_PGCTL_SSB_EU19_ACK REG_BIT(10)
534+
#define GEN9_PGCTL_SSB_EU08_ACK REG_BIT(8)
535+
#define GEN9_PGCTL_SSA_EU311_ACK REG_BIT(6)
536+
#define GEN9_PGCTL_SSA_EU210_ACK REG_BIT(4)
537+
#define GEN9_PGCTL_SSA_EU19_ACK REG_BIT(2)
538+
#define GEN9_PGCTL_SSA_EU08_ACK REG_BIT(0)
538539

539540
#define VF_PREEMPTION _MMIO(0x83a4)
540541
#define PREEMPTION_VERTEX_COUNT REG_GENMASK(15, 0)
@@ -601,24 +602,24 @@
601602
#define HSW_F1_EU_DIS_6EUS 2
602603

603604
#define GEN8_FUSE2 _MMIO(0x9120)
604-
#define GEN8_F2_SS_DIS_MASK REG_GENMASK(23, 21)
605-
#define GEN8_F2_S_ENA_MASK REG_GENMASK(27, 25)
606-
#define GEN9_F2_SS_DIS_MASK REG_GENMASK(23, 20)
607605
#define GEN10_F2_S_ENA_MASK REG_GENMASK(27, 22)
608606
#define GEN10_F2_SS_DIS_MASK REG_GENMASK(21, 18)
607+
#define GEN8_F2_S_ENA_MASK REG_GENMASK(27, 25)
608+
#define GEN9_F2_SS_DIS_MASK REG_GENMASK(23, 20)
609+
#define GEN8_F2_SS_DIS_MASK REG_GENMASK(23, 21)
609610

610611
#define GEN8_EU_DISABLE0 _MMIO(0x9134)
611612
#define GEN9_EU_DISABLE(slice) _MMIO(0x9134 + (slice) * 0x4)
612613
#define GEN11_EU_DISABLE _MMIO(0x9134)
613-
#define GEN8_EU_DIS0_S0_MASK REG_GENMASK(23, 0)
614614
#define GEN8_EU_DIS0_S1_MASK REG_GENMASK(31, 24)
615+
#define GEN8_EU_DIS0_S0_MASK REG_GENMASK(23, 0)
615616
#define GEN11_EU_DIS_MASK REG_GENMASK(7, 0)
616617
#define XEHP_EU_ENABLE _MMIO(0x9134)
617618
#define XEHP_EU_ENA_MASK REG_GENMASK(7, 0)
618619

619620
#define GEN8_EU_DISABLE1 _MMIO(0x9138)
620-
#define GEN8_EU_DIS1_S1_MASK REG_GENMASK(15, 0)
621621
#define GEN8_EU_DIS1_S2_MASK REG_GENMASK(31, 16)
622+
#define GEN8_EU_DIS1_S1_MASK REG_GENMASK(15, 0)
622623

623624
#define GEN11_GT_SLICE_ENABLE _MMIO(0x9138)
624625
#define GEN11_GT_S_ENA_MASK REG_GENMASK(7, 0)
@@ -632,8 +633,8 @@
632633
#define GEN10_EU_DISABLE3 _MMIO(0x9140)
633634
#define GEN10_EU_DIS_SS_MASK 0xff
634635
#define GEN11_GT_VEBOX_VDBOX_DISABLE _MMIO(0x9140)
635-
#define GEN11_GT_VDBOX_DISABLE_MASK REG_GENMASK(7, 0)
636636
#define GEN11_GT_VEBOX_DISABLE_MASK REG_GENMASK(19, 16)
637+
#define GEN11_GT_VDBOX_DISABLE_MASK REG_GENMASK(7, 0)
637638

638639
#define GEN12_GT_COMPUTE_DSS_ENABLE _MMIO(0x9144)
639640
#define XEHPC_GT_COMPUTE_DSS_ENABLE_EXT _MMIO(0x9148)

0 commit comments

Comments
 (0)