Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'drm-vmwgfx-fixes-4_10' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes

Single vmwgfx boot crasher fix.

* 'drm-vmwgfx-fixes-4_10' of git://people.freedesktop.org/~syeh/repos_linux:
  drm/vmwgfx: Fix depth input into drm_mode_legacy_fb_format
Dave Airlie 8 years ago
parent
d5adbfcd5f 242ef5d483
commit
5d18a61997
1 changed files with 1 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 2
      drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+ 1 - 2
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
View File 

@@ -481,8 +481,7 @@ static int vmw_fb_kms_framebuffer(struct fb_info *info)
 
 	mode_cmd.height = var->yres;
 
 	mode_cmd.height = var->yres;
 
 	mode_cmd.pitches[0] = ((var->bits_per_pixel + 7) / 8) * mode_cmd.width;
 
 	mode_cmd.pitches[0] = ((var->bits_per_pixel + 7) / 8) * mode_cmd.width;
 
 	mode_cmd.pixel_format =
 
 	mode_cmd.pixel_format =
 
-		drm_mode_legacy_fb_format(var->bits_per_pixel,
 
-			((var->bits_per_pixel + 7) / 8) * mode_cmd.width);
 
+		drm_mode_legacy_fb_format(var->bits_per_pixel, depth);
 
 
 
 	cur_fb = par->set_fb;
 
 	cur_fb = par->set_fb;
 
 	if (cur_fb && cur_fb->width == mode_cmd.width &&
 
 	if (cur_fb && cur_fb->width == mode_cmd.width &&