Matt Roper
cf4c7c1225
drm/i915: Make all plane disables use 'update_plane' (v5) ...
If we extend the commit_plane handlers for each plane type to be able to
handle fb=0, then we can easily implement plane disable via the
update_plane handler. The cursor plane already works this way, and this
is the direction we need to go to integrate with the atomic plane
handler. We can now kill off the type-specific disable functions, as
well as the redundant intel_plane_disable() (not to be confused with
intel_disable_plane()).
Note that prepare_plane_fb() only gets called as part of update_plane
when fb!=NULL (by design, to match the semantics of the atomic plane
helpers); this means that our commit_plane handlers need to handle the
frontbuffer tracking for the disable case, even though they don't handle
it for normal updates.
v2:
- Change BUG_ON to WARN_ON (Ander/Daniel)
v3:
- Drop unnecessary plane->crtc check since a previous patch to plane
update ensures that plane->crtc will always be non-NULL, even for
disable calls that might pass NULL from userspace. (Ander)
- Drop a s/crtc/plane->crtc/ hunk that was unnecessary. (Ander)
v4:
- Fix missing whitespace (Ander)
v5:
- Use state's crtc rather than plane's crtc in
intel_check_primary_plane(). plane->crtc could be NULL, but we've
already fixed up state->crtc to ensure it's non-NULL (even if
userspace passed it as NULL during a disable call). (Ander)
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-12-06 01:46:26 +01:00
ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
2014-11-20 01:24:16 +01:00
ahci: fix AHCI parameters not taken into account
2014-11-04 12:56:25 -05:00
solos-pci: fix error return code
2014-11-23 14:29:44 -05:00
Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq'
2014-11-14 15:17:32 +01:00
bcma: add another PCI ID of device with BCM43228
2014-10-23 14:02:06 -04:00
zram: avoid kunmap_atomic() of a NULL pointer
2014-11-13 16:17:05 -08:00
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
clk: pxa: fix pxa27x CCCR bit usage
2014-11-17 11:25:29 -08:00
clockevent: sun4i: Fix race condition in the probe code
2014-11-19 10:43:51 +01:00
cpufreq: Avoid crash in resume on SMP without OPP
2014-11-08 02:10:04 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-10-24 12:48:47 -07:00
crypto: caam - fix missing dma unmap on error path
2014-11-06 23:10:20 +08:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2014-11-21 16:24:27 -08:00
e7xxx_edac: Report CE events properly
2014-10-22 22:59:00 +02:00
firewire: cdev: prevent kernel stack leaking into ioctl arguments
2014-11-14 12:10:13 +01:00
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-23 14:45:09 -07:00
drm/i915: Make all plane disables use 'update_plane' (v5)
2014-12-06 01:46:26 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-11-13 16:19:14 -08:00
hwmon: (g762) fix call to devm_hwmon_device_register_with_groups()
2014-11-19 14:06:47 -08:00
i2c: core: Dispose OF IRQ mapping at client removal time
2014-11-07 19:03:18 +01:00
Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block
2014-10-18 12:12:45 -07:00
iio: accel: bmc150: set low default thresholds
2014-11-16 20:25:00 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-11-21 16:28:45 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-11-27 17:51:50 -08:00
irqchip: brcmstb-l2: Fix error handling of irq_of_parse_and_map
2014-11-26 06:28:42 +00:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2014-10-21 08:18:38 -07:00
Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2014-10-21 11:21:19 -07:00
One fix for md for 3.18.
2014-11-16 15:34:31 -08:00
[media] sp2: sp2_init() can be static
2014-11-03 19:08:06 -02:00
mfd: twl4030-power: Fix poweroff with PM configuration enabled
2014-11-10 15:22:04 +00:00
cxl: Fix PSL error due to duplicate segment table entries
2014-10-28 19:52:52 +11:00
mmc: core: fix card detection regression
2014-11-05 09:28:48 +01:00
Three main MTD fixes for 3.18:
2014-11-02 14:45:52 -08:00
Merge tag 'master-2014-11-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2014-11-26 16:38:35 -05:00
ntb: Adding split BAR support for Haswell platforms
2014-10-17 07:08:51 -04:00
of/selftest: Fix testing when /aliases is missing
2014-11-20 15:32:49 +00:00
PCI/MSI: Add device flag indicating that 64-bit MSIs don't work
2014-11-24 14:11:34 +11:00
phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
2014-11-05 14:34:06 -08:00
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
2014-10-28 11:16:26 +01:00
platform: hp_accel: Add SERIO_I8042 as a dependency since it now includes i8042.h/serio.h
2014-11-10 21:16:15 -08:00
power supply and reset changes for the v3.18-rc
2014-11-15 15:22:51 -08:00
pwm: Changes for v3.18-rc1
2014-10-21 08:17:43 -07:00
Merge remote-tracking branches 'regulator/fix/max1586', 'regulator/fix/max77686', 'regulator/fix/max77693', 'regulator/fix/max77802', 'regulator/fix/max8860' and 'regulator/fix/s2mpa01' into regulator-linus
2014-11-05 14:59:25 +00:00
drivers/rtc/rtc-bq32k.c: fix register value
2014-10-29 16:33:14 -07:00
KVM: s390: virtio_ccw: remove unused variable
2014-11-03 10:43:00 +01:00
SCSI fixes on 20141128
2014-11-29 10:15:31 -08:00
soc/tegra: fuse: export tegra_sku_info
2014-12-02 15:43:37 +10:00
Merge remote-tracking branches 'spi/fix/dw' and 'spi/fix/sirf' into spi-linus
2014-11-26 19:05:25 +00:00
Linux 3.18-rc7
2014-12-02 10:58:33 +10:00
target: return CONFLICT only when SA key unmatched
2014-11-02 22:04:57 -08:00
thermal: Exynos: Deletion of unnecessary checks before two function calls
2014-11-21 15:20:17 -04:00
Revert "serial: of-serial: add PM suspend/resume support"
2014-11-25 12:46:39 -08:00
usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000
2014-11-24 17:01:55 -08:00
vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT
2014-10-28 13:54:16 -07:00
Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
2014-10-30 14:53:49 +02:00
One cc: stable commit, the rest are a series of minor cleanups which have
2014-10-18 10:25:09 -07:00
watchdog: meson: remove magic value for reboot
2014-10-20 21:09:17 +02:00
xen/pci: Allocate memory for physdev_pci_device_add's optarr
2014-10-23 16:24:02 +01:00
cf4c7c1225