Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: gmux
Commits on Mar 18, 2012
  1. Temporary hack: don't unregister handler

    Andreas Heider authored
  2. Restore full rom_window, unregister client

    Andreas Heider authored
Commits on Mar 17, 2012
  1. Hack so lock_ddc works at boot

    Andreas Heider authored
  2. lock_ddc fix, some more logging

    Andreas Heider authored
  3. vga_switcheroo: Add DDC lock for LVDS detection.

    Andreas Heider authored
    Some GPU drivers don't support hotplugging LVDS displays and disable the LVDS
    output completely if no display is connected to it at boot. But during boot of a
    system with switchable graphics the internal display is only connected to one
    card. This adds a function that switches the DDC line of the internal display
    so the LVDS panel can be detected by the secondary GPU driver.
Commits on Mar 16, 2012
  1. drm/i915: Use lock_ddc for LVDS detection

    Andreas Heider authored
  2. Restore PRAMIN vbios after switcheroo powerdown

    Andreas Heider authored
    After shutting down the dedicated card on 2010 MBPs, the VBIOS
    is no longer accessible via PRAMIN. Unfortunately this is the
    only way to access the VBIOS at all.
    This saves and restores the VBIOS when shutting down the card.
  3. @tiwai

    drm/i915: Add lvds_channel module option

    tiwai authored Andreas Heider committed
    Add a new module optoin lvds_channel to specify the LVDS channel mode
    explicitly instead of probing the LVDS register value set by BIOS.
    This will be helpful when VBT is broken or incompatible with the
    current code.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  4. @tiwai

    drm/i915: Check VBIOS value for determining LVDS dual channel mode, too

    tiwai authored Andreas Heider committed
    Currently i915 driver checks [PCH_]LVDS register bits to decide
    whether to set up the dual-link or the single-link mode.  This relies
    implicitly on that BIOS initializes the register properly at boot.
    However, BIOS doesn't initialize it always.  When the machine is
    booted with the closed lid, BIOS skips the LVDS reg initialization.
    This ends up in blank output on a machine with a dual-link LVDS when
    you open the lid after the boot.
    
    This patch adds a workaround for that problem by checking the initial
    LVDS register value in VBT.
    
    Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
    Reviewed-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  5. Intialize has_optimus.

    Andreas Heider authored
  6. i5 force enable Intel Integrated Graphics

    Andreas Heider authored
    Adds a parameter to enable the Intel Integrated Graphics in BIOS emulation
    mode. When booting in BIOS emulation mode, the Intel graphics card is
    disabled by setting the corresponding DEVEN bit to 0. This patch undoes that.
    See http://download.intel.com/design/processor/datashts/322813.pdf page 62.
  7. i5s 3400s AHCI handling for incapable EFI

    Andreas Heider authored
    Adds a boot parameter to enable AHCI in BIOS emulation mode, by Bernhard
    Froemel. Not really needed for graphics switching, but since we're
    doing fixups anyways why not? See
    https://bugs.launchpad.net/mactel-support/+bug/817017
  8. Created mbp debian kernel flavour

    Andreas Heider authored
Commits on Mar 9, 2012
  1. UBUNTU: Ubuntu-3.2.0-18.29

    Leann Ogasawara authored
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Commits on Mar 8, 2012
  1. UBUNTU: SAUCE: ata_piix: defer disks to the Hyper-V drivers by default

    Andy Whitcroft authored Leann Ogasawara committed
    When we are hosted on a Microsoft Hyper-V hypervisor the guest disks
    are exposed both via the Hyper-V paravirtualised drivers and via an
    emulated SATA disk drive.  In this case we want to use the paravirtualised
    drivers if we can as they are much more efficient.  Note that the Hyper-V
    paravirtualised drivers only expose the virtual hard disk devices, the
    CDROM/DVD devices must still be enumerated.
    
    Check the disk type when picking up its ID and if it appears to be a
    disk just report it disconnected.
    
    BugLink: http://bugs.launchpad.net/bugs/929545
    BugLink: http://bugs.launchpad.net/bugs/942316
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
  2. regset: Return -EFAULT, not -EIO, on host-side memory fault

    H. Peter Anvin authored Leann Ogasawara committed
    BugLink: http://bugs.launchpad.net/bugs/949905
    
    There is only one error code to return for a bad user-space buffer
    pointer passed to a system call in the same address space as the
    system call is executed, and that is EFAULT.  Furthermore, the
    low-level access routines, which catch most of the faults, return
    EFAULT already.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Reviewed-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: Roland McGrath <roland@hack.frob.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    (cherry picked from commit 5189fa19a4b2b4c3bec37c3a019d446148827717)
    CVE-2012-1097
    Acked-by: Seth Forshee <seth.forshee@canonical.com>
    Acked-by: Colin King <colin.king@canonical.com>
    Signed-off-by: Andy Whitcroft <andy.whitcroft@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  3. regset: Prevent null pointer reference on readonly regsets

    H. Peter Anvin authored Leann Ogasawara committed
    BugLink: http://bugs.launchpad.net/bugs/949905
    
    The regset common infrastructure assumed that regsets would always
    have .get and .set methods, but not necessarily .active methods.
    Unfortunately people have since written regsets without .set methods.
    
    Rather than putting in stub functions everywhere, handle regsets with
    null .get or .set methods explicitly.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Reviewed-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: Roland McGrath <roland@hack.frob.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    (cherry picked from commit c8e252586f8d5de906385d8cf6385fee289a825e)
    CVE-2012-1097
    Acked-by: Seth Forshee <seth.forshee@canonical.com>
    Acked-by: Colin King <colin.king@canonical.com>
    Signed-off-by: Andy Whitcroft <andy.whitcroft@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  4. @fengguang

    UBUNTU: SAUCE: (drop after 3.4) ALSA: hda - add id for Atom Cedar Tra…

    fengguang authored Leann Ogasawara committed
    …il HDMI codec
    
    rtg - Scheduled for upstream, plucked from git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
    https://lists.ubuntu.com/archives/kernel-team/2012-March/019232.html
    
    [the order sorted by tiwai]
    
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: David Henningsson <david.henningsson@canonical.com>
    Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  5. UBUNTU: [Config] restore build-% shortcut

    Andy Whitcroft authored Leann Ogasawara committed
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
  6. @sgruszka

    bsg: fix sysfs link remove warning

    sgruszka authored Leann Ogasawara committed
    BugLink: http://bugs.launchpad.net/bugs/946928
    
    We create "bsg" link if q->kobj.sd is not NULL, so remove it only
    when the same condition is true.
    
    Fixes:
    
    WARNING: at fs/sysfs/inode.c:323 sysfs_hash_and_remove+0x2b/0x77()
    sysfs: can not remove 'bsg', no directory
    Call Trace:
      [<c0429683>] warn_slowpath_common+0x6a/0x7f
      [<c0537a68>] ? sysfs_hash_and_remove+0x2b/0x77
      [<c042970b>] warn_slowpath_fmt+0x2b/0x2f
      [<c0537a68>] sysfs_hash_and_remove+0x2b/0x77
      [<c053969a>] sysfs_remove_link+0x20/0x23
      [<c05d88f1>] bsg_unregister_queue+0x40/0x6d
      [<c0692263>] __scsi_remove_device+0x31/0x9d
      [<c069149f>] scsi_forget_host+0x41/0x52
      [<c0689fa9>] scsi_remove_host+0x71/0xe0
      [<f7de5945>] quiesce_and_remove_host+0x51/0x83 [usb_storage]
      [<f7de5a1e>] usb_stor_disconnect+0x18/0x22 [usb_storage]
      [<c06c29de>] usb_unbind_interface+0x4e/0x109
      [<c067a80f>] __device_release_driver+0x6b/0xa6
      [<c067a861>] device_release_driver+0x17/0x22
      [<c067a46a>] bus_remove_device+0xd6/0xe6
      [<c06785e2>] device_del+0xf2/0x137
      [<c06c101f>] usb_disable_device+0x94/0x1a0
    
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    (cherry picked from commit 37b40adf2d1b4a5e51323be73ccf8ddcf3f15dd3)
    
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  7. UBUNTU: SAUCE: drm: give up on edid retries when i2c bus is not respo…

    Eugeni Dodonov authored Leann Ogasawara committed
    …nding
    
    BugLink: http://bugs.launchpad.net/bugs/855124
    
    This allows to avoid talking to a non-responding bus repeatedly until we
    finally timeout after 15 attempts. We can do this by catching the -ENXIO
    error, provided by i2c_algo_bit:bit_doAddress call.
    
    Within the bit_doAddress we already try 3 times to get the edid data, so
    if the routine tells us that bus is not responding, it is mostly pointless
    to keep re-trying those attempts over and over again until we reach final
    number of retries.
    
    This change should fix https://bugs.freedesktop.org/show_bug.cgi?id=41059
    and improve overall edid detection timing by 10-30% in most cases, and by
    a much larger margin in case of phantom outputs (up to 30x in one worst
    case).
    
    Timing results for i915-powered machines for 'time xrandr' command:
    Machine 1: from 0.840s to 0.290s
    Machine 2: from 0.315s to 0.280s
    Machine 3: from +/- 4s to 0.184s
    
    Timing results for HD5770 with 'time xrandr' command:
    Machine 4: from 3.210s to 1.060s
    
    Reviewed-by: Chris Wilson <chris@hchris-wilson.co.uk>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Tested-by: Sean Finney <seanius@seanius.net>
    Tested-by: Soren Hansen <soren@linux2go.dk>
    Tested-by: Hernando Torque <sirius@sonnenkinder.org>
    Tested-by: Mike Lothian <mike@fireburn.co.uk>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41059
    Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    (cherry picked from commit 9292f37e1f5c79400254dca46f83313488093825 in
    git://people.freedesktop.org/~airlied/linux drm-next)
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  8. UBUNTU: Start new release

    Leann Ogasawara authored
    Ignore: yes
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  9. UBUNTU: SAUCE: (drop after 3.3) platform/x86: Add driver for Apple gm…

    Seth Forshee authored Leann Ogasawara committed
    …ux device
    
    Apple laptops with hybrid graphics have a device named gmux that
    controls the muxing of the LVDS panel between the GPUs as well as screen
    brightness. This driver adds support for the gmux device. Only backlight
    control is supported initially.
    
    BugLink: http://bugs.launchpad.net/bugs/925544
    Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
    Tested-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  10. UBUNTU: Ubuntu-3.2.0-18.28

    Leann Ogasawara authored
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  11. UBUNTU: [Config] Enable aufs

    Tim Gardner authored Leann Ogasawara committed
  12. UBUNTU: Add ibmvfc and ibmvscsic to d-i/modules-powerpc/nic-modules

    Leann Ogasawara authored
    BugLink: http://bugs.launchpad.net/bugs/712188
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  13. UBUNTU: [Config] Enable CONFIG_SCSI_IBMVFC=m for powerpc

    Leann Ogasawara authored
    BugLink: http://bugs.launchpad.net/bugs/712188
    
    This also resolves a policy mis-match for our Precise kernel config review.
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  14. @jmberg

    UBUNTU: SAUCE: iwlwifi: fix key removal

    jmberg authored Leann Ogasawara committed
    BugLink: http://bugs.launchpad.net/bugs/911059
    
    When trying to remove a key, we always send key
    flags just setting the key type, not including
    the multicast flag and the key ID. As a result,
    whenever any key was removed, the unicast key 0
    would be removed, causing a complete connection
    loss after the second rekey (the first doesn't
    cause a key removal). Fix the key removal code
    to include the key ID and multicast flag, thus
    removing the correct key.
    
    Cc: stable@vger.kernel.org
    Reported-by: Alexander Schnaidt <alex.schnaidt@googlemail.com>
    Tested-by: Alexander Schnaidt <alex.schnaidt@googlemail.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    (cherry picked from commit 5dcbf480473f6c3f06ad2426b7517038a2a18911 in
    git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git)
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  15. UBUNTU: Add ibmveth to d-i/modules-powerpc/nic-modules

    Leann Ogasawara authored
    BugLink: http://bugs.launchpad.net/bugs/712188
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  16. UBUNTU: Rebase to v3.2.9

    Leann Ogasawara authored
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  17. UBUNTU: provide ipmi udeb

    Leann Ogasawara authored
    BugLink: http://bugs.launchpad.net/bugs/942926
    
    Provide ipmi udeb to allow access to critical hardware management
    functionality (e.g. the RAID controller in the case of the HP Proliant
    servers) in a d-i rescue environment.
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  18. UBUNTU: SAUCE: i2c-i801: Add device IDs for Intel Lynx Point

    Seth Heasley authored Leann Ogasawara committed
    BugLink: http://bugs.launchpad.net/bugs/900119
    
    Add the SMBus controller device IDs for the Intel Lynx Point PCH.
    
    Signed-off-by: Seth Heasley <seth.heasley@intel.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    (cherry picked from commit 3ced25f55e139dac4a501c89da7e72b1dc2a85f9 in
    linux-next)
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  19. UBUNTU: SAUCE: ata_piix: IDE-mode SATA patch for Intel Lynx Point Dev…

    Seth Heasley authored Leann Ogasawara committed
    …iceIDs
    
    BugLink: http://bugs.launchpad.net/bugs/900119
    
    This patch adds the IDE-mode SATA DeviceIDs for the Intel Lynx Point PCH.
    
    Signed-off-by: Seth Heasley <seth.heasley@intel.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    (cherry picked from commit a62e2f961c6ab2750136d2ba44153aca260250fc in
    linux-next
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  20. UBUNTU: SAUCE: ahci: AHCI-mode SATA patch for Intel Lynx Point DeviceIDs

    Seth Heasley authored Leann Ogasawara committed
    BugLink: http://bugs.launchpad.net/bugs/900119
    
    This patch adds the AHCI-mode SATA DeviceIDs for the Intel Lynx Point PCH.
    
    Signed-off-by: Seth Heasley <seth.heasley@intel.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    (cherry picked from commit aace5c0e740fa18a057ef55bd7b39762217b1c6d in
    linux-next)
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
  21. UBUNTU: SAUCE: ALSA: hda - Add Lynx Point HD Audio Controller DeviceIDs

    Seth Heasley authored Leann Ogasawara committed
    BugLink: http://bugs.launchpad.net/bugs/900119
    
    This patch adds the HD Audio DeviceIDs for the Intel Lynx Point PCH.
    
    Signed-off-by: Seth Heasley <seth.heasley@intel.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    (cherry picked from commit 8bc039a1e15a72da8426b84293723fb7181f0b5e in
    linux-next)
    
    Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Something went wrong with that request. Please try again.