17 Oct, 2007

40 commits

  • * Add "hdx=nodma" option allowing user to disallow DMA for a given device.

    * Obsolete "ide=nodma" option.

    Acked-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * hpt34x.c: disable DMA masks for HPT345
    (hwif->autodma is zero so DMA won't be enabled anyway).

    * trm290.c: disable IDE_HFLAG_TRUST_BIOS_FOR_DMA flag
    (hwif->autodma is zero so DMA won't be enabled anyway).

    * Check noautodma global variable instead of drive->autodma in ide_tune_dma().

    This fixes handling of "ide=nodma" kernel parameter for icside, ide-cris,
    au1xxx-ide, pmac, it821x, jmicron, sgiioc4 and siimage host drivers.

    * Remove hwif->autodma (it was not checked by IDE core code anyway) and
    drive->autodma (was set by all host drivers - except HPT345/TRM290 special
    cases - unless "ide=nodma" was used).

    While at it:
    - remove needless printk() from icside.c
    - remove stale FIXME/comment from ide-probe.c
    - don't force DMA off if PCI bus-mastering had to be enabled in setup-pci.c
    (this setting was always later over-ridden by host drivers anyway)

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * Add IDE_HFLAG_TRUST_BIOS_FOR_DMA host flag for host drivers that depend
    on BIOS for programming device/controller for DMA. Set it in cy82c693,
    generic, ns87415, opti621 and trm290 host drivers.

    * Add IDE_HFLAG_VDMA host flag for host drivers using VDMA. Set it in cs5520
    host driver.

    * Teach ide_tune_dma() about IDE_HFLAG_TRUST_BIOS_FOR_DMA flag.

    * Add generic ide_dma_check() helper and remove all open coded ->ide_dma_check
    implementations. Fix all places checking for presence of ->ide_dma_check
    hook to check for ->ide_dma_on instead.

    * Remove no longer needed code from config_drive_for_dma().

    * Make ide_tune_dma() static.

    v2:
    * Fix config_drive_for_dma() return values.

    * Fix ide-dma.c build for CONFIG_BLK_DEV_IDEDMA_PCI=n by adding
    dummy config_drive_for_dma() inline.

    * Fix IDE_HFLAG_TRUST_BIOS_FOR_DMA handling in ide_dma_check().

    * Fix init_hwif_it8213() comment.

    There should be no functionality changes caused by this patch.

    Cc: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • Remove ide_use_fast_pio() and just re-tune PIO unconditionally if DMA tuning
    has failed in ->ide_dma_check. All host drivers using ide_use_fast_pio() set
    drive->autotune so PIO is always tuned anyway and in some cases we _really_
    need to re-tune PIO because PIO and DMA timings are shared.

    Acked-by: Sergei Shtylyov
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
    kbuild: introduce ccflags-y, asflags-y and ldflags-y
    kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
    kbuild: enable use of AFLAGS and CFLAGS on commandline
    kbuild: enable 'make AFLAGS=...' to add additional options to AS
    kbuild: fix AFLAGS use in h8300 and m68knommu
    kbuild: check for wrong use of CFLAGS
    kbuild: enable 'make CFLAGS=...' to add additional options to CC
    kbuild: fix up CFLAGS usage
    kbuild: make modpost detect unterminated device id lists
    kbuild: call export_report from the Makefile
    kbuild: move Kai Germaschewski to CREDITS
    kconfig/menuconfig: distinguish between selected-by-another options and comments
    kconfig: tristate choices with mixed tristate and boolean values
    include/linux/Kbuild: remove duplicate entries
    kbuild: kill backward compatibility checks
    kbuild: kill EXTRA_ARFLAGS
    kbuild: fix documentation in makefiles.txt
    kbuild: call make once for all targets when O=.. is used
    kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
    kbuild: update _shipped files for kconfig syntax cleanup
    ...

    Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.

    Linus Torvalds
     
  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
    [MIPS] Increase cp0 compare clockevent min_delta_ns from 0x30 to 0x300.
    [MIPS] Cache: Provide more information on cache policy on bootup.
    [MIPS] Fix aliasing bug in copy_user_highpage, take 2.
    [MIPS] VPE loader: convert from struct class_ device to struct device
    [MIPS] MIPSsim: Fix booting from NFS root
    [MIPS] Alchemy: Get rid of au1xxx_irq_map_t.
    [MIPS] Alchemy: Get rid of au_ffz().
    [MIPS] Alchemy: Get rid of au_ffs().
    [MIPS] Alchemy: cleanup interrupt code.
    [MIPS] Lasat: Fix build by conversion to irq_cpu.c.
    [MIPS] Lasat: Add #ifndef ... #endif include warpper to lasatint.h.
    [MIPS] IP22: Enable -Werror.
    [MIPS] IP22: Fix warning.
    [MIPS] IP22: Complain if requesting the front panel irq failed.
    [MIPS] vmlinux.lds.S: Handle KPROBES_TEXT.
    [MIPS] vmlinux.lds.S: Fix handling of .notes in final link.
    [MIPS] vmlinux.lds.S: Remove duplicate comment.
    [MIPS] MSP71XX: Add workarounds file.
    [MIPS] IP32: Fix build by conversion to irq_cpu.c.

    Linus Torvalds
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • There were no users - and why have a private version anyway.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • It was plain a bad idea ...

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • CC arch/mips/sgi-ip22/ip22-berr.o
    arch/mips/sgi-ip22/ip22-berr.c: In function 'ip22_be_interrupt':
    arch/mips/sgi-ip22/ip22-berr.c:100: warning: passing argument 2 of 'die_if_kernel' discards qualifiers from pointer target type

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (264 commits)
    [ALSA] version 1.0.15
    [ALSA] Fix thinko in cs4231 mce down check
    [ALSA] sun-cs4231: improved waiting after MCE down
    [ALSA] sun-cs4231: use cs4231-regs.h
    [ALSA] This simplifies and fixes waiting loops of the mce_down()
    [ALSA] This patch adds support for a wavetable chip on
    [ALSA] This patch removes open_mutex from the ad1848-lib as
    [ALSA] fix bootup crash in snd_gus_interrupt()
    [ALSA] hda-codec - Fix SKU ID function for realtek codecs
    [ALSA] Support ASUS P701 eeepc [0x1043 0x82a1] support
    [ALSA] hda-codec - Add array terminator for dmic in STAC codec
    [ALSA] hdsp - Fix zero division
    [ALSA] usb-audio - Fix double comment
    [ALSA] hda-codec - Fix STAC922x volume knob control
    [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz
    [ALSA] hda-codec - Fix for Fujitsu Lifebook C1410
    [ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag
    [ALSA] mpu-401: do not require an ACK byte for the ENTER_UART command
    [ALSA] via82xx - Add DXS quirk for Shuttle AK31v2
    [ALSA] hda-codec - Fix input_mux numbers for vaio stac92xx
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: (63 commits)
    Fix memory leak in dm-crypt
    SPARC64: sg chaining support
    SPARC: sg chaining support
    PPC: sg chaining support
    PS3: sg chaining support
    IA64: sg chaining support
    x86-64: enable sg chaining
    x86-64: update pci-gart iommu to sg helpers
    x86-64: update nommu to sg helpers
    x86-64: update calgary iommu to sg helpers
    swiotlb: sg chaining support
    i386: enable sg chaining
    i386 dma_map_sg: convert to using sg helpers
    mmc: need to zero sglist on init
    Panic in blk_rq_map_sg() from CCISS driver
    remove sglist_len
    remove blk_queue_max_phys_segments in libata
    revert sg segment size ifdefs
    Fixup u14-34f ENABLE_SG_CHAINING
    qla1280: enable use_sg_chaining option
    ...

    Linus Torvalds
     
  • Move the extern declaration for global_mode_option to and rename
    the variable to fb_mode_option.

    Signed-off-by: Geert Uytterhoeven
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • The i.MX frame-buffer read operation should be faster for all configurations
    then drawing each individual character again in response to scroll events.

    The nonstandard fields allows to configure frame-buffer special options flags
    for different display configurations by board specific initialization code.

    One of such specific options is reversed order of pixels in each individual
    byte. i.MX frame-buffer seems to be designed for big-endian use first. The
    byte order is correctly configured for little-endian ordering, but if 1, 2 or
    4 bits per pixel are used, pixels ordering is incompatible to Linux generic
    frame-buffer drawing functions.

    The patch "Allow generic BitBLT functions to work with swapped pixel order in
    bytes" introduces required functionality into FBDEV core. The pixels ordering
    selection has to be enabled at compile time CONFIG_FB_CFB_REV_PIXELS_IN_BYTE
    and for each display configuration which requires it by flag
    FB_NONSTD_REV_PIX_IN_B in "nonstd" field of info structure.

    This patch provides way for board specific code to select this option.

    Signed-off-by: Pavel Pisa
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Pavel Pisa
     
  • don't distinguish between `boot' and `non-boot' autodetection now the
    autodetection code has been improved

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • remove unused ps3av_set_mode()

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • add autodetection for VESA modes

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • treat DVI-D monitors like HDMI monitors when autodetecting the best video mode

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • It doesn't make much sense to use the PS3AV_CMD_VIDEO_VID_* values in the
    autodetection code, just to convert them to PS3 video mode ids afterwards.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • ps3av: eliminate PS3AV_DEBUG
    - Move ps3av_cmd_av_monitor_info_dump from ps3av_cmd.c to ps3av.c, as
    it's
    used there only
    - Integrate ps3av_cmd_av_hw_conf_dump() into its sole user
    - Use pr_debug() for printing debug info

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • Blackfin BF54x framebuffer device driver for a SHARP LQ043T1DG01 TFT LCD

    [adaplas]
    Add 'fb' suffix to driver name.
    Move Makefile entry under platform device section

    Signed-off-by: Michael Hennerich
    Signed-off-by: Bryan Wu
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Hennerich
     
  • Various console drivers are able to resize the screen via the con_resize()
    hook. This hook is also visible in userspace via the TIOCWINSZ, VT_RESIZE and
    VT_RESIZEX ioctl's. One particular utility, SVGATextMode, expects that
    con_resize() of the VGA console will always return success even if the
    resulting screen is not compatible with the hardware. However, this
    particular behavior of the VGA console, as reported in Kernel Bugzilla Bug
    7513, can cause undefined behavior if the user starts with a console size
    larger than 80x25.

    To work around this problem, add an extra parameter to con_resize(). This
    parameter is ignored by drivers except for vgacon. If this parameter is
    non-zero, then the resize request came from a VT_RESIZE or VT_RESIZEX ioctl
    and vgacon will always return success. If this parameter is zero, vgacon will
    return -EINVAL if the requested size is not compatible with the hardware. The
    latter is the more correct behavior.

    With this change, SVGATextMode should still work correctly while in-kernel and
    stty resize calls can expect correct behavior from vgacon.

    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Antonino A. Daplas
     
  • Intel FB: allow odd- and even-field-first in interlaced modes, and
    proper sync to vertical retrace

    Signed-off-by: Krzysztof Halasa
    Cc: "Antonino A. Daplas"
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Halasa
     
  • Allow generic frame-buffer code to correctly write texts and blit images for
    1, 2 and 4 bit per pixel frame-buffer organizations when pixels in bytes are
    organized to in opposite order than bytes in long type.

    Overhead should be reasonable. If option is not selected, than compiler
    should eliminate completely all overhead.

    The feature is disabled at compile time if CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is
    not set.

    [adaplas]
    Convert helper functions to macros if feature is not enabled.

    Signed-off-by: Pavel Pisa
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Pavel Pisa
     
  • This patch adds hardware cursor support for the Permedia 2 chip.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch fixes white spaces, redudant definitions and formating in the pm3fb
    header file.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch removes lcdcon1 register field from the s3c2410fb_display as all
    bits are calculated from other fields.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch adds pixelclock field to the s3c2410fb_display structure and make
    use of it in the driver.

    The Bast machine defined 9 modes but pixclock and margin values are defined
    only for the 640x480 modes so I removed other modes.

    This patch also fixes wrong display type constant for the SMDK2440 board.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • assumes that struct tty_struct has previously been
    included. If not, this pile of warnings will result:

    CC [M] drivers/video/console/newport_con.o
    In file included from drivers/video/console/newport_con.c:18:
    include/linux/selection.h:16: warning: 'struct tty_struct' declared inside param
    eter list
    include/linux/selection.h:16: warning: its scope is only this definition or decl
    aration, which is probably not what you want
    include/linux/selection.h:17: warning: 'struct tty_struct' declared inside param
    eter list
    include/linux/selection.h:20: warning: 'struct tty_struct' declared inside param
    eter list

    Fixed by adding a forward declaration of struct tty_struct.

    Signed-off-by: Ralf Baechle
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     
  • This patch removes unused lcdcon2 and lcdcon3 register value
    from the s3c2410fb_display structure.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch removes unused lcdcon3 register from the
    s3c2410fb_display structure.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch adds margins fields to the s3c2410fb_display
    structure. It also sets display type and horizontal
    margins in all platform files that use the s3c2410fb
    driver.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch adds a new structure to describe and handle
    more than one panel (display mode) for the s3c2410 framebuffer.
    This structure is added after the pxafb driver.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch adds hardware cursor support for Permedia 2V chips.
    The hardware cursor is disabled by default. It does not blink - the
    same issue is mentioned in the x11 driver.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch adds mtrr support to the tdfxfb driver. It also kills one
    redundant include and initialization value.

    [akpm@linux-foundation.org: cleanups]
    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • This patch adds hardware cursor support to the tdfxfb driver.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt