[PATCH] compat-drivers: Enable CONFIG_DRM_LOAD_EDID_FIRMWARE

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This was added in 3.4. Rename the option in the relevant source file
and enable CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE in config.mk to build
the symbol into DRM_KMS_HELPER kernel module.

Signed-off-by: Ozan Çağlayan <ozancag@xxxxxxxxx>
---
 config.mk                                  |  1 +
 patches/drm/06-rename-config-options.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/config.mk b/config.mk
index c9b2353..4a390fd 100644
--- a/config.mk
+++ b/config.mk
@@ -702,5 +702,6 @@ ifndef CONFIG_COMPAT_KERNEL_3_2
 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_KMS_HELPER=m
 endif #CONFIG_COMPAT_KERNEL_3_2
diff --git a/patches/drm/06-rename-config-options.patch b/patches/drm/06-rename-config-options.patch
index 1096fce..9fda1f8 100644
--- a/patches/drm/06-rename-config-options.patch
+++ b/patches/drm/06-rename-config-options.patch
@@ -75,3 +75,14 @@
  sil164-y := sil164_drv.o
 -obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
 +obj-$(CONFIG_COMPAT_DRM_I2C_SIL164) += sil164.o
+--- a/drivers/gpu/drm/drm_crtc_helper.c
++++ b/drivers/gpu/drm/drm_crtc_helper.c
+@@ -119,7 +119,7 @@ int drm_helper_probe_single_connector_mo
+ 		goto prune;
+ 	}
+ 
+-#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
++#ifdef CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE
+ 	count = drm_load_edid_firmware(connector);
+ 	if (count == 0)
+ #endif
-- 
1.7.11.7

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux