21 Sep, 2009
13 commits
-
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
drm/vgaarb: add VGA arbitration support to the drm and kms.
drm/radeon: some r420s have a CP race with the DMA engine.
drm/radeon/r600/kms: rv670 is not DCE3
drm/radeon/kms: r420 idle after programming GA_ENHANCE
drm/radeon/kms: more fixes to rv770 suspend/resume path.
drm/radeon/kms: more alignment for rv770.c with r600.c
drm/radeon/kms: rv770 blit init called too late.
drm/radeon/kms: move around new init path code to avoid posting at init
drm/radeon/r600: fix some issues with suspend/resume.
drm/radeon/kms: disable VGA rendering engine before taking over VRAM
drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
drm/radeon/kms: add initial connector properties
drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
drm/radeon/kms: don't fail if we fail to init GPU acceleration
drm/r600/kms: fixup number of loops per blit calculation.
drm/radeon/kms: reprogram format in set base.
drm/radeon: avivo chips have no separate int bit for display
drm/radeon/r600: don't do interrupts
drm: fix _DRM_GEM addmap error message
drm: update crtc x/y when only fb changes
...Fixed up trivial conflicts in firmware/Makefile due to network driver
(cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
other. -
The build of the dabusb driver broke:
drivers/media/video/dabusb.c:758: error: unknown field 'nodename' specified in initializer
drivers/media/video/dabusb.c:758: warning: initialization from incompatible pointer type
make[3]: *** wait: No child processes. Stop.Due to this commit:
e454cea: Driver-Core: extend devnode callbacks to provide permissions
Missing the dabusb driver's dabusb_nodename() callback.
Similar issues with the iio/industrialio driver in staging, pointed out
and patched by Jean Delvare.Signed-off-by: Ingo Molnar
Industrialio-parts-by: Jean Delvare
Signed-off-by: Linus Torvalds -
VGA arb requires DRM support for non-kms drivers, to turn on/off
irqs when disabling the mem/io regions.VGA arb requires KMS support for GPUs where we can turn off VGA
decoding. Currently we know how to do this for intel and radeon
kms drivers, which allows them to be removed from the arbiter.This patch comes from Fedora rawhide kernel.
Signed-off-by: Dave Airlie
-
This patch makes sure the CP doesn't DMA do VRAM while 2D
is active by inserting a CP resync token.todo: port to kms.
Signed-off-by: Dave Airlie
-
RV670 was using the wrong modesetting code.
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
https://bugs.freedesktop.org/show_bug.cgi?id=24041
The idle allows rs690 to startup properly.
Signed-off-by: Dave Airlie
-
This resumes my
RV730PRO (4650)
RV770 (4850)
fine.Still researching the RV4550 (RV710), resumes without X fine.
Signed-off-by: Dave Airlie
-
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
includecheck fix: x86, cpu/common.c
includecheck fix: kernel/trace, ring_buffer.c
includecheck fix: include/linux, ftrace.h
includecheck fix: include/linux, page_cgroup.h
includecheck fix: include/linux, aio.h
includecheck fix: include/drm, drm_memory.h
includecheck fix: include/acpi, acpi_bus.h
includecheck fix: drivers/xen, evtchn.c
includecheck fix: drivers/video, vgacon.c
includecheck fix: drivers/scsi, ibmvscsi.c
includecheck fix: drivers/scsi, libfcoe.c
includecheck fix: x86, shadow.c
includecheck fix: x86, traps.c
includecheck fix: um, helper.c
includecheck fix: s390, sys_s390.c -
Ingo points out that I screwed up when merging the 'timers-for-linus'
branch in commit a03fdb7612874834d6847107198712d18b5242c7.A bit too much copy-and-pasting caused the end result to have an
extraneous 'return' in the middle of an expression. That was obviously
bogus. Blush.Reported-by-with-patch: Ingo Molnar
Signed-off-by: Linus Torvalds -
* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
[PATCH] i2c-imx: make bus available early
i2c-mv64xxx: correct mv64xxx_i2c_intr() return type -
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
Driver-Core: extend devnode callbacks to provide permissions -
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (79 commits)
USB serial: update the console driver
usb-serial: straighten out serial_open
usb-serial: add missing tests and debug lines
usb-serial: rename subroutines
usb-serial: fix termios initialization logic
usb-serial: acquire references when a new tty is installed
usb-serial: change logic of serial lookups
usb-serial: put subroutines in logical order
usb-serial: change referencing of port and serial structures
tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl
tty: Char: mxser, add support for CP112UL
uartlite: support shared interrupt lines
tty: USB: serial/mct_u232, fix tty refcnt
tty: riscom8, fix tty refcnt
tty: riscom8, fix shutdown declaration
TTY: fix typos
tty: Power: fix suspend vt regression
tty: vt: use printk_once
tty: handle VT specific compat ioctls in vt driver
n_tty: move echoctl check and clean up logic
... -
…/kernel/git/tip/linux-2.6-tip
* 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (58 commits)
perf_counter: Fix perf_copy_attr() pointer arithmetic
perf utils: Use a define for the maximum length of a trace event
perf: Add timechart help text and add timechart to "perf help"
tracing, x86, cpuidle: Move the end point of a C state in the power tracer
perf utils: Be consistent about minimum text size in the svghelper
perf timechart: Add "perf timechart record"
perf: Add the timechart tool
perf: Add a SVG helper library file
tracing, perf: Convert the power tracer into an event tracer
perf: Add a sample_event type to the event_union
perf: Allow perf utilities to have "callback" options without arguments
perf: Store trace event name/id pairs in perf.data
perf: Add a timestamp to fork events
sched_clock: Make it NMI safe
perf_counter: Fix up swcounter throttling
x86, perf_counter, bts: Optimize BTS overflow handling
perf sched: Add --input=file option to builtin-sched.c
perf trace: Sample timestamp and cpu when using record flag
perf tools: Increase MAX_EVENT_LENGTH
perf tools: Fix memory leak in read_ftrace_printk()
...
20 Sep, 2009
27 commits
-
fix the following 'make includecheck' warning:
arch/x86/kernel/cpu/common.c: linux/smp.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Alan Cox
Cc: Ingo Molnar
LKML-Reference: -
fix the following 'make includecheck' warning:
kernel/trace/ring_buffer.c: trace.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Steven Rostedt
Cc: Ingo Molnar
Cc: Sam Ravnborg
LKML-Reference: -
fix the following 'make includecheck' warning:
include/linux/ftrace.h: linux/sched.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Steven Rostedt
Cc: Ingo Molnar
Cc: Sam Ravnborg
LKML-Reference: -
fix the following 'make includecheck' warning:
include/linux/page_cgroup.h: linux/swap.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Li Zefan
Acked-by: Paul Menage -
fix the following 'make includecheck' warning:
include/linux/aio.h: linux/aio_abi.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: bcrl@kvack.org
Cc: Sam Ravnborg
LKML-Reference: -
fix the following 'make includecheck' warning:
include/drm/drm_memory.h: linux/vmalloc.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Sam Ravnborg
LKML-Reference:
Acked-by: Dave Airlie -
fix the following 'make includecheck' warning:
include/acpi/acpi_bus.h: linux/device.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Sam Ravnborg
LKML-Reference:
Acked-by: Len Brown -
fix the following 'make includecheck' warning:
drivers/xen/evtchn.c: linux/errno.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: chrisw@sous-sol.org
Cc: Sam Ravnborg
LKML-Reference:
Acked-by: Jeremy Fitzhardinge -
fix the following 'make includecheck' warning:
drivers/video/console/vgacon.c: linux/slab.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Martin Mares
Cc: mchehab@infradead.org
Cc: Sam Ravnborg
LKML-Reference: -
fix the following 'make includecheck' warning:
drivers/scsi/ibmvscsi/ibmvscsi.c: asm/firmware.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: James Bottomley
Cc: Sam Ravnborg
LKML-Reference:
Acked-by: Brian King -
fix the following 'make includecheck' warning:
drivers/scsi/fcoe/libfcoe.c: linux/netdevice.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: James Bottomley
Cc: Sam Ravnborg
LKML-Reference: -
fix the following 'make includecheck' warning:
arch/x86/mm/kmemcheck/shadow.c: linux/module.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Ingo Molnar
Cc: Sam Ravnborg
LKML-Reference: -
fix the following 'make includecheck' warning:
arch/x86/kernel/traps.c: asm/traps.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: Ingo Molnar
Cc: Sam Ravnborg
LKML-Reference: -
fix the following 'make includecheck' warning:
arch/um/os-Linux/helper.c: linux/limits.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: jdike@addtoit.com
Cc: Sam Ravnborg
LKML-Reference:
Acked-by: WANG Cong -
fix the following 'make includecheck' warning:
arch/s390/kernel/sys_s390.c: linux/syscalls.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput
Cc: schwidefsky@de.ibm.com
Cc: heiko.carstens@de.ibm.com
Cc: Sam Ravnborg
LKML-Reference: -
As I2C is used by PMICs also, make the busses available early via
subsys_initcall().Signed-off-by: Wolfram Sang
Signed-off-by: Ben Dooks -
The mv64xxx_i2c_intr() irq handler in drivers/i2c/busses/i2c-mv64xxx.c
is declared as returning 'int', resulting in this compile-time warning:drivers/i2c/busses/i2c-mv64xxx.c: In function 'mv64xxx_i2c_probe':
drivers/i2c/busses/i2c-mv64xxx.c:540: warning: passing argument 2 of 'request_irq' from incompatible pointer typeFix: correct the return type to 'irqreturn_t'.
Signed-off-by: Mikael Pettersson
Signed-off-by: Ben Dooks -
This patch (as1292) modifies the USB serial console driver, to make it
compatible with the recent changes to the USB serial core. The most
important change is that serial->disc_mutex now has to be unlocked
following a successful call to usb_serial_get_by_index().Other less notable changes include:
Use the requested port number instead of port 0 always.
Prevent the serial device from being autosuspended.
Use the ASYNCB_INITIALIZED flag bit to indicate when the
port hardware has been initialized.In spite of these changes, there's no question that the USB serial
console code is still a big hack.Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1291) removes a bunch of code from serial_open(), things
that were rendered unnecessary by earlier patches. A missing spinlock
is added to protect port->port.count, which needs to be incremented
even if the open fails but not if the tty has gotten a hangup. The
test for whether the hardware has been initialized, based on the use
count, is replaced by a more transparent test of the
ASYNCB_INITIALIZED bit in the port flags.Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1290) adds some missing tests. serial_down() isn't
supposed to do anything if the hardware hasn't been initialized, and
serial_close() isn't supposed to do anything if the tty has gotten a
hangup (because serial_hangup() takes care of shutting down the
hardware).The patch also updates and adds a few debugging lines.
Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1289) renames serial_do_down() to serial_down() and
serial_do_free() to serial_release(). It also adds a missing call to
tty_shutdown() in serial_release().Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1288) fixes the initialization logic in
serial_install(). A new tty always needs to have a termios
initialized no matter what, not just in the case where the lower
driver will override the termios settings.Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1287) makes serial_install() be reponsible for acquiring
references to the usb_serial structure and the driver module when a
tty is first used. This is more sensible than having serial_open() do
it, because a tty can be opened many times whereas it is installed
only once, when it is created. (Not to mention that these actions are
reversed when the tty is released, not when it is closed.) Finally,
it is at install time that the TTY core takes its own reference to the
usb_serial module, so it is only fitting that we should act the same
way in regard to the lower-level serial driver.Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1286) changes usb_serial_get_by_index(). Now the
routine will check whether the serial device has been disconnected; if
it has then the return value will be NULL. If the device hasn't been
disconnected then the routine will return with serial->disc_mutex
held, so that the caller can use the structure without fear of racing
against driver unloads.This permits the scope of table_mutex in destroy_serial() to be
reduced. Instead of protecting the entire function, it suffices to
protect the part that actually uses serial_table[], i.e., the call to
return_serial(). There's no longer any danger of the refcount being
incremented after it reaches 0 (which was the reason for having the
large scope previously), because it can't reach 0 until the serial
device has been disconnected.Also, the patch makes serial_install() check that serial is non-NULL
before attempting to use it.Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1285) rearranges the subroutines in usb-serial.c
concerned with tty lifetimes into a more logical order: install, open,
hangup, close, release. It also updates the formatting of the
kerneldoc comments.Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
This patch (as1284) changes the referencing of the usb_serial and
usb_serial_port structures in usb-serial.c. It's not feasible to make
the port structures keep a reference to the serial structure, because
the ports need to remain in existence when serial is released -- quite
a few of the drivers expect this. Consequently taking a reference
to the port when the device file is open is insufficient; such a
reference would not pin serial.To fix this, we now take a reference to serial when the device file is
opened. The final put_device() for the ports occurs in
destroy_serial(), so that the ports will last as long as they are
needed.The patch initializes all the port devices, including those in the
unused "fake" ports. This makes the code more uniform because they
can all be released in the same way. The error handling code in
usb_serial_probe() is much simplified by this approach; instead of
freeing everything by hand we can use a single usb_serial_put() call.Also simplified is the port-release mechanism. Instead of being two
separate routines, port_release() and port_free() can be combined into
one.Signed-off-by: Alan Stern
Cc: stable
Signed-off-by: Greg Kroah-Hartman -
In moxa specific ASPP_OQUEUE ioctl command, they apparently want
only know whether there is space in transmitter hold register.So switch UART_LSR_TEMT to UART_LSR_THRE in that specific case
according to the change in 1.14 moxa drivers.Signed-off-by: Jiri Slaby
Signed-off-by: Greg Kroah-Hartman
