Skip to contentSkip to conversation

Enabling GuC Loading on Broxton

PATCH In review Peter Antoine 4 participants 8 messages Jan 21, 2016 – Apr 6, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Enabling GuC Loading on Broxton

This set of patches will enable the GuC loading for BXT. There is also a fix that is required for GuC submission with the BXT GuC to make it reliable.

v2: Remove patch that is to be added with a later patchset.
remove erroneous write (merge error) - Jeff McGee

Peter Antoine (2):
drm/i915: Adding Broxton GuC Loader Support
drm/i915: resize the GuC WOPCM for rc6

 drivers/gpu/drm/i915/i915_guc_reg.h     |  3 ++-
 drivers/gpu/drm/i915/intel_guc_loader.c | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v2 1/2 drm/i915: Adding Broxton GuC Loader Support

This commits adds the Broxton target to the GuC loader

Issue: https://jira01.devtools.intel.com/browse/VIZ-6638

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +7 -0
index 550921f..8182d11 100644
@@ -62,6 +62,9 @@
 #define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin"
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
+#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver3.bin"
+MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
+
 /* User-friendly representation of an enum */
 const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
 {
@@ -587,6 +590,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
 		fw_path = I915_SKL_GUC_UCODE;
 		guc_fw->guc_fw_major_wanted = 4;
 		guc_fw->guc_fw_minor_wanted = 3;
+	} else if (IS_BROXTON(dev)) {
+		fw_path = I915_BXT_GUC_UCODE;
+		guc_fw->guc_fw_major_wanted = 3;
+		guc_fw->guc_fw_minor_wanted = 0;
 	} else {
 		i915.enable_guc_submission = false;
 		fw_path = "";	/* unknown device */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v2 2/2 drm/i915: resize the GuC WOPCM for rc6

In reply to Peter Antoine

This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.

Issue: https://jira01.devtools.intel.com/browse/VIZ-6638

---
 drivers/gpu/drm/i915/i915_guc_reg.h     | 3 ++-
 drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_reg.h +2 -1
index 685c799..cb938b0 100644
@@ -58,7 +58,8 @@
 #define GUC_MAX_IDLE_COUNT		_MMIO(0xC3E4)
 
 #define GUC_WOPCM_SIZE			_MMIO(0xc050)
-#define   GUC_WOPCM_SIZE_VALUE  	  (0x80 << 12)	/* 512KB */
+#define   GUC_WOPCM_SIZE_VALUE		(0x80 << 12)	/* 512KB */
+#define   BXT_GUC_WOPCM_SIZE_VALUE	(0x70 << 12)	/* 448KB */
 
 /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
 #define	GUC_WOPCM_TOP			(GUC_WOPCM_SIZE_VALUE)
drivers/gpu/drm/i915/intel_guc_loader.c +5 -1
index 8182d11..69c85d1 100644
@@ -304,7 +304,11 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
 	/* init WOPCM */
-	I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
+	if (IS_BROXTON(dev))
+		I915_WRITE(GUC_WOPCM_SIZE, BXT_GUC_WOPCM_SIZE_VALUE);
+	else
+		I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
+
 	I915_WRITE(DMA_GUC_WOPCM_OFFSET, GUC_WOPCM_OFFSET_VALUE);
 
 	/* Enable MIA caching. GuC clock gating is disabled. */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [PATCH v2 2/2] drm/i915: resize the GuC WOPCM for rc6

Quoted 15 lines · Peter Antoine

This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.

Issue: https://jira01.devtools.intel.com/browse/VIZ-6638

---
 drivers/gpu/drm/i915/i915_guc_reg.h     | 3 ++-
 drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_reg.h +0 -0
index 685c799..cb938b0 100644

drivers/gpu/drm/i915/i915_guc_reg.h line 65

Quoted 9 lines
drivers/gpu/drm/i915/i915_guc_reg.h +2 -1
@@ -58,7 +58,8 @@
 #define GUC_MAX_IDLE_COUNT		_MMIO(0xC3E4)
 
 #define GUC_WOPCM_SIZE			_MMIO(0xc050)
-#define   GUC_WOPCM_SIZE_VALUE  	  (0x80 << 12)	/* 512KB */
+#define   GUC_WOPCM_SIZE_VALUE		(0x80 << 12)	/* 512KB */
+#define   BXT_GUC_WOPCM_SIZE_VALUE	(0x70 << 12)	/* 448KB */
 
 /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
 #define	GUC_WOPCM_TOP			(GUC_WOPCM_SIZE_VALUE)

Should GUC_WOPCM_TOP be dynamically assigned the proper value, or is it sufficient to leave at the max possible WOPCM size? If the later, might be worth a comment.
-Jeff

Quoted 24 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5 -1
index 8182d11..69c85d1 100644
@@ -304,7 +304,11 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
 	/* init WOPCM */
-	I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
+	if (IS_BROXTON(dev))
+		I915_WRITE(GUC_WOPCM_SIZE, BXT_GUC_WOPCM_SIZE_VALUE);
+	else
+		I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
+
 	I915_WRITE(DMA_GUC_WOPCM_OFFSET, GUC_WOPCM_OFFSET_VALUE);
 
 	/* Enable MIA caching. GuC clock gating is disabled. */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: [PATCH v2 2/2] drm/i915: resize the GuC WOPCM for rc6

Reply inline.

Quoted 23 lines · Jeff McGee
Quoted 22 lines · Peter Antoine

This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.

Issue: https://jira01.devtools.intel.com/browse/VIZ-6638

---
 drivers/gpu/drm/i915/i915_guc_reg.h     | 3 ++-
 drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_reg.h +2 -1
index 685c799..cb938b0 100644
@@ -58,7 +58,8 @@
 #define GUC_MAX_IDLE_COUNT		_MMIO(0xC3E4)
 
 #define GUC_WOPCM_SIZE			_MMIO(0xc050)
-#define   GUC_WOPCM_SIZE_VALUE  	  (0x80 << 12)	/* 512KB */
+#define   GUC_WOPCM_SIZE_VALUE		(0x80 << 12)	/* 512KB */
+#define   BXT_GUC_WOPCM_SIZE_VALUE	(0x70 << 12)	/* 448KB */
 
Quoted 6 lines

drivers/gpu/drm/i915/i915_guc_reg.h line 65

Quoted 2 lines
drivers/gpu/drm/i915/i915_guc_reg.h +0 -0
 /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
 #define	GUC_WOPCM_TOP			(GUC_WOPCM_SIZE_VALUE)

Should GUC_WOPCM_TOP be dynamically assigned the proper value, or is it sufficient to leave at the max possible WOPCM size? If the later, might be worth a comment.
-Jeff

I'll send a follow up patch to add a comment this.

The whole area needs to be not mapped, as it is still accessed from the GuC.

-Peter.

Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5 -1
index 8182d11..69c85d1 100644
@@ -304,7 +304,11 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
 	/* init WOPCM */
-	I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
+	if (IS_BROXTON(dev))
+		I915_WRITE(GUC_WOPCM_SIZE, BXT_GUC_WOPCM_SIZE_VALUE);
+	else
+		I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);
+
 	I915_WRITE(DMA_GUC_WOPCM_OFFSET, GUC_WOPCM_OFFSET_VALUE);
 
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0 -1
 	/* Enable MIA caching. GuC clock gating is disabled. */
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Peter Antoine (Android Graphics Driver Software Engineer)
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

