Skip to content

Commit 5d18a61

Browse files
committed
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
2 parents d5adbfc + 242ef5d commit 5d18a61

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,7 @@ static int vmw_fb_kms_framebuffer(struct fb_info *info)
481481
mode_cmd.height = var->yres;
482482
mode_cmd.pitches[0] = ((var->bits_per_pixel + 7) / 8) * mode_cmd.width;
483483
mode_cmd.pixel_format =
484-
drm_mode_legacy_fb_format(var->bits_per_pixel,
485-
((var->bits_per_pixel + 7) / 8) * mode_cmd.width);
484+
drm_mode_legacy_fb_format(var->bits_per_pixel, depth);
486485

487486
cur_fb = par->set_fb;
488487
if (cur_fb && cur_fb->width == mode_cmd.width &&

0 commit comments

Comments
 (0)