diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-01-18 14:14:01 -0800 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-01-26 20:52:54 -0800 |
| commit | 8c95742e566f3945f992472a5f99f78aaa7f890b (patch) | |
| tree | 0d6ff72ad124b7f71b07f8b498c6ca1e54342704 | |
| parent | 0f580386b6ad295c04c1b32120826494f8a29c1c (diff) | |
| download | linux-8c95742e566f3945f992472a5f99f78aaa7f890b.tar.gz linux-8c95742e566f3945f992472a5f99f78aaa7f890b.tar.bz2 linux-8c95742e566f3945f992472a5f99f78aaa7f890b.zip | |
drm/vmwgfx: Fix depth input into drm_mode_legacy_fb_format
Currently the pitch is passed in as depth. This causes
drm_mode_legacy_fb_format() to return the wrong pixel format.
The wrong pixel format will be rejected by vmw_kms_new_framebuffer(),
thus leaving par->set_fb to NULL.
This eventually causes a crash in vmw_fb_setcolreg() when the code
tries to dereference par->set_fb.
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
| -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 867a8442220c..e9005b9a5e8c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c @@ -482,8 +482,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 && |