All of lore.kernel.org
 help / color / mirror / Atom feed
From: Luben Tuikov <luben.tuikov@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: Tom StDenis <tom.stdenis@amd.com>,
	"Jinzhou . Su" <Jinzhou.Su@amd.com>,
	Luben Tuikov <luben.tuikov@amd.com>
Subject: [PATCH 2/5] umr: Reorg and print the message on ppt-read
Date: Sun, 27 Mar 2022 06:42:11 -0400	[thread overview]
Message-ID: <20220327104214.106340-2-luben.tuikov@amd.com> (raw)
In-Reply-To: <20220327104214.106340-1-luben.tuikov@amd.com>

Reorganize the logic and actually print the error message when the ASIC
doesn't support the power-play table feature.

Cc: Tom StDenis <tom.stdenis@amd.com>
Cc: Jinzhou.Su <Jinzhou.Su@amd.com>
Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
---
 src/app/pp_table.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/app/pp_table.c b/src/app/pp_table.c
index 9ab42a9ae2296c..33c2d01e897ef3 100644
--- a/src/app/pp_table.c
+++ b/src/app/pp_table.c
@@ -20,27 +20,32 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
+#include <errno.h>
 #include "umrapp.h"
 #include "smu_pptable_navi10.h"
 
-int umr_print_pp_table(struct umr_asic *asic, const char* param)
+int umr_print_pp_table(struct umr_asic *asic, const char *param)
 {
-	FILE* fp;
-	int ret = -1;
+	FILE *fp;
+	int res;
 	char name[256];
 
 	snprintf(name, sizeof(name)-1, \
-		"/sys/class/drm/card%d/device/pp_table", asic->instance);
+		 "/sys/class/drm/card%d/device/pp_table", asic->instance);
 	fp = fopen(name, "r");
-	if (fp) {
-		if (strcmp(asic->asicname, "navi10") == 0 || strcmp(asic->asicname, "navi14") == 0) {
-			ret = umr_navi10_pptable_print(param, fp);
-		}
-		fclose(fp);
+	if (!fp) {
+		asic->err_msg("fopen: %s: %d\n", strerror(errno), errno);
+		return -errno;
+	}
+	if (strcmp(asic->asicname, "navi10") == 0 ||
+	    strcmp(asic->asicname, "navi14") == 0) {
+		res = umr_navi10_pptable_print(param, fp);
 	} else {
-		printf("Powerplay table feature only support on Navi10/Navi14 now.");
-		return -1;
+		asic->err_msg("The powerplay table feature is currently supported only on Navi10/Navi14.\n");
+		res = -1;
 	}
+	fclose(fp);
 
-	return ret;
+	return res;
 }
-- 
2.35.1.607.gf01e51a7cf


  reply	other threads:[~2022-03-27 10:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-27 10:42 [PATCH 1/5] umr: Add support for "--ppt-read" Luben Tuikov
2022-03-27 10:42 ` Luben Tuikov [this message]
2022-03-27 10:42 ` [PATCH 3/5] umr: Add command line support for "--gpu-metrics" Luben Tuikov
2022-03-27 10:42 ` [PATCH 4/5] umr: Document new format command line options Luben Tuikov
2022-03-27 10:42 ` [PATCH 5/5] umr: Completion: update new format options Luben Tuikov
2022-03-28 17:09   ` StDenis, Tom

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220327104214.106340-2-luben.tuikov@amd.com \
    --to=luben.tuikov@amd.com \
    --cc=Jinzhou.Su@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=tom.stdenis@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.