Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ca5fa3a authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Put the kernel_context in drm_i915_private next to its friends 



Just move the kernel_context member of drm_i915_private next to the
engines it is associated with.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1464098023-3294-7-git-send-email-chris@chris-wilson.co.uk
parent d28b99ab

drivers/gpu/drm/i915/i915_drv.h

+1 −2
Original line number Diff line number Diff line
@@ -1760,6 +1760,7 @@ struct drm_i915_private { 
	wait_queue_head_t gmbus_wait_queue;



	struct pci_dev *bridge_dev;

	struct i915_gem_context *kernel_context;

	struct intel_engine_cs engine[I915_NUM_ENGINES];

	struct drm_i915_gem_object *semaphore_obj;

	uint32_t last_seqno, next_seqno;
@@ -2017,8 +2018,6 @@ struct drm_i915_private { 
		void (*stop_engine)(struct intel_engine_cs *engine);

	} gt;



	struct i915_gem_context *kernel_context;



	/* perform PHY state sanity checks? */

	bool chv_phy_assert[2];

drivers/gpu/drm/i915/i915_guc_submission.c

+3 −2
Original line number Diff line number Diff line
@@ -935,11 +935,12 @@ int i915_guc_submission_enable(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_guc *guc = &dev_priv->guc;

	struct i915_gem_context *ctx = dev_priv->kernel_context;

	struct i915_guc_client *client;



	/* client for execbuf submission */

	client = guc_client_alloc(dev, GUC_CTX_PRIORITY_KMD_NORMAL, ctx);

	client = guc_client_alloc(dev,

				  GUC_CTX_PRIORITY_KMD_NORMAL,

				  dev_priv->kernel_context);

	if (!client) {

		DRM_ERROR("Failed to create execbuf guc_client\n");

		return -ENOMEM;