mirror of
				https://github.com/tiagovignatti/intel-gpu-tools.git
				synced 2025-11-04 03:58:27 +00:00 
			
		
		
		
	fix warn in gem_reg_read: 'read' shadows a global declaration
Signed-off-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
		
							parent
							
								
									3a622b9784
								
							
						
					
					
						commit
						bcfc0f1e4b
					
				@ -52,29 +52,29 @@ static void handle_bad(int ret, int lerrno, int expected, const char *desc)
 | 
			
		||||
 | 
			
		||||
static uint64_t timer_query(int fd)
 | 
			
		||||
{
 | 
			
		||||
	struct local_drm_i915_reg_read read;
 | 
			
		||||
	struct local_drm_i915_reg_read reg_read;
 | 
			
		||||
	int ret;
 | 
			
		||||
 | 
			
		||||
	read.offset = 0x2358;
 | 
			
		||||
	ret = drmIoctl(fd, REG_READ_IOCTL, &read);
 | 
			
		||||
	reg_read.offset = 0x2358;
 | 
			
		||||
	ret = drmIoctl(fd, REG_READ_IOCTL, ®_read);
 | 
			
		||||
	if (ret) {
 | 
			
		||||
		perror("positive test case failed: ");
 | 
			
		||||
		exit(EXIT_FAILURE);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return read.val;
 | 
			
		||||
	return reg_read.val;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int main(int argc, char *argv[])
 | 
			
		||||
{
 | 
			
		||||
	struct local_drm_i915_reg_read read;
 | 
			
		||||
	struct local_drm_i915_reg_read reg_read;
 | 
			
		||||
	int ret, fd;
 | 
			
		||||
	uint64_t val;
 | 
			
		||||
 | 
			
		||||
	fd = drm_open_any();
 | 
			
		||||
 | 
			
		||||
	read.offset = 0x2358;
 | 
			
		||||
	ret = drmIoctl(fd, REG_READ_IOCTL, &read);
 | 
			
		||||
	reg_read.offset = 0x2358;
 | 
			
		||||
	ret = drmIoctl(fd, REG_READ_IOCTL, ®_read);
 | 
			
		||||
	if (errno == EINVAL)
 | 
			
		||||
		exit(77);
 | 
			
		||||
	else if (ret)
 | 
			
		||||
@ -88,8 +88,8 @@ int main(int argc, char *argv[])
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* bad reg */
 | 
			
		||||
	read.offset = 0x12345678;
 | 
			
		||||
	ret = drmIoctl(fd, REG_READ_IOCTL, &read);
 | 
			
		||||
	reg_read.offset = 0x12345678;
 | 
			
		||||
	ret = drmIoctl(fd, REG_READ_IOCTL, ®_read);
 | 
			
		||||
	handle_bad(ret, errno, EINVAL, "bad register");
 | 
			
		||||
 | 
			
		||||
	close(fd);
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user