drm/i915/cfl: Introduce Coffee Lake platform definition.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/3 drm/i915/cfl: Introduce Coffee Lake platform definition.
Coffee Lake is a Intel® Processor containing Intel® HD Graphics following Kabylake.
It is Gen9 graphics based platform on top of CNP PCH.
Let's start by adding the platform definition based on previous platforms but yet as preliminary_hw_support.
On following patches we will start adding PCI IDs and the platform specific changes.
v2: Also add BS2 ring that is present on GT3. As on KBL, according
spec: "GT3 also has additional media blocks with second instance of VEBox and VDBox each", i.e. BSD2 ring in our case. Noticed when reviewing PCI ID patches.
v3: CFL_PLATFORM instead for CFL_FEATURES because it contains
Platform information and no new features when compared to BDW_FEATURES definition.
v4: Rebased on top of Cannonlake patches.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_pci.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + 3 files changed, 19 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -826,6 +826,7 @@ enum intel_platform {INTEL_BROXTON ,INTEL_KABYLAKE ,INTEL_GEMINILAKE , +INTEL_COFFEELAKE ,INTEL_CANNONLAKE , INTEL_MAX_PLATFORMS };
@@ -2769,6 +2770,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)#define IS_BROXTON (dev_priv) ((dev_priv)->info.platform == INTEL_BROXTON)#define IS_KABYLAKE (dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE)#define IS_GEMINILAKE (dev_priv) ((dev_priv)->info.platform == INTEL_GEMINILAKE) +#define IS_COFFEELAKE (dev_priv) ((dev_priv)->info.platform == INTEL_COFFEELAKE)#define IS_CANNONLAKE (dev_priv) ((dev_priv)->info.platform == INTEL_CANNONLAKE)#define IS_MOBILE (dev_priv) ((dev_priv)->info.is_mobile)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \
drivers/gpu/drm/i915/i915_pci.c +16 -0
@@ -422,6 +422,22 @@ .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING, }; +#define CFL_PLATFORM \ + .is_alpha_support = 1, \ + BDW_FEATURES, \ + .gen = 9, \ + .platform = INTEL_COFFEELAKE, \ + .ddb_size = 896 + +static const struct intel_device_info intel_coffeelake_info = { +CFL_PLATFORM , +}; + +static const struct intel_device_info intel_coffeelake_gt3_info = { +CFL_PLATFORM , + .ring_mask =RENDER_RING |BSD_RING |BLT_RING |VEBOX_RING |BSD2_RING , +}; +static const struct intel_device_info intel_cannonlake_info = {BDW_FEATURES , .is_alpha_support =1 ,
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -51,6 +51,7 @@PLATFORM_NAME (BROXTON ),PLATFORM_NAME (KABYLAKE ),PLATFORM_NAME (GEMINILAKE ), +PLATFORM_NAME (COFFEELAKE ), PLATFORM_NAME(CANNONLAKE), };#undef PLATFORM_NAME
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 2/3 drm/i915/cfl: Coffee Lake uses CNP PCH.
So let's force it on the virtual detection.
Also it is still the only silicon for now on this PCH, so WARN otherwise.
v2: Rebased on top of Cannonlake and added the missed
debug message as pointed by DK.
--- drivers/gpu/drm/i915/i915_drv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +6 -3
@@ -139,8 +139,9 @@ static enum intel_pch intel_virt_detect_pch(struct drm_i915_private *dev_priv) }else if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) { ret =PCH_SPT ;DRM_DEBUG_KMS ("Assuming SunrisePoint PCH\n" ); - }else if (IS_CANNONLAKE (dev_priv)) { + }else if (IS_COFFEELAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) { ret =PCH_CNP ; +DRM_DEBUG_KMS ("Assuming CannonPoint PCH\n" ); }return ret;
@@ -224,11 +225,13 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) }else if (id ==INTEL_PCH_CNP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_CNP ;DRM_DEBUG_KMS ("Found CannonPoint PCH\n" ); -WARN_ON (!IS_CANNONLAKE (dev_priv)); +WARN_ON (!IS_CANNONLAKE (dev_priv) && + !IS_COFFEELAKE (dev_priv)); }else if (id_ext ==INTEL_PCH_CNP_LP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_CNP ;DRM_DEBUG_KMS ("Found CannonPoint LP PCH\n" ); -WARN_ON (!IS_CANNONLAKE (dev_priv)); +WARN_ON (!IS_CANNONLAKE (dev_priv) && + !IS_COFFEELAKE (dev_priv)); } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) || (id == INTEL_PCH_P3X_DEVICE_ID_TYPE) || ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerPATCH 3/3 drm/i915/cfl: Introduce Display workarounds for Coffee Lake.
In reply to Rodrigo ViviThe whole Display engine for Coffee Lake is pretty much identical to the Kabylake. For this reason let's reuse all display related production workardounds here even though CFL is not explicit listed at Display workarounds page at Spec.
v2: moved intel_pm.c chunck to this patch in order to address
all display related w/a in a single place.
--- drivers/gpu/drm/i915/intel_pm.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +11 -10
@@ -58,24 +58,24 @@static void gen9_init_clock_gating (struct drm_i915_private *dev_priv) { -/* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */ +/* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl,cfl */ I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP );I915_WRITE (GEN8_CONFIG0 ,I915_READ (GEN8_CONFIG0 ) |GEN9_DEFAULT_FIXES ); -/* WaEnableChickenDCPR:skl,bxt,kbl,glk */ +/* WaEnableChickenDCPR:skl,bxt,kbl,glk,cfl */ I915_WRITE (GEN8_CHICKEN_DCPR_1 ,I915_READ (GEN8_CHICKEN_DCPR_1 ) |MASK_WAKEMEM ); -/* WaFbcTurnOffFbcWatermark:skl,bxt,kbl */ -/* WaFbcWakeMemOn:skl,bxt,kbl,glk */ +/* WaFbcTurnOffFbcWatermark:skl,bxt,kbl,cfl */ +/* WaFbcWakeMemOn:skl,bxt,kbl,glk,cfl */ I915_WRITE (DISP_ARB_CTL ,I915_READ (DISP_ARB_CTL ) |DISP_FBC_WM_DIS |DISP_FBC_MEMORY_WAKE ); -/* WaFbcHighMemBwCorruptionAvoidance:skl,bxt,kbl */ +/* WaFbcHighMemBwCorruptionAvoidance:skl,bxt,kbl,cfl */ I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) |ILK_DPFC_DISABLE_DUMMY0 ); }
@@ -3549,7 +3549,7 @@ static bool skl_needs_memory_bw_wa(struct intel_atomic_state *state)static bool intel_has_sagv (struct drm_i915_private *dev_priv) { -if (IS_KABYLAKE (dev_priv)) +if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv))return true; if (IS_SKYLAKE(dev_priv) &&
@@ -4459,8 +4459,9 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, fb->modifier == I915_FORMAT_MOD_Yf_TILED; x_tiled = fb->modifier ==I915_FORMAT_MOD_X_TILED ; -/* Display WA #1141: kbl. */ -if (IS_KABYLAKE (dev_priv) && dev_priv->ipc_enabled) +/* Display WA #1141: kbl,cfl */ +if ((IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) && + dev_priv->ipc_enabled) latency +=4 ;if (apply_memory_bw_wa && x_tiled)
@@ -8312,7 +8313,7 @@ static void kabylake_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) |GEN6_GAMUNIT_CLOCK_GATE_DISABLE ); -/* WaFbcNukeOnHostModify:kbl */ +/* WaFbcNukeOnHostModify:kbl,cfl */ I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) |ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); }
@@ -8780,7 +8781,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv) {if (IS_SKYLAKE (dev_priv)) dev_priv->display.init_clock_gating = skylake_init_clock_gating; -else if (IS_KABYLAKE (dev_priv)) +else if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) dev_priv->display.init_clock_gating = kabylake_init_clock_gating;else if (IS_BROXTON (dev_priv)) dev_priv->display.init_clock_gating = bxt_init_clock_gating;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915/cfl: Introduce Display workarounds for Coffee Lake.
patches merged to dinq.
Thanks for the reviews.
Quoted 96 lines · Rodrigo Vivi
The whole Display engine for Coffee Lake is pretty much identical to the Kabylake. For this reason let's reuse all display related production workardounds here even though CFL is not explicit listed at Display workarounds page at Spec.
v2: moved
intel_pm.cchunck to this patch in order to address
all display related w/a in a single place.Cc Arthur Runyan <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>Reviewed-by Dhinakaran Pandiyan <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/intel_pm.c +11
-11@@ -58,24 +58,24 @@static void gen9_init_clock_gating (struct drm_i915_private *dev_priv) { -/* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */ +/* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl,cfl */ I915_WRITE (CHICKEN_PAR1_1 ,I915_READ (CHICKEN_PAR1_1 ) |SKL_EDP_PSR_FIX_RDWRAP );I915_WRITE (GEN8_CONFIG0 ,I915_READ (GEN8_CONFIG0 ) |GEN9_DEFAULT_FIXES ); -/* WaEnableChickenDCPR:skl,bxt,kbl,glk */ +/* WaEnableChickenDCPR:skl,bxt,kbl,glk,cfl */ I915_WRITE (GEN8_CHICKEN_DCPR_1 ,I915_READ (GEN8_CHICKEN_DCPR_1 ) |MASK_WAKEMEM ); -/* WaFbcTurnOffFbcWatermark:skl,bxt,kbl */ -/* WaFbcWakeMemOn:skl,bxt,kbl,glk */ +/* WaFbcTurnOffFbcWatermark:skl,bxt,kbl,cfl */ +/* WaFbcWakeMemOn:skl,bxt,kbl,glk,cfl */ I915_WRITE (DISP_ARB_CTL ,I915_READ (DISP_ARB_CTL ) |DISP_FBC_WM_DIS |DISP_FBC_MEMORY_WAKE ); -/* WaFbcHighMemBwCorruptionAvoidance:skl,bxt,kbl */ +/* WaFbcHighMemBwCorruptionAvoidance:skl,bxt,kbl,cfl */ I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) |ILK_DPFC_DISABLE_DUMMY0 ); }@@ -3549,7 +3549,7 @@ static bool skl_needs_memory_bw_wa(struct intel_atomic_state *state)static bool intel_has_sagv (struct drm_i915_private *dev_priv) { -if (IS_KABYLAKE (dev_priv)) +if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv))return true; if (IS_SKYLAKE(dev_priv) &&@@ -4459,8 +4459,9 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, fb->modifier == I915_FORMAT_MOD_Yf_TILED; x_tiled = fb->modifier ==I915_FORMAT_MOD_X_TILED ; -/* Display WA #1141: kbl. */ -if (IS_KABYLAKE (dev_priv) && dev_priv->ipc_enabled) +/* Display WA #1141: kbl,cfl */ +if ((IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) && + dev_priv->ipc_enabled) latency +=4 ;if (apply_memory_bw_wa && x_tiled)@@ -8312,7 +8313,7 @@ static void kabylake_init_clock_gating(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_UCGCTL1 ,I915_READ (GEN6_UCGCTL1 ) |GEN6_GAMUNIT_CLOCK_GATE_DISABLE ); -/* WaFbcNukeOnHostModify:kbl */ +/* WaFbcNukeOnHostModify:kbl,cfl */ I915_WRITE (ILK_DPFC_CHICKEN ,I915_READ (ILK_DPFC_CHICKEN ) |ILK_DPFC_NUKE_ON_ANY_MODIFICATION ); }@@ -8780,7 +8781,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv) {if (IS_SKYLAKE (dev_priv)) dev_priv->display.init_clock_gating = skylake_init_clock_gating; -else if (IS_KABYLAKE (dev_priv)) +else if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) dev_priv->display.init_clock_gating = kabylake_init_clock_gating;else if (IS_BROXTON (dev_priv)) dev_priv->display.init_clock_gating = bxt_init_clock_gating; --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915/cfl: Introduce Coffee Lake platform definition.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/cfl: Introduce Coffee Lake platform definition.
URL : https://patchwork.freedesktop.org/series/25486/
State : success
== Summary ==
Series 25486v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/25486/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:441s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:434s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:581s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:504s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:492s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:477s fi-glk-2a total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:585s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:428s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:415s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:415s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:483s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:464s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:471s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:571s fi-kbl-r total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time:570s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:459s fi-skl-6700hq total:278 pass:228 dwarn:1 dfail:0 fail:27 skip:22 time:403s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:466s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:501s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:434s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:537s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:398s
17f9a91122b35ff8eb237b65fec35d347ee49520 drm-tip: 2017y-06m-08d-14h-17m-12s UTC integration manifest 1cf5a5d drm/i915/cfl: Introduce Display workarounds for Coffee Lake.
04859c7 drm/i915/cfl: Coffee Lake uses CNP PCH.
38dc8e8 drm/i915/cfl: Introduce Coffee Lake platform definition.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4913/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx