linux.git/drivers/video/matrox, branch v2.6.31

Remove multiple KERN_ prefixes from printk formats

2009-07-08T17:30:03+00:00

Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up
handling of log-levels and newlines") changed printk semantics.  printk
lines with multiple KERN_ prefixes are no longer emitted as
before the patch.

 is now included in the output on each additional use.

Remove all uses of multiple KERN_s in formats.

Signed-off-by: Joe Perches 
Signed-off-by: Linus Torvalds

Revert "fb: Initialize fb_info mutexes in framebuffer_alloc()"

2009-07-08T16:20:11+00:00

This reverts commit 4148df9b0f38bdd362dd91d52076926c11cbe5a9.

Let's hope that the mm_lock initialization is now correct with all
drivers, following Krzysztof's patches.

Requested-by: Krzysztof Helt 
Signed-off-by: Linus Torvalds

matroxfb: fix regression with uninitalized fb_info->mm_lock mutex (second head)

2009-07-08T16:19:50+00:00

Remove redundant locking by the mm_lock mutex before a second head of
matrox framebuffer is registered.

This fixes a problem with uninitialized the fb_info->mm_lock mutex
introduced by the commit 537a1bf059f " fbdev: add mutex for fb_mmap
locking"

Signed-off-by: Krzysztof Helt 
Signed-off-by: Linus Torvalds

matroxfb: fix regression with uninitalized fb_info->mm_lock mutex

2009-07-08T16:19:49+00:00

Remove redundant call to the matroxfb_update_fix() before matrox
frambuffer is registered.

This fixes a problem with uninitialized the fb_info->mm_lock mutex
introduced by the commit 537a1bf059f " fbdev: add mutex for fb_mmap
locking"

Signed-off-by: Krzysztof Helt 
Signed-off-by: Linus Torvalds

fb: Initialize fb_info mutexes in framebuffer_alloc()

2009-07-06T21:02:50+00:00

This way they'll be properly initialized early enough for users that may
touch them before the framebuffer has been registered.

Drivers that allocate their fb_info structure some other way (like
matrocfb's broken static allocation) need to be fixed up appropriately.

Signed-off-by: Paul Mundt 
Signed-off-by: Linus Torvalds

fbdev: add mutex for fb_mmap locking

2009-07-01T01:56:00+00:00

Add a mutex to avoid a circular locking problem between the mm layer
semaphore and fbdev ioctl mutex through the fb_mmap() call.

Also, add mutex to all places where smem_start and smem_len fields change
so the mutex inside the fb_mmap() is actually used.  Changing of these
fields before calling the framebuffer_register() are not mutexed.

This is 2.6.31 material.  It removes one lockdep (fb_mmap() and
register_framebuffer()) but there is still another one (fb_release() and
register_framebuffer()).  It also cleans up handling of the smem_start and
smem_len fields used by mutexed section of the fb_mmap().

Signed-off-by: Krzysztof Helt 
Cc: Peter Zijlstra 
Cc: "Rafael J. Wysocki" 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

matroxfb: support G200eV chip

2008-10-16T18:21:45+00:00

Support the Matrox G200eV chip, based on timings that I found in the X.org
matrox driver.

Signed-off-by: Darrick J. Wong 
Acked-by: Krzysztof Helt 
Cc: Petr Vandrovec 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

matrox maven: convert to a new-style i2c driver

2008-08-12T23:07:29+00:00

The legacy i2c model is going away soon, so switch to the new model.

Signed-off-by: Jean Delvare 
Acked-by: Krzysztof Helt 
Cc: Petr Vandrovec 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

matroxfb: i2c structure templates clean-up

2008-08-12T23:07:29+00:00

Clean up the use of structure templates in i2c-matroxfb. In this case
it's more efficient to initialize the few fields we need individually.
This makes i2c-matroxfb.ko 16% smaller on my system.

Signed-off-by: Jean Delvare 
Acked-by: Krzysztof Helt 
Cc: Petr Vandrovec 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

matrox maven: fix a broken error path

2008-08-12T23:07:29+00:00

I broke an error path with d03c21ec0be7787ff6b75dcf56c0e96209ccbfbd,
sorry about that.

The machine will crash if the i2c_attach_client() or maven_init_client()
calls fail, although nobody has yet reported this happening.

Signed-off-by: Jean Delvare 
Acked-by: Krzysztof Helt 
Cc: Petr Vandrovec 
Cc: 		[2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds