UBUNTU: Start new release

Ignore: yes
Signed-off-by: Steve Conklin <sconklin@canonical.com>
UBUNTU: Revert "drm/i915: GFX_MODE Flush TLB Invalidate Mode must be '1' for scanline waits"

This reverts commit 30ae292ec68402c773ddc8c80f83f7cd84289a39.

This has been shown to cause GPU hangs

BugLink: http://bugs.launchpad.net/bugs/1140716

Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Bradd Figg <brad.figg@canonical.com>
Signed-off-by: Steve Conklin <sconklin@canonical.com>
fbcon: fix locking harder

BugLink: http://bugs.launchpad.net/bugs/1169380
BugLink: http://bugs.launchpad.net/bugs/1168961

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: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Tested-by: Lu Hua <huax.lu@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

(backported from commit 054430e773c9a1e26f38e30156eff02dedfffc17 upstream)
Just context changes

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Steve Conklin <sconklin@canonical.com>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
UBUNTU: Ubuntu-3.2.0-41.66

Signed-off-by: Steve Conklin <sconklin@canonical.com>