| Message ID | alpine.LFD.2.00.0905292113150.4293@localhost.localdomain (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Len Brown wrote: > From: Len Brown <len.brown@intel.com> > Subject: [PATCH] ACPI, i915: build fix (v2) > > drivers/built-in.o: In function `intel_opregion_init': > (.text+0x9d540): undefined reference to `acpi_video_register' > > v2: move under DRM_I915 from DRM_I915_KMS > > Signed-off-by: Len Brown <len.brown@intel.com> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > --- > as applied. > thanks, > -Len > > drivers/gpu/drm/Kconfig | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 4cd35d8..f5d46e7 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -67,12 +67,18 @@ config DRM_I830 > will load the correct one. > > config DRM_I915 > + tristate "i915 driver" > select FB_CFB_FILLRECT > select FB_CFB_COPYAREA > select FB_CFB_IMAGEBLIT > select FB > select FRAMEBUFFER_CONSOLE if !EMBEDDED > - tristate "i915 driver" > + # i915 depends on ACPI_VIDEO when ACPI is enabled > + # but for select to work, need to select ACPI_VIDEO's dependencies, ick > + select VIDEO_OUTPUT_CONTROL if ACPI > + select BACKLIGHT_CLASS_DEVICE if ACPI > + select INPUT if ACPI > + select ACPI_VIDEO if ACPI > help > Choose this option if you have a system that has Intel 830M, 845G, > 852GM, 855GM 865G or 915G integrated graphics. If M is selected, the > @@ -84,12 +90,6 @@ config DRM_I915 > config DRM_I915_KMS > bool "Enable modesetting on intel by default" > depends on DRM_I915 > - # i915 KMS depends on ACPI_VIDEO when ACPI is enabled > - # but for select to work, need to select ACPI_VIDEO's dependencies, ick > - select VIDEO_OUTPUT_CONTROL if ACPI > - select BACKLIGHT_CLASS_DEVICE if ACPI > - select INPUT if ACPI > - select ACPI_VIDEO if ACPI > help > Choose this option if you want kernel modesetting enabled by default, > and you have a new enough userspace to support this. Running old > Confirmed fixed - tried 2 builds based on -rc7, all OK. Thanks, Woody
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 4cd35d8..f5d46e7 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -67,12 +67,18 @@ config DRM_I830 will load the correct one. config DRM_I915 + tristate "i915 driver" select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB select FRAMEBUFFER_CONSOLE if !EMBEDDED - tristate "i915 driver" + # i915 depends on ACPI_VIDEO when ACPI is enabled + # but for select to work, need to select ACPI_VIDEO's dependencies, ick + select VIDEO_OUTPUT_CONTROL if ACPI + select BACKLIGHT_CLASS_DEVICE if ACPI + select INPUT if ACPI + select ACPI_VIDEO if ACPI help Choose this option if you have a system that has Intel 830M, 845G, 852GM, 855GM 865G or 915G integrated graphics. If M is selected, the @@ -84,12 +90,6 @@ config DRM_I915 config DRM_I915_KMS bool "Enable modesetting on intel by default" depends on DRM_I915 - # i915 KMS depends on ACPI_VIDEO when ACPI is enabled - # but for select to work, need to select ACPI_VIDEO's dependencies, ick - select VIDEO_OUTPUT_CONTROL if ACPI - select BACKLIGHT_CLASS_DEVICE if ACPI - select INPUT if ACPI - select ACPI_VIDEO if ACPI help Choose this option if you want kernel modesetting enabled by default, and you have a new enough userspace to support this. Running old