Re: [PATCH v2 2/2] drm/i915: resize the GuC WOPCM for rc6

In reply to Jeff McGee
Quoted 23 lines · Jeff McGee
Quoted 22 lines · Peter Antoine

This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.

Issue: https://jira01.devtools.intel.com/browse/VIZ-6638

---
  drivers/gpu/drm/i915/i915_guc_reg.h     | 3 ++-
  drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++-
  2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_reg.h +2 -1
index 685c799..cb938b0 100644
@@ -58,7 +58,8 @@
  #define GUC_MAX_IDLE_COUNT		_MMIO(0xC3E4)
 
  #define GUC_WOPCM_SIZE			_MMIO(0xc050)
-#define   GUC_WOPCM_SIZE_VALUE  	  (0x80 << 12)	/* 512KB */
+#define   GUC_WOPCM_SIZE_VALUE		(0x80 << 12)	/* 512KB */
+#define   BXT_GUC_WOPCM_SIZE_VALUE	(0x70 << 12)	/* 448KB */
 
Quoted 6 lines

drivers/gpu/drm/i915/i915_guc_reg.h line 65

Quoted 2 lines
drivers/gpu/drm/i915/i915_guc_reg.h +0 -0
  /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
  #define	GUC_WOPCM_TOP			(GUC_WOPCM_SIZE_VALUE)

