Skip to content

Commit

Permalink
drm/i915/guc: Init send_mutex in intel_uc_init_early()
Browse files Browse the repository at this point in the history
send_mutex is used to serialise communication with GuC via
intel_guc_send().

Since functions that utilize it are no longer limited to submission,
initialization should be handled as a part of general setup.

v2: move initialization to *_early()

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-5-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 2d803c2 commit 413e8fd
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
mutex_init(&dev_priv->wm.wm_mutex);
mutex_init(&dev_priv->pps_mutex);

intel_uc_init_early(dev_priv);

i915_memcpy_init_early(dev_priv);

ret = i915_workqueues_init(dev_priv);
Expand Down
1 change: 0 additions & 1 deletion drivers/gpu/drm/i915/i915_guc_submission.c
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,6 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)

guc->ctx_pool_vma = vma;
ida_init(&guc->ctx_ids);
mutex_init(&guc->send_mutex);
guc_log_create(guc);
guc_addon_create(guc);

Expand Down
5 changes: 5 additions & 0 deletions drivers/gpu/drm/i915/intel_uc.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
#include "i915_drv.h"
#include "intel_uc.h"

void intel_uc_init_early(struct drm_i915_private *dev_priv)
{
mutex_init(&dev_priv->guc.send_mutex);
}

/*
* Read GuC command/status register (SOFT_SCRATCH_0)
* Return true if it contains a response rather than a command
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/i915/intel_uc.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ struct intel_guc {
};

/* intel_uc.c */
void intel_uc_init_early(struct drm_i915_private *dev_priv);
bool intel_guc_recv(struct drm_i915_private *dev_priv, u32 *status);
int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);
int intel_guc_sample_forcewake(struct intel_guc *guc);
Expand Down

0 comments on commit 413e8fd

Please sign in to comment.