mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	drm/amdgpu/display: disable prefer_shadow for generic fb helpers
Seems to break hibernation.  Disable for now until we can root
cause it.
Fixes: 087451f372 ("drm/amdgpu: use generic fb helpers instead of setting up AMD own's.")
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=216119
Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
			
			
This commit is contained in:
		
							parent
							
								
									f9a89117fb
								
							
						
					
					
						commit
						3a4b1cc28f
					
				
					 6 changed files with 12 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -496,7 +496,8 @@ static int amdgpu_vkms_sw_init(void *handle)
 | 
			
		|||
	adev_to_drm(adev)->mode_config.max_height = YRES_MAX;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.preferred_depth = 24;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
 | 
			
		||||
	/* disable prefer shadow for now due to hibernation issues */
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 0;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2796,7 +2796,8 @@ static int dce_v10_0_sw_init(void *handle)
 | 
			
		|||
	adev_to_drm(adev)->mode_config.max_height = 16384;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.preferred_depth = 24;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
 | 
			
		||||
	/* disable prefer shadow for now due to hibernation issues */
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 0;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2914,7 +2914,8 @@ static int dce_v11_0_sw_init(void *handle)
 | 
			
		|||
	adev_to_drm(adev)->mode_config.max_height = 16384;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.preferred_depth = 24;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
 | 
			
		||||
	/* disable prefer shadow for now due to hibernation issues */
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 0;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2673,7 +2673,8 @@ static int dce_v6_0_sw_init(void *handle)
 | 
			
		|||
	adev_to_drm(adev)->mode_config.max_width = 16384;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.max_height = 16384;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.preferred_depth = 24;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
 | 
			
		||||
	/* disable prefer shadow for now due to hibernation issues */
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 0;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2693,7 +2693,8 @@ static int dce_v8_0_sw_init(void *handle)
 | 
			
		|||
	adev_to_drm(adev)->mode_config.max_height = 16384;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.preferred_depth = 24;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
 | 
			
		||||
	/* disable prefer shadow for now due to hibernation issues */
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 0;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3822,7 +3822,8 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)
 | 
			
		|||
	adev_to_drm(adev)->mode_config.max_height = 16384;
 | 
			
		||||
 | 
			
		||||
	adev_to_drm(adev)->mode_config.preferred_depth = 24;
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 1;
 | 
			
		||||
	/* disable prefer shadow for now due to hibernation issues */
 | 
			
		||||
	adev_to_drm(adev)->mode_config.prefer_shadow = 0;
 | 
			
		||||
	/* indicates support for immediate flip */
 | 
			
		||||
	adev_to_drm(adev)->mode_config.async_page_flip = true;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue