Skip to content

Commit 05e2658

Browse files
Abdiel Janulguelucasdemarchi
authored andcommitted
drm/i915/dg1: add initial DG-1 definitions
Bspec: 33617, 33617 v2: s/intel_dg1_info/dg1_info/ as done for other platforms before and try to shut up compiler about ununsed variable that we know shouldn't be used (Lucas) v3: replace explicit attribute with __maybe_unused (Lucas) Cc: José Roberto de Souza <[email protected]> Cc: Daniele Ceraolo Spurio <[email protected]> Cc: Stuart Summers <[email protected]> Cc: Vanshidhar Konda <[email protected]> Cc: Lucas De Marchi <[email protected]> Cc: Aravind Iddamsetty <[email protected]> Cc: Matt Roper <[email protected]> Signed-off-by: Abdiel Janulgue <[email protected]> Signed-off-by: Lucas De Marchi <[email protected]> Reviewed-by: José Roberto de Souza <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 2ffcfd8 commit 05e2658

File tree

4 files changed

+21
-0
lines changed

4 files changed

+21
-0
lines changed

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,6 +1431,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
14311431
#define IS_ELKHARTLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)
14321432
#define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE)
14331433
#define IS_ROCKETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE)
1434+
#define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
14341435
#define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \
14351436
(INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)
14361437
#define IS_BDW_ULT(dev_priv) \
@@ -1559,6 +1560,12 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
15591560
#define IS_RKL_REVID(p, since, until) \
15601561
(IS_ROCKETLAKE(p) && IS_REVID(p, since, until))
15611562

1563+
#define DG1_REVID_A0 0x0
1564+
#define DG1_REVID_B0 0x1
1565+
1566+
#define IS_DG1_REVID(p, since, until) \
1567+
(IS_DG1(p) && IS_REVID(p, since, until))
1568+
15621569
#define IS_LP(dev_priv) (INTEL_INFO(dev_priv)->is_lp)
15631570
#define IS_GEN9_LP(dev_priv) (IS_GEN(dev_priv, 9) && IS_LP(dev_priv))
15641571
#define IS_GEN9_BC(dev_priv) (IS_GEN(dev_priv, 9) && !IS_LP(dev_priv))

drivers/gpu/drm/i915/i915_pci.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,8 +897,20 @@ static const struct intel_device_info rkl_info = {
897897

898898
#define GEN12_DGFX_FEATURES \
899899
GEN12_FEATURES, \
900+
.memory_regions = REGION_SMEM | REGION_LMEM, \
901+
.has_master_unit_irq = 1, \
900902
.is_dgfx = 1
901903

904+
static const struct intel_device_info dg1_info __maybe_unused = {
905+
GEN12_DGFX_FEATURES,
906+
PLATFORM(INTEL_DG1),
907+
.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D),
908+
.require_force_probe = 1,
909+
.platform_engine_mask =
910+
BIT(RCS0) | BIT(BCS0) | BIT(VECS0) |
911+
BIT(VCS0) | BIT(VCS2),
912+
};
913+
902914
#undef GEN
903915
#undef PLATFORM
904916

drivers/gpu/drm/i915/intel_device_info.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ static const char * const platform_names[] = {
6464
PLATFORM_NAME(ELKHARTLAKE),
6565
PLATFORM_NAME(TIGERLAKE),
6666
PLATFORM_NAME(ROCKETLAKE),
67+
PLATFORM_NAME(DG1),
6768
};
6869
#undef PLATFORM_NAME
6970

drivers/gpu/drm/i915/intel_device_info.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ enum intel_platform {
8282
/* gen12 */
8383
INTEL_TIGERLAKE,
8484
INTEL_ROCKETLAKE,
85+
INTEL_DG1,
8586
INTEL_MAX_PLATFORMS
8687
};
8788

0 commit comments

Comments
 (0)