diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-02-08 12:05:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-08 12:05:02 +1000 |
| commit | 5d18a619976944dc3114bbe1525880c431196c7a (patch) | |
| tree | 9582bc2d7cffce63b27f0541ce71f3c95fd09208 /drivers/gpu | |
| parent | Linux 4.10-rc7 (diff) | |
| parent | drm/vmwgfx: Fix depth input into drm_mode_legacy_fb_format (diff) | |
| download | linux-dev-5d18a619976944dc3114bbe1525880c431196c7a.tar.xz linux-dev-5d18a619976944dc3114bbe1525880c431196c7a.zip | |
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
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 723fd763da8e..7a96798b9c0a 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c @@ -481,8 +481,7 @@ static int vmw_fb_kms_framebuffer(struct fb_info *info) mode_cmd.height = var->yres; mode_cmd.pitches[0] = ((var->bits_per_pixel + 7) / 8) * mode_cmd.width; 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; if (cur_fb && cur_fb->width == mode_cmd.width && |