[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTimdPFGJxjWHPZ2kojxJoj76zDw2=fiwDiMrinjy@mail.gmail.com>
Date: Thu, 13 Jan 2011 21:53:55 +0200
From: Anca Emanuel <anca.emanuel@...il.com>
To: James Simmons <jsimmons@...radead.org>
Cc: Christian Borntraeger <borntraeger@...ibm.com>,
Dave Airlie <airlied@...ux.ie>,
DRI mailing list <dri-devel@...ts.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [git pull] drm for rc1
On Thu, Jan 13, 2011 at 7:55 PM, James Simmons <jsimmons@...radead.org> wrote:
>
>> > > With your patch, I can boot the system. But nouveau is not loaded.
>> > > dmesg attached.
>> > >
>> >
>> > Forget to mention: the revert makes first steps of boot look the same
>> > (change the resolution of the text)
>> > but with your patch, I see a big ugly ununtu logo, (I think that is
>> > because nouveau is not loaded)
>
> Okay, can you do one more experiment for me. Since you already reverted
> the patch to get it booting I like to ask you to add
>
> drm_fb_helper_fill_fix(info, fb_helper->fb);
>
> back into the drm_fb_helper_set_par function in drm_fb_helper.c. You have
> something like this:
>
> mutex_lock(&dev->mode_config.mutex);
> for (i = 0; i < fb_helper->crtc_count; i++) {
> crtc = fb_helper->crtc_info[i].mode_set.crtc;
> ret = crtc->funcs->set_config(&fb_helper->crtc_info[i].mode_set);
> if (ret) {
> mutex_unlock(&dev->mode_config.mutex);
> return ret;
> }
> drm_fb_helper_fill_fix(info, fb_helper->fb);
> }
> mutex_unlock(&dev->mode_config.mutex);
>
> Tell me if your system is still usable after that. Thanks for testing for
> me.
>
after
git revert dfe63bb0ad9810db13aab0058caba97866e0a681
and
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 5c4f9b9..2aad663 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -816,6 +816,7 @@ int drm_fb_helper_set_par(struct fb_info *info)
mutex_unlock(&dev->mode_config.mutex);
return ret;
}
+ drm_fb_helper_fill_fix(info, fb_helper->fb->pitch, fb_helper->fb
}
mutex_unlock(&dev->mode_config.mutex);
I get an working system. ( the boot screen is not ok )
Tested suspend/resume. Dmesg attached.
View attachment "dmesg-ok.txt" of type "text/plain" (124466 bytes)
Powered by blists - more mailing lists