Commit Graph

70 Commits

Author SHA1 Message Date
Orczykowski, Juergen 71c6efd993 intelfb: fix ring space calculation
If there is less than RING_MIN_FREE available in the ring buffer,
dinfo->ring_space is set to a big value forcing wait_ring to return.

Fix by making ring space = 0 if ring space < RING_MIN_FREE.

Signed-off-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:15:26 -07:00
David Brownell 2096b956d2 i2c: Shrink struct i2c_client
This shrinks the size of "struct i2c_client" by 40 bytes:

 - Substantially shrinks the string used to identify the chip type
 - The "flags" don't need to be so big
 - Removes some internal padding

It also adds kerneldoc for that struct, explaining how "name" is really a
chip type identifier; it's otherwise potentially confusing.

Because the I2C_NAME_SIZE symbol was abused for both i2c_client.name
and for i2c_adapter.name, this needed to affect i2c_adapter too.  The
adapters which used that symbol now use the more-obviously-correct
idiom of taking the size of that field.

JD: Shorten i2c_adapter.name from 50 to 48 bytes while we're here, to
avoid wasting space in padding.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
2007-05-01 23:26:28 +02:00
Thomas Gleixner 38515e908b [PATCH] Scheduled removal of SA_xxx interrupt flags fixups
The obsolete SA_xxx interrupt flags have been used despite the scheduled
removal.  Fixup the remaining users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-02-14 08:09:54 -08:00
Tim Schmielau cd354f1ae7 [PATCH] remove many unneeded #includes of sched.h
After Al Viro (finally) succeeded in removing the sched.h #include in module.h
recently, it makes sense again to remove other superfluous sched.h includes.
There are quite a lot of files which include it but don't actually need
anything defined in there.  Presumably these includes were once needed for
macros that used to live in sched.h, but moved to other header files in the
course of cleaning it up.

To ease the pain, this time I did not fiddle with any header files and only
removed #includes from .c-files, which tend to cause less trouble.

Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha,
arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig,
allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all
configs in arch/arm/configs on arm.  I also checked that no new warnings were
introduced by the patch (actually, some warnings are removed that were emitted
by unnecessarily included header files).

Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-02-14 08:09:54 -08:00
Jiri Slaby f5610b9c3a [PATCH] Video: fb, kzalloc changes
Use kzalloc instead of kmalloc + memset(0).

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-02-12 09:48:43 -08:00
Jean Delvare 3269711b76 i2c: Discard the i2c algo del_bus wrappers
They are all only calling i2c_del_adapter, so we may as well do
it directly.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
2006-12-10 21:21:33 +01:00
Alexey Dobriyan bfba7b3793 [PATCH] drivers/video/*: use kmemdup()
From: Eric Sesterhenn <snakebyte@gmx.de>

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-08 08:29:07 -08:00
Eric Sesterhenn f84fcb06a1 Remove unnecessary check in drivers/video/intelfb/intelfbhw.c
All callers and the function itself dereference dinfo, so we can remove the
check.  (coverity id #1371)

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-10-25 12:05:18 -07:00
Alan Cox a77b895001 intel fb: switch to pci_get API
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-10-25 12:05:18 -07:00
David Howells 7d12e780e0 IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.

The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around.  On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).

Where appropriate, an arch may override the generic storage facility and do
something different with the variable.  On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.

Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions.  Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller.  A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.

I've build this code with allyesconfig for x86_64 and i386.  I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.

This will affect all archs.  Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:

	struct pt_regs *old_regs = set_irq_regs(regs);

And put the old one back at the end:

	set_irq_regs(old_regs);

Don't pass regs through to generic_handle_irq() or __do_IRQ().

In timer_interrupt(), this sort of change will be necessary:

	-	update_process_times(user_mode(regs));
	-	profile_tick(CPU_PROFILING, regs);
	+	update_process_times(user_mode(get_irq_regs()));
	+	profile_tick(CPU_PROFILING);

I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().

Some notes on the interrupt handling in the drivers:

 (*) input_dev() is now gone entirely.  The regs pointer is no longer stored in
     the input_dev struct.

 (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking.  It does
     something different depending on whether it's been supplied with a regs
     pointer or not.

 (*) Various IRQ handler function pointers have been moved to type
     irq_handler_t.

Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 15:10:12 +01:00
Dave Jones 038b0a6d8d Remove all inclusions of <linux/config.h>
kbuild explicitly includes this at build time.

Signed-off-by: Dave Jones <davej@redhat.com>
2006-10-04 03:38:54 -04:00
Linus Torvalds db1a19b38f Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6
* 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
  intelfbhw.c: intelfbhw_get_p1p2 defined but not used
  intelfb: fix mtrr_reg signedness
  intelfb: update doc and Kconfig (supported devices)
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add preliminary i2c support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support
  intelfb: add vsync interrupt support
2006-09-30 09:36:56 -07:00
Parag Warudkar 4dc3595f5c intelfbhw.c: intelfbhw_get_p1p2 defined but not used
intelfbhw_get_p1p2 is used only if REGDUMP is defined - compile it in only
if REGDUMP is defined - one less compiler warning.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-08-22 10:12:58 +10:00
Dave Airlie d5afabcea2 intelfb: fix mtrr_reg signedness
This is my fix for gcc 4.1 sign issue reported by Eric Sesterhenn
<snakebyte@gmx.de>.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-08-22 10:10:56 +10:00
Jon Smirl a8f340e394 [PATCH] vt: Remove VT-specific declarations and definitions from tty.h
MAX_NR_CONSOLES, fg_console, want_console and last_console are more of a
function of the VT layer than the TTY one.  Moving these to vt.h and vt_kern.h
allows all of the framebuffer and VT console drivers to remove their
dependency on tty.h.

[akpm@osdl.org: fix alpha build]
Signed-off-by: Jon Smirl <jonsmir@gmail.com>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-07-10 13:24:16 -07:00
Dennis Munsie 7627899b11 intelfb: add preliminary i2c support
Adds code to unregister the I2C buses in the cleanup function.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
2006-07-03 19:04:37 +10:00
Dennis Munsie 1f6e8449e1 intelfb: add preliminary i2c support
[07/07] intelfb: adds an option to enable I2C support in the intelfb driver.  Also adds
the intel_i2c.c file to the Makefile.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
2006-07-03 19:04:37 +10:00
Dennis Munsie 41c9480a1d intelfb: add preliminary i2c support
[06/07] intelfb: adds intelfb_i2c.c which contains the infrastructure needed to
enumerate the i2c busses on the intelfb.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
2006-07-03 19:04:37 +10:00
Dennis Munsie dd696ec852 intelfb: add preliminary i2c support
[05/07] intelfb: add output fields to dinfo.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
2006-07-03 19:04:37 +10:00
Dennis Munsie 399fb4316a intelfb: add preliminary i2c support
[04/07] intelfb: add intelfb_output_rec struct and the constants for it's
fields.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
2006-07-03 19:03:11 +10:00
Dennis Munsie 183b121440 intelfb: add preliminary i2c support
[03/07] intelfb: add intelfb_i2c_chan struct.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
2006-07-03 19:03:11 +10:00
Dennis Munsie 82c10f07c2 intelfb: add preliminary i2c support
[02/07] intelfb: add GPIO registers.

Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
2006-07-03 19:03:10 +10:00
Eric Hustvedt f80d0d23f2 intelfb: add vsync interrupt support
[05/05] intelfb: Honor FB_ACTIVATE_VBL for display panning

Extends the intelfb_vsync struct to store panning offset. The interrupt service routine uses the stored panning offset if a pan is requested for the vsync. intelfbhw_disable_irq also pans the display if there is a pending request.

Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
2006-07-03 18:59:47 +10:00
Eric Hustvedt 37bced38b3 intelfb: add vsync interrupt support
[04/05] intelfb: implement FBIO_WAITFORVSYNC ioctl

The (unofficial) FBIO_WAITFORVSYNC ioctl is implemented by sleeping on the appropriate waitqueue, as defined in my earlier patch. Currently, only display 0 (aka pipe A) is supported.

Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
2006-07-03 18:59:46 +10:00
Eric Hustvedt 7649757bd9 intelfb: add vsync interrupt support
[03/05] intelfb: Implement basic interrupt handling

Functions have been added to enable and disable interrupts using the MMIO registers. Currently only pipe A vsync interrupts are enabled.
A generalized vsync accounting struct is defined, with the intent that it can encapsulate per-pipe vsync related info in the future. Currently a single instance is hard-coded.
The interrupt service routine currently only looks for vsync interrupts on pipe A, and increments a counter and wakes up anyone waiting on it.

This implementation is heavily influenced by similar implementations in the atyfb and matroxfb drivers.

Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
2006-07-03 18:59:46 +10:00
Eric Hustvedt 9a5f019b1a intelfb: add vsync interrupt support
[02/05] intelfb: Add interrupt related register definitions

Add constants for accessing HWSTAM, IER, IIR, and IMR registers.
Add constants for interrupt types supported by the 8xx and 9xx chipsets.
The registers are also stored in the hwstate struct and dumped in the debug routine.

Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
2006-07-03 18:59:46 +10:00
Eric Hustvedt 3ce6fb4358 intelfb: add vsync interrupt support
[01/05] intelfb: Add 16-bit register access macros

This patch adds macros to read and write two-byte MMIO registers. The interrupt-related registers are all word-sized, rather than long-sized.

Signed-off-by: Eric Hustvedt <ehustvedt@cecropia.com>
2006-07-03 18:59:46 +10:00
Jörn Engel 6ab3d5624e Remove obsolete #include <linux/config.h>
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-06-30 19:25:36 +02:00
Al Viro 0fe6e2d292 intelfb delousing
ring_head is offset in card memory, not iomem pointer.  Fixed, removed
fuckloads of amazingly bogus casts somebody had sprinkled all over the
place.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-06-24 17:22:17 +10:00
Dave Airlie 2abac1db35 intelfb: fixup clock calculation debugging.
The debugging code for pll clocks was wrong and causing div by 0.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-06-18 16:12:27 +10:00
Dennis Munsie 72109368de Removed hard coded EDID buffer size.
Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
Acked-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-06-07 18:53:38 +10:00
Dennis Munsie 7a532c69c3 intelfb: use regular modedb table instead of VESA
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>
2006-05-29 18:58:09 +10:00
Antonino A. Daplas 56e004e543 intelfb: use firmware EDID for mode database
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>
2006-05-29 18:49:08 +10:00
Dave Airlie 080a416802 Revert "intelfb driver -- use the regular modedb table instead of the VESA"
This reverts 2c47430a03 commit.
This conflicts with a patch in -mm from Antonino reapply later.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-05-29 18:45:19 +10:00
Eric Hustvedt 65eb2f97db intelfb: int option fix
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>
2006-05-29 18:38:55 +10:00
Dave Airlie f728377f67 sync modesetting code with X.org
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-05-27 18:56:02 +10:00
Dave Airlie c9daa873c3 intelfb: align with changes from my X driver.
This just realigns the PLL calculation routines with the ones from my X.org
driver.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-05-27 18:44:02 +10:00
Dennis Munsie 2c47430a03 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>
2006-05-27 18:33:35 +10:00
Eric Hustvedt 1aecb39309 Adds support for 256MB aperture on 945 chipsets to the intelfb driver
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>
2006-05-27 18:30:00 +10:00
Dennis Munsie df7df8ab7b intelfb -- uses stride alignment of 64 on the 9xx chipsets.
Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-05-27 18:17:52 +10:00
Dave Airlie 51d797474f intelfb: some cleanups for intelfbhw
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 16:19:26 +10:00
Dave Airlie 3587c50991 intelfb: fixup pitch calculation like X does
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 14:46:55 +10:00
Dave Airlie 3aff13cfb8 intelfb: fixup p calculation
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>
2006-04-03 11:43:29 +10:00
Dave Airlie 46f60b8e67 This patch makes a needlessly global struct static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 11:43:29 +10:00
Dave Airlie 9a90603f65 intelfb: add i945GM support
Untested i945GM support just add the framework.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 11:43:28 +10:00
Dave Airlie 8b91b0b4f2 intelfb: fixup whitespace..
repeat after me, I must not take code from X without reformatting...

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 11:43:28 +10:00
Dave Airlie 8bb91f6a2d intelfb: add hw cursor support for i9xx
This adds hw cursor support for the i9xx chipsets.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 11:43:28 +10:00
Dave Airlie 7679f4d692 intelfb: make i915 modeset
This takes the modeset and pll code from my X driver.

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 11:43:28 +10:00
Dave Airlie 9639d5ec07 intelfb: add support for i945G
This just adds the defines and structure for i945G

Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 11:43:28 +10:00
Dave Airlie 16109b3f4c intelfb: add p divisor increments for i9xx.
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-04-03 11:43:28 +10:00