Should GUC_WOPCM_TOP be dynamically assigned the proper value, or is it sufficient to leave at the max possible WOPCM size? If the later, might be worth a comment.
-Jeff

This isn't the right interpretation of these values.

GUC_WOPCM_TOP is the value defining the top of the GTT address range NOT available to the GuC and hence where GuC-accessible objects must NOT be placed.

GUC_WOPCM_SIZE_VALUE is the value written to the GUC_WOPCM_SIZE register, defining how much WOPCM space CAN be used.

The former is an architectural constant (512K); the latter is a software-defined boundary between areas of memory within that range that are used for different purposes.

Therefore, GUC_WOPCM_TOP must NOT be defined in terms of GUC_WOPCM_SIZE_VALUE, but GUC_WOPCM_SIZE_VALUE could be defined in terms of GUC_WOPCM_TOP, in particular as (GUC_WOPCM_TOP-reserved).

.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

Re: [PATCH v2 2/2] drm/i915: resize the GuC WOPCM for rc6

Hi Peter,

This patch is required for the BXT firmware loading. (Maybe/Probably something similar for KBL is also required)
Do you have plans to fix this interpretation as Dave pointed and send a new version?

Thanks,
Rodrigo.

Quoted 59 lines · Dave Gordon
Quoted 26 lines · Jeff McGee
Quoted 24 lines · Peter Antoine

This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.

Issue: https://jira01.devtools.intel.com/browse/VIZ-6638

---
  drivers/gpu/drm/i915/i915_guc_reg.h     | 3 ++-
  drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++-
  2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_reg.h +2 -1
index 685c799..cb938b0 100644
@@ -58,7 +58,8 @@
  #define GUC_MAX_IDLE_COUNT            _MMIO(0xC3E4)
 
  #define GUC_WOPCM_SIZE                        _MMIO(0xc050)
-#define   GUC_WOPCM_SIZE_VALUE           (0x80 << 12)  /* 512KB */
+#define   GUC_WOPCM_SIZE_VALUE         (0x80 << 12)    /* 512KB */
+#define   BXT_GUC_WOPCM_SIZE_VALUE     (0x70 << 12)    /* 448KB */
 
Quoted 7 lines

drivers/gpu/drm/i915/i915_guc_reg.h line 65

Quoted 2 lines
drivers/gpu/drm/i915/i915_guc_reg.h +0 -0
  /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
  #define       GUC_WOPCM_TOP                   (GUC_WOPCM_SIZE_VALUE)

Should GUC_WOPCM_TOP be dynamically assigned the proper value, or is it sufficient to leave at the max possible WOPCM size? If the later, might be worth a comment.
-Jeff

This isn't the right interpretation of these values.

GUC_WOPCM_TOP is the value defining the top of the GTT address range NOT available to the GuC and hence where GuC-accessible objects must NOT be placed.

