diff options
| author | Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> | 2019-12-17 04:23:11 +0300 |
|---|---|---|
| committer | Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> | 2019-12-18 02:22:47 +0300 |
| commit | 7f5390c433876a6baef1ee09c5442160ae03cde0 (patch) | |
| tree | 232d5067e4462c43ee097771f95b6f073ff1ca63 /drivers/gpu/drm/i915/gt/uc | |
| parent | e627ad50a2d787dcd8d1e7755a995ec31efa0e44 (diff) | |
| download | linux-7f5390c433876a6baef1ee09c5442160ae03cde0.tar.xz | |
drm/i915/guc/ct: Drop guards in enable/disable calls
We track the status of the GuC much more closely now and we expect the
enable/disable functions to be correctly called only once. If this isn't
true we do want to flag it as a flow failure (via the BUG_ON in the ctch
functions) and not silently ignore the call.
Suggested-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191217012316.13271-2-daniele.ceraolospurio@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/uc')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c index f74ba4750a94..b23b46619742 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c @@ -862,9 +862,6 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct) struct intel_guc *guc = ct_to_guc(ct); struct intel_guc_ct_channel *ctch = &ct->host_channel; - if (ctch->enabled) - return 0; - return ctch_enable(guc, ctch); } @@ -877,8 +874,5 @@ void intel_guc_ct_disable(struct intel_guc_ct *ct) struct intel_guc *guc = ct_to_guc(ct); struct intel_guc_ct_channel *ctch = &ct->host_channel; - if (!ctch->enabled) - return; - ctch_disable(guc, ctch); } |