From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Christian_K=F6nig?= Subject: Re: [PATCH] drm/radeon: restore nomodeset operation (v2) Date: Wed, 15 May 2013 15:21:01 +0200 Message-ID: <51938BBD.6000805@vodafone.de> References: <1368581016-32356-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de [139.7.28.128]) by gabe.freedesktop.org (Postfix) with ESMTP id D1A77E6293 for ; Wed, 15 May 2013 06:21:04 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Alex Deucher Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Am 15.05.2013 15:00, schrieb Alex Deucher: > On Tue, May 14, 2013 at 9:23 PM, Dave Airlie wrote: >> From: Dave Airlie >> >> When UMS was deprecated it removed support for nomodeset commandline >> we really want this in distro land so we can debug stuff, everyone >> should fallback to vesa correctly. >> >> v2: oops -1 isn't used anymore, restore original behaviour >> -1 is default, so we can boot with nomodeset on the command line, >> then use radeon.modeset=3D1 to override it for debugging later. >> >> Cc: stable@vger.kernel.org >> Signed-off-by: Dave Airlie > Whoops. Looks good to me. Do you want me take this patch through my > tree or do you want to apply it? > > Reviewed-by: Alex Deucher I was really wondering what that code does exactly while removing it, = now I know. Patch is: Reviewed-by: Christian K=F6nig > > >> --- >> drivers/gpu/drm/radeon/radeon_drv.c | 12 +++++++++++- >> 1 file changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeo= n/radeon_drv.c >> index d33f484..094e7e5 100644 >> --- a/drivers/gpu/drm/radeon/radeon_drv.c >> +++ b/drivers/gpu/drm/radeon/radeon_drv.c >> @@ -147,7 +147,7 @@ static inline void radeon_unregister_atpx_handler(vo= id) {} >> #endif >> >> int radeon_no_wb; >> -int radeon_modeset =3D 1; >> +int radeon_modeset =3D -1; >> int radeon_dynclks =3D -1; >> int radeon_r4xx_atom =3D 0; >> int radeon_agpmode =3D 0; >> @@ -456,6 +456,16 @@ static struct pci_driver radeon_kms_pci_driver =3D { >> >> static int __init radeon_init(void) >> { >> +#ifdef CONFIG_VGA_CONSOLE >> + if (vgacon_text_force() && radeon_modeset =3D=3D -1) { >> + DRM_INFO("VGACON disable radeon kernel modesetting.\n"); >> + radeon_modeset =3D 0; >> + } >> +#endif >> + /* set to modesetting by default if not nomodeset */ >> + if (radeon_modeset =3D=3D -1) >> + radeon_modeset =3D 1; >> + >> if (radeon_modeset =3D=3D 1) { >> DRM_INFO("radeon kernel modesetting enabled.\n"); >> driver =3D &kms_driver; >> -- >> 1.8.1.2 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >