Skip to contentSkip to conversation

drm/amdgpu: add get clockgating_state method for uvd v5&v6

PATCH Superseded Huang Rui 3 participants 6 messages Jan 6, 2017 4 messages not in the archive

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Huang Rui

author
#0 lore raw

PATCH v3 7/8 drm/amdgpu: add get clockgating_state method for uvd v5&v6

---

Changes from V2 -> V3:
- add mutex to protect the is_powergated flag.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h   |  2 ++
 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 37 +++++++++++++++++++++++++++++++++--
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 37 +++++++++++++++++++++++++++++++++--
 3 files changed, 72 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
index 530549b..afb3ded 100644
@@ -1183,6 +1183,8 @@ struct amdgpu_uvd {
 	bool			use_ctx_buf;
 	struct amd_sched_entity entity;
 	uint32_t                srbm_soft_reset;
+	bool			is_powergated;
+	struct mutex		pg_mutex;
 };
 
 /*
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +35 -2
index 03a35d9..bf797b8 100644
@@ -781,16 +781,48 @@ static int uvd_v5_0_set_powergating_state(void *handle,
 	 * the smc and the hw blocks
 	 */
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int ret = 0;
 
 	if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
 		return 0;
 
+	mutex_lock(&adev->uvd.pg_mutex);
+
 	if (state == AMD_PG_STATE_GATE) {
+		adev->uvd.is_powergated = true;
 		uvd_v5_0_stop(adev);
-		return 0;
 	} else {
-		return uvd_v5_0_start(adev);
+		ret = uvd_v5_0_start(adev);
+		if (ret)
+			goto out;
+		adev->uvd.is_powergated = false;
+	}
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
+
+	return ret;
+}
+
+static void uvd_v5_0_get_clockgating_state(void *handle, u32 *flags)
+{
+	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int data;
+
+	mutex_lock(&adev->uvd.pg_mutex);
+
+	if (adev->uvd.is_powergated) {
+		DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+		goto out;
 	}
+
+	/* AMD_CG_SUPPORT_UVD_MGCG */
+	data = RREG32(mmUVD_CGC_CTRL);
+	if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+		*flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
 }
 
 static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
@@ -808,6 +840,7 @@ static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
 	.soft_reset = uvd_v5_0_soft_reset,
 	.set_clockgating_state = uvd_v5_0_set_clockgating_state,
 	.set_powergating_state = uvd_v5_0_set_powergating_state,
+	.get_clockgating_state = uvd_v5_0_get_clockgating_state,
 };
 
 static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = {
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +35 -2
index 8779d4b..0ec692d 100644
@@ -987,18 +987,50 @@ static int uvd_v6_0_set_powergating_state(void *handle,
 	 * the smc and the hw blocks
 	 */
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int ret = 0;
 
 	if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
 		return 0;
 
 	WREG32(mmUVD_POWER_STATUS, UVD_POWER_STATUS__UVD_PG_EN_MASK);
 
+	mutex_lock(&adev->uvd.pg_mutex);
+
 	if (state == AMD_PG_STATE_GATE) {
+		adev->uvd.is_powergated = true;
 		uvd_v6_0_stop(adev);
-		return 0;
 	} else {
-		return uvd_v6_0_start(adev);
+		ret = uvd_v6_0_start(adev);
+		if (ret)
+			goto out;
+		adev->uvd.is_powergated = false;
+	}
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
+
+	return ret;
+}
+
+static void uvd_v6_0_get_clockgating_state(void *handle, u32 *flags)
+{
+	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int data;
+
+	mutex_lock(&adev->uvd.pg_mutex);
+
+	if (adev->uvd.is_powergated) {
+		DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+		goto out;
 	}
+
+	/* AMD_CG_SUPPORT_UVD_MGCG */
+	data = RREG32(mmUVD_CGC_CTRL);
+	if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+		*flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
 }
 
 static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
@@ -1019,6 +1051,7 @@ static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
 	.post_soft_reset = uvd_v6_0_post_soft_reset,
 	.set_clockgating_state = uvd_v6_0_set_clockgating_state,
 	.set_powergating_state = uvd_v6_0_set_powergating_state,
+	.get_clockgating_state = uvd_v6_0_get_clockgating_state,
 };
 
 static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1483699875-27734-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH v3 8/8 drm/amdgpu: add get clockgating_state method for vce v3

