Commit 4f91dd6f authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915/context/: s/CTX/CXT 



*sigh* the docs had it spelled wrong, corrected it, and then proceeded
to re-do the original error. The original code preserved this history,
and this patch attempts to keep in sync with the current docs.

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 83bc5fd2

drivers/gpu/drm/i915/i915_gem_context.c

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ static int get_context_size(struct drm_device *dev) 
		ret = GEN6_CXT_TOTAL_SIZE(reg) * 64;

		break;

	case 7:

		reg = I915_READ(GEN7_CTX_SIZE);

		ret = GEN7_CTX_TOTAL_SIZE(reg) * 64;

		reg = I915_READ(GEN7_CXT_SIZE);

		ret = GEN7_CXT_TOTAL_SIZE(reg) * 64;

		break;

	default:

		BUG();

drivers/gpu/drm/i915/i915_reg.h

+9 −9
Original line number Diff line number Diff line
@@ -1482,15 +1482,15 @@ 
					GEN6_CXT_RENDER_SIZE(cxt_reg) + \

					GEN6_CXT_EXTENDED_SIZE(cxt_reg) + \

					GEN6_CXT_PIPELINE_SIZE(cxt_reg))

#define GEN7_CTX_SIZE		0x21a8

#define GEN7_CTX_RENDER_SIZE(ctx_reg)	((ctx_reg >> 16) & 0x3f)

#define GEN7_CTX_EXTENDED_SIZE(ctx_reg)	((ctx_reg >> 9) & 0x7f)

#define GEN7_CTX_GT1_SIZE(ctx_reg)	((ctx_reg >> 6) & 0x7)

#define GEN7_CTX_VFSTATE_SIZE(ctx_reg)	((ctx_reg >> 0) & 0x3f)

#define GEN7_CTX_TOTAL_SIZE(ctx_reg)	(GEN7_CTX_RENDER_SIZE(ctx_reg) + \

					 GEN7_CTX_EXTENDED_SIZE(ctx_reg) + \

					 GEN7_CTX_GT1_SIZE(ctx_reg) + \

					 GEN7_CTX_VFSTATE_SIZE(ctx_reg))

#define GEN7_CXT_SIZE		0x21a8

#define GEN7_CXT_RENDER_SIZE(ctx_reg)	((ctx_reg >> 16) & 0x3f)

#define GEN7_CXT_EXTENDED_SIZE(ctx_reg)	((ctx_reg >> 9) & 0x7f)

#define GEN7_CXT_GT1_SIZE(ctx_reg)	((ctx_reg >> 6) & 0x7)

#define GEN7_CXT_VFSTATE_SIZE(ctx_reg)	((ctx_reg >> 0) & 0x3f)

#define GEN7_CXT_TOTAL_SIZE(ctx_reg)	(GEN7_CXT_RENDER_SIZE(ctx_reg) + \

					 GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \

					 GEN7_CXT_GT1_SIZE(ctx_reg) + \

					 GEN7_CXT_VFSTATE_SIZE(ctx_reg))



/*

 * Overlay regs

CRA Git | Maintained and supported by SUSTech CRA and CCSE