Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update my fork with torvalds #8

Merged
merged 85 commits into from
Nov 18, 2014
Merged

Update my fork with torvalds #8

Changes from 2 commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
8000ebf
power: ab8500_fg.c: use 64-bit time types
ebruAkagunduz Oct 8, 2014
0eaf437
power: bq2415x_charger: Properly handle ENODEV from power_supply_get_…
krzk Oct 15, 2014
21e863b
power: bq2415x_charger: Fix memory leak on DTS parsing error
krzk Oct 15, 2014
a69d82b
power_supply: Add no_thermal property to prevent recursive get_temp c…
krzk Oct 7, 2014
ba9c918
power: charger-manager: Avoid recursive thermal get_temp call
krzk Oct 7, 2014
bdbe814
power: charger-manager: Fix accessing invalidated power supply after …
krzk Oct 13, 2014
cdaf3e1
power: charger-manager: Fix accessing invalidated power supply after …
krzk Oct 13, 2014
7da89a2
sparc64: Fix crashes in schizo_pcierr_intr_other().
davem330 Nov 1, 2014
4750a0d
x86, microcode, AMD: Fix early ucode loading on 32-bit
suryasaimadhu Oct 31, 2014
e602336
x86, kaslr: Prevent .bss from overlaping initrd
Oct 31, 2014
5129ee2
ARM: mvebu: armada xp: Generalize use of i2c quirk
lunn Jul 26, 2014
9ece883
ARM: orion: Fix for certain sequence of request_irq can cause irq storm
Dushistov Jul 26, 2014
809fd14
NFSv4: Ensure nfs_atomic_open set the dentry verifier on ENOENT
trondmypd Oct 23, 2014
7488cbc
Revert "NFS: remove BUG possibility in nfs4_open_and_get_state"
trondmypd Oct 23, 2014
dca7800
Revert "NFS: nfs4_do_open should add negative results to the dcache."
trondmypd Oct 23, 2014
85be07c
x86, microcode: Fix accessing dis_ucode_ldr on 32-bit
suryasaimadhu Nov 5, 2014
a8ead0e
ARM: dts: am335x-evm: Fix 5th NAND partition's name
Oct 21, 2014
ab5c780
sparc64: Do irq_{enter,exit}() around generic_smp_call_function*().
davem330 Nov 7, 2014
1a17fdc
sparc32: Implement xchg and atomic_xchg using ATOMIC_HASH locks
andreas-gaisler Nov 5, 2014
06a2f5c
drm/exynos: resolve infinite loop issue on multi-platform
daeinki Nov 6, 2014
f7c2f36
drm/exynos: resolve infinite loop issue on non multi-platform
daeinki Nov 6, 2014
9ad703e
drm/exynos: g2d: fix null pointer dereference
daeinki Nov 7, 2014
7afbfcc
drm/exynos: fix possible infinite loop issue
daeinki Nov 7, 2014
5427955
x86/core, x86/xen/smp: Use 'die_complete' completion when taking CPU …
Oct 31, 2014
c0a717f
x86, microcode, AMD: Fix ucode patch stashing on 32-bit
suryasaimadhu Nov 5, 2014
4837927
scsi: only re-lock door after EH on devices that were reset
Nov 3, 2014
e925cc4
scsi: call device handler for failed TUR command
Nov 6, 2014
333b244
scsi: TUR path is down after adapter gets reset with multipath
wxiong38 Nov 6, 2014
d8ae3c3
cxgbi: add maintainer for cxgb3i/cxgb4i
anish Nov 4, 2014
7b07bf2
cxgb4i: send abort_rpl correctly
anish Nov 6, 2014
c12de88
megaraid_sas: fix bug in handling return value of pci_enable_msix_ran…
Nov 3, 2014
dc6311d
bnx2fc: fix tgt spinlock locking
maurizio-lombardi Nov 7, 2014
0cafa3e
Merge tag 'microcode_fixes_for_3.18' of git://git.kernel.org/pub/scm/…
Nov 10, 2014
fc2a602
ARM: dts: AM43x-EPOS-EVM: Fix DCDC3 voltage
Keerthyj Nov 6, 2014
3015ddb
ARM: dts: AM437x-GP-EVM: Fix DCDC3 voltage
Keerthyj Nov 6, 2014
5cd98a7
ARM: dts: AM437x-SK-EVM: Fix DCDC3 voltage
Keerthyj Nov 6, 2014
dc68cd1
MAINTAINERS: add more files under OMAP SUPPORT
Nov 6, 2014
05eb20f
MAINTAINERS: Update entry for omap related .dts files to cover new SoCs
nmenon Oct 21, 2014
e6be7bb
parisc: Wire up bpf syscall
hdeller Oct 21, 2014
8dd95c6
parisc: Use BUILD_BUG() instead of undefined functions
hdeller Oct 21, 2014
2fe749f
parisc: Use compat layer for msgctl, shmat, shmctl and semtimedop sys…
hdeller Nov 10, 2014
d8f5457
parisc: Avoid using CONFIG_64BIT in userspace exported headers
hdeller Nov 10, 2014
73b3a66
pinctrl: dra: dt-bindings: Fix output pull up/down
Nov 3, 2014
e9d784d
drm/i915: Fix obj->map_and_fenceable across tiling changes
ickle Nov 6, 2014
1c94984
drm/radeon: add locking around atombios scratch space usage
airlied Nov 10, 2014
8c393f9
nfs: fix pnfs direct write memory leak
Nov 5, 2014
e0d4ed7
pnfs/blocklayout: serialize GETDEVICEINFO calls
Sep 26, 2014
16c9914
nfs: remove spurious WARN_ON_ONCE in write path
westonandrosadamson Nov 3, 2014
b283f94
nfs: Remove bogus assignment
jankara Oct 21, 2014
16caf5b
nfs: Fix use of uninitialized variable in nfs_getattr()
jankara Oct 23, 2014
e983120
NFS: SEEK is an NFS v4.2 feature
amschuma-ntap Oct 22, 2014
4dfd4f7
NFSv4: Ensure that we remove NFSv4.0 delegations when state has expired
trondmypd Oct 17, 2014
0c116ca
NFSv4.1: nfs41_clear_delegation_stateid shouldn't trust NFS_DELEGATED…
trondmypd Nov 12, 2014
869f9df
NFSv4: Fix races between nfs_remove_bad_delegation() and delegation r…
trondmypd Nov 10, 2014
c606bb8
NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are rev…
trondmypd Oct 17, 2014
f8ebf7a
NFS: Don't try to reclaim delegation open state if recovery failed
trondmypd Oct 17, 2014
3b548f4
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux…
airlied Nov 12, 2014
5f2fcdb
Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/…
airlied Nov 12, 2014
b2c1987
drm/gk20a/fb: fix setting of large page size bit
Gnurou Nov 12, 2014
eae7382
drm/nouveau/nv50/disp: Fix modeset on G94
RSpliet Oct 30, 2014
8ff64c1
drm/tegra: dc: Add missing call to drm_vblank_on()
thierryreding Oct 8, 2014
b3ecba0
sunrpc: fix sleeping under rcu_read_lock in gss_stringify_acceptor
Nov 13, 2014
64e5fcc
Merge tag 'drm-intel-fixes-2014-11-13' of git://anongit.freedesktop.o…
airlied Nov 13, 2014
3d0f853
Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouvea…
airlied Nov 13, 2014
bcfef97
Merge tag 'drm/tegra/for-3.18-rc5' of git://people.freedesktop.org/~t…
airlied Nov 13, 2014
238962a
ARM: 8191/1: decompressor: ensure I-side picks up relocated code
wildea01 Nov 4, 2014
08b964f
ARM: 8198/1: make kuser helpers depend on MMU
nlynch-mentor Nov 10, 2014
1afcb6e
Merge tag 'nfs-for-3.18-3' of git://git.linux-nfs.org/projects/trondm…
torvalds Nov 15, 2014
51b97e3
kernel: use the gnu89 standard explicitly
kiryl Oct 20, 2014
e061167
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
torvalds Nov 15, 2014
ec7de65
Merge tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6
torvalds Nov 15, 2014
555e598
Merge branch 'parisc-3.18-2' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Nov 15, 2014
5f01feb
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
torvalds Nov 15, 2014
3b91270
x86-64: make csum_partial_copy_from_user() error handling consistent
torvalds Nov 16, 2014
de55bbb
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Nov 16, 2014
dec943f
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Nov 16, 2014
5a2b59d
sparc64: Fix constraints on swab helpers.
davem330 Nov 16, 2014
45eaf45
md: Always set RECOVERY_NEEDED when clearing RECOVERY_FROZEN
neilbrown Oct 28, 2014
ae8f504
Merge tag 'mvebu-fixes-3.18' of git://git.infradead.org/linux-mvebu i…
olofj Nov 16, 2014
f7efdad
Merge tag 'omap-fixes-against-v3.18-rc4' of git://git.kernel.org/pub/…
olofj Nov 16, 2014
e899dba
ARM: at91/dt: Fix sama5d3x typos
peda-r Oct 23, 2014
0fbae13
Merge tag 'md/3.18-fix' of git://neil.brown.name/md
torvalds Nov 16, 2014
435e46f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
torvalds Nov 17, 2014
e35c5a2
Merge tag 'armsoc-for-rc5' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Nov 17, 2014
fc14f9c
Linux 3.18-rc5
torvalds Nov 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions drivers/gpu/drm/tegra/dc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,6 @@ static const struct drm_crtc_funcs tegra_crtc_funcs = {

static void tegra_crtc_disable(struct drm_crtc *crtc)
{
struct tegra_dc *dc = to_tegra_dc(crtc);
struct drm_device *drm = crtc->dev;
struct drm_plane *plane;

Expand All @@ -752,7 +751,7 @@ static void tegra_crtc_disable(struct drm_crtc *crtc)
}
}

