lkml.org 
[lkml]   [2009]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] fb: do not ignore fb_set_par errors
    Date
    fb: do not ignore fb_set_par errors

    At the moment about half of the framebuffer drivers can return an error
    code in fb_set_par. Until now it would be silently ignored by fbmem.c
    and fbcon.c. This patch fixes fbmem.c to return the error code and
    restore var on error. But it is not clear in which video mode the device
    is when fb_set_par fails. It would be good and reasonable if it were in
    the old state but there is no guarantee that this is true for all
    existing drivers.
    Although most errors should be caught by the previous fb_check_var some
    errors can't as they are dynamic (memory allocations, ...) and can only
    be detected while performing the operations which is forbidden in
    fb_check_var.
    This patch shouldn't have a negative impact on normal operation as all
    drivers return 0 on success. The impact in case of error depends heavily
    on the driver and caller but it's expected to be better than before.

    Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
    ---
    drivers/video/fbmem.c | 12 ++++++++++--
    1 files changed, 10 insertions(+), 2 deletions(-)

    diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
    index a85c818..85c1595 100644
    --- a/drivers/video/fbmem.c
    +++ b/drivers/video/fbmem.c
    @@ -954,6 +954,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
    goto done;

    if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
    + struct fb_var_screeninfo old_var;
    struct fb_videomode mode;

    if (info->fbops->fb_get_caps) {
    @@ -963,10 +964,17 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
    goto done;
    }

    + old_var = info->var;
    info->var = *var;

    - if (info->fbops->fb_set_par)
    - info->fbops->fb_set_par(info);
    + if (info->fbops->fb_set_par) {
    + ret = info->fbops->fb_set_par(info);
    +
    + if (ret) {
    + info->var = old_var;
    + goto done;
    + }
    + }

    fb_pan_display(info, &info->var);
    fb_set_cmap(&info->cmap, info);
    --
    1.6.3.2


    \
     
     \ /
      Last update: 2009-08-20 13:59    [W:0.045 / U:0.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site