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

Commit 01136acf authored by Andi Kleen's avatar Andi Kleen Committed by Dave Airlie
Browse files

DRM: Rename clamp variable 



linux/kernel.h has a "clamp" macro, but r300_cmdbuf also uses a variable
with the same name. Right now it doesn't seem to include the header,
but sooner or later someone will. So better rename the variable
now.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ed8b6704

drivers/gpu/drm/radeon/r300_cmdbuf.c

+3 −3
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ static inline int r300_emit_r500fp(drm_radeon_private_t *dev_priv, 
	int sz;

	int addr;

	int type;

	int clamp;

	int isclamp;

	int stride;

	RING_LOCALS;
@@ -999,10 +999,10 @@ static inline int r300_emit_r500fp(drm_radeon_private_t *dev_priv, 
	addr = ((header.r500fp.adrhi_flags & 1) << 8) | header.r500fp.adrlo;



	type = !!(header.r500fp.adrhi_flags & R500FP_CONSTANT_TYPE);

	clamp = !!(header.r500fp.adrhi_flags & R500FP_CONSTANT_CLAMP);

	isclamp = !!(header.r500fp.adrhi_flags & R500FP_CONSTANT_CLAMP);



	addr |= (type << 16);

	addr |= (clamp << 17);

	addr |= (isclamp << 17);



	stride = type ? 4 : 6;