drm_vblank_off(drm, dc->pipe);
drm_crtc_vblank_off(crtc);
}

static bool tegra_crtc_mode_fixup(struct drm_crtc *crtc,
Expand Down Expand Up @@ -841,8 +840,6 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc,
u32 value;
int err;

drm_vblank_pre_modeset(crtc->dev, dc->pipe);

err = tegra_crtc_setup_clk(crtc, mode);
if (err) {
dev_err(dc->dev, "failed to setup clock for CRTC: %d\n", err);
Expand Down Expand Up @@ -896,6 +893,8 @@ static void tegra_crtc_prepare(struct drm_crtc *crtc)
unsigned int syncpt;
unsigned long value;

drm_crtc_vblank_off(crtc);

/* hardware initialization */
reset_control_deassert(dc->rst);
usleep_range(10000, 20000);
Expand Down Expand Up @@ -943,7 +942,7 @@ static void tegra_crtc_commit(struct drm_crtc *crtc)
value = GENERAL_ACT_REQ | WIN_A_ACT_REQ;
tegra_dc_writel(dc, value, DC_CMD_STATE_CONTROL);

drm_vblank_post_modeset(crtc->dev, dc->pipe);
drm_crtc_vblank_on(crtc);
}

static void tegra_crtc_load_lut(struct drm_crtc *crtc)
Expand Down