| Message ID | 1355228850-18732-1-git-send-email-luis.henriques@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 11/12/12 12:27, Luis Henriques wrote: > BugLink: http://bugs.launchpad.net/bugs/1087622 > > By defining the i915_hsw_enabled symbol in i915_hsw driver will force this > driver to be loaded when the intel_ips driver gets loaded. This will > result in a failure to load the i915 driver as it will clash with > i915_hsw. > > Signed-off-by: Luis Henriques <luis.henriques@canonical.com> > Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > drivers/platform/x86/intel_ips.c | 3 ++- > ubuntu/i915/i915_drv.c | 3 +-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c > index 6c1291c..0f38ec5 100644 > --- a/drivers/platform/x86/intel_ips.c > +++ b/drivers/platform/x86/intel_ips.c > @@ -251,7 +251,8 @@ > > static const int IPS_ADJUST_PERIOD = 5000; /* ms */ > static bool late_i915_load = false; > -extern int i915_hsw_enabled; > +int i915_hsw_enabled = 0; > +EXPORT_SYMBOL(i915_hsw_enabled); > > /* For initial average collection */ > static const int IPS_SAMPLE_PERIOD = 200; /* ms */ > diff --git a/ubuntu/i915/i915_drv.c b/ubuntu/i915/i915_drv.c > index 630b14c..bdc659f 100644 > --- a/ubuntu/i915/i915_drv.c > +++ b/ubuntu/i915/i915_drv.c > @@ -122,8 +122,7 @@ MODULE_PARM_DESC(i915_enable_ppgtt, > static struct drm_driver driver; > extern int intel_agp_enabled; > > -int i915_hsw_enabled = 0; > -EXPORT_SYMBOL(i915_hsw_enabled); > +extern int i915_hsw_enabled; > > #define INTEL_VGA_DEVICE(id, info) { \ > .class = PCI_BASE_CLASS_DISPLAY << 16, \ > Looks good to me. Acked-by: Colin Ian King <colin.king@canonical.com>
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 6c1291c..0f38ec5 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c @@ -251,7 +251,8 @@ static const int IPS_ADJUST_PERIOD = 5000; /* ms */ static bool late_i915_load = false; -extern int i915_hsw_enabled; +int i915_hsw_enabled = 0; +EXPORT_SYMBOL(i915_hsw_enabled); /* For initial average collection */ static const int IPS_SAMPLE_PERIOD = 200; /* ms */ diff --git a/ubuntu/i915/i915_drv.c b/ubuntu/i915/i915_drv.c index 630b14c..bdc659f 100644 --- a/ubuntu/i915/i915_drv.c +++ b/ubuntu/i915/i915_drv.c @@ -122,8 +122,7 @@ MODULE_PARM_DESC(i915_enable_ppgtt, static struct drm_driver driver; extern int intel_agp_enabled; -int i915_hsw_enabled = 0; -EXPORT_SYMBOL(i915_hsw_enabled); +extern int i915_hsw_enabled; #define INTEL_VGA_DEVICE(id, info) { \ .class = PCI_BASE_CLASS_DISPLAY << 16, \