Eric Lee / smarc-fsl-linux-kernel

07 Oct, 2010

3 commits

05 Oct, 2010

6 commits

03 Oct, 2010

7 commits

02 Oct, 2010

11 commits

  • 929f49bf2   drivers/gpu/drm/i915/i915_gem.c: Add missing error handling code ... Browse Code »

    Extend the error handling code with operations found in other nearby error
    handling code

    A simplified version of the sematic match that finds this problem is as
    follows: (http://coccinelle.lip6.fr/)

    //
    @r exists@
    @r@
    statement S1,S2,S3;
    constant C1,C2,C3;
    @@

    *if (...)
    {... S1 return -C1;}
    ...
    *if (...)
    {... when != S1
    return -C2;}
    ...
    *if (...)
    {... S1 return -C3;}
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Chris Wilson
    Cc: stable@kernel.org

    Julia Lawall
     
  • 0f69c897f   regulator: max8649 - fix setting extclk_freq ... Browse Code »

    The SYNC bits are BIT6 and BIT7 of MAX8649_SYNC register.
    pdata->extclk_freq could be [0|1|2].
    (MAX8649_EXTCLK_26MHZ|MAX8649_EXTCLK_13MHZ|MAX8649_EXTCLK_19MHZ)
    It requires to left shift 6 bits to properly set extclk_freq.

    Signed-off-by: Axel Lin
    Acked-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Axel Lin
     
  • e4a6376b3   regulator: fix typo in current units ... Browse Code »

    This patch fixes a typo that incorrectly reports mA numbers as uA.

    Signed-off-by: Cyril Chemparathy
    Acked-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Cyril Chemparathy
     
  • ad7725cb4   regulator: fix device_register() error handling ... Browse Code »

    If device_register() fails then call put_device().
    See comment to device_register.

    Signed-off-by: Vasiliy Kulikov
    Acked-by: Mark Brown
    Signed-off-by: Liam Girdwood

    Vasiliy Kulikov
     
  • 18ffe4b18   Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... Browse Code »

    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    vmwgfx: Fix fb VRAM pinning failure due to fragmentation
    vmwgfx: Remove initialisation of dev::devname
    vmwgfx: Enable use of the vblank system
    vmwgfx: vt-switch (master drop) fixes
    drm/vmwgfx: Fix breakage introduced by commit "drm: block userspace under allocating buffer and having drivers overwrite it (v2)"
    drm: Hold the mutex when dropping the last GEM reference (v2)
    drm/gem: handlecount isn't really a kref so don't make it one.
    drm: i810/i830: fix locked ioctl variant
    drm/radeon/kms: add quirk for MSI K9A2GM motherboard
    drm/radeon/kms: fix potential segfault in r600_ioctl_wait_idle
    drm: Prune GEM vma entries
    drm/radeon/kms: fix up encoder info messages for DFP6
    drm/radeon: fix PCI ID 5657 to be an RV410

    Linus Torvalds
     
  • b10c4d40b   Merge branch 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux ... Browse Code »

    * 'for-linus/i2c/2636-rc5' of git://git.fluff.org/bjdooks/linux:
    i2c-s3c2410: fix calculation of SDA line delay
    i2c-davinci: Fix race when setting up for TX
    i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout

    Linus Torvalds
     
  • 303a40700   Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 ... Browse Code »

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
    ACPI: invoke DSDT corruption workaround on all Toshiba Satellite
    ACPI, APEI, Fix ERST MOVE_DATA instruction implementation
    ACPI: fan: Fix more unbalanced code block
    ACPI: acpi_pad: simplify code to avoid false gcc build warning
    ACPI, APEI, Fix error path for memory allocation
    ACPI, APEI, HEST Fix the unsuitable usage of platform_data
    ACPI, APEI, Fix acpi_pre_map() return value
    ACPI, APEI, Fix APEI related table size checking
    ACPI: Disable Windows Vista compatibility for Toshiba P305D
    ACPI: Kconfig: fix typo.
    ACPI: add missing __percpu markup in arch/x86/kernel/acpi/cstate.c
    ACPI: Fix typos
    ACPI video: fix a poor warning message
    ACPI: fix build warnings resulting from merge window conflict
    ACPI: EC: add Vista incompatibility DMI entry for Toshiba Satellite L355
    ACPI: expand Vista blacklist to include SP1 and SP2
    ACPI: delete ZEPTO idle=nomwait DMI quirk
    ACPI: enable repeated PCIEXP wakeup by clearing PCIEXP_WAKE_STS on resume
    PM / ACPI: Blacklist systems known to require acpi_sleep=nonvs
    ACPI: Don't report current_now if battery reports in mWh

    Linus Torvalds
     
  • 35ec42167   Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 ... Browse Code »

    * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
    intel_idle: Voluntary leave_mm before entering deeper
    acpi_idle: add missing \n to printk
    intel_idle: add missing __percpu markup
    intel_idle: Change mode 755 => 644
    cpuidle: Fix typos
    intel_idle: PCI quirk to prevent Lenovo Ideapad s10-3 boot hang

    Linus Torvalds
     
  • 64aab720b   i7core_edac: fix panic in udimm sysfs attributes registration ... Browse Code »

    Array of udimm sysfs attributes was not ended with NULL marker, leading to
    dereference of random memory.

    EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm0
    EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm1
    EDAC DEBUG: edac_create_mci_instance_attributes: edac_create_mci_instance_attributes() file udimm2
    BUG: unable to handle kernel NULL pointer dereference at 00000000000001a4
    IP: [] edac_create_mci_instance_attributes+0x148/0x1f1
    Pid: 1, comm: swapper Not tainted 2.6.36-rc3-nv+ #483 P6T SE/System Product Name
    RIP: 0010:[] [] edac_create_mci_instance_attributes+0x148/0x1f1
    (...)
    Call Trace:
    [] edac_create_mci_instance_attributes+0x198/0x1f1
    [] edac_create_sysfs_mci_device+0xbb/0x2b2
    [] edac_mc_add_mc+0x46b/0x557
    [] i7core_probe+0xccf/0xec0
    RIP [] edac_create_mci_instance_attributes+0x148/0x1f1
    ---[ end trace 20de320855b81d78 ]---
    Kernel panic - not syncing: Attempted to kill init!

    Signed-off-by: Marcin Slusarz
    Cc: Mauro Carvalho Chehab
    Acked-by: Doug Thompson
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Marcin Slusarz
     
  • c044391bd   drivers/serial/mrst_max3110.c needs linux/irq.h ... Browse Code »

    sparc64 allmodconfig:

    drivers/serial/mrst_max3110.c: In function `serial_m3110_startup':
    drivers/serial/mrst_max3110.c:470: error: `IRQ_TYPE_EDGE_FALLING' undeclared (first use in this function)

    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • 63d66cab4   drivers/serial/mfd.c needs slab.h ... Browse Code »

    alpha allmodconfig:

    drivers/serial/mfd.c:144: error: implicit declaration of function 'kzalloc'
    drivers/serial/mfd.c:144: warning: assignment makes pointer from integer without a cast

    Cc: Greg Kroah-Hartman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     

01 Oct, 2010

11 commits

  • abb295f3b   vmwgfx: Fix fb VRAM pinning failure due to fragmentation ... Browse Code »

    If the soon-to-be scanout buffer is partly covering the intended
    VRAM region, move and pin will fail. In that case, just move it out
    to system before attempting to move it in again.

    Signed-off-by: Thomas Hellstrom
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • f1a28ee23   vmwgfx: Remove initialisation of dev::devname ... Browse Code »

    The removed code causes oopses with newer drms on master drop.

    Signed-off-by: Thomas Hellstrom
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • 7a1c2f6c8   vmwgfx: Enable use of the vblank system ... Browse Code »

    This is to avoid accessing uninitialized data during
    drm_irq_uninstall and vblank ioctls. At the same time, enable error check from
    drm_kms_init which previously appeared to ignore all errors.

    Signed-off-by: Thomas Hellstrom
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • 30c78bb83   vmwgfx: vt-switch (master drop) fixes ... Browse Code »

    We add an option not to enable fbdev, this option is off (0) by default.
    Not enabling fbdev at load time makes it possible to co-operate with
    vga16fb and vga text mode when VT switching.

    However, if 3D resources are active when VT switching, we're currently
    not able to switch over to vga, due to device limitations.
    This fixes a bug where we previously lost 3D state during VT switch.

    Signed-off-by: Thomas Hellstrom
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • 2854eedae   drm/vmwgfx: Fix breakage introduced by commit "drm: block userspace under alloca… ... Browse Code »

    …ting buffer and having drivers overwrite it (v2)"

    The mentioned commit breaks the vmwgfx ioctl argument sanity check.

    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

    Thomas Hellstrom
     
  • 39b4d07aa   drm: Hold the mutex when dropping the last GEM reference (v2) ... Browse Code »

    In order to be fully threadsafe we need to check that the drm_gem_object
    refcount is still 0 after acquiring the mutex in order to call the free
    function. Otherwise, we may encounter scenarios like:

    Thread A: Thread B:
    drm_gem_close
    unreference_unlocked
    kref_put mutex_lock
    ... i915_gem_evict
    ... kref_get -> BUG
    ... i915_gem_unbind
    ... kref_put
    ... i915_gem_object_free
    ... mutex_unlock
    mutex_lock
    i915_gem_object_free -> BUG
    i915_gem_object_unbind
    kfree
    mutex_unlock

    Note that no driver is currently using the free_unlocked vfunc and it is
    scheduled for removal, hasten that process.

    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30454
    Reported-and-Tested-by: Magnus Kessler
    Signed-off-by: Chris Wilson
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie

    Chris Wilson
     
  • e39a01501   drm/i915: Fix refleak during eviction. ... Browse Code »

    Now that we hold onto a reference whilst evicting objects, we need to
    be sure that we drop all the references taken -- even on the error
    paths.

    Signed-off-by: Chris Wilson

    Chris Wilson
     
  • 6110a1f43   intel_idle: Voluntary leave_mm before entering deeper ... Browse Code »

    Avoid TLB flush IPIs for the cores in deeper c-states by voluntary leave_mm()
    before entering into that state. CPUs tend to flush TLB in those c-states
    anyways.

    acpi_idle does this with C3-type states, but it was not caried over
    when intel_idle was introduced. intel_idle can apply it
    to C-states in addition to those that ACPI might export as C3...

    Signed-off-by: Suresh Siddha
    Signed-off-by: Len Brown

    Suresh Siddha
     
  • 29d08b3ef   drm/gem: handlecount isn't really a kref so don't make it one. ... Browse Code »

    There were lots of places being inconsistent since handle count
    looked like a kref but it really wasn't.

    Fix this my just making handle count an atomic on the object,
    and have it increase the normal object kref.

    Now i915/radeon/nouveau drivers can drop the normal reference on
    userspace object creation, and have the handle hold it.

    This patch fixes a memory leak or corruption on unload, because
    the driver had no way of knowing if a handle had been actually
    added for this object, and the fbcon object needed to know this
    to clean itself up properly.

    Reviewed-by: Chris Wilson
    Signed-off-by: Dave Airlie

    Dave Airlie
     
  • 7031307ae   i2c-s3c2410: fix calculation of SDA line delay ... Browse Code »

    S3C2440 style I2C controller uses PCLK to calculate the SDA line delay.
    The driver wrongly assumed that this delay is calculated from the
    frequency that the controller is operating on. This patch fixes this
    issue.

    Signed-off-by: MyungJoo Ham
    Signed-off-by: Kyungmin Park
    Signed-off-by: Marek Szyprowski
    Signed-off-by: Ben Dooks

    MyungJoo Ham
     
  • 926291953   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Browse Code »
    David S. Miller
     

30 Sep, 2010

2 commits