aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'i915fb' of ↵Linus Torvalds2006-06-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: (25 commits) intelfb: fixup clock calculation debugging. Removed hard coded EDID buffer size. intelfb: use regular modedb table instead of VESA intelfb: use firmware EDID for mode database Revert "intelfb driver -- use the regular modedb table instead of the VESA" intelfb: int option fix sync modesetting code with X.org intelfb: align with changes from my X driver. intelfb driver -- use the regular modedb table instead of the VESA Adds support for 256MB aperture on 945 chipsets to the intelfb driver intelfb -- uses stride alignment of 64 on the 9xx chipsets. intelfb: some cleanups for intelfbhw intelfb: fixup pitch calculation like X does intelfb: fixup p calculation This patch makes a needlessly global struct static. intelfb: add i945GM support intelfb: fixup whitespace.. intelfb: add hw cursor support for i9xx intelfb: make i915 modeset intelfb: add support for i945G ...
| * intelfb: fixup clock calculation debugging.Dave Airlie2006-06-18
| | | | | | | | | | | | The debugging code for pll clocks was wrong and causing div by 0. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * Removed hard coded EDID buffer size.Dennis Munsie2006-06-07
| | | | | | | | | | | | Signed-off-by: Dennis Munsie <dmunsie@cecropia.com> Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: use regular modedb table instead of VESADennis Munsie2006-05-29
| | | | | | | | | | | | | | | | | | intelfb driver -- use the regular modedb table instead of the VESA modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: use firmware EDID for mode databaseAntonino A. Daplas2006-05-29
| | | | | | | | | | | | | | | | | | Use firmware EDID for the driver's private mode database. Signed-off-by: Antonino Daplas <adaplas@pol.net> Cc: Sylvain Meyer <sylvain.meyer@worldonline.fr> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * Revert "intelfb driver -- use the regular modedb table instead of the VESA"Dave Airlie2006-05-29
| | | | | | | | | | | | | | This reverts 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 commit. This conflicts with a patch in -mm from Antonino reapply later. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: int option fixEric Hustvedt2006-05-29
| | | | | | | | | | | | | | | | | | | | Fix integer option parsing in the intelfb driver. The macro wasn't accounting for the equal sign past the option name. As a result, the vram option always returned 0. Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com> Signed-off-by: Dennis Munsie <dmunsie@cecropia.com Signed-off-by: Dave Airlie <airlied@linux.ie>
| * sync modesetting code with X.orgDave Airlie2006-05-27
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: align with changes from my X driver.Dave Airlie2006-05-27
| | | | | | | | | | | | | | This just realigns the PLL calculation routines with the ones from my X.org driver. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb driver -- use the regular modedb table instead of the VESADennis Munsie2006-05-27
| | | | | | | | | | | | | | | | modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie <dmunsie@cecropia.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * Adds support for 256MB aperture on 945 chipsets to the intelfb driverEric Hustvedt2006-05-27
| | | | | | | | | | | | | | | | and corrects calculation of stolen memory overhead. Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com> Signed-off-by: Dennis Munsie <dmunsie@cecropia.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb -- uses stride alignment of 64 on the 9xx chipsets.Dennis Munsie2006-05-27
| | | | | | | | | | Signed-off-by: Dennis Munsie <dmunsie@cecropia.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: some cleanups for intelfbhwDave Airlie2006-04-03
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: fixup pitch calculation like X doesDave Airlie2006-04-03
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: fixup p calculationDave Airlie2006-04-02
| | | | | | | | | | | | | | This fixes up the p calculation of p1 and p2 for the i9xx chipsets. This seems to work a lot better for lower pixel clocks.. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * This patch makes a needlessly global struct static.Dave Airlie2006-04-02
| | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: add i945GM supportDave Airlie2006-04-02
| | | | | | | | | | | | Untested i945GM support just add the framework. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: fixup whitespace..Dave Airlie2006-04-02
| | | | | | | | | | | | repeat after me, I must not take code from X without reformatting... Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: add hw cursor support for i9xxDave Airlie2006-04-02
| | | | | | | | | | | | This adds hw cursor support for the i9xx chipsets. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: make i915 modesetDave Airlie2006-04-02
| | | | | | | | | | | | This takes the modeset and pll code from my X driver. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: add support for i945GDave Airlie2006-04-02
| | | | | | | | | | | | This just adds the defines and structure for i945G Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: enable on x86_64Dave Airlie2006-04-02
| | | | | | | | | | | | i945G chipsets supports 64-bit. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: add p divisor increments for i9xx.Dave Airlie2006-04-02
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: change splitm to be brute forceDave Airlie2006-04-02
| | | | | | | | | | | | The old splitm didn't always work use a brute force. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * intelfb: add pll index to the intelfb structureDave Airlie2006-04-02
| | | | | | | | | | Add the pll index into the information structure, change get_chipset to take only the info structure, use plls in correct places
| * intelfb: prepare for i9xx support.Dave Airlie2006-04-02
| | | | | | | | | | | | | | This code just moves the PLL min/max calculations variables into a structure, it doesn't change or add any new functionality. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgartLinus Torvalds2006-06-19
|\ \ | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] alpha-agp warning fix [AGPGART] uninorth-agp warning fixes [AGPGART] Remove pointless initialisation in intel-agp [AGPGART] Remove pointless code from agp_generic_create_gatt_table()
| * | [AGPGART] alpha-agp warning fixAndrew Morton2006-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/char/agp/alpha-agp.c:138: warning: initialization from incompatible pointer type drivers/char/agp/alpha-agp.c:139: warning: initialization from incompatible pointer type Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Jones <davej@redhat.com>
| * | [AGPGART] uninorth-agp warning fixesAndrew Morton2006-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_suspend': drivers/char/agp/uninorth-agp.c:332: warning: cast to pointer from integer of different size drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_resume': drivers/char/agp/uninorth-agp.c:354: warning: cast from pointer to integer of different size Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Jones <davej@redhat.com>
| * | [AGPGART] Remove pointless initialisation in intel-agpDave Jones2006-05-30
| | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | [AGPGART] Remove pointless code from agp_generic_create_gatt_table()Dave Jones2006-05-30
| | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreqLinus Torvalds2006-06-19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] sets nforce2 minimum PLL divider to 2. [CPUFREQ] Make powernow-k7 work on SMP kernels. [CPUFREQ] cpufreq core {d,}printk adjustments [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino [CPUFREQ] dprintk adjustments to cpufreq-nforce2 [CPUFREQ] Prepare powernow-k8 for future CPUs. [CPUFREQ] Make acpi-cpufreq 'sticky'. [CPUFREQ] Remove strange No-op from longrun.c [CPUFREQ] Remove more freq_table reinitialisations. [CPUFREQ] Fix another redundant initialisation in freq_table [CPUFREQ] Remove duplicate assignment in freq_table [CPUFREQ] CodingStyle nits in cpufreq_stats.c [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq [CPUFREQ] Remove pointless reinitialisation from powernow-k8 [CPUFREQ] Remove redundant initialisation from longhaul. [CPUFREQ] Clean up longhaul's speed pretty-printer [CPUFREQ] Disambiguate loop indexes in powernow-k7 [CPUFREQ] Typo in powernow-k8
| * | | [CPUFREQ] sets nforce2 minimum PLL divider to 2.Dave Jones2006-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets minimum PLL divider to 2. No negative impact when tested with two nForce2 based boards. Alexander Choporov reported (06/01/06) that xdiv = 1 does not work on his Abit NF7S2. Although there shouldn't be much cases that lead to xdiv = 1. (Updates also the (C) year) Signed-off-by: Sebastian Witt <se.witt@gmx.net> Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Make powernow-k7 work on SMP kernels.Dave Jones2006-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though powernow-k7 doesn't work in SMP environments, it can work on an SMP configured kernel if there's only one CPU present, however recalibrate_cpu_khz was returning -EINVAL on such kernels, so we failed to init the cpufreq driver. Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] cpufreq core {d,}printk adjustmentsJan Beulich2006-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove KERN_* suffixes from some cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrinoJan Beulich2006-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove KERN_* suffixes from some Centrino cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] dprintk adjustments to cpufreq-nforce2Jan Beulich2006-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove KERN_* suffixes from some NForce2 cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Prepare powernow-k8 for future CPUs.Dave Jones2006-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forthcoming AMD products will use a different algorithm for transitioning pstates than the current generation Opteron products do. The attached patch allows the powernow-k8 driver to work with those products. Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com> Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Make acpi-cpufreq 'sticky'.Dave Jones2006-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents annoying messages being printed when it gets loaded on a machine that doesn't have support scaling via ACPI. Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Remove strange No-op from longrun.cDave Jones2006-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ORing something with zero is meaningless. ACKed-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Remove more freq_table reinitialisations.Dave Jones2006-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Fix another redundant initialisation in freq_tableDave Jones2006-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Remove duplicate assignment in freq_tableDave Jones2006-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] CodingStyle nits in cpufreq_stats.cDave Jones2006-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2Dave Jones2006-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreqDave Jones2006-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Remove pointless reinitialisation from powernow-k8Dave Jones2006-05-30
| | | | | | | | | | | | | | | | | | | | | | | | This var is already set at entry to the function. Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Remove redundant initialisation from longhaul.Dave Jones2006-05-30
| | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Clean up longhaul's speed pretty-printerDave Jones2006-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting ready to move to core cpufreq. - Use snprintf - Remove unnecessary nesting improving readability. Signed-off-by: Dave Jones <davej@redhat.com>
| * | | [CPUFREQ] Disambiguate loop indexes in powernow-k7Dave Jones2006-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't have actually caused any problems (as we return if we 'corrupt' 'i', but it's still not very pretty. For the sake of adding another local variable, this got cleaner. Signed-off-by: Dave Jones <davej@redhat.com>