All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH] drm/i915/huc: Fix error reported by I915_PARAM_HUC_STATUS
Date: Wed, 22 Jan 2020 19:48:25 +0000	[thread overview]
Message-ID: <20200122194825.101240-1-michal.wajdeczko@intel.com> (raw)

From commit 84b1ca2f0e68 ("drm/i915/uc: prefer intel_gt over i915
in GuC/HuC paths") we stopped using HUC_STATUS error -ENODEV only
to indicate lack of HuC hardware and we started to use this error
also for all other cases when HuC was not in use or supported.

Fix that by relying again on HAS_GT_UC macro, since currently
used function intel_huc_is_supported() is based on HuC firmware
support which could be unsupported also due to force disabled
GuC firmware.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Tony Ye <tony.ye@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index 32a069841c14..ad4d9e16a24e 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -209,7 +209,7 @@ int intel_huc_check_status(struct intel_huc *huc)
 	intel_wakeref_t wakeref;
 	u32 status = 0;
 
-	if (!intel_huc_is_supported(huc))
+	if (!HAS_GT_UC(gt->i915))
 		return -ENODEV;
 
 	with_intel_runtime_pm(gt->uncore->rpm, wakeref)
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2020-01-22 19:48 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-22 19:48 Michal Wajdeczko [this message]
2020-01-22 23:52 ` [Intel-gfx] [PATCH] drm/i915/huc: Fix error reported by I915_PARAM_HUC_STATUS Daniele Ceraolo Spurio
2020-01-23 15:02   ` Chris Wilson
2020-01-23 15:38     ` Michal Wajdeczko
2020-01-23 15:51       ` Chris Wilson
2020-01-26 17:41         ` Michal Wajdeczko
2020-02-05  0:43           ` Ye, Tony
2020-02-11 17:53             ` Fosha, Robert M
2020-02-11 19:57               ` Michal Wajdeczko
2020-02-11 21:54                 ` Fosha, Robert M
2020-02-21  3:56                   ` Ye, Tony
2020-02-28 11:33                     ` Joonas Lahtinen
2020-02-28 13:44                       ` Michal Wajdeczko
2020-01-23 18:26       ` Ye, Tony
2020-01-23 18:43         ` Michal Wajdeczko
2020-01-23 19:50       ` Ye, Tony
2020-01-23  2:43 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
2020-01-23 14:57   ` Michal Wajdeczko
2020-01-23 18:12 ` [Intel-gfx] [PATCH] " Ye, Tony

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=20200122194825.101240-1-michal.wajdeczko@intel.com \
    --to=michal.wajdeczko@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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.