Patchwork [Precise] UBUNTU: [Config] powerpc-smp: build in ATI and RADEON frame buffer drivers

login
register
mail settings
Submitter Tim Gardner
Date April 23, 2012, 1:09 p.m.
Message ID <1335186554-10846-1-git-send-email-tim.gardner@canonical.com>
Download mbox | patch
Permalink /patch/154423/
State New
Headers show

Comments

Tim Gardner - April 23, 2012, 1:09 p.m.
BugLink: http://bugs.launchpad.net/bugs/949288

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.master/abi/3.2.0-23.36/powerpc/ignore       |    1 +
 .../abi/3.2.0-23.36/powerpc/ignore.modules         |    1 +
 debian.master/config/amd64/config.common.amd64     |    1 -
 debian.master/config/config.common.ubuntu          |    1 +
 debian.master/config/i386/config.common.i386       |    1 -
 debian.master/config/powerpc/config.common.powerpc |    5 ++---
 debian.master/config/ppc64/config.common.ppc64     |    1 -
 7 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore
 create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
Stefan Bader - April 23, 2012, 1:14 p.m.
On 23.04.2012 15:09, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/949288
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.master/abi/3.2.0-23.36/powerpc/ignore       |    1 +
>  .../abi/3.2.0-23.36/powerpc/ignore.modules         |    1 +
>  debian.master/config/amd64/config.common.amd64     |    1 -
>  debian.master/config/config.common.ubuntu          |    1 +
>  debian.master/config/i386/config.common.i386       |    1 -
>  debian.master/config/powerpc/config.common.powerpc |    5 ++---
>  debian.master/config/ppc64/config.common.ppc64     |    1 -
>  7 files changed, 5 insertions(+), 6 deletions(-)
>  create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore
>  create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> 
> diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore b/debian.master/abi/3.2.0-23.36/powerpc/ignore
> new file mode 100644
> index 0000000..d00491f
> --- /dev/null
> +++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore
> @@ -0,0 +1 @@
> +1
> diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> new file mode 100644
> index 0000000..d00491f
> --- /dev/null
> +++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> @@ -0,0 +1 @@
> +1
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 802f900..28e44a4 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -36,7 +36,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  CONFIG_DM_RAID45=m
>  CONFIG_DRM_PSB=m
> -CONFIG_DRM_RADEON_KMS=y
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
>  # CONFIG_EZX_PCAP is not set
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 232566b..aebd7bf 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -1310,6 +1310,7 @@ CONFIG_DRM_PSB_MFLD=y
>  CONFIG_DRM_PSB_MRST=y
>  CONFIG_DRM_R128=m
>  CONFIG_DRM_RADEON=m
> +CONFIG_DRM_RADEON_KMS=y
>  CONFIG_DRM_SAVAGE=m
>  CONFIG_DRM_SIS=m
>  CONFIG_DRM_TDFX=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 51423da..ffec50b 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -36,7 +36,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  CONFIG_DM_RAID45=m
>  CONFIG_DRM_PSB=m
> -CONFIG_DRM_RADEON_KMS=y
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
>  # CONFIG_EZX_PCAP is not set
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index 561f711..9cbb6b7 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -31,18 +31,17 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  # CONFIG_DM_RAID45 is not set
>  # CONFIG_DRM_PSB is not set
> -# CONFIG_DRM_RADEON_KMS is not set
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
>  # CONFIG_EZX_PCAP is not set
>  CONFIG_FAT_FS=m
>  CONFIG_FB_3DFX=y
> -CONFIG_FB_ATY128=m
> +CONFIG_FB_ATY128=y
>  CONFIG_FB_BACKLIGHT=y
>  # CONFIG_FB_BOOT_VESA_SUPPORT is not set
>  CONFIG_FB_DDC=y
>  CONFIG_FB_MACMODES=y
> -CONFIG_FB_RADEON=m
> +CONFIG_FB_RADEON=y
>  CONFIG_FB_SVGALIB=m
>  CONFIG_FB_TILEBLITTING=y
>  CONFIG_FB_VOODOO1=y
> diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
> index 66ae66d..cb1c72b 100644
> --- a/debian.master/config/ppc64/config.common.ppc64
> +++ b/debian.master/config/ppc64/config.common.ppc64
> @@ -37,7 +37,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  # CONFIG_DM_RAID45 is not set
>  # CONFIG_DRM_PSB is not set
> -CONFIG_DRM_RADEON_KMS=y
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
>  # CONFIG_EZX_PCAP is not set

Looks simple enough...
Herton Ronaldo Krzesinski - April 23, 2012, 2 p.m.
On Mon, Apr 23, 2012 at 07:09:14AM -0600, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/949288

Ack, from the feedback on the bug, and on an upstream discussion linked
to the bug, seems the best option for now. This seems to be reverting
two previous changes:
"UBUNTU: [Config] Build some framebuffer drivers as modules for powerpc
kernels."
"UBUNTU: [Config] Disable CONFIG_DRM_RADEON_KMS on powerpc kernels"