GUC_WOPCM_SIZE_VALUE is the value written to the GUC_WOPCM_SIZE register, defining how much WOPCM space CAN be used.

The former is an architectural constant (512K); the latter is a software-defined boundary between areas of memory within that range that are used for different purposes.

Therefore, GUC_WOPCM_TOP must NOT be defined in terms of GUC_WOPCM_SIZE_VALUE, but GUC_WOPCM_SIZE_VALUE could be defined in terms of GUC_WOPCM_TOP, in particular as (GUC_WOPCM_TOP-reserved).

.Dave.

_______________________________________________
Intel-gfx mailing list
[email protected]
http://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
#7 lore raw

Re: [PATCH v2 2/2] drm/i915: resize the GuC WOPCM for rc6

Ok,

The value written to GUC_WOPCM_SIZE is done on i915-gem.c@6474:

	/* init WOPCM */
	if (IS_BROXTON(dev))
		I915_WRITE(GUC_WOPCM_SIZE, BXT_GUC_WOPCM_SIZE_VALUE);
	else
		I915_WRITE(GUC_WOPCM_SIZE, GUC_WOPCM_SIZE_VALUE);

So I think it is correct on BXT. The definition is confusing as the space on BXT is smaller so that the RC6 data can be written to the WOPCM.

I don't think there is anything to do.

Peter.

Quoted 7 lines · Rodrigo Vivi

Hi Peter,

This patch is required for the BXT firmware loading. (Maybe/Probably something similar for KBL is also required)
Do you have plans to fix this interpretation as Dave pointed and send a new version?

Quoted 67 lines

Thanks,
Rodrigo.

Quoted 59 lines · Dave Gordon
Quoted 26 lines · Jeff McGee
Quoted 24 lines · Peter Antoine

This patch resizes the GuC WOPCM to so that the GuC and the RC6 memory spaces do not overlap.

Issue: https://jira01.devtools.intel.com/browse/VIZ-6638

---
  drivers/gpu/drm/i915/i915_guc_reg.h     | 3 ++-
  drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++-
  2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_guc_reg.h +2 -1
index 685c799..cb938b0 100644
@@ -58,7 +58,8 @@
  #define GUC_MAX_IDLE_COUNT            _MMIO(0xC3E4)
 
  #define GUC_WOPCM_SIZE                        _MMIO(0xc050)
-#define   GUC_WOPCM_SIZE_VALUE           (0x80 << 12)  /* 512KB */
+#define   GUC_WOPCM_SIZE_VALUE         (0x80 << 12)    /* 512KB */
+#define   BXT_GUC_WOPCM_SIZE_VALUE     (0x70 << 12)    /* 448KB */
 
Quoted 7 lines

drivers/gpu/drm/i915/i915_guc_reg.h line 65

Quoted 2 lines
drivers/gpu/drm/i915/i915_guc_reg.h +0 -0
  /* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */
  #define       GUC_WOPCM_TOP                   (GUC_WOPCM_SIZE_VALUE)

Should GUC_WOPCM_TOP be dynamically assigned the proper value, or is it sufficient to leave at the max possible WOPCM size? If the later, might be worth a comment.
-Jeff

This isn't the right interpretation of these values.

GUC_WOPCM_TOP is the value defining the top of the GTT address range NOT available to the GuC and hence where GuC-accessible objects must NOT be placed.

GUC_WOPCM_SIZE_VALUE is the value written to the GUC_WOPCM_SIZE register, defining how much WOPCM space CAN be used.

The former is an architectural constant (512K); the latter is a software-defined boundary between areas of memory within that range that are used for different purposes.

Therefore, GUC_WOPCM_TOP must NOT be defined in terms of GUC_WOPCM_SIZE_VALUE, but GUC_WOPCM_SIZE_VALUE could be defined in terms of GUC_WOPCM_TOP, in particular as (GUC_WOPCM_TOP-reserved).

.Dave.

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Peter Antoine (Android Graphics Driver Software Engineer)
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx