1. 14 Dec, 2010 4 commits
  2. 09 Dec, 2010 11 commits
  3. 08 Dec, 2010 8 commits
    • David Flynn's avatar
      drm/i915/dp: Fix I2C/EDID handling with active DisplayPort to DVI converter · 8316f337
      David Flynn authored
      The DisplayPort standard (1.1a) states that:
        The I2C-over-AUX Reply field is valid only when Native AUX CH Reply
        field is AUX_ACK (00). When Native AUX CH Reply field is not 00, then,
        I2C-over-AUX Reply field must be 00 and be ignored.
      
      This fixes broken EDID reading when using an active DisplayPort to
      duallink DVI converter.  If the AUX CH replier chooses to defer the
      transaction, a short read occurs and erroneous data is returned as
      the i2c reply due to a lack of length checking and failure to check
      for AUX ACK.
      
      As a result, broken EDIDs can look like:
           0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f    0123456789abcdef
      00: bc bc bc ff bc bc bc ff bc bc bc ac bc bc bc 45    ???.???.???????E
      10: bc bc bc 10 bc bc bc 34 bc bc bc ee bc bc bc 4c    ???????4???????L
      20: bc bc bc 50 bc bc bc 00 bc bc bc 40 bc bc bc 00    ???P???.???@???.
      30: bc bc bc 01 bc bc bc 01 bc bc bc a0 bc bc bc 40    ???????????????@
      40: bc bc bc 00 bc bc bc 00 bc bc bc 00 bc bc bc 55    ???.???.???.???U
      50: bc bc bc 35 bc bc bc 31 bc bc bc 20 bc bc bc fc    ???5???1??? ????
      60: bc bc bc 4c bc bc bc 34 bc bc bc 46 bc bc bc 00    ???L???4???F???.
      70: bc bc bc 38 bc bc bc 11 bc bc bc 20 bc bc bc 20    ???8??????? ???
      80: bc bc bc ff bc bc bc ff bc bc bc ff bc bc bc ff    ???.???.???.???.
      ...
      
      which can lead to:
      [drm:drm_edid_block_valid] *ERROR* EDID checksum is invalid, remainder
      [drm:drm_edid_block_valid] *ERROR* Raw EDID:
      <3>30 30 30 30 30 30 30 32 38 32 30 32 63 63 31 61  000000028202cc1a
      <3>28 00 02 8c 00 00 00 00 18 00 00 00 00 00 00 00  (...............
      <3>20 4c 61 73 74 20 62 65 61 63 6f 6e 3a 20 33 32   Last beacon: 32
      <3>32 30 6d 73 20 61 67 6f 46 00 05 8c 00 00 00 00  20ms agoF.......
      <3>36 00 00 00 00 00 00 00 00 0c 57 69 2d 46 69 20  6.........Wi-Fi
      <3>52 6f 75 74 65 72 01 08 82 84 8b 96 24 30 48 6c  Router......$0Hl
      <3>03 01 01 06 02 00 00 2a 01 00 2f 01 00 32 04 0c  .......*../..2..
      <3>12 18 60 dd 09 00 10 18 02 00 00 01 00 00 18 00  ..`.............
      Signed-off-by: default avatarDavid Flynn <davidf@rd.bbc.co.uk>
      [ickle: fix up some surrounding checkpatch warnings]
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: stable@kernel.org
      8316f337
    • Linus Torvalds's avatar
      Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and... · 6313e3c2
      Linus Torvalds authored
      Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86/pvclock: Zero last_value on resume
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf record: Fix eternal wait for stillborn child
        perf header: Don't assume there's no attr info if no sample ids is provided
        perf symbols: Figure out start address of kernel map from kallsyms
        perf symbols: Fix kallsyms kernel/module map splitting
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        nohz: Fix printk_needs_cpu() return value on offline cpus
        printk: Fix wake_up_klogd() vs cpu hotplug
      6313e3c2
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 6dde39be
      Linus Torvalds authored
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/i915: i915 cannot provide switcher services.
        drm/radeon/kms: fix vram base calculation on rs780/rs880
        drm/radeon/kms: fix formatting of vram and gtt info
        drm/radeon/kms: forbid big bo allocation (fdo 31708) v3
        drm: Don't try and disable an encoder that was never enabled
        drm: Add missing drm_vblank_put() along queue vblank error path
        drm/i915/dp: Only apply the workaround if the select is still active
        drm/i915: Emit a request to clear a flushed and idle ring for unbusy bo
        drm/i915/lvds: Always restore panel-fitter when enabling the LVDS
        drm/i915/ringbuffer: Only print an error on the second attempt to reset head
        drm/i915: announce to userspace that the bsd ring is coherent
        agp/intel: Fix wrong kunmap in i830_cleanup()
        drm/i915: Factor in pixel-repeat in FDI M/N calculation
        drm/i915: Death to the unnecessary 64bit divide
        drm/i915: Clean conflicting modesetting registers upon init
        drm/i915: Apply a workaround for transitioning from DP on pipe B to HDMI.
        drm/i915: Always set the DP transcoder config to 8BPC.
      6dde39be
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f8f5d4f1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wacom - add new Bamboo PT (0xdb)
        Input: add input driver for polled GPIO buttons
        Input: turbografx - fix reference counting
        Input: synaptics - fix handling of 2-button ClickPads
        Input: wacom - add IDs for two new Bamboo PTs
        Input: document struct input_absinfo
        Input: add keycodes for touchpad on/off keys
        Input: usbtouchscreen - add support for LG Flatron T1710B
      f8f5d4f1
    • Dave Airlie's avatar
      drm/i915: i915 cannot provide switcher services. · 599bbb9d
      Dave Airlie authored
      it has a DSM but the switcher is done via WMI.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      599bbb9d
    • David Foley's avatar
      Input: wacom - add new Bamboo PT (0xdb) · 47d09235
      David Foley authored
      Adds new Bamboo Pen & Touch model - Bamboo P & T Special Edition
      Medium (CTH661/L; Product ID = 0xdb).
      Tested-by: default avatarTobias Verbeke <tobias.verbeke@gmail.com>
      Signed-off-by: default avatarDavid Foley <favux.is@gmail.com>
      Acked-by: default avatarPing Cheng <pingc@wacom.com>
      Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
      47d09235
    • Linus Torvalds's avatar
      Merge branch 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux · 2cedcc4f
      Linus Torvalds authored
      * 'fixes/2637-rc5/s3c24xx' of git://git.fluff.org/bjdooks/linux:
        ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks
        ARM: mini2440: Fix Kconfig to allow kernel to build
        ARM: S3C2412: Fix typo in CONFIG_CPU_S3C2412_ONLY definition
        ARM: S3C2443: Select properly ARM core type
        ARM: SMDK2416: Select MACH_SMDK, S3C_DEV_NAND, S3C_DEV_USB_HOST
      2cedcc4f
    • Vasily Khoruzhick's avatar
      ARM: S3C24XX: Fix mess with gpio {set,get}_pull callbacks · 812c4e40
      Vasily Khoruzhick authored
      Currently the {set,get}_pull callbacks of the s3c24xx_gpiocfg_default structure
      are initalized via s3c_gpio_{get,set}pull_1up. This results in a linker
      error when only CONFIG_CPU_S3C2442 is selected:
      
      arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f4): undefined reference to
      `s3c_gpio_getpull_1up'
      arch/arm/plat-s3c24xx/built-in.o:(.data+0x13f8): undefined reference to
      `s3c_gpio_setpull_1up'
      
      The s3c2442 has pulldowns instead of pullups compared to the s3c2440.
      The method of controlling them is the same though.
      So this patch modifies the existing s3c_gpio_{get,set}pull_1up helper functions
      to take an additional parameter deciding whether the pin has a pullup or pulldown.
      The s3c_gpio_{get,set}pull_1{down,up} functions then wrap that functions passing
      either S3C_GPIO_PULL_UP or S3C_GPIO_PULL_DOWN.
      
      Furthermore this patch sets up the s3c24xx_gpiocfg_default.{get,set}_pull fields
      in the s3c244{0,2}_map_io function to the new pulldown helper functions.
      
      Based on patch from "Lars-Peter Clausen" <lars@metafoo.de>
      Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      812c4e40
  4. 07 Dec, 2010 17 commits