Skip to contentSkip to conversation

Revert "drm/amd/pm: workaround to pass jpeg unit test"

PATCH In review Kenneth Feng 3 participants 4 messages Jun 20, 2024

Subsystems (3)
lore
Share & tools
lore

Kenneth Feng

author maintainer
#0 lore raw

PATCH 1/2 Revert "drm/amd/pm: workaround to pass jpeg unit test"

This reverts commit a03b8169582453c01cbf76d8a92a8194d3421b13. Revert this due to a final solution in amdgpu vcn:
commit eef47ed5f703377781ce89eae4b9140325049873

Author: Sonny Jiang <[email protected]>
Date:   Tue Jun 18 11:11:11 2024 -0400

drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback

Doorbell needs to be configured after power up during each playback

---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  3 +-
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c  | 30 +------------------
 2 files changed, 2 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -2
index 8e694b576d1c..00384b381289 100644
@@ -237,7 +237,6 @@ static int smu_dpm_set_vcn_enable(struct smu_context *smu,
 {
 	struct smu_power_context *smu_power = &smu->smu_power;
 	struct smu_power_gate *power_gate = &smu_power->power_gate;
-	struct amdgpu_device *adev = smu->adev;
 	int ret = 0;
 
 	/*
@@ -253,7 +252,7 @@ static int smu_dpm_set_vcn_enable(struct smu_context *smu,
 		return 0;
 
 	ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable);
-	if (!ret && !adev->enable_jpeg_test)
+	if (!ret)
 		atomic_set(&power_gate->vcn_gated, !enable);
 
 	return ret;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +1 -29
index 7179cdacf156..98ea58d792ca 100644
@@ -1869,34 +1869,6 @@ static ssize_t smu_v14_0_2_get_ecc_info(struct smu_context *smu,
 	return ret;
 }
 
-static int smu_v14_0_2_set_vcn_enable(struct smu_context *smu,
-			     bool enable)
-{
-	struct amdgpu_device *adev = smu->adev;
-	struct smu_power_gate *power_gate = &smu->smu_power.power_gate;
-	int i, ret = 0;
-
-	if (!adev->enable_jpeg_test)
-		return smu_v14_0_set_vcn_enable(smu, enable);
-
-	if (!atomic_read(&power_gate->vcn_gated) || !enable)
-		return 0;
-
-	for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-		if (adev->vcn.harvest_config & (1 << i))
-			continue;
-
-		ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_PowerUpVcn,
-						      i << 16U, NULL);
-		if (ret)
-			return ret;
-	}
-
-	atomic_set(&power_gate->vcn_gated, 0);
-
-	return ret;
-}
-
 static const struct pptable_funcs smu_v14_0_2_ppt_funcs = {
 	.get_allowed_feature_mask = smu_v14_0_2_get_allowed_feature_mask,
 	.set_default_dpm_table = smu_v14_0_2_set_default_dpm_table,
@@ -1919,7 +1891,7 @@ static const struct pptable_funcs smu_v14_0_2_ppt_funcs = {
 	.system_features_control = smu_v14_0_system_features_control,
 	.set_allowed_mask = smu_v14_0_set_allowed_mask,
 	.get_enabled_mask = smu_cmn_get_enabled_mask,
-	.dpm_set_vcn_enable = smu_v14_0_2_set_vcn_enable,
+	.dpm_set_vcn_enable = smu_v14_0_set_vcn_enable,
 	.dpm_set_jpeg_enable = smu_v14_0_set_jpeg_enable,
 	.get_dpm_ultimate_freq = smu_v14_0_2_get_dpm_ultimate_freq,
 	.get_vbios_bootup_values = smu_v14_0_get_vbios_bootup_values,
Signature · 1 line
2.34.1
author maintainer
#1 lore raw

PATCH 2/2 Revert "drm/amd/amdgpu: add module parameter for jpeg"

This reverts commit 63400bcf5cb23b6a9b674eb3f2d733d826860065. Revert this due to a final solution in amdgu vcn:
commit eef47ed5f703377781ce89eae4b9140325049873

Author: Sonny Jiang <[email protected]>
Date:   Tue Jun 18 11:11:11 2024 -0400

drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback

Doorbell needs to be configured after power up during each playback

---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h           | 2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c       | 4 ----
 3 files changed, 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
index 6129f9f7a577..137a88b8de45 100644
@@ -224,7 +224,6 @@ extern int amdgpu_mes;
 extern int amdgpu_mes_log_enable;
 extern int amdgpu_mes_kiq;
 extern int amdgpu_uni_mes;
-extern int amdgpu_jpeg_test;
 extern int amdgpu_noretry;
 extern int amdgpu_force_asic_type;
 extern int amdgpu_smartshift_bias;
@@ -1022,7 +1021,6 @@ struct amdgpu_device {
 
 	/* jpeg */
 	struct amdgpu_jpeg		jpeg;
-	bool enable_jpeg_test;
 
 	/* vpe */
 	struct amdgpu_vpe		vpe;
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +0 -2
index 4edcbd272fa4..df753ebfd109 100644
@@ -2302,8 +2302,6 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev)
 		case IP_VERSION(5, 0, 0):
 			amdgpu_device_ip_block_add(adev, &vcn_v5_0_0_ip_block);
 			amdgpu_device_ip_block_add(adev, &jpeg_v5_0_0_ip_block);
-			if (amdgpu_jpeg_test)
-				adev->enable_jpeg_test = true;
 			break;
 		default:
 			dev_err(adev->dev,
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -4
index 60d5758939ae..802debd8d9f0 100644
@@ -205,7 +205,6 @@ int amdgpu_force_asic_type = -1;
 int amdgpu_tmz = -1; /* auto */
 uint amdgpu_freesync_vid_mode;
 int amdgpu_reset_method = -1; /* auto */
-int amdgpu_jpeg_test;
 int amdgpu_num_kcq = -1;
 int amdgpu_smartshift_bias;
 int amdgpu_use_xgmi_p2p = 1;
@@ -941,9 +940,6 @@ module_param_named(freesync_video, amdgpu_freesync_vid_mode, uint, 0444);
 MODULE_PARM_DESC(reset_method, "GPU reset method (-1 = auto (default), 0 = legacy, 1 = mode0, 2 = mode1, 3 = mode2, 4 = baco/bamaco)");
 module_param_named(reset_method, amdgpu_reset_method, int, 0644);
 
-MODULE_PARM_DESC(jpeg_test, "jpeg test(0 = disable (default), 1 = enable)");
-module_param_named(jpeg_test, amdgpu_jpeg_test, int, 0444);
-
 /**
  * DOC: bad_page_threshold (int) Bad page threshold is specifies the
  * threshold value of faulty pages detected by RAS ECC, which may
Signature · 1 line
2.34.1
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] Revert "drm/amd/amdgpu: add module parameter for jpeg"

Quoted 4 lines · Kenneth Feng

This reverts commit 63400bcf5cb23b6a9b674eb3f2d733d826860065. Revert this due to a final solution in amdgu vcn:
commit eef47ed5f703377781ce89eae4b9140325049873

Quoted 8 lines
Author: Sonny Jiang <[email protected]>
Date:   Tue Jun 18 11:11:11 2024 -0400

drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback

Doorbell needs to be configured after power up during each playback

Series is:

Quoted 64 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h           | 2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c       | 4 ----
 3 files changed, 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
index 6129f9f7a577..137a88b8de45 100644
@@ -224,7 +224,6 @@ extern int amdgpu_mes;
 extern int amdgpu_mes_log_enable;
 extern int amdgpu_mes_kiq;
 extern int amdgpu_uni_mes;
-extern int amdgpu_jpeg_test;
 extern int amdgpu_noretry;
 extern int amdgpu_force_asic_type;
 extern int amdgpu_smartshift_bias;
@@ -1022,7 +1021,6 @@ struct amdgpu_device {
 
        /* jpeg */
        struct amdgpu_jpeg              jpeg;
-       bool enable_jpeg_test;
 
        /* vpe */
        struct amdgpu_vpe               vpe;
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +0 -2
index 4edcbd272fa4..df753ebfd109 100644
@@ -2302,8 +2302,6 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev)
                case IP_VERSION(5, 0, 0):
                        amdgpu_device_ip_block_add(adev, &vcn_v5_0_0_ip_block);
                        amdgpu_device_ip_block_add(adev, &jpeg_v5_0_0_ip_block);
-                       if (amdgpu_jpeg_test)
-                               adev->enable_jpeg_test = true;
                        break;
                default:
                        dev_err(adev->dev,
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -5
index 60d5758939ae..802debd8d9f0 100644
@@ -205,7 +205,6 @@ int amdgpu_force_asic_type = -1;
 int amdgpu_tmz = -1; /* auto */
 uint amdgpu_freesync_vid_mode;
 int amdgpu_reset_method = -1; /* auto */
-int amdgpu_jpeg_test;
 int amdgpu_num_kcq = -1;
 int amdgpu_smartshift_bias;
 int amdgpu_use_xgmi_p2p = 1;
@@ -941,9 +940,6 @@ module_param_named(freesync_video, amdgpu_freesync_vid_mode, uint, 0444);
 MODULE_PARM_DESC(reset_method, "GPU reset method (-1 = auto (default), 0 = legacy, 1 = mode0, 2 = mode1, 3 = mode2, 4 = baco/bamaco)");
 module_param_named(reset_method, amdgpu_reset_method, int, 0644);
 
-MODULE_PARM_DESC(jpeg_test, "jpeg test(0 = disable (default), 1 = enable)");
-module_param_named(jpeg_test, amdgpu_jpeg_test, int, 0444);
-
 /**
  * DOC: bad_page_threshold (int) Bad page threshold is specifies the
  * threshold value of faulty pages detected by RAS ECC, which may
--

2.34.1

Reviewed-by Sonny Jiang Acked-by Alex Deucher
#3 lore raw

Re: [PATCH 2/2] Revert "drm/amd/amdgpu: add module parameter for jpeg"

[AMD Official Use Only - AMD Internal Distribution Only]

Series is:

________________________________
From: Alex Deucher <[email protected]>
Sent: Thursday, June 20, 2024 8:48 AM
To: Feng, Kenneth <[email protected]>
Cc: [email protected] <[email protected]>; Jiang, Sonny <[email protected]>
Subject: Re: [PATCH 2/2] Revert "drm/amd/amdgpu: add module parameter for jpeg"

Quoted 4 lines · Kenneth Feng

This reverts commit 63400bcf5cb23b6a9b674eb3f2d733d826860065. Revert this due to a final solution in amdgu vcn:
commit eef47ed5f703377781ce89eae4b9140325049873

Quoted 8 lines
Author: Sonny Jiang <[email protected]>
Date:   Tue Jun 18 11:11:11 2024 -0400

drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback

Doorbell needs to be configured after power up during each playback

Series is:

Quoted 64 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h           | 2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c       | 4 ----
 3 files changed, 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
index 6129f9f7a577..137a88b8de45 100644
@@ -224,7 +224,6 @@ extern int amdgpu_mes;
 extern int amdgpu_mes_log_enable;
 extern int amdgpu_mes_kiq;
 extern int amdgpu_uni_mes;
-extern int amdgpu_jpeg_test;
 extern int amdgpu_noretry;
 extern int amdgpu_force_asic_type;
 extern int amdgpu_smartshift_bias;
@@ -1022,7 +1021,6 @@ struct amdgpu_device {
 
        /* jpeg */
        struct amdgpu_jpeg              jpeg;
-       bool enable_jpeg_test;
 
        /* vpe */
        struct amdgpu_vpe               vpe;
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +0 -2
index 4edcbd272fa4..df753ebfd109 100644
@@ -2302,8 +2302,6 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev)
                case IP_VERSION(5, 0, 0):
                        amdgpu_device_ip_block_add(adev, &vcn_v5_0_0_ip_block);
                        amdgpu_device_ip_block_add(adev, &jpeg_v5_0_0_ip_block);
-                       if (amdgpu_jpeg_test)
-                               adev->enable_jpeg_test = true;
                        break;
                default:
                        dev_err(adev->dev,
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -5
index 60d5758939ae..802debd8d9f0 100644
@@ -205,7 +205,6 @@ int amdgpu_force_asic_type = -1;
 int amdgpu_tmz = -1; /* auto */
 uint amdgpu_freesync_vid_mode;
 int amdgpu_reset_method = -1; /* auto */
-int amdgpu_jpeg_test;
 int amdgpu_num_kcq = -1;
 int amdgpu_smartshift_bias;
 int amdgpu_use_xgmi_p2p = 1;
@@ -941,9 +940,6 @@ module_param_named(freesync_video, amdgpu_freesync_vid_mode, uint, 0444);
 MODULE_PARM_DESC(reset_method, "GPU reset method (-1 = auto (default), 0 = legacy, 1 = mode0, 2 = mode1, 3 = mode2, 4 = baco/bamaco)");
 module_param_named(reset_method, amdgpu_reset_method, int, 0644);
 
-MODULE_PARM_DESC(jpeg_test, "jpeg test(0 = disable (default), 1 = enable)");
-module_param_named(jpeg_test, amdgpu_jpeg_test, int, 0444);
-
 /**
  * DOC: bad_page_threshold (int) Bad page threshold is specifies the
  * threshold value of faulty pages detected by RAS ECC, which may
--

2.34.1