---

Changes from V2 -> V3:
- use mutex to protect the is_powergated flag.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h   |  1 +
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 44 +++++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
index afb3ded..5d31e4d 100644
@@ -1213,6 +1213,7 @@ struct amdgpu_vce {
 	struct amd_sched_entity	entity;
 	uint32_t                srbm_soft_reset;
 	unsigned		num_rings;
+	bool			is_powergated;
 };
 
 /*
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +40 -4

61 lines not on this page · raw message

Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw
In reply to a message not in the archive

Am 06.01.2017 um 11:51 schrieb Huang Rui:

Quoted 17 lines

---

Changes from V2 -> V3:
- add mutex to protect the is_powergated flag.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h   |  2 ++
  drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 37 +++++++++++++++++++++++++++++++++--
  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 37 +++++++++++++++++++++++++++++++++--
  3 files changed, 72 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 530549b..afb3ded 100644

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct amdgpu_uvd { · line 1187

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -1183,6 +1183,8 @@ struct amdgpu_uvd {
  	bool			use_ctx_buf;
  	struct amd_sched_entity entity;
  	uint32_t                srbm_soft_reset;
+	bool			is_powergated;
+	struct mutex		pg_mutex;

You are missing a mutex_init for pg_mutex, probably best to put this into amdgpu_uvd_sw_init().

Apart from that the patch looks good to me now.

Regards,
Christian.

Quoted 124 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
  };
 
  /*
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +35 -2
index 03a35d9..bf797b8 100644
@@ -781,16 +781,48 @@ static int uvd_v5_0_set_powergating_state(void *handle,
  	 * the smc and the hw blocks
  	 */
  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int ret = 0;
 
  	if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
  		return 0;
 
