Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-alx/patches-2.6.33-r3/0300-2.6.33-create-macropairs-intel-agp-i915.patch

    Contents of /trunk/kernel26-alx/patches-2.6.33-r3/0300-2.6.33-create-macropairs-intel-agp-i915.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1260 - (show annotations) (download)
    Wed Jan 26 11:54:32 2011 UTC (13 years, 3 months ago) by niro
    File size: 1426 byte(s) 
    2.6.33-alx-r3: always enable kms support at runtime for xorg-server-1.9.x
    1 From 378b8e9b866452112b5da30e9c64a048dc4c44dd Mon Sep 17 00:00:00 2001
    2 From: Tim Gardner <tim.gardner@canonical.com>
    3 Date: Tue, 6 Oct 2009 17:29:11 -0600
    4 Subject: [PATCH 1/1] UBUNTU: SAUCE: Use MODULE_IMPORT macro to tie intel_agp to i915
    5
    6 BugLink: http://bugs.launchpad.net/bugs/430694
    7
    8 Symbolicly link i915 and intel_agp, forcing intel_agp to
    9 get loaded first.
    10
    11 Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
    12 ---
    13 drivers/char/agp/intel-agp.c | 1 +
    14 drivers/gpu/drm/i915/i915_drv.c | 1 +
    15 2 files changed, 2 insertions(+), 0 deletions(-)
    16
    17 diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
    18 index 6a45365..9c6b68e 100644
    19 --- a/drivers/char/agp/intel-agp.c
    20 +++ b/drivers/char/agp/intel-agp.c
    21 @@ -2448,5 +2448,6 @@ static void __exit agp_intel_cleanup(void)
    22 module_init(agp_intel_init);
    23 module_exit(agp_intel_cleanup);
    24
    25 +MODULE_EXPORT(intel_agp);
    26 MODULE_AUTHOR("Dave Jones <davej@redhat.com>");
    27 MODULE_LICENSE("GPL and additional rights");
    28 diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
    29 index c078d99..e4d7056 100644
    30 --- a/drivers/gpu/drm/i915/i915_drv.c
    31 +++ b/drivers/gpu/drm/i915/i915_drv.c
    32 @@ -261,6 +261,7 @@ static void __exit i915_exit(void)
    33 module_init(i915_init);
    34 module_exit(i915_exit);
    35
    36 +MODULE_IMPORT(intel_agp);
    37 MODULE_AUTHOR(DRIVER_AUTHOR);
    38 MODULE_DESCRIPTION(DRIVER_DESC);
    39 MODULE_LICENSE("GPL and additional rights");
    40 --
    41 1.7.0.4
    42