[PULL] drm-intel-fixes

Daniel Vetter
2013-07-22T06:14:00Z

Hi Dave,

Like I've said yesterday I've originally wanted to include a hdmi
regression fix for modes with dotclocks > 165MHz, but this morning (after
reading the test result from QA) I've noticed that I've fumbled something.
So that patch has to take another round. So that regression is still
open, but otherwise this pull request here resolves everything else
outstanding:
- fixup panel fitter readout for gen2/3 (just quitens dmesg noise)
- fix pft computations for non-autoscaled resolutions (i.e. letter/pillar
boxing on gen2/3)
- preserve the DDI A/E lane sharing bit (Stéphane Marchesin)
- fix the "rc6 fails to work after resume" regression, big thanks to
Konstantin Khlebnikov for the patch and debug insight about what
actually might be going on here
- fix Oops in is_crtc_connector_off (Chris)
- sanitize shared dpll state - our new paranoid state checker tripped up
over dirt left behind by the BIOS
- correctly restore fences, fixes the "my screen is all messed up after
resume" regression introduced in the final 3.10 pull request
- quirk backlights harder, this time for Dell XPS13 machines to fix a
regression (patch from Kamal Mostafa)
- 90% fix for some haswell hangs when accessing registers concurrently,
the 100% solution is simply too invasive for -fixes and what we have
here seems to be good enough (Chris)

Cheers, Daniel

The following changes since commit 46a0b638f35b45fc13d3dc0deb6a7e17988170b2:

Revert "drm/i915: Workaround incoherence between fences and LLC across multiple CPUs" (2013-07-10 15:31:12 +0200)

are available in the git repository at:

git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-fixes-2013-07-22

for you to fetch changes up to 181d1b9e31c668259d3798c521672afb8edd355c:

drm/i915: fix up gt init sequence fallout (2013-07-21 15:37:02 +0200)

----------------------------------------------------------------
Chris Wilson (2):
drm/i915: Fix dereferencing invalid connectors in is_crtc_connector_off()
drm/i915: Serialize almost all register access

Daniel Vetter (6):
drm/i915: fix up readout of the lvds dither bit on gen2/3
drm/i915: fix pfit regression for non-autoscaled resolutions
drm/i915: Sanitize shared dpll state
Merge tag 'v3.10' into drm-intel-fixes
drm/i915: correctly restore fences with objects attached
drm/i915: fix up gt init sequence fallout

Kamal Mostafa (1):
drm/i915: quirk no PCH_PWM_ENABLE for Dell XPS13 backlight

Konstantin Khlebnikov (1):
drm/i915: fix long-standing SNB regression in power consumption after resume v2

Stéphane Marchesin (1):
drm/i915: Preserve the DDI_A_4_LANES bit from the bios