+	mutex_lock(&adev->uvd.pg_mutex);
+
  	if (state == AMD_PG_STATE_GATE) {
+		adev->uvd.is_powergated = true;
  		uvd_v5_0_stop(adev);
-		return 0;
  	} else {
-		return uvd_v5_0_start(adev);
+		ret = uvd_v5_0_start(adev);
+		if (ret)
+			goto out;
+		adev->uvd.is_powergated = false;
+	}
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
+
+	return ret;
+}
+
+static void uvd_v5_0_get_clockgating_state(void *handle, u32 *flags)
+{
+	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int data;
+
+	mutex_lock(&adev->uvd.pg_mutex);
+
+	if (adev->uvd.is_powergated) {
+		DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+		goto out;
  	}
+
+	/* AMD_CG_SUPPORT_UVD_MGCG */
+	data = RREG32(mmUVD_CGC_CTRL);
+	if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+		*flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
@@ -808,6 +840,7 @@ static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
  	.soft_reset = uvd_v5_0_soft_reset,
  	.set_clockgating_state = uvd_v5_0_set_clockgating_state,
  	.set_powergating_state = uvd_v5_0_set_powergating_state,
+	.get_clockgating_state = uvd_v5_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = {
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +34 -2
index 8779d4b..0ec692d 100644
@@ -987,18 +987,50 @@ static int uvd_v6_0_set_powergating_state(void *handle,
  	 * the smc and the hw blocks
  	 */
  	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int ret = 0;
 
  	if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
  		return 0;
 
  	WREG32(mmUVD_POWER_STATUS, UVD_POWER_STATUS__UVD_PG_EN_MASK);
 
+	mutex_lock(&adev->uvd.pg_mutex);
+
  	if (state == AMD_PG_STATE_GATE) {
+		adev->uvd.is_powergated = true;
  		uvd_v6_0_stop(adev);
-		return 0;
  	} else {
-		return uvd_v6_0_start(adev);
+		ret = uvd_v6_0_start(adev);
+		if (ret)
+			goto out;
+		adev->uvd.is_powergated = false;
+	}
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
+
+	return ret;
+}
+
+static void uvd_v6_0_get_clockgating_state(void *handle, u32 *flags)
+{
+	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+	int data;
+
+	mutex_lock(&adev->uvd.pg_mutex);
+
+	if (adev->uvd.is_powergated) {
+		DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+		goto out;
  	}
+
+	/* AMD_CG_SUPPORT_UVD_MGCG */
+	data = RREG32(mmUVD_CGC_CTRL);
+	if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+		*flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+	mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { · line 1057

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -0
@@ -1019,6 +1051,7 @@ static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
  	.post_soft_reset = uvd_v6_0_post_soft_reset,
  	.set_clockgating_state = uvd_v6_0_set_clockgating_state,
  	.set_powergating_state = uvd_v6_0_set_powergating_state,
+	.get_clockgating_state = uvd_v6_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): e2d8d323-1ee0-6f76-74c4-18a19fb2b0da-5C7GfCeVMHo@public.gmane.org

#5 lore raw

There's already the adev->pm.mutex which is held while gating/ungating blocks. There's no need for a second mutex right?

Tom

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Christian König <[email protected]>
Sent: Friday, January 6, 2017 07:52
To: Huang, Ray; Deucher, Alexander; [email protected]
Cc: Kuehling, Felix; Zhang, Hawking; Zhu, Rex; Fu, Ping; Mao, David
Subject: Re: [PART1 PATCH v3 7/8] drm/amdgpu: add get clockgating_state method for uvd v5&v6

Am 06.01.2017 um 11:51 schrieb Huang Rui:

Quoted 17 lines

---

Changes from V2 -> V3:
- add mutex to protect the is_powergated flag.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h   |  2 ++
  drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 37 +++++++++++++++++++++++++++++++++--
  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 37 +++++++++++++++++++++++++++++++++--
  3 files changed, 72 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 530549b..afb3ded 100644

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct amdgpu_uvd { · line 1187

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -1183,6 +1183,8 @@ struct amdgpu_uvd {
       bool                    use_ctx_buf;
       struct amd_sched_entity entity;
       uint32_t                srbm_soft_reset;
+     bool                    is_powergated;
+     struct mutex            pg_mutex;

You are missing a mutex_init for pg_mutex, probably best to put this into amdgpu_uvd_sw_init().

Apart from that the patch looks good to me now.

Regards,
Christian.

Quoted 124 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
  };
 
  /*
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +35 -2
index 03a35d9..bf797b8 100644
@@ -781,16 +781,48 @@ static int uvd_v5_0_set_powergating_state(void *handle,
        * the smc and the hw blocks
        */
       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int ret = 0;
 
       if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
               return 0;
 
+     mutex_lock(&adev->uvd.pg_mutex);
+
       if (state == AMD_PG_STATE_GATE) {
+             adev->uvd.is_powergated = true;
               uvd_v5_0_stop(adev);
-             return 0;
       } else {
-             return uvd_v5_0_start(adev);
+             ret = uvd_v5_0_start(adev);
+             if (ret)
+                     goto out;
+             adev->uvd.is_powergated = false;
+     }
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
+
+     return ret;
+}
+
+static void uvd_v5_0_get_clockgating_state(void *handle, u32 *flags)
+{
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int data;
+
+     mutex_lock(&adev->uvd.pg_mutex);
+
+     if (adev->uvd.is_powergated) {
+             DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+             goto out;
       }
+
+     /* AMD_CG_SUPPORT_UVD_MGCG */
+     data = RREG32(mmUVD_CGC_CTRL);
+     if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+             *flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
@@ -808,6 +840,7 @@ static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
       .soft_reset = uvd_v5_0_soft_reset,
       .set_clockgating_state = uvd_v5_0_set_clockgating_state,
       .set_powergating_state = uvd_v5_0_set_powergating_state,
+     .get_clockgating_state = uvd_v5_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = {
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +34 -2
index 8779d4b..0ec692d 100644
@@ -987,18 +987,50 @@ static int uvd_v6_0_set_powergating_state(void *handle,
        * the smc and the hw blocks
        */
       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int ret = 0;
 
       if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
               return 0;
 
       WREG32(mmUVD_POWER_STATUS, UVD_POWER_STATUS__UVD_PG_EN_MASK);
 
+     mutex_lock(&adev->uvd.pg_mutex);
+
       if (state == AMD_PG_STATE_GATE) {
+             adev->uvd.is_powergated = true;
               uvd_v6_0_stop(adev);
-             return 0;
       } else {
-             return uvd_v6_0_start(adev);
+             ret = uvd_v6_0_start(adev);
+             if (ret)
+                     goto out;
+             adev->uvd.is_powergated = false;
+     }
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
+
+     return ret;
+}
+
+static void uvd_v6_0_get_clockgating_state(void *handle, u32 *flags)
+{
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int data;
+
+     mutex_lock(&adev->uvd.pg_mutex);
+
+     if (adev->uvd.is_powergated) {
+             DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+             goto out;
       }
+
+     /* AMD_CG_SUPPORT_UVD_MGCG */
+     data = RREG32(mmUVD_CGC_CTRL);
+     if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+             *flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { · line 1057

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -0
@@ -1019,6 +1051,7 @@ static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
       .post_soft_reset = uvd_v6_0_post_soft_reset,
       .set_clockgating_state = uvd_v6_0_set_clockgating_state,
       .set_powergating_state = uvd_v6_0_set_powergating_state,
+     .get_clockgating_state = uvd_v6_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CY4PR12MB1768DCF4453B731FDD726447F7630-rpdhrqHFk06yjjPBNVDk/[email protected]

#7 lore raw

Good point, I wasn't ware that the pm mutex still existed and is taken under all code flows.

Christian.

Am 06.01.2017 um 14:42 schrieb StDenis, Tom:

Quoted 190 lines

There's already the adev->pm.mutex which is held while gating/ungating blocks. There's no need for a second mutex right?

Tom

------------------------------------------------------------------------
*From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Christian König <[email protected]> *Sent:* Friday, January 6, 2017 07:52
*To:* Huang, Ray; Deucher, Alexander; [email protected]
*Cc:* Kuehling, Felix; Zhang, Hawking; Zhu, Rex; Fu, Ping; Mao, David
*Subject:* Re: [PART1 PATCH v3 7/8] drm/amdgpu: add get clockgating_state method for uvd v5&v6
Am 06.01.2017 um 11:51 schrieb Huang Rui:

Quoted 9 lines

---

Changes from V2 -> V3:
- add mutex to protect the is_powergated flag.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h   |  2 ++
  drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 37 

+++++++++++++++++++++++++++++++++--

Quoted 1 line
  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 37 

+++++++++++++++++++++++++++++++++--

Review

Quoted 3 lines
  3 files changed, 72 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

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

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct amdgpu_uvd { · line 1187

Quoted 9 lines

index 530549b..afb3ded 100644

drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -1183,6 +1183,8 @@ struct amdgpu_uvd {
       bool                    use_ctx_buf;
       struct amd_sched_entity entity;
       uint32_t                srbm_soft_reset;
+     bool                    is_powergated;
+     struct mutex            pg_mutex;

You are missing a mutex_init for pg_mutex, probably best to put this into amdgpu_uvd_sw_init().

Apart from that the patch looks good to me now.

Regards,
Christian.

Review

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
  };
 
  /*
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c

drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c static int uvd_v5_0_set_powergating_state(void

Quoted 4 lines

index 03a35d9..bf797b8 100644

drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +0 -0
@@ -781,16 +781,48 @@ static int uvd_v5_0_set_powergating_state(void 

*handle,

Quoted 27 lines
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +15 -2
        * the smc and the hw blocks
        */
       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int ret = 0;
 
       if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
               return 0;
 
+     mutex_lock(&adev->uvd.pg_mutex);
+
       if (state == AMD_PG_STATE_GATE) {
+             adev->uvd.is_powergated = true;
               uvd_v5_0_stop(adev);
-             return 0;
       } else {
-             return uvd_v5_0_start(adev);
+             ret = uvd_v5_0_start(adev);
+             if (ret)
+                     goto out;
+             adev->uvd.is_powergated = false;
+     }
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
+
+     return ret;
+}

drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c static int uvd_v5_0_set_powergating_state(void *handle,

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +10 -0
+
+static void uvd_v5_0_get_clockgating_state(void *handle, u32 *flags)
+{
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int data;
+
+     mutex_lock(&adev->uvd.pg_mutex);
+
+     if (adev->uvd.is_powergated) {
+             DRM_INFO("Cannot get clockgating state when UVD is 

powergated.\n");

drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c static const struct amd_ip_funcs

Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +9 -0
+             goto out;
       }
+
+     /* AMD_CG_SUPPORT_UVD_MGCG */
+     data = RREG32(mmUVD_CGC_CTRL);
+     if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+             *flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
@@ -808,6 +840,7 @@ static const struct amd_ip_funcs 

uvd_v5_0_ip_funcs = {

Review

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +1 -0
       .soft_reset = uvd_v5_0_soft_reset,
       .set_clockgating_state = uvd_v5_0_set_clockgating_state,
       .set_powergating_state = uvd_v5_0_set_powergating_state,
+     .get_clockgating_state = uvd_v5_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = {
(quoted diff) +0 -0

b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static int uvd_v6_0_set_powergating_state(void

Quoted 4 lines

index 8779d4b..0ec692d 100644

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0 -0
@@ -987,18 +987,50 @@ static int uvd_v6_0_set_powergating_state(void 

*handle,

Quoted 29 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +15 -2
        * the smc and the hw blocks
        */
       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int ret = 0;
 
       if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
               return 0;
 
       WREG32(mmUVD_POWER_STATUS, UVD_POWER_STATUS__UVD_PG_EN_MASK);
 
+     mutex_lock(&adev->uvd.pg_mutex);
+
       if (state == AMD_PG_STATE_GATE) {
+             adev->uvd.is_powergated = true;
               uvd_v6_0_stop(adev);
-             return 0;
       } else {
-             return uvd_v6_0_start(adev);
+             ret = uvd_v6_0_start(adev);
+             if (ret)
+                     goto out;
+             adev->uvd.is_powergated = false;
+     }
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
+
+     return ret;
+}

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static int uvd_v6_0_set_powergating_state(void *handle,

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +10 -0
+
+static void uvd_v6_0_get_clockgating_state(void *handle, u32 *flags)
+{
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int data;
+
+     mutex_lock(&adev->uvd.pg_mutex);
+
+     if (adev->uvd.is_powergated) {
+             DRM_INFO("Cannot get clockgating state when UVD is 

powergated.\n");

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static const struct amd_ip_funcs

Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +9 -0
+             goto out;
       }
+
+     /* AMD_CG_SUPPORT_UVD_MGCG */
+     data = RREG32(mmUVD_CGC_CTRL);
+     if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+             *flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
@@ -1019,6 +1051,7 @@ static const struct amd_ip_funcs 

uvd_v6_0_ip_funcs = {

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { · line 1057

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -0
       .post_soft_reset = uvd_v6_0_post_soft_reset,
       .set_clockgating_state = uvd_v6_0_set_clockgating_state,
       .set_powergating_state = uvd_v6_0_set_powergating_state,
+     .get_clockgating_state = uvd_v6_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {
Quoted 10 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1e6d1ea8-00b4-2af2-bedd-c1abaa5d24a6-5C7GfCeVMHo@public.gmane.org

#9 lore raw

It was added late last year so that debugfs mmio could read vce/uvd registers without triggering a race condition between transitions.

Cheers,

Tom

________________________________
From: Koenig, Christian
Sent: Friday, January 6, 2017 08:45
To: StDenis, Tom; Huang, Ray; Deucher, Alexander; [email protected]
Cc: Kuehling, Felix; Zhang, Hawking; Zhu, Rex; Fu, Ping; Mao, David
Subject: Re: [PART1 PATCH v3 7/8] drm/amdgpu: add get clockgating_state method for uvd v5&v6

Good point, I wasn't ware that the pm mutex still existed and is taken under all code flows.

Christian.

Am 06.01.2017 um 14:42 schrieb StDenis, Tom:

There's already the adev->pm.mutex which is held while gating/ungating blocks. There's no need for a second mutex right?

Tom

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org><mailto:[email protected]> on behalf of Christian König <[email protected]><mailto:[email protected]>
Sent: Friday, January 6, 2017 07:52
To: Huang, Ray; Deucher, Alexander; [email protected]<mailto:[email protected]>
Cc: Kuehling, Felix; Zhang, Hawking; Zhu, Rex; Fu, Ping; Mao, David
Subject: Re: [PART1 PATCH v3 7/8] drm/amdgpu: add get clockgating_state method for uvd v5&v6

Am 06.01.2017 um 11:51 schrieb Huang Rui:

Quoted 17 lines

---

Changes from V2 -> V3:
- add mutex to protect the is_powergated flag.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu.h   |  2 ++
  drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 37 +++++++++++++++++++++++++++++++++--
  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 37 +++++++++++++++++++++++++++++++++--
  3 files changed, 72 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
index 530549b..afb3ded 100644

drivers/gpu/drm/amd/amdgpu/amdgpu.h struct amdgpu_uvd { · line 1187

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -1183,6 +1183,8 @@ struct amdgpu_uvd {
       bool                    use_ctx_buf;
       struct amd_sched_entity entity;
       uint32_t                srbm_soft_reset;
+     bool                    is_powergated;
+     struct mutex            pg_mutex;

You are missing a mutex_init for pg_mutex, probably best to put this into amdgpu_uvd_sw_init().

Apart from that the patch looks good to me now.

Regards,
Christian.

Quoted 124 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -0
  };
 
  /*
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +35 -2
index 03a35d9..bf797b8 100644
@@ -781,16 +781,48 @@ static int uvd_v5_0_set_powergating_state(void *handle,
        * the smc and the hw blocks
        */
       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int ret = 0;
 
       if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
               return 0;
 
+     mutex_lock(&adev->uvd.pg_mutex);
+
       if (state == AMD_PG_STATE_GATE) {
+             adev->uvd.is_powergated = true;
               uvd_v5_0_stop(adev);
-             return 0;
       } else {
-             return uvd_v5_0_start(adev);
+             ret = uvd_v5_0_start(adev);
+             if (ret)
+                     goto out;
+             adev->uvd.is_powergated = false;
+     }
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
+
+     return ret;
+}
+
+static void uvd_v5_0_get_clockgating_state(void *handle, u32 *flags)
+{
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int data;
+
+     mutex_lock(&adev->uvd.pg_mutex);
+
+     if (adev->uvd.is_powergated) {
+             DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+             goto out;
       }
+
+     /* AMD_CG_SUPPORT_UVD_MGCG */
+     data = RREG32(mmUVD_CGC_CTRL);
+     if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+             *flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
@@ -808,6 +840,7 @@ static const struct amd_ip_funcs uvd_v5_0_ip_funcs = {
       .soft_reset = uvd_v5_0_soft_reset,
       .set_clockgating_state = uvd_v5_0_set_clockgating_state,
       .set_powergating_state = uvd_v5_0_set_powergating_state,
+     .get_clockgating_state = uvd_v5_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = {
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +34 -2
index 8779d4b..0ec692d 100644
@@ -987,18 +987,50 @@ static int uvd_v6_0_set_powergating_state(void *handle,
        * the smc and the hw blocks
        */
       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int ret = 0;
 
       if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
               return 0;
 
       WREG32(mmUVD_POWER_STATUS, UVD_POWER_STATUS__UVD_PG_EN_MASK);
 
+     mutex_lock(&adev->uvd.pg_mutex);
+
       if (state == AMD_PG_STATE_GATE) {
+             adev->uvd.is_powergated = true;
               uvd_v6_0_stop(adev);
-             return 0;
       } else {
-             return uvd_v6_0_start(adev);
+             ret = uvd_v6_0_start(adev);
+             if (ret)
+                     goto out;
+             adev->uvd.is_powergated = false;
+     }
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
+
+     return ret;
+}
+
+static void uvd_v6_0_get_clockgating_state(void *handle, u32 *flags)
+{
+     struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+     int data;
+
+     mutex_lock(&adev->uvd.pg_mutex);
+
+     if (adev->uvd.is_powergated) {
+             DRM_INFO("Cannot get clockgating state when UVD is powergated.\n");
+             goto out;
       }
+
+     /* AMD_CG_SUPPORT_UVD_MGCG */
+     data = RREG32(mmUVD_CGC_CTRL);
+     if (data & UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK)
+             *flags |= AMD_CG_SUPPORT_UVD_MGCG;
+
+out:
+     mutex_unlock(&adev->uvd.pg_mutex);
  }
 
  static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { · line 1057

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -0
@@ -1019,6 +1051,7 @@ static const struct amd_ip_funcs uvd_v6_0_ip_funcs = {
       .post_soft_reset = uvd_v6_0_post_soft_reset,
       .set_clockgating_state = uvd_v6_0_set_clockgating_state,
       .set_powergating_state = uvd_v6_0_set_powergating_state,
+     .get_clockgating_state = uvd_v6_0_get_clockgating_state,
  };
 
  static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = {

_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ...

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx