lkml.org 
[lkml]   [2010]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 3/4] viafb: do modesetting after updating variables


    Florian Tobias Schandinat wrote:
    > Hi Andrew,
    >
    > Andrew Morton schrieb:
    >> On Tue, 5 Jan 2010 22:59:58 +0000
    >> Florian Tobias Schandinat <FlorianSchandinat@gmx.de> wrote:
    >>
    >>> viafb: do modesetting after updating variables
    >>>
    >>> Reorder viafb_set_par to allow using the updated variables in
    >>> viafb_setmode. This fixes a regression that prevented proper
    >>> runtime mode changes.
    >>>
    >>> Signed-off-by: Erik-Jan Post <ej.lfs@xs4all.nl>
    >>> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
    >>> ---
    >>> drivers/video/via/viafbdev.c | 6 +++---
    >>> 1 files changed, 3 insertions(+), 3 deletions(-)
    >>>
    >>> diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
    >>> index e16df84..f7ff4ea 100644
    >>> --- a/drivers/video/via/viafbdev.c
    >>> +++ b/drivers/video/via/viafbdev.c
    >>> @@ -174,15 +174,15 @@ static int viafb_set_par(struct fb_info *info)
    >>> }
    >>>
    >>> if (vmode_entry) {
    >>> - viafb_setmode(vmode_entry, info->var.bits_per_pixel,
    >>> - vmode_entry1, viafb_bpp1);
    >>> -
    >>> viafb_update_fix(info);
    >>> viafb_bpp = info->var.bits_per_pixel;
    >>> if (info->var.accel_flags & FB_ACCELF_TEXT)
    >>> info->flags &= ~FBINFO_HWACCEL_DISABLED;
    >>> else
    >>> info->flags |= FBINFO_HWACCEL_DISABLED;
    >>> +
    >>> + viafb_setmode(vmode_entry, info->var.bits_per_pixel,
    >>> + vmode_entry1, viafb_bpp1);
    >>> }
    >>>
    >>> return 0;
    >>
    >> Problem.
    >>
    >> Patches 2, 3 and 4 are appropriate to 2.6.33 - they fix regressions.
    >> But all four patches are dependent upon patches which we already have
    >> queued for 2.6.34!
    >
    > That are good news.
    >
    >> I redid patches 2, 3 and 4 so they apply to current mainline. This
    >> particular patch (3/4) needed fixing - please check the result.
    >> ---
    >> a/drivers/video/via/viafbdev.c~viafb-do-modesetting-after-updating-variables
    >>
    >> +++ a/drivers/video/via/viafbdev.c
    >> @@ -177,16 +177,15 @@ static int viafb_set_par(struct fb_info }
    >>
    >> if (vmode_index != VIA_RES_INVALID) {
    >> - viafb_setmode(vmode_index, info->var.xres, info->var.yres,
    >> - info->var.bits_per_pixel, vmode_index1,
    >> - viafb_second_xres, viafb_second_yres, viafb_bpp1);
    >> -
    >> viafb_update_fix(info);
    >> viafb_bpp = info->var.bits_per_pixel;
    >> if (info->var.accel_flags & FB_ACCELF_TEXT)
    >> info->flags &= ~FBINFO_HWACCEL_DISABLED;
    >> else
    >> info->flags |= FBINFO_HWACCEL_DISABLED;
    >> + viafb_setmode(vmode_index, info->var.xres, info->var.yres,
    >> + info->var.bits_per_pixel, vmode_index1,
    >> + viafb_second_xres, viafb_second_yres, viafb_bpp1);
    >> }
    >>
    >> return 0;
    >> _
    >
    > This is correct.

    Yep, it is correct.

    Bye,
    Erik-Jan

    >
    >> This reordering broke viafb-split-global-index-up.patch, which I fixed
    >> up.
    >
    > Thanks,
    >
    >
    > Florian Tobias Schandinat
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    >


    \
     
     \ /
      Last update: 2010-01-12 22:07    [W:0.029 / U:0.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site