lkml.org 
[lkml]   [2014]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 118/182] drm/vmwgfx: correct fb_fix_screeninfo.line_length
    Date
    3.11.10.9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christopher Friedt <chrisfriedt@gmail.com>

    commit aa6de142c901cd2d90ef08db30ae87da214bedcc upstream.

    Previously, the vmwgfx_fb driver would allow users to call FBIOSET_VINFO, but it would not adjust
    the FINFO properly, resulting in distorted screen rendering. The patch corrects that behaviour.

    See https://bugs.gentoo.org/show_bug.cgi?id=494794 for examples.

    Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
    Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
    index ed5ce2a..021b522 100644
    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
    @@ -147,7 +147,7 @@ static int vmw_fb_check_var(struct fb_var_screeninfo *var,
    }

    if (!vmw_kms_validate_mode_vram(vmw_priv,
    - info->fix.line_length,
    + var->xres * var->bits_per_pixel/8,
    var->yoffset + var->yres)) {
    DRM_ERROR("Requested geom can not fit in framebuffer\n");
    return -EINVAL;
    @@ -162,6 +162,8 @@ static int vmw_fb_set_par(struct fb_info *info)
    struct vmw_private *vmw_priv = par->vmw_priv;
    int ret;

    + info->fix.line_length = info->var.xres * info->var.bits_per_pixel/8;
    +
    ret = vmw_kms_write_svga(vmw_priv, info->var.xres, info->var.yres,
    info->fix.line_length,
    par->bpp, par->depth);
    @@ -177,6 +179,7 @@ static int vmw_fb_set_par(struct fb_info *info)
    vmw_write(vmw_priv, SVGA_REG_DISPLAY_POSITION_Y, info->var.yoffset);
    vmw_write(vmw_priv, SVGA_REG_DISPLAY_WIDTH, info->var.xres);
    vmw_write(vmw_priv, SVGA_REG_DISPLAY_HEIGHT, info->var.yres);
    + vmw_write(vmw_priv, SVGA_REG_BYTES_PER_LINE, info->fix.line_length);
    vmw_write(vmw_priv, SVGA_REG_DISPLAY_ID, SVGA_ID_INVALID);
    }

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-04-25 08:41    [W:4.066 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site