-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/i915/guc: Move guc_{send,recv}() to intel_uc.c
guc_send(), guc_recv() and related functions were introduced in the i915_guc_submission.c and their scope was limited only to that file. Those are not submission specific though. This patch moves moves them to intel_uc.c with intel_ prefix added. v2: rename intel_guc_log_* functions and clean up intel_guc_send usages Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michal Winiarski <michal.winiarski@intel.com> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1480096777-12573-4-git-send-email-arkadiusz.hiler@intel.com Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
- Loading branch information
Arkadiusz Hiler
authored and
Chris Wilson
committed
Nov 25, 2016
1 parent
a80bc45
commit 2d803c2
Showing
4 changed files
with
163 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /* | ||
| * Copyright © 2016 Intel Corporation | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a | ||
| * copy of this software and associated documentation files (the "Software"), | ||
| * to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| * and/or sell copies of the Software, and to permit persons to whom the | ||
| * Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice (including the next | ||
| * paragraph) shall be included in all copies or substantial portions of the | ||
| * Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
| * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
| * IN THE SOFTWARE. | ||
| * | ||
| */ | ||
|
|
||
| #include "i915_drv.h" | ||
| #include "intel_uc.h" | ||
|
|
||
| /* | ||
| * Read GuC command/status register (SOFT_SCRATCH_0) | ||
| * Return true if it contains a response rather than a command | ||
| */ | ||
| bool intel_guc_recv(struct drm_i915_private *dev_priv, u32 *status) | ||
| { | ||
| u32 val = I915_READ(SOFT_SCRATCH(0)); | ||
| *status = val; | ||
| return INTEL_GUC_RECV_IS_RESPONSE(val); | ||
| } | ||
|
|
||
| int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len) | ||
| { | ||
| struct drm_i915_private *dev_priv = guc_to_i915(guc); | ||
| u32 status; | ||
| int i; | ||
| int ret; | ||
|
|
||
| if (WARN_ON(len < 1 || len > 15)) | ||
| return -EINVAL; | ||
|
|
||
| mutex_lock(&guc->send_mutex); | ||
| intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL); | ||
|
|
||
| dev_priv->guc.action_count += 1; | ||
| dev_priv->guc.action_cmd = action[0]; | ||
|
|
||
| for (i = 0; i < len; i++) | ||
| I915_WRITE(SOFT_SCRATCH(i), action[i]); | ||
|
|
||
| POSTING_READ(SOFT_SCRATCH(i - 1)); | ||
|
|
||
| I915_WRITE(GUC_SEND_INTERRUPT, GUC_SEND_TRIGGER); | ||
|
|
||
| /* | ||
| * Fast commands should complete in less than 10us, so sample quickly | ||
| * up to that length of time, then switch to a slower sleep-wait loop. | ||
| * No inte_guc_send command should ever take longer than 10ms. | ||
| */ | ||
| ret = wait_for_us(intel_guc_recv(dev_priv, &status), 10); | ||
| if (ret) | ||
| ret = wait_for(intel_guc_recv(dev_priv, &status), 10); | ||
| if (status != INTEL_GUC_STATUS_SUCCESS) { | ||
| /* | ||
| * Either the GuC explicitly returned an error (which | ||
| * we convert to -EIO here) or no response at all was | ||
| * received within the timeout limit (-ETIMEDOUT) | ||
| */ | ||
| if (ret != -ETIMEDOUT) | ||
| ret = -EIO; | ||
|
|
||
| DRM_WARN("INTEL_GUC_SEND: Action 0x%X failed;" | ||
| " ret=%d status=0x%08X response=0x%08X\n", | ||
| action[0], ret, status, I915_READ(SOFT_SCRATCH(15))); | ||
|
|
||
| dev_priv->guc.action_fail += 1; | ||
| dev_priv->guc.action_err = ret; | ||
| } | ||
| dev_priv->guc.action_status = status; | ||
|
|
||
| intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); | ||
| mutex_unlock(&guc->send_mutex); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| int intel_guc_sample_forcewake(struct intel_guc *guc) | ||
| { | ||
| struct drm_i915_private *dev_priv = guc_to_i915(guc); | ||
| u32 action[2]; | ||
|
|
||
| action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE; | ||
| /* WaRsDisableCoarsePowerGating:skl,bxt */ | ||
| if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(dev_priv)) | ||
| action[1] = 0; | ||
| else | ||
| /* bit 0 and 1 are for Render and Media domain separately */ | ||
| action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA; | ||
|
|
||
| return intel_guc_send(guc, action, ARRAY_SIZE(action)); | ||
| } | ||
|
|
||
| int intel_guc_log_flush_complete(struct intel_guc *guc) | ||
| { | ||
| u32 action[] = { INTEL_GUC_ACTION_LOG_BUFFER_FILE_FLUSH_COMPLETE }; | ||
|
|
||
| return intel_guc_send(guc, action, ARRAY_SIZE(action)); | ||
| } | ||
|
|
||
| int intel_guc_log_flush(struct intel_guc *guc) | ||
| { | ||
| u32 action[] = { | ||
| INTEL_GUC_ACTION_FORCE_LOG_BUFFER_FLUSH, | ||
| 0 | ||
| }; | ||
|
|
||
| return intel_guc_send(guc, action, ARRAY_SIZE(action)); | ||
| } | ||
|
|
||
| int intel_guc_log_control(struct intel_guc *guc, u32 control_val) | ||
| { | ||
| u32 action[] = { | ||
| INTEL_GUC_ACTION_UK_LOG_ENABLE_LOGGING, | ||
| control_val | ||
| }; | ||
|
|
||
| return intel_guc_send(guc, action, ARRAY_SIZE(action)); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters