From: Erik-Jan <ej.post@xs4all.nl>
To: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Andrew Morton <akpm@linux-foundation.org>,
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
Date: Tue, 12 Jan 2010 20:58:01 +0000 [thread overview]
Message-ID: <4B4CE259.2070705@xs4all.nl> (raw)
In-Reply-To: <4B4BC0AA.5080209@gmx.de>
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
>
prev parent reply other threads:[~2010-01-12 20:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-05 22:59 [PATCH 1/4] viafb: yet another dead code removal Florian Tobias Schandinat
2010-01-05 22:59 ` [PATCH 2/4] viafb: fix LCD hardware cursor regression Florian Tobias Schandinat
2010-01-05 22:59 ` [PATCH 3/4] viafb: do modesetting after updating variables Florian Tobias Schandinat
2010-01-05 22:59 ` [PATCH 4/4] viafb: fix acceleration for some chips Florian Tobias Schandinat
2010-01-11 21:46 ` [PATCH 3/4] viafb: do modesetting after updating variables Andrew Morton
2010-01-12 0:22 ` Florian Tobias Schandinat
2010-01-12 20:58 ` Erik-Jan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B4CE259.2070705@xs4all.nl \
--to=ej.post@xs4all.nl \
--cc=FlorianSchandinat@gmx.de \
--cc=JosephChan@via.com.tw \
--cc=ScottFang@viatech.com.cn \
--cc=akpm@linux-foundation.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).