Documentation/networking/ip-sysctl.txt | 4 +-
MAINTAINERS | 2 +-
Makefile | 2 +-
arch/arm/Kconfig | 14 +
arch/arm/include/asm/cputype.h | 2 +
arch/arm/include/asm/glue-proc.h | 9 +
arch/arm/include/asm/smp_plat.h | 2 +-
arch/arm/kernel/devtree.c | 10 +-
arch/arm/kernel/setup.c | 2 +-
arch/arm/mm/nommu.c | 6 +
arch/arm/mm/proc-fa526.S | 1 -
arch/arm/mm/proc-macros.S | 5 +
arch/arm/mm/proc-v7.S | 34 +-
arch/mn10300/include/asm/uaccess.h | 2 +-
arch/mn10300/kernel/setup.c | 54 +-
arch/powerpc/kernel/pci-common.c | 17 +-
arch/powerpc/platforms/pseries/eeh_cache.c | 4 +-
arch/powerpc/platforms/pseries/eeh_pe.c | 3 +-
arch/x86/kernel/kprobes/core.c | 14 +-
crypto/algboss.c | 15 +-
crypto/api.c | 6 -
crypto/internal.h | 6 +
drivers/acpi/dock.c | 179 ++-
drivers/acpi/internal.h | 5 +
drivers/acpi/scan.c | 1 +
drivers/ata/libata-acpi.c | 37 +-
drivers/ata/libata-core.c | 2 +
drivers/ata/libata.h | 2 +
drivers/block/rbd.c | 14 +-
drivers/bluetooth/btmrvl_main.c | 9 +-
drivers/cpufreq/cpufreq_ondemand.c | 17 +-
drivers/gpio/gpio-omap.c | 22 +-
drivers/gpu/drm/i915/i915_dma.c | 18 +-
drivers/gpu/drm/i915/i915_drv.c | 13 +-
drivers/gpu/drm/i915/i915_drv.h | 5 +-
drivers/gpu/drm/i915/i915_gem.c | 36 +-
drivers/gpu/drm/i915/i915_suspend.c | 1 +
drivers/gpu/drm/i915/intel_ddi.c | 10 +-
drivers/gpu/drm/i915/intel_display.c | 69 +-
drivers/gpu/drm/i915/intel_drv.h | 2 +-
drivers/gpu/drm/i915/intel_lvds.c | 12 +-
drivers/gpu/drm/i915/intel_panel.c | 6 +-
drivers/gpu/drm/i915/intel_pm.c | 8 +-
drivers/gpu/drm/qxl/qxl_ioctl.c | 5 +
drivers/mfd/tps6586x.c | 2 +-
drivers/net/bonding/bond_main.c | 3 +-
drivers/net/can/usb/usb_8dev.c | 5 +-
drivers/net/ethernet/atheros/Kconfig | 18 +
drivers/net/ethernet/atheros/Makefile | 1 +
drivers/net/ethernet/atheros/alx/Makefile | 3 +
drivers/net/ethernet/atheros/alx/alx.h | 114 ++
drivers/net/ethernet/atheros/alx/ethtool.c | 272 ++++
drivers/net/ethernet/atheros/alx/hw.c | 1226 +++++++++++++++
drivers/net/ethernet/atheros/alx/hw.h | 499 ++++++
drivers/net/ethernet/atheros/alx/main.c | 1625 ++++++++++++++++++++
drivers/net/ethernet/atheros/alx/reg.h | 810 ++++++++++
drivers/net/ethernet/broadcom/tg3.c | 36 +
drivers/net/ethernet/freescale/fec_main.c | 14 +
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
drivers/net/ethernet/marvell/pxa168_eth.c | 4 +-
drivers/net/ethernet/mellanox/mlx4/main.c | 3 +
drivers/net/ethernet/octeon/octeon_mgmt.c | 31 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 2 +-
drivers/net/ethernet/renesas/sh_eth.c | 38 +-
drivers/net/ethernet/renesas/sh_eth.h | 2 +-
drivers/net/ethernet/sfc/efx.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/common.h | 4 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 66 +-
drivers/net/ethernet/ti/cpsw.c | 5 +-
drivers/net/ethernet/ti/davinci_cpdma.c | 7 +
drivers/net/hyperv/netvsc_drv.c | 4 +-
drivers/net/macvtap.c | 6 +-
drivers/net/tun.c | 6 +-
drivers/net/usb/qmi_wwan.c | 8 +-
drivers/net/vxlan.c | 40 +-
drivers/net/wan/dlci.c | 26 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +-
drivers/net/wireless/ath/ath9k/xmit.c | 6 +-
.../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 4 +
drivers/net/wireless/brcm80211/brcmsmac/main.c | 17 +-
drivers/net/wireless/iwlegacy/3945-rs.c | 1 +
drivers/net/wireless/iwlegacy/4965-rs.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/rs.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/rxon.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-drv.c | 2 +
drivers/net/wireless/iwlwifi/mvm/rs.c | 1 +
drivers/net/wireless/iwlwifi/mvm/tx.c | 3 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 29 +-
drivers/pci/hotplug/acpiphp_glue.c | 53 +-
drivers/pci/pci.h | 5 +
drivers/pci/setup-bus.c | 8 +-
drivers/regulator/tps6586x-regulator.c | 2 +-
drivers/scsi/fcoe/fcoe.c | 7 +-
drivers/scsi/fcoe/fcoe_ctlr.c | 15 +-
drivers/scsi/ipr.c | 16 -
drivers/scsi/ipr.h | 6 +-
drivers/scsi/libfc/fc_exch.c | 37 +-
drivers/scsi/libfc/fc_rport.c | 2 +-
drivers/scsi/qla2xxx/qla_inline.h | 11 +
drivers/scsi/qla2xxx/qla_isr.c | 27 +-
drivers/scsi/qla2xxx/qla_mbx.c | 2 -
drivers/scsi/qla2xxx/qla_mr.c | 10 +-
drivers/scsi/qla2xxx/qla_nx.c | 26 +-
fs/exec.c | 16 +-
fs/ubifs/dir.c | 54 +-
include/acpi/acpi_drivers.h | 8 +-
include/linux/if_vlan.h | 2 +-
include/linux/netdevice.h | 1 +
include/linux/skbuff.h | 1 +
include/uapi/linux/Kbuild | 1 +
kernel/events/hw_breakpoint.c | 6 +-
kernel/ptrace.c | 20 +-
kernel/time/tick-broadcast.c | 7 +-
net/bluetooth/hci_core.c | 15 +-
net/bluetooth/l2cap_core.c | 5 +-
net/bridge/br_multicast.c | 5 +-
net/core/dev.c | 34 +
net/core/dev_ioctl.c | 19 +-
net/core/ethtool.c | 6 +-
net/core/skbuff.c | 20 +-
net/core/sock.c | 17 +-
net/ipv4/gre.c | 2 +-
net/ipv4/netfilter/ipt_ULOG.c | 12 +-
net/ipv4/tcp_ipv4.c | 4 +-
net/ipv6/addrconf.c | 12 +-
net/ipv6/ip6_output.c | 13 +-
net/ipv6/ndisc.c | 2 +-
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 2 +-
net/key/af_key.c | 2 +
net/mac80211/cfg.c | 6 +
net/mac80211/ieee80211_i.h | 5 +-
net/mac80211/mlme.c | 87 +-
net/mac80211/rate.c | 2 +-
net/mac80211/util.c | 4 +-
net/netfilter/ipvs/ip_vs_core.c | 3 +-
net/netfilter/nf_conntrack_labels.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 1 +
net/netfilter/nf_nat_sip.c | 3 +-
net/netfilter/xt_TCPMSS.c | 25 +-
net/netfilter/xt_TCPOPTSTRIP.c | 6 +-
net/wireless/nl80211.c | 11 +-
141 files changed, 5697 insertions(+), 613 deletions(-)
create mode 100644 drivers/net/ethernet/atheros/alx/Makefile
create mode 100644 drivers/net/ethernet/atheros/alx/alx.h
create mode 100644 drivers/net/ethernet/atheros/alx/ethtool.c
create mode 100644 drivers/net/ethernet/atheros/alx/hw.c
create mode 100644 drivers/net/ethernet/atheros/alx/hw.h
create mode 100644 drivers/net/ethernet/atheros/alx/main.c
create mode 100644 drivers/net/ethernet/atheros/alx/reg.h
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch