From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik-Jan Date: Tue, 12 Jan 2010 20:58:01 +0000 Subject: Re: [PATCH 3/4] viafb: do modesetting after updating variables Message-Id: <4B4CE259.2070705@xs4all.nl> List-Id: References: <1262732399-3416-1-git-send-email-FlorianSchandinat@gmx.de> <1262732399-3416-2-git-send-email-FlorianSchandinat@gmx.de> <1262732399-3416-3-git-send-email-FlorianSchandinat@gmx.de> <20100111134644.bf26dd07.akpm@linux-foundation.org> <4B4BC0AA.5080209@gmx.de> In-Reply-To: <4B4BC0AA.5080209@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Florian Tobias Schandinat Cc: Andrew Morton , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, JosephChan@via.com.tw, ScottFang@viatech.com.cn Florian Tobias Schandinat wrote: > Hi Andrew, > > Andrew Morton schrieb: >> On Tue, 5 Jan 2010 22:59:58 +0000 >> Florian Tobias Schandinat 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 >>> Signed-off-by: Florian Tobias Schandinat >>> --- >>> 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754330Ab0ALVFG (ORCPT ); Tue, 12 Jan 2010 16:05:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754155Ab0ALVFF (ORCPT ); Tue, 12 Jan 2010 16:05:05 -0500 Received: from smtp-vbr16.xs4all.nl ([194.109.24.36]:3686 "EHLO smtp-vbr16.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754115Ab0ALVFE (ORCPT ); Tue, 12 Jan 2010 16:05:04 -0500 X-Greylist: delayed 386 seconds by postgrey-1.27 at vger.kernel.org; Tue, 12 Jan 2010 16:05:03 EST Message-ID: <4B4CE259.2070705@xs4all.nl> Date: Tue, 12 Jan 2010 21:58:01 +0100 From: Erik-Jan User-Agent: Thunderbird 2.0.0.16 (X11/20080808) MIME-Version: 1.0 To: Florian Tobias Schandinat CC: Andrew Morton , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, JosephChan@via.com.tw, ScottFang@viatech.com.cn Subject: Re: [PATCH 3/4] viafb: do modesetting after updating variables References: <1262732399-3416-1-git-send-email-FlorianSchandinat@gmx.de> <1262732399-3416-2-git-send-email-FlorianSchandinat@gmx.de> <1262732399-3416-3-git-send-email-FlorianSchandinat@gmx.de> <20100111134644.bf26dd07.akpm@linux-foundation.org> <4B4BC0AA.5080209@gmx.de> In-Reply-To: <4B4BC0AA.5080209@gmx.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Florian Tobias Schandinat wrote: > Hi Andrew, > > Andrew Morton schrieb: >> On Tue, 5 Jan 2010 22:59:58 +0000 >> Florian Tobias Schandinat 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 >>> Signed-off-by: Florian Tobias Schandinat >>> --- >>> 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 >