From 815fb4c9d7da862a47c9d2a9765a4759826c5783 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>

Date: Tue, 24 Sep 2019 17:53:25 -0400

Subject: drm/amdgpu: return tcc_disabled_mask to userspace

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Git-commit: 815fb4c9d7da862a47c9d2a9765a4759826c5783

Patch-mainline: v5.4-rc2

References: bsc#1152472

UMDs need this for correct programming of harvested chips.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |  3 ++-

 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h |  1 +

 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c |  2 ++

 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c  | 12 ++++++++++++

 include/uapi/drm/amdgpu_drm.h           |  2 ++

 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

index 264677ab248a..6f8aaf655a9f 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

@@ -81,9 +81,10 @@

  * - 3.32.0 - Add syncobj timeline support to AMDGPU_CS.

  * - 3.33.0 - Fixes for GDS ENOMEM failures in AMDGPU_CS.

  * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches

+ * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask

  */

 #define KMS_DRIVER_MAJOR	3

-#define KMS_DRIVER_MINOR	34

+#define KMS_DRIVER_MINOR	35

 #define KMS_DRIVER_PATCHLEVEL	0

 #define AMDGPU_MAX_TIMEOUT_PARAM_LENTH	256

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h

index 554a59b3c4a6..6ee4021910e2 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h

@@ -165,6 +165,7 @@ struct amdgpu_gfx_config {

 	uint32_t num_sc_per_sh;

 	uint32_t num_packer_per_sc;

 	uint32_t pa_sc_tile_steering_override;

+	uint64_t tcc_disabled_mask;

 };

 struct amdgpu_cu_info {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

index f6147528be64..f2c097983f48 100644

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

@@ -787,6 +787,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file

 			dev_info.pa_sc_tile_steering_override =

 				adev->gfx.config.pa_sc_tile_steering_override;

+		dev_info.tcc_disabled_mask = adev->gfx.config.tcc_disabled_mask;

+

 		return copy_to_user(out, &dev_info,

 				    min((size_t)size, sizeof(dev_info))) ? -EFAULT : 0;

 	}

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

index 638c821611ab..957811b73672 100644

--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

@@ -1691,6 +1691,17 @@ static void gfx_v10_0_tcp_harvest(struct amdgpu_device *adev)

 	}

 }

+static void gfx_v10_0_get_tcc_info(struct amdgpu_device *adev)

+{

+	/* TCCs are global (not instanced). */

+	uint32_t tcc_disable = RREG32_SOC15(GC, 0, mmCGTS_TCC_DISABLE) |

+			       RREG32_SOC15(GC, 0, mmCGTS_USER_TCC_DISABLE);

+

+	adev->gfx.config.tcc_disabled_mask =

+		REG_GET_FIELD(tcc_disable, CGTS_TCC_DISABLE, TCC_DISABLE) |

+		(REG_GET_FIELD(tcc_disable, CGTS_TCC_DISABLE, HI_TCC_DISABLE) << 16);

+}

+

 static void gfx_v10_0_constants_init(struct amdgpu_device *adev)

 {

 	u32 tmp;

@@ -1702,6 +1713,7 @@ static void gfx_v10_0_constants_init(struct amdgpu_device *adev)

 	gfx_v10_0_setup_rb(adev);

 	gfx_v10_0_get_cu_info(adev, &adev->gfx.cu_info);

+	gfx_v10_0_get_tcc_info(adev);

 	adev->gfx.config.pa_sc_tile_steering_override =

 		gfx_v10_0_init_pa_sc_tile_steering_override(adev);

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h

index c99b4f2482c6..4fe35d600ab8 100644

--- a/include/uapi/drm/amdgpu_drm.h

+++ b/include/uapi/drm/amdgpu_drm.h

@@ -1003,6 +1003,8 @@ struct drm_amdgpu_info_device {

 	__u64 high_va_max;

 	/* gfx10 pa_sc_tile_steering_override */

 	__u32 pa_sc_tile_steering_override;

+	/* disabled TCCs */

+	__u64 tcc_disabled_mask;

 };

 struct drm_amdgpu_info_hw_ip {

-- 

2.28.0