1. 08 Feb, 2013 10 commits
    • Dave Airlie's avatar
      Merge branch 'console-fixes' into drm-next · 62cd2fa8
      Dave Airlie authored
      (not the fbcon maintainer pull 2)
      
      fix bug in vgacon on bootup and fbcon losing fonts on startup.
      
      * console-fixes: (50 commits)
        fbcon: don't lose the console font across generic->chip driver switch
        vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
      62cd2fa8
    • Dave Airlie's avatar
      Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux into drm-next · 6dc1c49d
      Dave Airlie authored
      This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep
      reported issues and re-enables fbcon lockdep.
      
      (not the fbcon maintainer)
      * 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux: (529 commits)
        Revert "Revert "console: implement lockdep support for console_lock""
        fbcon: fix locking harder
        fb: Yet another band-aid for fixing lockdep mess
        fb: rework locking to fix lock ordering on takeover
      6dc1c49d
    • Dave Airlie's avatar
      Revert "Revert "console: implement lockdep support for console_lock"" · 5845b81b
      Dave Airlie authored
      This reverts commit ff0d05bf.
      
      Now that we have all the locking fixes in place, we can revert the
      revert. This re-enables lockdep tracking for the console lock,
      daee7797.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      5845b81b
    • Dave Airlie's avatar
      fbcon: fix locking harder · 054430e7
      Dave Airlie authored
      Okay so Alan's patch handled the case where there was no registered fbcon,
      however the other path entered in set_con2fb_map pit.
      
      In there we called fbcon_takeover, but we also took the console lock in a couple
      of places. So push the console lock out to the callers of set_con2fb_map,
      
      this means fbmem and switcheroo needed to take the lock around the fb notifier
      entry points that lead to this.
      
      This should fix the efifb regression seen by Maarten.
      Tested-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Tested-by: default avatarLu Hua <huax.lu@intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      054430e7
    • Takashi Iwai's avatar
      fb: Yet another band-aid for fixing lockdep mess · e93a9a86
      Takashi Iwai authored
      I've still got lockdep warnings even after Alan's patch, and it seems that
      yet more band aids are required to paper over similar paths for
      unbind_con_driver() and unregister_con_driver().  After this hack, lockdep
      warnings are finally gone.
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      Cc: Alan Cox <alan@linux.intel.com>
      Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
      Cc: Jiri Kosina <jkosina@suse.cz>
      Cc: stable <stable@vger.kernel.org>
      Tested-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e93a9a86
    • Alan Cox's avatar
      fb: rework locking to fix lock ordering on takeover · 50e244cc
      Alan Cox authored
      Adjust the console layer to allow a take over call where the caller
      already holds the locks.  Make the fb layer lock in order.
      
      This is partly a band aid, the fb layer is terminally confused about the
      locking rules it uses for its notifiers it seems.
      
      [akpm@linux-foundation.org: remove stray non-ascii char, tidy comment]
      [akpm@linux-foundation.org: export do_take_over_console()]
      [airlied: cleanup another non-ascii char]
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: Jiri Kosina <jkosina@suse.cz>
      Cc: stable <stable@vger.kernel.org>
      Tested-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      50e244cc
    • Borislav Petkov's avatar
      x86/intel/cacheinfo: Shut up annoying warning · 84b603ab
      Borislav Petkov authored
      I've been getting the following warning when doing randbuilds
      since forever. Now it finally pissed me off just the perfect
      amount so that I can fix it.
      
        arch/x86/kernel/cpu/intel_cacheinfo.c:489:27: warning: ‘cache_disable_0’ defined but not used [-Wunused-variable]
        arch/x86/kernel/cpu/intel_cacheinfo.c:491:27: warning: ‘cache_disable_1’ defined but not used [-Wunused-variable] arch/x86/kernel/cpu/intel_cacheinfo.c:524:27: warning: ‘subcaches’ defined but not used [-Wunused-variable]
      
      It happens because in randconfigs where CONFIG_SYSFS is not set,
      the whole sysfs-interface to L3 cache index disabling is
      remaining unused and gcc correctly warns about it. Make it
      optional, depending on CONFIG_SYSFS too, as is the case with
      other sysfs-related machinery in this file.
      Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
      Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
      Link: http://lkml.kernel.org/r/1359969195-27362-1-git-send-email-bp@alien8.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      84b603ab
    • H. Peter Anvin's avatar
      x86, doc: Boot protocol 2.12 is in 3.8 · 521dfda9
      H. Peter Anvin authored
      The boot protocol 2.12 changes were pulled for 3.8, so update the
      documentation accordingly.
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      521dfda9
    • Jan Beulich's avatar
      x86-64: Replace left over sti/cli in ia32 audit exit code · 313751fa
      Jan Beulich authored
      For some reason they didn't get replaced so far by their
      paravirt equivalents, resulting in code to be run with
      interrupts disabled that doesn't expect so (causing, in the
      observed case, a BUG_ON() to trigger) when syscall auditing is
      enabled.
      
      David (Cc-ed) came up with an identical fix, so likely this can
      be taken to count as an ack from him.
      Reported-by: default avatarPeter Moody <pmoody@google.com>
      Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Link: http://lkml.kernel.org/r/5108E01902000078000BA9C5@nat28.tlf.novell.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      Cc: stable@vger.kernel.org
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Tested-by: default avatarPeter Moody <pmoody@google.com>
      313751fa
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2013-02-01' of... · cd17ef41
      Dave Airlie authored
      Merge tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
      
      Daniel writes:
      "Probably the last feature pull for 3.9, there's some fixes outstanding
      thought that I'd like to sneak in. And maybe 3.8 takes a bit longer ...
      Anyway, highlights of this pull:
      - Kill the horrible IS_DISPLAYREG hack to handle the mmio offset movements
        on vlv, big thanks to Ville.
      - Dynamic power well support for Haswell, shaves away a bit when only
        using the eDP port on pipe A (Paulo). Plus unclaimed register fixes
        uncovered by this.
      - Clarifications of the gpu hang/reset state transitions, hopefully fixing
        a few spurious -EIO deaths in userspace.
      - Haswell ELD fixes.
      - Some more (pp)gtt cleanups from Ben.
      - A few smaller things all over.
      
      Plus all the stuff from the previous rather small pull request:
      - Broadcast RBG improvements and reduced color range fixes from Ville.
      - Ben is on a "kill legacy gtt code for good" spree, first pile of patches
        included.
      - No-relocs and bo lut improvements for faster execbuf from Chris.
      - Some refactorings from Imre."
      
      * tag 'drm-intel-next-2013-02-01' of git://people.freedesktop.org/~danvet/drm-intel: (101 commits)
        GPU/i915: Fix acpi_bus_get_device() check in drivers/gpu/drm/i915/intel_opregion.c
        drm/i915: Set the SR01 "screen off" bit in i915_redisable_vga() too
        drm/i915: Kill IS_DISPLAYREG()
        drm/i915: Introduce i915_vgacntrl_reg()
        drm/i915: gen6_gmch_remove can be static
        drm/i915: dynamic Haswell display power well support
        drm/i915: check the power down well on assert_pipe()
        drm/i915: don't send DP "idle" pattern before "normal" on HSW PORT_A
        drm/i915: don't run hsw power well code on !hsw
        drm/i915: kill cargo-culted locking from power well code
        drm/i915: Only run idle processing from i915_gem_retire_requests_worker
        drm/i915: Fix CAGF for HSW
        drm/i915: Reclaim GTT space for failed PPGTT
        drm/i915: remove intel_gtt structure
        drm/i915: Add probe and remove to the gtt ops
        drm/i915: extract hw ppgtt setup/cleanup code
        drm/i915: pte_encode is gen6+
        drm/i915: vfuncs for ppgtt
        drm/i915: vfuncs for gtt_clear_range/insert_entries
        drm/i915: Error state should print /sys/kernel/debug
        ...
      cd17ef41
  2. 07 Feb, 2013 2 commits
    • Dave Airlie's avatar
      fbcon: don't lose the console font across generic->chip driver switch · ae128786
      Dave Airlie authored
      If grub2 loads efifb/vesafb, then when systemd starts it can set the console
      font on that framebuffer device, however when we then load the native KMS
      driver, the first thing it does is tear down the generic framebuffer driver.
      
      The thing is the generic code is doing the right thing, it frees the font
      because otherwise it would leak memory. However we can assume that if you
      are removing the generic firmware driver (vesa/efi/offb), that a new driver
      *should* be loading soon after, so we effectively leak the font.
      
      However the old code left a dangling pointer in vc->vc_font.data and we
      can now reuse that dangling pointer to load the font into the new
      driver, now that we aren't freeing it.
      
      Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=892340
      
      Cc: Kay Sievers <kay.sievers@vrfy.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ae128786
    • Dave Airlie's avatar
      vgacon/vt: clear buffer attributes when we load a 512 character font (v2) · 2a248307
      Dave Airlie authored
      When we switch from 256->512 byte font rendering mode, it means the
      current contents of the screen is being reinterpreted. The bit that holds
      the high bit of the 9-bit font, may have been previously set, and thus
      the new font misrenders.
      
      The problem case we see is grub2 writes spaces with the bit set, so it
      ends up with data like 0x820, which gets reinterpreted into 0x120 char
      which the font translates into G with a circumflex. This flashes up on
      screen at boot and is quite ugly.
      
      A current side effect of this patch though is that any rendering on the
      screen changes color to a slightly darker color, but at least the screen
      no longer corrupts.
      
      v2: as suggested by hpa, always clear the attribute space, whether we
      are are going to or from 512 chars.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      2a248307
  3. 05 Feb, 2013 17 commits
  4. 04 Feb, 2013 11 commits