* [PATCH 1/3] compat-drivers: Rename CONFIG_DRM_RADEON_KMS
@ 2012-10-28 17:55 Ozan Çağlayan
2012-10-28 17:55 ` [PATCH 2/3] compat-drivers: drm: Revert ACPI table size check for < 3.6 Ozan Çağlayan
2012-10-28 17:55 ` [PATCH 3/3] compat-drivers: Enable ATI/AMD Radeon for kernels >= 3.2 Ozan Çağlayan
0 siblings, 2 replies; 4+ messages in thread
From: Ozan Çağlayan @ 2012-10-28 17:55 UTC (permalink / raw)
To: backports; +Cc: mcgrof, Ozan Çağlayan
Prefix it with CONFIG_COMPAT_ to allow setting it correctly.
Signed-off-by: Ozan Çağlayan <ozancag@gmail.com>
---
patches/drm/06-rename-config-options.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/patches/drm/06-rename-config-options.patch b/patches/drm/06-rename-config-options.patch
index ad605ab..4d2cf72 100644
--- a/patches/drm/06-rename-config-options.patch
+++ b/patches/drm/06-rename-config-options.patch
@@ -107,3 +107,23 @@
count = drm_load_edid_firmware(connector);
if (count == 0)
#endif
+--- a/drivers/gpu/drm/radeon/radeon_drv.c 2012-10-28 19:17:02.738091628 +0200
++++ b/drivers/gpu/drm/radeon/radeon_drv.c 2012-10-28 19:17:27.429558561 +0200
+@@ -226,7 +226,7 @@
+ radeon_PCI_IDS
+ };
+
+-#if defined(CONFIG_DRM_RADEON_KMS)
++#if defined(CONFIG_COMPAT_DRM_RADEON_KMS)
+ MODULE_DEVICE_TABLE(pci, pciidlist);
+ #endif
+
+@@ -431,7 +431,7 @@
+ #endif
+ /* if enabled by default */
+ if (radeon_modeset == -1) {
+-#ifdef CONFIG_DRM_RADEON_KMS
++#ifdef CONFIG_COMPAT_DRM_RADEON_KMS
+ DRM_INFO("radeon defaulting to kernel modesetting.\n");
+ radeon_modeset = 1;
+ #else
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/3] compat-drivers: drm: Revert ACPI table size check for < 3.6
2012-10-28 17:55 [PATCH 1/3] compat-drivers: Rename CONFIG_DRM_RADEON_KMS Ozan Çağlayan
@ 2012-10-28 17:55 ` Ozan Çağlayan
2012-10-28 17:55 ` [PATCH 3/3] compat-drivers: Enable ATI/AMD Radeon for kernels >= 3.2 Ozan Çağlayan
1 sibling, 0 replies; 4+ messages in thread
From: Ozan Çağlayan @ 2012-10-28 17:55 UTC (permalink / raw)
To: backports; +Cc: mcgrof, Ozan Çağlayan
acpi_get_table_with_size() was exported with kernels >= 3.6. Revert the
size checking for kernels < 3.6.
Signed-off-by: Ozan Çağlayan <ozancag@gmail.com>
---
.../10-radeon-revert-acpi-table-size-check.patch | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 patches/drm/10-radeon-revert-acpi-table-size-check.patch
diff --git a/patches/drm/10-radeon-revert-acpi-table-size-check.patch b/patches/drm/10-radeon-revert-acpi-table-size-check.patch
new file mode 100644
index 0000000..d595a98
--- /dev/null
+++ b/patches/drm/10-radeon-revert-acpi-table-size-check.patch
@@ -0,0 +1,29 @@
+acpi_get_table_with_size() was exported with kernels >= 3.6. Revert the
+size checking for kernels < 3.6.
+
+Index: compat-drivers/drivers/gpu/drm/radeon/radeon_bios.c
+===================================================================
+--- compat-drivers.orig/drivers/gpu/drm/radeon/radeon_bios.c
++++ compat-drivers/drivers/gpu/drm/radeon/radeon_bios.c
+@@ -554,12 +554,21 @@ static bool radeon_acpi_vfct_bios(struct
+ {
+ bool ret = false;
+ struct acpi_table_header *hdr;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
+ acpi_size tbl_size;
++#else
++ /* acpi_get_table_with_size() not exported on kernels < 3.6 */
++ acpi_size tbl_size = 0x7fffffff;
++#endif
+ UEFI_ACPI_VFCT *vfct;
+ GOP_VBIOS_CONTENT *vbios;
+ VFCT_IMAGE_HEADER *vhdr;
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
+ if (!ACPI_SUCCESS(acpi_get_table_with_size("VFCT", 1, &hdr, &tbl_size)))
++#else
++ if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr)))
++#endif
+ return false;
+ if (tbl_size < sizeof(UEFI_ACPI_VFCT)) {
+ DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n");
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] compat-drivers: Enable ATI/AMD Radeon for kernels >= 3.2
2012-10-28 17:55 [PATCH 1/3] compat-drivers: Rename CONFIG_DRM_RADEON_KMS Ozan Çağlayan
2012-10-28 17:55 ` [PATCH 2/3] compat-drivers: drm: Revert ACPI table size check for < 3.6 Ozan Çağlayan
@ 2012-10-28 17:55 ` Ozan Çağlayan
2012-11-04 17:36 ` Luis R. Rodriguez
1 sibling, 1 reply; 4+ messages in thread
From: Ozan Çağlayan @ 2012-10-28 17:55 UTC (permalink / raw)
To: backports; +Cc: mcgrof, Ozan Çağlayan
Signed-off-by: Ozan Çağlayan <ozancag@gmail.com>
---
config.mk | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/config.mk b/config.mk
index 5941135..3c0a8bd 100644
--- a/config.mk
+++ b/config.mk
@@ -703,16 +703,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_31
# compilation has been tested down to 3.0 but run time
# tests have only started on 3.2.
ifndef CONFIG_COMPAT_KERNEL_3_2
+# Basic DRM support
export CONFIG_COMPAT_VIDEO_MODULES=y
export CONFIG_COMPAT_DRM=m
-export CONFIG_COMPAT_DRM_I915=m
-export CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE=y
+export CONFIG_COMPAT_DRM_TTM=m
export CONFIG_COMPAT_DRM_KMS_HELPER=m
+export CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE=y
+# Intel i915
+export CONFIG_COMPAT_DRM_I915=m
+# ATI/AMD Radeon
+export CONFIG_COMPAT_DRM_RADEON=m
+export CONFIG_COMPAT_DRM_RADEON_KMS=y
endif #CONFIG_COMPAT_KERNEL_3_2
# Enable nouveau on >= 3.3
ifndef CONFIG_COMPAT_KERNEL_3_3
-export CONFIG_COMPAT_DRM_TTM=m
export CONFIG_COMPAT_DRM_NOUVEAU=m
export CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT=y
export CONFIG_COMPAT_NOUVEAU_DEBUG=5
--
1.7.11.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-04 17:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-28 17:55 [PATCH 1/3] compat-drivers: Rename CONFIG_DRM_RADEON_KMS Ozan Çağlayan
2012-10-28 17:55 ` [PATCH 2/3] compat-drivers: drm: Revert ACPI table size check for < 3.6 Ozan Çağlayan
2012-10-28 17:55 ` [PATCH 3/3] compat-drivers: Enable ATI/AMD Radeon for kernels >= 3.2 Ozan Çağlayan
2012-11-04 17:36 ` Luis R. Rodriguez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.