From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754323AbZHTN0d (ORCPT ); Thu, 20 Aug 2009 09:26:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754099AbZHTN0c (ORCPT ); Thu, 20 Aug 2009 09:26:32 -0400 Received: from cantor.suse.de ([195.135.220.2]:58844 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753966AbZHTN0b (ORCPT ); Thu, 20 Aug 2009 09:26:31 -0400 Date: Thu, 20 Aug 2009 15:26:32 +0200 Message-ID: From: Takashi Iwai To: David Airlie Cc: gregkh@suse.de, dri-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] drm/kms/radeon: Add kconfig to specify the default modesetting User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds a Kconfig item to specify the default radeon modeset value. Also fixed the description of CONFIG_DRM_RADEON_KMS. Since KMS gives problems on some Radeon devices, it's safer to disable it as default on distro kernels. But distros would love to include the feature itself instead of disabling KMS completely. Reference: Novell bnc#527910 https://bugzilla.novell.com/show_bug.cgi?id=527910 Signed-off-by: Takashi Iwai --- drivers/gpu/drm/radeon/Kconfig | 13 +++++++++++-- drivers/gpu/drm/radeon/radeon_drv.c | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig index 2168d67..230de32 100644 --- a/drivers/gpu/drm/radeon/Kconfig +++ b/drivers/gpu/drm/radeon/Kconfig @@ -1,9 +1,9 @@ config DRM_RADEON_KMS - bool "Enable modesetting on radeon by default" + bool "Enable kernel modesetting on radeon" depends on DRM_RADEON select DRM_TTM help - Choose this option if you want kernel modesetting enabled by default, + Choose this option if you want kernel modesetting enabled, and you have a new enough userspace to support this. Running old userspaces with this enabled will cause pain. @@ -32,3 +32,12 @@ config DRM_RADEON_KMS This code support the following hardware : R1XX,R2XX,R3XX,R4XX,R5XX (radeon up to X1950). Works is underway to provide support for R6XX, R7XX and newer hardware (radeon from HD2XXX to HD4XXX). + +config CONFIG_DRM_RADEON_KMS_DEFAULT + bool "Enable modesetting on radeon by default" + depends on DRM_RADEON_KMS + help + Choose this option if you want to enable the kernel modesetting + feature in the radeon driver by default. Even if this is set + off, you can still enable it via the kernel commandline option + radeon.modeset=1. diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 0bd5879..74d5b70 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -82,7 +82,11 @@ void radeon_debugfs_cleanup(struct drm_minor *minor); int radeon_no_wb; #if defined(CONFIG_DRM_RADEON_KMS) +#ifdef CONFIG_DRM_RADEON_KMS_DEFAULT int radeon_modeset = -1; +#else +int radeon_modeset = 0; +#endif int radeon_dynclks = -1; int radeon_r4xx_atom = 0; int radeon_agpmode = 0; -- 1.6.3.3