that can be tracked to oneiric/natty, but if it introduced more problems
like the suspend/resume issues etc. and KMS isn't working well by
default on ppc yet, better do this change now, and revisit later (I
assume CONFIG_FB_RADEON=y will prevent KMS and its issues by default).

> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.master/abi/3.2.0-23.36/powerpc/ignore       |    1 +
>  .../abi/3.2.0-23.36/powerpc/ignore.modules         |    1 +
>  debian.master/config/amd64/config.common.amd64     |    1 -
>  debian.master/config/config.common.ubuntu          |    1 +
>  debian.master/config/i386/config.common.i386       |    1 -
>  debian.master/config/powerpc/config.common.powerpc |    5 ++---
>  debian.master/config/ppc64/config.common.ppc64     |    1 -
>  7 files changed, 5 insertions(+), 6 deletions(-)
>  create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore
>  create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> 
> diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore b/debian.master/abi/3.2.0-23.36/powerpc/ignore
> new file mode 100644
> index 0000000..d00491f
> --- /dev/null
> +++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore
> @@ -0,0 +1 @@
> +1
> diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> new file mode 100644
> index 0000000..d00491f
> --- /dev/null
> +++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> @@ -0,0 +1 @@
> +1
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 802f900..28e44a4 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -36,7 +36,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  CONFIG_DM_RAID45=m
>  CONFIG_DRM_PSB=m
> -CONFIG_DRM_RADEON_KMS=y
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
>  # CONFIG_EZX_PCAP is not set
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 232566b..aebd7bf 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -1310,6 +1310,7 @@ CONFIG_DRM_PSB_MFLD=y
>  CONFIG_DRM_PSB_MRST=y
>  CONFIG_DRM_R128=m
>  CONFIG_DRM_RADEON=m
> +CONFIG_DRM_RADEON_KMS=y
>  CONFIG_DRM_SAVAGE=m
>  CONFIG_DRM_SIS=m
>  CONFIG_DRM_TDFX=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 51423da..ffec50b 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -36,7 +36,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  CONFIG_DM_RAID45=m
>  CONFIG_DRM_PSB=m
> -CONFIG_DRM_RADEON_KMS=y
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
>  # CONFIG_EZX_PCAP is not set
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index 561f711..9cbb6b7 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -31,18 +31,17 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  # CONFIG_DM_RAID45 is not set
>  # CONFIG_DRM_PSB is not set
> -# CONFIG_DRM_RADEON_KMS is not set
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
>  # CONFIG_EZX_PCAP is not set
>  CONFIG_FAT_FS=m
>  CONFIG_FB_3DFX=y
> -CONFIG_FB_ATY128=m
> +CONFIG_FB_ATY128=y
>  CONFIG_FB_BACKLIGHT=y
>  # CONFIG_FB_BOOT_VESA_SUPPORT is not set
>  CONFIG_FB_DDC=y
>  CONFIG_FB_MACMODES=y
> -CONFIG_FB_RADEON=m
> +CONFIG_FB_RADEON=y
>  CONFIG_FB_SVGALIB=m
>  CONFIG_FB_TILEBLITTING=y
>  CONFIG_FB_VOODOO1=y
> diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
> index 66ae66d..cb1c72b 100644
> --- a/debian.master/config/ppc64/config.common.ppc64
> +++ b/debian.master/config/ppc64/config.common.ppc64
> @@ -37,7 +37,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>  # CONFIG_DM9000 is not set
>  # CONFIG_DM_RAID45 is not set
>  # CONFIG_DRM_PSB is not set
> -CONFIG_DRM_RADEON_KMS=y
>  # CONFIG_DVB_FE_CUSTOMISE is not set
>  CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
>  # CONFIG_EZX_PCAP is not set
> -- 
> 1.7.9.5
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
Leann Ogasawara - April 23, 2012, 2:08 p.m.
Applied to Precise master-next and day-0.

Thanks,
Leann

