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

Commit 0184c2ff authored by Dave Gordon's avatar Dave Gordon Committed by Jani Nikula
Browse files

drm/i915: Reattach comment, complete type specification 



In the recent patch
bc3d6744 drm/i915: Allow userspace to request no-error-capture upon ...
the final version moved the flags and the associated #defines around
so they were adjacent; unfortunately, they ended up between a comment
and the thing (hw_id) to which the comment applies :(

So this patch reshuffles the comment and subject back together.

Also, as we're touching 'hw_id', let's change it from just 'unsigned'
to a fully-specified 'unsigned int', because some code checking tools
(including checkpatch) object to plain 'unsigned'.

Fixes: bc3d6744 ("drm/i915: Allow userspace to request no-error-capture...")
Signed-off-by: default avatarDave Gordon <david.s.gordon@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1471616622-6919-1-git-send-email-david.s.gordon@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 0be81156)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent dcd79934

drivers/gpu/drm/i915/i915_drv.h

+3 −2
Original line number Diff line number Diff line
@@ -882,11 +882,12 @@ struct i915_gem_context { 


	struct i915_ctx_hang_stats hang_stats;



	/* Unique identifier for this context, used by the hw for tracking */

	unsigned long flags;

#define CONTEXT_NO_ZEROMAP		BIT(0)

#define CONTEXT_NO_ERROR_CAPTURE	BIT(1)

	unsigned hw_id;



	/* Unique identifier for this context, used by the hw for tracking */

	unsigned int hw_id;

	u32 user_handle;



	u32 ggtt_alignment;