@ -4680,7 +4680,6 @@ drm_output_choose_initial_mode(struct drm_backend *backend, 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					static  int  
					 
					 
					 
					static  int  
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					drm_head_read_current_setup ( struct  drm_head  * head ,  struct  drm_backend  * backend )  
					 
					 
					 
					drm_head_read_current_setup ( struct  drm_head  * head ,  struct  drm_backend  * backend )  
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					{  
					 
					 
					 
					{  
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						drmModeModeInfo  * mode  =  & head - > inherited_mode ;   
					 
					 
					 
					 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						int  drm_fd  =  backend - > drm . fd ;   
					 
					 
					 
						int  drm_fd  =  backend - > drm . fd ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						drmModeEncoder  * encoder ;   
					 
					 
					 
						drmModeEncoder  * encoder ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						drmModeCrtc  * crtc ;   
					 
					 
					 
						drmModeCrtc  * crtc ;   
				
			 
			
		
	
	
		
		
			
				
					
						
						
						
							
								 
							 
						
					 
					 
					@ -4688,14 +4687,13 @@ drm_head_read_current_setup(struct drm_head *head, struct drm_backend *backend) 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						/* Get the current mode on the crtc that's currently driving
   
					 
					 
					 
						/* Get the current mode on the crtc that's currently driving
   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						 *  this  connector .  */   
					 
					 
					 
						 *  this  connector .  */   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						encoder  =  drmModeGetEncoder ( drm_fd ,  head - > connector - > encoder_id ) ;   
					 
					 
					 
						encoder  =  drmModeGetEncoder ( drm_fd ,  head - > connector - > encoder_id ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						memset ( mode ,  0 ,  sizeof  * mode ) ;   
					 
					 
					 
					 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						if  ( encoder  ! =  NULL )  {   
					 
					 
					 
						if  ( encoder  ! =  NULL )  {   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
							crtc  =  drmModeGetCrtc ( drm_fd ,  encoder - > crtc_id ) ;   
					 
					 
					 
							crtc  =  drmModeGetCrtc ( drm_fd ,  encoder - > crtc_id ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
							drmModeFreeEncoder ( encoder ) ;   
					 
					 
					 
							drmModeFreeEncoder ( encoder ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
							if  ( crtc  = =  NULL )   
					 
					 
					 
							if  ( crtc  = =  NULL )   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
								return  - 1 ;   
					 
					 
					 
								return  - 1 ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
							if  ( crtc - > mode_valid )   
					 
					 
					 
							if  ( crtc - > mode_valid )   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
								* mode  =  crtc - > mode ;   
					 
					 
					 
								head - > inherited_ mode  =  crtc - > mode ;   
				
			 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 
					 
					 
							drmModeFreeCrtc ( crtc ) ;   
					 
					 
					 
							drmModeFreeCrtc ( crtc ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						}   
					 
					 
					 
						}   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					
 
					 
					 
					 
					
 
				
			 
			
		
	
	
		
		
			
				
					
						
							
								 
							 
						
						
							
								 
							 
						
						
					 
					 
					@ -5239,7 +5237,7 @@ drm_head_create(struct drm_backend *backend, uint32_t connector_id, 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						if  ( drm_head_read_current_setup ( head ,  backend )  <  0 )  {   
					 
					 
					 
						if  ( drm_head_read_current_setup ( head ,  backend )  <  0 )  {   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
							weston_log ( " Failed to retrieve current mode from connector %d. \n " ,   
					 
					 
					 
							weston_log ( " Failed to retrieve current mode from connector %d. \n " ,   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
								   head - > connector_id ) ;   
					 
					 
					 
								   head - > connector_id ) ;   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
							/* Continue, inherited_mode was memset to zero . */   
					 
					 
					 
							/* Not fatal . */   
				
			 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 
					 
					 
						}   
					 
					 
					 
						}   
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
					
 
					 
					 
					 
					
 
				
			 
			
		
	
		
		
			
				
					
					 
					 
					 
						weston_compositor_add_head ( backend - > compositor ,  & head - > base ) ;   
					 
					 
					 
						weston_compositor_add_head ( backend - > compositor ,  & head - > base ) ;