On 04/23/2012 06:09 AM, Tim Gardner wrote:
> BugLink: http://bugs.launchpad.net/bugs/949288
>
> Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
> ---
>   debian.master/abi/3.2.0-23.36/powerpc/ignore       |    1 +
>   .../abi/3.2.0-23.36/powerpc/ignore.modules         |    1 +
>   debian.master/config/amd64/config.common.amd64     |    1 -
>   debian.master/config/config.common.ubuntu          |    1 +
>   debian.master/config/i386/config.common.i386       |    1 -
>   debian.master/config/powerpc/config.common.powerpc |    5 ++---
>   debian.master/config/ppc64/config.common.ppc64     |    1 -
>   7 files changed, 5 insertions(+), 6 deletions(-)
>   create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore
>   create mode 100644 debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
>
> diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore b/debian.master/abi/3.2.0-23.36/powerpc/ignore
> new file mode 100644
> index 0000000..d00491f
> --- /dev/null
> +++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore
> @@ -0,0 +1 @@
> +1
> diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> new file mode 100644
> index 0000000..d00491f
> --- /dev/null
> +++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
> @@ -0,0 +1 @@
> +1
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 802f900..28e44a4 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -36,7 +36,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>   # CONFIG_DM9000 is not set
>   CONFIG_DM_RAID45=m
>   CONFIG_DRM_PSB=m
> -CONFIG_DRM_RADEON_KMS=y
>   # CONFIG_DVB_FE_CUSTOMISE is not set
>   # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
>   # CONFIG_EZX_PCAP is not set
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 232566b..aebd7bf 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -1310,6 +1310,7 @@ CONFIG_DRM_PSB_MFLD=y
>   CONFIG_DRM_PSB_MRST=y
>   CONFIG_DRM_R128=m
>   CONFIG_DRM_RADEON=m
> +CONFIG_DRM_RADEON_KMS=y
>   CONFIG_DRM_SAVAGE=m
>   CONFIG_DRM_SIS=m
>   CONFIG_DRM_TDFX=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 51423da..ffec50b 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -36,7 +36,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>   # CONFIG_DM9000 is not set
>   CONFIG_DM_RAID45=m
>   CONFIG_DRM_PSB=m
> -CONFIG_DRM_RADEON_KMS=y
>   # CONFIG_DVB_FE_CUSTOMISE is not set
>   # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
>   # CONFIG_EZX_PCAP is not set
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index 561f711..9cbb6b7 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -31,18 +31,17 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>   # CONFIG_DM9000 is not set
>   # CONFIG_DM_RAID45 is not set
>   # CONFIG_DRM_PSB is not set
> -# CONFIG_DRM_RADEON_KMS is not set
>   # CONFIG_DVB_FE_CUSTOMISE is not set
>   CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
>   # CONFIG_EZX_PCAP is not set
>   CONFIG_FAT_FS=m
>   CONFIG_FB_3DFX=y
> -CONFIG_FB_ATY128=m
> +CONFIG_FB_ATY128=y
>   CONFIG_FB_BACKLIGHT=y
>   # CONFIG_FB_BOOT_VESA_SUPPORT is not set
>   CONFIG_FB_DDC=y
>   CONFIG_FB_MACMODES=y
> -CONFIG_FB_RADEON=m
> +CONFIG_FB_RADEON=y
>   CONFIG_FB_SVGALIB=m
>   CONFIG_FB_TILEBLITTING=y
>   CONFIG_FB_VOODOO1=y
> diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
> index 66ae66d..cb1c72b 100644
> --- a/debian.master/config/ppc64/config.common.ppc64
> +++ b/debian.master/config/ppc64/config.common.ppc64
> @@ -37,7 +37,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
>   # CONFIG_DM9000 is not set
>   # CONFIG_DM_RAID45 is not set
>   # CONFIG_DRM_PSB is not set
> -CONFIG_DRM_RADEON_KMS=y
>   # CONFIG_DVB_FE_CUSTOMISE is not set
>   CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
>   # CONFIG_EZX_PCAP is not set

Patch

diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore b/debian.master/abi/3.2.0-23.36/powerpc/ignore
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore
@@ -0,0 +1 @@ 
+1
diff --git a/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/debian.master/abi/3.2.0-23.36/powerpc/ignore.modules
@@ -0,0 +1 @@ 
+1
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 802f900..28e44a4 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -36,7 +36,6 @@  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DM9000 is not set
 CONFIG_DM_RAID45=m
 CONFIG_DRM_PSB=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 # CONFIG_EZX_PCAP is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 232566b..aebd7bf 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1310,6 +1310,7 @@  CONFIG_DRM_PSB_MFLD=y
 CONFIG_DRM_PSB_MRST=y
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_TDFX=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 51423da..ffec50b 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -36,7 +36,6 @@  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DM9000 is not set
 CONFIG_DM_RAID45=m
 CONFIG_DRM_PSB=m
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DVB_FE_CUSTOMISE is not set
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
 # CONFIG_EZX_PCAP is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 561f711..9cbb6b7 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -31,18 +31,17 @@  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DM9000 is not set
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DRM_PSB is not set
-# CONFIG_DRM_RADEON_KMS is not set
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_EZX_PCAP is not set
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=y
-CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128=y
 CONFIG_FB_BACKLIGHT=y
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_DDC=y
 CONFIG_FB_MACMODES=y
-CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON=y
 CONFIG_FB_SVGALIB=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_VOODOO1=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 66ae66d..cb1c72b 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -37,7 +37,6 @@  CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DM9000 is not set
 # CONFIG_DM_RAID45 is not set
 # CONFIG_DRM_PSB is not set
-CONFIG_DRM_RADEON_KMS=y
 # CONFIG_DVB_FE_CUSTOMISE is not set
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 # CONFIG_EZX_PCAP is not set