diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/radeon/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/radeon/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/radeon/Kconfig | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig index 1c02d23f6fcc..ea92bbe3ed37 100644 --- a/drivers/gpu/drm/radeon/Kconfig +++ b/drivers/gpu/drm/radeon/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config DRM_RADEON_KMS | 1 | config DRM_RADEON_KMS |
| 2 | bool "Enable modesetting on radeon by default - NEW DRIVER" | 2 | bool "Enable modesetting on radeon by default - NEW DRIVER" |
| 3 | depends on DRM_RADEON | 3 | depends on DRM_RADEON |
| 4 | select BACKLIGHT_CLASS_DEVICE | ||
| 4 | help | 5 | help |
| 5 | Choose this option if you want kernel modesetting enabled by default. | 6 | Choose this option if you want kernel modesetting enabled by default. |
| 6 | 7 | ||
| @@ -27,11 +28,4 @@ config DRM_RADEON_KMS | |||
| 27 | The kernel will also perform security check on command stream | 28 | The kernel will also perform security check on command stream |
| 28 | provided by the user, we want to catch and forbid any illegal use | 29 | provided by the user, we want to catch and forbid any illegal use |
| 29 | of the GPU such as DMA into random system memory or into memory | 30 | of the GPU such as DMA into random system memory or into memory |
| 30 | not owned by the process supplying the command stream. This part | 31 | not owned by the process supplying the command stream. |
| 31 | of the code is still incomplete and this why we propose that patch | ||
| 32 | as a staging driver addition, future security might forbid current | ||
| 33 | experimental userspace to run. | ||
| 34 | |||
| 35 | This code support the following hardware : R1XX,R2XX,R3XX,R4XX,R5XX | ||
| 36 | (radeon up to X1950). Works is underway to provide support for R6XX, | ||
| 37 | R7XX and newer hardware (radeon from HD2XXX to HD4XXX). | ||