drm-intel-next
Hi Dave,
The big ticket item here is the new i915 modeset infrastructure. Shockingly it didn't not blow up all over the place (i.e. I've managed to fix the ugly issues before merging). 1-2 smaller corner cases broke, but we have patches. Also, there's tons of patches on top of this that clean out cruft and fix a few bugs that couldn't be fixed with the crtc helper based stuff. So more stuff to come ;-)
Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the forcewake magic.
- a few smaller cleanups
Cheers, Daniel
The following changes since commit d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:
drm/i915: Remove __GFP_NO_KSWAPD (2012-08-27 17:11:38 +0200)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-09-09
for you to fetch changes up to e04190e0ecb236c51af181c18c545ea076fb9cca:
drm/fb helper: don't call drm_helper_connector_dpms directly (2012-09-08 00:51:15 +0200)
----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout drm/i915: use cpu_relax() in wait_for_atomic drm/i915: Change forcewake timeout to 2ms drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff without CONFIG_PM
Chris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings to for_each_ring()
Daniel Vetter (66):
drm/ips: move drps/ips/ilk related variables into dev_priv->ips drm/i915: add a tracepoint for gpu frequency changes drm/i915: align vlv forcewake with common lore
drm/i915: differ error message between forcwake timeouts drm/i915: add crtc->enable/disable vfuncs insted of dpms drm/i915: rip out crtc prepare/commit indirection drm/i915: add direct encoder disable/enable infrastructure drm/i915/hdmi: convert to encoder->disable/enable drm/i915/tv: convert to encoder enable/disable drm/i915/lvds: convert to encoder disable/enable drm/i915/dp: convert to encoder disable/enable drm/i915/crt: convert to encoder disable/enable drm/i915/sdvo: convert to encoder disable/enable drm/i915/dvo: convert to encoder disable/enable
drm/i915: convert dpms functions of dvo/sdvo/crt
drm/i915: rip out encoder->disable/enable checks
drm/i915: clean up encoder_prepare/commit
drm/i915: copy&paste drm_crtc_helper_set_config
drm/i915: call set_base directly
drm/i915: inline intel_best_encoder
drm/i915: copy&paste drm_crtc_helper_set_mode
drm/i915: simplify intel_crtc_prepare_encoders
drm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc drm/i915: Add interfaces to read out encoder/connector hw state drm/i915/dp: implement get_hw_state
drm/i915/hdmi: implement get_hw_state
drm/i915/tv: implement get_hw_state
drm/i915/lvds: implement get_hw_state
drm/i915/crt: implement get_hw_state
drm/i915/sdvo: implement get_hw_state
drm/i915/dvo: implement get_hw_state
drm/i915: read out the modeset hw state at load and resume time drm/i915: check connector hw/sw state
drm/i915: rip out intel_crtc->dpms_mode
drm/i915: rip out intel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed drm/i915: introduce struct intel_set_config
drm/i915: extract modeset config save/restore code drm/i915: extract intel_set_config_compute_mode_changes drm/i915: extract intel_set_config_update_output_state drm/i915: implement crtc helper semantics relied upon by the fb helper drm/i915: don't update the fb base if there is no fb drm/i915: convert pointless error checks in set_config to BUGs drm/i915: don't save all the encoder/crtc state in set_config drm/i915: stage modeset output changes
drm/i915: push crtc->fb update into pipe_set_base drm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling into set_mode drm/i915: extract adjusted mode computation
drm/i915: use staged outuput config in tv->mode_fixup drm/i915: use staged outuput config in lvds->mode_fixup drm/i915: compute masks of crtcs affected in set_mode drm/i915: implement new set_mode code flow
drm/i915: push commit_output_state past crtc disabling drm/i915: s/intel_encoder_disable/intel_encoder_noop drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config drm/i915: push commit_output_state past the crtc/encoder preparing drm/i915: disable all crtcs at suspend time
drm/i915: no longer call drm_helper_resume_force_mode drm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls Merge the modeset-rework, basic conversion into drm-intel-next drm/fb helper: don't call drm_helper_connector_dpms directly
Jani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed drm/i915: fix sdvo hotplug support check and activation
Paulo Zanoni (3):
drm/i915: add gen7_render_ring_flush
drm/i915: add workarounds directly to gen6_render_ring_flush drm/i915: add workarounds to gen7_render_ring_flush
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Hi Daniel,
This tree gives me recursive dependency problems, which ends up removing a big (& important) part of my .config:
[bpowers@fina linux]$ git reset --hard drm-intel-next-2012-09-09 HEAD is now at e04190e drm/fb helper: don't call drm_helper_connector_dpms directly
[bpowers@fina linux]$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 207 and 323 different commits each, respectively. # nothing to commit (working directory clean) [bpowers@fina linux]$ make oldconfig scripts/kconfig/conf --oldconfig Kconfig drivers/gpu/drm/udl/Kconfig:1:error: recursive dependency detected! drivers/gpu/drm/udl/Kconfig:1: symbol DRM_UDL depends on USB_ARCH_HAS_HCD drivers/usb/Kconfig:76: symbol USB_ARCH_HAS_HCD depends on USB_SUPPORT drivers/usb/Kconfig:58: symbol USB_SUPPORT is selected by DRM_USB drivers/gpu/drm/Kconfig:22: symbol DRM_USB is selected by DRM_UDL # # configuration written to .config #
I've attached my config & the diff between what is attached and the result of make oldconfig. Let me know if there is any other info that would help, or if I'm just doing something boneheaded. Thanks!
yours,
Bobby
Quoted 124 lines · Daniel Vetter
Hi Dave,
The big ticket item here is the new i915 modeset infrastructure. Shockingly it didn't not blow up all over the place (i.e. I've managed to fix the ugly issues before merging). 1-2 smaller corner cases broke, but we have patches. Also, there's tons of patches on top of this that clean out cruft and fix a few bugs that couldn't be fixed with the crtc helper based stuff. So more stuff to come ;-)
Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the forcewake magic.
- a few smaller cleanupsCheers, Daniel
The following changes since commit
d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:drm/i915: Remove
__GFP_NO_KSWAPD(2012-08-27 17:11:38 +0200)are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-inteltags/drm-intel-next-2012-09-09for you to fetch changes up to
e04190e0ecb236c51af181c18c545ea076fb9cca:drm/fb helper: don't call
drm_helper_connector_dpmsdirectly (2012-09-08 00:51:15 +0200)----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout drm/i915: usecpu_relax()inwait_for_atomicdrm/i915: Change forcewake timeout to 2ms drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff withoutCONFIG_PMChris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings tofor_each_ring()Daniel Vetter (66):
drm/ips: move drps/ips/ilk related variables intodev_priv->ipsdrm/i915: add a tracepoint for gpu frequency changes drm/i915: align vlv forcewake with common lore
drm/i915: differ error message between forcwake timeouts drm/i915: add crtc->enable/disable vfuncs insted of dpms drm/i915: rip out crtc prepare/commit indirection drm/i915: add direct encoder disable/enable infrastructure drm/i915/hdmi: convert to encoder->disable/enable drm/i915/tv: convert to encoder enable/disable drm/i915/lvds: convert to encoder disable/enable drm/i915/dp: convert to encoder disable/enable drm/i915/crt: convert to encoder disable/enable drm/i915/sdvo: convert to encoder disable/enable drm/i915/dvo: convert to encoder disable/enable
drm/i915: convert dpms functions of dvo/sdvo/crt
drm/i915: rip out encoder->disable/enable checks
drm/i915: clean up encoder_prepare/commit
drm/i915: copy&pastedrm_crtc_helper_set_config
drm/i915: callset_basedirectly
drm/i915: inlineintel_best_encoder
drm/i915: copy&pastedrm_crtc_helper_set_mode
drm/i915: simplifyintel_crtc_prepare_encoders
drm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc drm/i915: Add interfaces to read out encoder/connector hw state drm/i915/dp: implementget_hw_state
drm/i915/hdmi: implementget_hw_state
drm/i915/tv: implementget_hw_state
drm/i915/lvds: implementget_hw_state
drm/i915/crt: implementget_hw_state
drm/i915/sdvo: implementget_hw_state
drm/i915/dvo: implementget_hw_state
drm/i915: read out the modeset hw state at load and resume time drm/i915: check connector hw/sw state
drm/i915: rip outintel_crtc->dpms_mode
drm/i915: rip outintel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed drm/i915: introduce structintel_set_config
drm/i915: extract modeset config save/restore code drm/i915: extractintel_set_config_compute_mode_changesdrm/i915: extractintel_set_config_update_output_statedrm/i915: implement crtc helper semantics relied upon by the fb helper drm/i915: don't update the fb base if there is no fb drm/i915: convert pointless error checks inset_configto BUGs drm/i915: don't save all the encoder/crtc state inset_configdrm/i915: stage modeset output changes
drm/i915: pushcrtc->fbupdate intopipe_set_basedrm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling intoset_modedrm/i915: extract adjusted mode computation
drm/i915: use staged outuput config intv->mode_fixupdrm/i915: use staged outuput config inlvds->mode_fixupdrm/i915: compute masks of crtcs affected inset_modedrm/i915: implement newset_modecode flow
drm/i915: pushcommit_output_statepast crtc disabling drm/i915: s/intel_encoder_disable/intel_encoder_noop drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config drm/i915: pushcommit_output_statepast the crtc/encoder preparing drm/i915: disable all crtcs at suspend time
drm/i915: no longer calldrm_helper_resume_force_modedrm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls Merge the modeset-rework, basic conversion into drm-intel-next drm/fb helper: don't calldrm_helper_connector_dpmsdirectlyJani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed drm/i915: fix sdvo hotplug support check and activationPaulo Zanoni (3):
drm/i915: addgen7_render_ring_flush
drm/i915: add workarounds directly togen6_render_ring_flushdrm/i915: add workarounds togen7_render_ring_flush
Quoted 8 lines
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
.config renamed from .config_36_PERFORMANCE +4 -313
@@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.0-rc5 Kernel Configuration +# Linux/x86_64 3.6.0-rc3 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set
@@ -1011,15 +1011,10 @@ CONFIG_BT_HIDP=y # # Bluetooth device drivers # -CONFIG_BT_HCIBTUSB=y # CONFIG_BT_HCIBTSDIO is not set # CONFIG_BT_HCIUART is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIVHCI is not set # CONFIG_BT_MRVL is not set -# CONFIG_BT_ATH3K is not set # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y
@@ -1116,7 +1111,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_NBD=y # CONFIG_BLK_DEV_NVME is not set # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set
@@ -1513,53 +1507,12 @@ CONFIG_FIXED_PHY=y # CONFIG_MDIO_BITBANG is not set # CONFIG_PPP is not set # CONFIG_SLIP is not set - -# -# USB Network Adapters -# -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_CDC_NCM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SMSC75XX=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -# CONFIG_USB_KC2190 is not set -# CONFIG_USB_NET_ZAURUS is not set -CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_KALMIA=m -# CONFIG_USB_NET_QMI_WWAN is not set -CONFIG_USB_HSO=m -CONFIG_USB_NET_INT51X1=m -CONFIG_USB_IPHETH=m -# CONFIG_USB_SIERRA_NET is not set -# CONFIG_USB_VL600 is not set CONFIG_WLAN=y # CONFIG_LIBERTAS_THINFIRM is not set # CONFIG_AIRO is not set # CONFIG_ATMEL is not set -# CONFIG_AT76C50X_USB is not set # CONFIG_PRISM54 is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_RTL8180 is not set -# CONFIG_RTL8187 is not set # CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set # CONFIG_MWL8K is not set
@@ -1591,9 +1544,7 @@ CONFIG_IWLWIFI_DEVICE_TESTMODE=y # CONFIG_RTL8192CE is not set # CONFIG_RTL8192SE is not set # CONFIG_RTL8192DE is not set -# CONFIG_RTL8192CU is not set # CONFIG_WL_TI is not set -# CONFIG_ZD1211RW is not set # CONFIG_MWIFIEX is not set #
@@ -1660,12 +1611,9 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y # CONFIG_MOUSE_PS2_TOUCHKIT is not set # CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_APPLETOUCH is not set -# CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOUSE_GPIO is not set # CONFIG_MOUSE_SYNAPTICS_I2C is not set -# CONFIG_MOUSE_SYNAPTICS_USB is not set CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ANALOG is not set # CONFIG_JOYSTICK_A3D is not set
@@ -1688,16 +1636,7 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -CONFIG_JOYSTICK_XPAD=y -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y CONFIG_INPUT_TABLET=y -# CONFIG_TABLET_USB_ACECAD is not set -# CONFIG_TABLET_USB_AIPTEK is not set -# CONFIG_TABLET_USB_GTCO is not set -# CONFIG_TABLET_USB_HANWANG is not set -# CONFIG_TABLET_USB_KBTAB is not set -# CONFIG_TABLET_USB_WACOM is not set CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
@@ -1726,7 +1665,6 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC_SERIO is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set
@@ -1741,12 +1679,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_GP2A is not set # CONFIG_INPUT_GPIO_TILT_POLLED is not set # CONFIG_INPUT_ATLAS_BTNS is not set -# CONFIG_INPUT_ATI_REMOTE2 is not set -# CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_KXTJ9 is not set -# CONFIG_INPUT_POWERMATE is not set -# CONFIG_INPUT_YEALINK is not set -# CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
@@ -1896,10 +1829,8 @@ CONFIG_I2C_I801=y # # External I2C/SMBus adapter drivers # -# CONFIG_I2C_DIOLAN_U2C is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set # # Other I2C/SMBus bus drivers
@@ -2156,11 +2087,6 @@ CONFIG_ITCO_VENDOR_SUPPORT=y # # CONFIG_PCIPCWATCHDOG is not set # CONFIG_WDTPCI is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set CONFIG_SSB_POSSIBLE=y #
@@ -2262,7 +2188,6 @@ CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=1 # CONFIG_VGA_SWITCHEROO is not set CONFIG_DRM=y -CONFIG_DRM_USB=y CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set # CONFIG_DRM_TDFX is not set
@@ -2284,7 +2209,6 @@ CONFIG_DRM_I915_KMS=y # CONFIG_DRM_SAVAGE is not set # CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_GMA500 is not set -CONFIG_DRM_UDL=y # CONFIG_DRM_AST is not set # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_CIRRUS_QEMU is not set
@@ -2299,13 +2223,12 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_SYS_FOPS is not set # CONFIG_FB_WMT_GE_ROPS is not set -CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set
@@ -2351,8 +2274,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_TMIO is not set -# CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set
@@ -2511,7 +2432,6 @@ CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 # CONFIG_SND_VIRTUOSO is not set # CONFIG_SND_VX222 is not set # CONFIG_SND_YMFPCI is not set -# CONFIG_SND_USB is not set # CONFIG_SND_SOC is not set # CONFIG_SOUND_PRIME is not set
@@ -2527,241 +2447,28 @@ CONFIG_HID_GENERIC=y # # Special HID drivers # -# CONFIG_HID_A4TECH is not set -# CONFIG_HID_ACRUX is not set # CONFIG_HID_APPLE is not set -# CONFIG_HID_AUREAL is not set -# CONFIG_HID_BELKIN is not set -# CONFIG_HID_CHERRY is not set -# CONFIG_HID_CHICONY is not set -# CONFIG_HID_PRODIKEYS is not set -# CONFIG_HID_CYPRESS is not set -# CONFIG_HID_DRAGONRISE is not set -# CONFIG_HID_EMS_FF is not set # CONFIG_HID_ELECOM is not set -# CONFIG_HID_EZKEY is not set -# CONFIG_HID_HOLTEK is not set -# CONFIG_HID_KEYTOUCH is not set -# CONFIG_HID_KYE is not set -# CONFIG_HID_UCLOGIC is not set -# CONFIG_HID_WALTOP is not set -# CONFIG_HID_GYRATION is not set -# CONFIG_HID_TWINHAN is not set -# CONFIG_HID_KENSINGTON is not set -# CONFIG_HID_LCPOWER is not set -CONFIG_HID_LENOVO_TPKBD=y -# CONFIG_HID_LOGITECH is not set # CONFIG_HID_MAGICMOUSE is not set -# CONFIG_HID_MICROSOFT is not set -# CONFIG_HID_MONTEREY is not set -# CONFIG_HID_MULTITOUCH is not set -# CONFIG_HID_NTRIG is not set -# CONFIG_HID_ORTEK is not set -# CONFIG_HID_PANTHERLORD is not set -# CONFIG_HID_PETALYNX is not set -# CONFIG_HID_PICOLCD is not set -# CONFIG_HID_PRIMAX is not set -# CONFIG_HID_ROCCAT is not set -# CONFIG_HID_SAITEK is not set -# CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set -# CONFIG_HID_SPEEDLINK is not set -# CONFIG_HID_SUNPLUS is not set -# CONFIG_HID_GREENASIA is not set -# CONFIG_HID_SMARTJOYPLUS is not set # CONFIG_HID_TIVO is not set -# CONFIG_HID_TOPSEED is not set -# CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set # CONFIG_HID_WIIMOTE is not set -# CONFIG_HID_ZEROPLUS is not set -# CONFIG_HID_ZYDACRON is not set - -# -# USB HID support -# -CONFIG_USB_HID=y -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=y -# CONFIG_USB_DEBUG is not set -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -# CONFIG_USB_DYNAMIC_MINORS is not set -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_MON=y -# CONFIG_USB_WUSB_CBAF is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=y -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_ISP1760_HCD is not set -# CONFIG_USB_ISP1362_HCD is not set -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_HCD_PLATFORM is not set -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=y -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HCD_SSB is not set -# CONFIG_USB_CHIPIDEA is not set - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -# CONFIG_USB_PRINTER is not set -# CONFIG_USB_WDM is not set -# CONFIG_USB_TMC is not set # # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=y -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_REALTEK is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_ONETOUCH is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -# CONFIG_USB_STORAGE_ENE_UB6250 is not set -CONFIG_USB_UAS=y -# CONFIG_USB_LIBUSUAL is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set - -# -# USB port drivers -# -CONFIG_USB_SERIAL=y -CONFIG_USB_SERIAL_CONSOLE=y -CONFIG_USB_EZUSB=y -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_CP210X is not set -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -# CONFIG_USB_SERIAL_FUNSOFT is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_F81232 is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_METRO is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MOTOROLA is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_QCAUX is not set -# CONFIG_USB_SERIAL_QUALCOMM is not set -# CONFIG_USB_SERIAL_SPCP8X5 is not set -# CONFIG_USB_SERIAL_HP4X is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_SIEMENS_MPI is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_SYMBOL is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OPTION is not set -# CONFIG_USB_SERIAL_OMNINET is not set -# CONFIG_USB_SERIAL_OPTICON is not set -# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set -# CONFIG_USB_SERIAL_ZIO is not set -# CONFIG_USB_SERIAL_SSU100 is not set -# CONFIG_USB_SERIAL_QT2 is not set -# CONFIG_USB_SERIAL_DEBUG is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_YUREX is not set - -# -# USB Physical Layer drivers -# -# CONFIG_USB_ISP1301 is not set # CONFIG_USB_GADGET is not set # # OTG and related infrastructure # -# CONFIG_USB_GPIO_VBUS is not set -# CONFIG_NOP_USB_XCEIV is not set # CONFIG_UWB is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set
@@ -2788,8 +2495,6 @@ CONFIG_MMC_RICOH_MMC=y # CONFIG_MMC_TIFM_SD is not set CONFIG_MMC_CB710=y # CONFIG_MMC_VIA_SDMMC is not set -# CONFIG_MMC_VUB300 is not set -# CONFIG_MMC_USHC is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y
@@ -2952,32 +2657,19 @@ CONFIG_VIRTIO_MMIO=y CONFIG_STAGING=y # CONFIG_ET131X is not set # CONFIG_SLICOSS is not set -# CONFIG_USBIP_CORE is not set -# CONFIG_W35UND is not set -# CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_COMEDI is not set -# CONFIG_ASUS_OLED is not set # CONFIG_R8187SE is not set -# CONFIG_RTL8192U is not set # CONFIG_RTLLIB is not set -# CONFIG_R8712U is not set # CONFIG_RTS_PSTOR is not set -# CONFIG_RTS5139 is not set -# CONFIG_TRANZPORT is not set # CONFIG_IDE_PHISON is not set -# CONFIG_LINE6_USB is not set -# CONFIG_USB_SERIAL_QUATECH2 is not set # CONFIG_VT6655 is not set -# CONFIG_VT6656 is not set # CONFIG_DX_SEP is not set # CONFIG_ZSMALLOC is not set # CONFIG_FB_SM7XX is not set # CONFIG_CRYSTALHD is not set # CONFIG_FB_XGI is not set # CONFIG_ACPI_QUICKSTART is not set -# CONFIG_USB_ENESTORAGE is not set -# CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set #
@@ -2994,7 +2686,6 @@ CONFIG_STAGING=y # CONFIG_ANDROID is not set # CONFIG_PHONE is not set # CONFIG_RAMSTER is not set -# CONFIG_USB_WPAN_HCD is not set # CONFIG_IPACK_BUS is not set # CONFIG_WIMAX_GDM72XX is not set # CONFIG_CSR_WIFI is not set
Quoted 9 lines · Bobby Powers
This tree gives me recursive dependency problems, which ends up removing a big (& important) part of my .config:
[bpowers@fina linux]$ git reset --hard drm-intel-next-2012-09-09 HEAD is now at e04190e drm/fb helper: don't call
drm_helper_connector_dpmsdirectly
[bpowers@fina linux]$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
Quoted 13 lines
# and have 207 and 323 different commits each, respectively. # nothing to commit (working directory clean) [bpowers@fina linux]$ make oldconfig scripts/kconfig/conf --oldconfig Kconfig drivers/gpu/drm/udl/Kconfig:1:error: recursive dependency detected! drivers/gpu/drm/udl/Kconfig:1: symbol DRM_UDL depends on USB_ARCH_HAS_HCD drivers/usb/Kconfig:76: symbol USB_ARCH_HAS_HCD depends on USB_SUPPORT drivers/usb/Kconfig:58: symbol USB_SUPPORT is selected by DRM_USB drivers/gpu/drm/Kconfig:22: symbol DRM_USB is selected by DRM_UDL # # configuration written to .config #
That's an issue with Dave Airlie's udl code I'd say - the drm-intel-next tree here simply includes a few drm-next patches already. Dave? -Daniel
Quoted 142 lines
I've attached my config & the diff between what is attached and the result of make oldconfig. Let me know if there is any other info that would help, or if I'm just doing something boneheaded. Thanks!
yours,
BobbyQuoted 132 lines · Daniel Vetter
Hi Dave,
The big ticket item here is the new i915 modeset infrastructure. Shockingly it didn't not blow up all over the place (i.e. I've managed to fix the ugly issues before merging). 1-2 smaller corner cases broke, but we have patches. Also, there's tons of patches on top of this that clean out cruft and fix a few bugs that couldn't be fixed with the crtc helper based stuff. So more stuff to come ;-)
Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the forcewake magic.
- a few smaller cleanupsCheers, Daniel
The following changes since commit
d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:drm/i915: Remove
__GFP_NO_KSWAPD(2012-08-27 17:11:38 +0200)are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-inteltags/drm-intel-next-2012-09-09for you to fetch changes up to
e04190e0ecb236c51af181c18c545ea076fb9cca:drm/fb helper: don't call
drm_helper_connector_dpmsdirectly (2012-09-08 00:51:15 +0200)----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout drm/i915: usecpu_relax()inwait_for_atomicdrm/i915: Change forcewake timeout to 2ms drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff withoutCONFIG_PMChris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings tofor_each_ring()Daniel Vetter (66):
drm/ips: move drps/ips/ilk related variables intodev_priv->ipsdrm/i915: add a tracepoint for gpu frequency changes drm/i915: align vlv forcewake with common lore
drm/i915: differ error message between forcwake timeouts drm/i915: add crtc->enable/disable vfuncs insted of dpms drm/i915: rip out crtc prepare/commit indirection drm/i915: add direct encoder disable/enable infrastructure drm/i915/hdmi: convert to encoder->disable/enable drm/i915/tv: convert to encoder enable/disable drm/i915/lvds: convert to encoder disable/enable drm/i915/dp: convert to encoder disable/enable drm/i915/crt: convert to encoder disable/enable drm/i915/sdvo: convert to encoder disable/enable drm/i915/dvo: convert to encoder disable/enable
drm/i915: convert dpms functions of dvo/sdvo/crt
drm/i915: rip out encoder->disable/enable checks
drm/i915: clean up encoder_prepare/commit
drm/i915: copy&pastedrm_crtc_helper_set_config
drm/i915: callset_basedirectly
drm/i915: inlineintel_best_encoder
drm/i915: copy&pastedrm_crtc_helper_set_mode
drm/i915: simplifyintel_crtc_prepare_encoders
drm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc drm/i915: Add interfaces to read out encoder/connector hw state drm/i915/dp: implementget_hw_state
drm/i915/hdmi: implementget_hw_state
drm/i915/tv: implementget_hw_state
drm/i915/lvds: implementget_hw_state
drm/i915/crt: implementget_hw_state
drm/i915/sdvo: implementget_hw_state
drm/i915/dvo: implementget_hw_state
drm/i915: read out the modeset hw state at load and resume time drm/i915: check connector hw/sw state
drm/i915: rip outintel_crtc->dpms_mode
drm/i915: rip outintel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed drm/i915: introduce structintel_set_config
drm/i915: extract modeset config save/restore code drm/i915: extractintel_set_config_compute_mode_changesdrm/i915: extractintel_set_config_update_output_statedrm/i915: implement crtc helper semantics relied upon by the fb helper drm/i915: don't update the fb base if there is no fb drm/i915: convert pointless error checks inset_configto BUGs drm/i915: don't save all the encoder/crtc state inset_configdrm/i915: stage modeset output changes
drm/i915: pushcrtc->fbupdate intopipe_set_basedrm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling intoset_modedrm/i915: extract adjusted mode computation
drm/i915: use staged outuput config intv->mode_fixupdrm/i915: use staged outuput config inlvds->mode_fixupdrm/i915: compute masks of crtcs affected inset_modedrm/i915: implement newset_modecode flow
drm/i915: pushcommit_output_statepast crtc disabling drm/i915: s/intel_encoder_disable/intel_encoder_noop drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config drm/i915: pushcommit_output_statepast the crtc/encoder preparing drm/i915: disable all crtcs at suspend time
drm/i915: no longer calldrm_helper_resume_force_modedrm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls Merge the modeset-rework, basic conversion into drm-intel-next drm/fb helper: don't calldrm_helper_connector_dpmsdirectlyJani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed drm/i915: fix sdvo hotplug support check and activationPaulo Zanoni (3):
drm/i915: addgen7_render_ring_flush
drm/i915: add workarounds directly togen6_render_ring_flushdrm/i915: add workarounds togen7_render_ring_flush--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Hi
2012/9/14 Daniel Vetter <[email protected]>:
Quoted 15 lines · Bobby Powers
Quoted 14 lines
This tree gives me recursive dependency problems, which ends up removing a big (& important) part of my .config:
[bpowers@fina linux]$ git reset --hard drm-intel-next-2012-09-09 HEAD is now at e04190e drm/fb helper: don't call
drm_helper_connector_dpmsdirectly
[bpowers@fina linux]$ git status
# On branch master
# Your branch and 'origin/master' have diverged,# and have 207 and 323 different commits each, respectively. # nothing to commit (working directory clean) [bpowers@fina linux]$ make oldconfig scripts/kconfig/conf --oldconfig Kconfig
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/udl/Kconfig:1:error: recursive dependency detected!
drivers/gpu/drm/udl/Kconfig:1: symbolDRM_UDLdepends onUSB_ARCH_HAS_HCDdrivers/usb/Kconfig:76: symbol USB_ARCH_HAS_HCD depends on USB_SUPPORT drivers/usb/Kconfig:58: symbol USB_SUPPORT is selected by DRM_USB drivers/gpu/drm/Kconfig:22: symbol DRM_USB is selected by DRM_UDL # # configuration written to .config #
You want this: http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-next&id=95ca19cf8cbf6163805dc9dc6a83f73b3e75ea13
Quoted 158 lines
That's an issue with Dave Airlie's udl code I'd say - the drm-intel-next tree here simply includes a few drm-next patches already. Dave? -Daniel
Quoted 142 lines
I've attached my config & the diff between what is attached and the result of make oldconfig. Let me know if there is any other info that would help, or if I'm just doing something boneheaded. Thanks!
yours,
BobbyQuoted 132 lines · Daniel Vetter
Hi Dave,
The big ticket item here is the new i915 modeset infrastructure. Shockingly it didn't not blow up all over the place (i.e. I've managed to fix the ugly issues before merging). 1-2 smaller corner cases broke, but we have patches. Also, there's tons of patches on top of this that clean out cruft and fix a few bugs that couldn't be fixed with the crtc helper based stuff. So more stuff to come ;-)
Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the forcewake magic.
- a few smaller cleanupsCheers, Daniel
The following changes since commit
d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:drm/i915: Remove
__GFP_NO_KSWAPD(2012-08-27 17:11:38 +0200)are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-inteltags/drm-intel-next-2012-09-09for you to fetch changes up to
e04190e0ecb236c51af181c18c545ea076fb9cca:drm/fb helper: don't call
drm_helper_connector_dpmsdirectly (2012-09-08 00:51:15 +0200)----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout drm/i915: usecpu_relax()inwait_for_atomicdrm/i915: Change forcewake timeout to 2ms drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff withoutCONFIG_PMChris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings tofor_each_ring()Daniel Vetter (66):
drm/ips: move drps/ips/ilk related variables intodev_priv->ipsdrm/i915: add a tracepoint for gpu frequency changes drm/i915: align vlv forcewake with common lore
drm/i915: differ error message between forcwake timeouts drm/i915: add crtc->enable/disable vfuncs insted of dpms drm/i915: rip out crtc prepare/commit indirection drm/i915: add direct encoder disable/enable infrastructure drm/i915/hdmi: convert to encoder->disable/enable drm/i915/tv: convert to encoder enable/disable drm/i915/lvds: convert to encoder disable/enable drm/i915/dp: convert to encoder disable/enable drm/i915/crt: convert to encoder disable/enable drm/i915/sdvo: convert to encoder disable/enable drm/i915/dvo: convert to encoder disable/enable
drm/i915: convert dpms functions of dvo/sdvo/crt
drm/i915: rip out encoder->disable/enable checks
drm/i915: clean up encoder_prepare/commit
drm/i915: copy&pastedrm_crtc_helper_set_config
drm/i915: callset_basedirectly
drm/i915: inlineintel_best_encoder
drm/i915: copy&pastedrm_crtc_helper_set_mode
drm/i915: simplifyintel_crtc_prepare_encoders
drm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc drm/i915: Add interfaces to read out encoder/connector hw state drm/i915/dp: implementget_hw_state
drm/i915/hdmi: implementget_hw_state
drm/i915/tv: implementget_hw_state
drm/i915/lvds: implementget_hw_state
drm/i915/crt: implementget_hw_state
drm/i915/sdvo: implementget_hw_state
drm/i915/dvo: implementget_hw_state
drm/i915: read out the modeset hw state at load and resume time drm/i915: check connector hw/sw state
drm/i915: rip outintel_crtc->dpms_mode
drm/i915: rip outintel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed drm/i915: introduce structintel_set_config
drm/i915: extract modeset config save/restore code drm/i915: extractintel_set_config_compute_mode_changesdrm/i915: extractintel_set_config_update_output_statedrm/i915: implement crtc helper semantics relied upon by the fb helper drm/i915: don't update the fb base if there is no fb drm/i915: convert pointless error checks inset_configto BUGs drm/i915: don't save all the encoder/crtc state inset_configdrm/i915: stage modeset output changes
drm/i915: pushcrtc->fbupdate intopipe_set_basedrm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling intoset_modedrm/i915: extract adjusted mode computation
drm/i915: use staged outuput config intv->mode_fixupdrm/i915: use staged outuput config inlvds->mode_fixupdrm/i915: compute masks of crtcs affected inset_modedrm/i915: implement newset_modecode flow
drm/i915: pushcommit_output_statepast crtc disabling drm/i915: s/intel_encoder_disable/intel_encoder_noop drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config drm/i915: pushcommit_output_statepast the crtc/encoder preparing drm/i915: disable all crtcs at suspend time
drm/i915: no longer calldrm_helper_resume_force_modedrm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls Merge the modeset-rework, basic conversion into drm-intel-next drm/fb helper: don't calldrm_helper_connector_dpmsdirectlyJani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed drm/i915: fix sdvo hotplug support check and activationPaulo Zanoni (3):
drm/i915: addgen7_render_ring_flush
drm/i915: add workarounds directly togen6_render_ring_flushdrm/i915: add workarounds togen7_render_ring_flush--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 1 line
Paulo Zanoni
Quoted 9 lines · Daniel Vetter
Hi Dave,
The big ticket item here is the new i915 modeset infrastructure. Shockingly it didn't not blow up all over the place (i.e. I've managed to fix the ugly issues before merging). 1-2 smaller corner cases broke, but we have patches. Also, there's tons of patches on top of this that clean out cruft and fix a few bugs that couldn't be fixed with the crtc helper based stuff. So more stuff to come ;-)
Quoted 10 lines
Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the forcewake magic.
- a few smaller cleanups
Updated pull request with the 2 bugfixers cherry-picked from my -next queue on top. Since I'll be travelling around for the next two weeks, rebasing things around will take a bit longer.
Cheers, Daniel
The following changes since commit 85f9e50d815a70780699752c4f2dc1198c2c0b61:
drm/i915: move i915_get_extra_insdone out of CONFIG_DEBUG_FS block (2012-09-03 18:06:37 +1000)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel for-airlied
for you to fetch changes up to 3b7a89fce3e3dc96b549d6d829387b4439044d0d:
drm/i915: fix OOPS in lid_notify (2012-09-18 00:59:37 +0200)
----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout drm/i915: use cpu_relax() in wait_for_atomic drm/i915: Change forcewake timeout to 2ms drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff without CONFIG_PM
Chris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings to for_each_ring()
Daniel Vetter (68):
drm/ips: move drps/ips/ilk related variables into dev_priv->ips drm/i915: add a tracepoint for gpu frequency changes drm/i915: align vlv forcewake with common lore
drm/i915: differ error message between forcwake timeouts drm/i915: add crtc->enable/disable vfuncs insted of dpms drm/i915: rip out crtc prepare/commit indirection drm/i915: add direct encoder disable/enable infrastructure drm/i915/hdmi: convert to encoder->disable/enable drm/i915/tv: convert to encoder enable/disable drm/i915/lvds: convert to encoder disable/enable drm/i915/dp: convert to encoder disable/enable drm/i915/crt: convert to encoder disable/enable drm/i915/sdvo: convert to encoder disable/enable drm/i915/dvo: convert to encoder disable/enable
drm/i915: convert dpms functions of dvo/sdvo/crt
drm/i915: rip out encoder->disable/enable checks
drm/i915: clean up encoder_prepare/commit
drm/i915: copy&paste drm_crtc_helper_set_config
drm/i915: call set_base directly
drm/i915: inline intel_best_encoder
drm/i915: copy&paste drm_crtc_helper_set_mode
drm/i915: simplify intel_crtc_prepare_encoders
drm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc drm/i915: Add interfaces to read out encoder/connector hw state drm/i915/dp: implement get_hw_state
drm/i915/hdmi: implement get_hw_state
drm/i915/tv: implement get_hw_state
drm/i915/lvds: implement get_hw_state
drm/i915/crt: implement get_hw_state
drm/i915/sdvo: implement get_hw_state
drm/i915/dvo: implement get_hw_state
drm/i915: read out the modeset hw state at load and resume time drm/i915: check connector hw/sw state
drm/i915: rip out intel_crtc->dpms_mode
drm/i915: rip out intel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed drm/i915: introduce struct intel_set_config
drm/i915: extract modeset config save/restore code drm/i915: extract intel_set_config_compute_mode_changes drm/i915: extract intel_set_config_update_output_state drm/i915: implement crtc helper semantics relied upon by the fb helper drm/i915: don't update the fb base if there is no fb drm/i915: convert pointless error checks in set_config to BUGs drm/i915: don't save all the encoder/crtc state in set_config drm/i915: stage modeset output changes
drm/i915: push crtc->fb update into pipe_set_base drm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling into set_mode drm/i915: extract adjusted mode computation
drm/i915: use staged outuput config in tv->mode_fixup drm/i915: use staged outuput config in lvds->mode_fixup drm/i915: compute masks of crtcs affected in set_mode drm/i915: implement new set_mode code flow
drm/i915: push commit_output_state past crtc disabling drm/i915: s/intel_encoder_disable/intel_encoder_noop drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config drm/i915: push commit_output_state past the crtc/encoder preparing drm/i915: disable all crtcs at suspend time
drm/i915: no longer call drm_helper_resume_force_mode drm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls Merge the modeset-rework, basic conversion into drm-intel-next drm/fb helper: don't call drm_helper_connector_dpms directly drm/i915: correctly update crtc->x/y in set_base
drm/i915: fix OOPS in lid_notify
Jani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed drm/i915: fix sdvo hotplug support check and activation
Paulo Zanoni (3):
drm/i915: add gen7_render_ring_flush
drm/i915: add workarounds directly to gen6_render_ring_flush drm/i915: add workarounds to gen7_render_ring_flush
drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/i915/dvo.h | 6 + drivers/gpu/drm/i915/dvo_ch7017.c | 13 + drivers/gpu/drm/i915/dvo_ch7xxx.c | 13 + drivers/gpu/drm/i915/dvo_ivch.c | 15 + drivers/gpu/drm/i915/dvo_ns2501.c | 15 + drivers/gpu/drm/i915/dvo_sil164.c | 16 + drivers/gpu/drm/i915/dvo_tfp410.c | 14 + drivers/gpu/drm/i915/i915_debugfs.c | 54 +- drivers/gpu/drm/i915/i915_drv.c | 9 +- drivers/gpu/drm/i915/i915_drv.h | 36 +- drivers/gpu/drm/i915/i915_irq.c | 20 +- drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/i915_sysfs.c | 15 +- drivers/gpu/drm/i915/i915_trace.h | 15 + drivers/gpu/drm/i915/intel_crt.c | 136 ++- drivers/gpu/drm/i915/intel_ddi.c | 59 +- drivers/gpu/drm/i915/intel_display.c | 1535 ++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_dp.c | 144 ++- drivers/gpu/drm/i915/intel_drv.h | 67 +- drivers/gpu/drm/i915/intel_dvo.c | 94 +- drivers/gpu/drm/i915/intel_hdmi.c | 151 ++- drivers/gpu/drm/i915/intel_lvds.c | 97 +- drivers/gpu/drm/i915/intel_pm.c | 138 +-- drivers/gpu/drm/i915/intel_ringbuffer.c | 82 +- drivers/gpu/drm/i915/intel_sdvo.c | 206 +++-- drivers/gpu/drm/i915/intel_tv.c | 61 +- 27 files changed, 2315 insertions(+), 700 deletions(-)
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 74 lines · Daniel Vetter
Hi Dave,
The big ticket item here is the new i915 modeset infrastructure. Shockingly it didn't not blow up all over the place (i.e. I've managed to fix the ugly issues before merging). 1-2 smaller corner cases broke, but we have patches. Also, there's tons of patches on top of this that clean out cruft and fix a few bugs that couldn't be fixed with the crtc helper based stuff. So more stuff to come ;-)
Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the forcewake magic.
- a few smaller cleanupsCheers, Daniel
The following changes since commit
d7c3b937bdf45f0b844400b7bf6fd3ed50bac604:drm/i915: Remove
__GFP_NO_KSWAPD(2012-08-27 17:11:38 +0200)are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-inteltags/drm-intel-next-2012-09-09for you to fetch changes up to
e04190e0ecb236c51af181c18c545ea076fb9cca:drm/fb helper: don't call
drm_helper_connector_dpmsdirectly (2012-09-08 00:51:15 +0200)----------------------------------------------------------------
Ben Widawsky (5):
drm/i915: Extract forcewake ack timeout drm/i915: usecpu_relax()inwait_for_atomicdrm/i915: Change forcewake timeout to 2ms drm/i915: Never read FORCEWAKE
drm/i915: Enable some sysfs stuff withoutCONFIG_PMChris Wilson (1):
drm/i915: Convert remaining debugfs iterators over rings tofor_each_ring()Daniel Vetter (66):
drm/ips: move drps/ips/ilk related variables intodev_priv->ipsdrm/i915: add a tracepoint for gpu frequency changes drm/i915: align vlv forcewake with common lore drm/i915: differ error message between forcwake timeouts drm/i915: add crtc->enable/disable vfuncs insted of dpms drm/i915: rip out crtc prepare/commit indirection drm/i915: add direct encoder disable/enable infrastructure drm/i915/hdmi: convert to encoder->disable/enable drm/i915/tv: convert to encoder enable/disable drm/i915/lvds: convert to encoder disable/enable drm/i915/dp: convert to encoder disable/enable drm/i915/crt: convert to encoder disable/enable drm/i915/sdvo: convert to encoder disable/enable drm/i915/dvo: convert to encoder disable/enable drm/i915: convert dpms functions of dvo/sdvo/crt drm/i915: rip out encoder->disable/enable checks drm/i915: clean up encoder_prepare/commit
drm/i915: copy&pastedrm_crtc_helper_set_configdrm/i915: callset_basedirectly
drm/i915: inlineintel_best_encoder
drm/i915: copy&pastedrm_crtc_helper_set_modedrm/i915: simplifyintel_crtc_prepare_encodersdrm/i915: rip out encoder->prepare/commit
drm/i915: call crtc functions directly
drm/i915: WARN when trying to enabled an unused crtc drm/i915: Add interfaces to read out encoder/connector hw state
Quoted 8 lines
drm/i915/dp: implement
get_hw_state
drm/i915/hdmi: implementget_hw_state
drm/i915/tv: implementget_hw_state
drm/i915/lvds: implementget_hw_state
drm/i915/crt: implementget_hw_state
drm/i915/sdvo: implementget_hw_state
drm/i915/dvo: implementget_hw_state
drm/i915: read out the modeset hw state at load and resume time
Hi Daniel,
This commit regresses modeset on the samsung series 5 chromebook (it is basically a pineview machine with an lvds panel). I don't seem to be able to set any mode on it any longer.
Any idea?
Stéphane
Quoted 50 lines
drm/i915: check connector hw/sw state
drm/i915: rip outintel_crtc->dpms_mode
drm/i915: rip outintel_dp->dpms_mode
drm/i915: ensure the force pipe A quirk is actually followed drm/i915: introduce structintel_set_config
drm/i915: extract modeset config save/restore code drm/i915: extractintel_set_config_compute_mode_changesdrm/i915: extractintel_set_config_update_output_statedrm/i915: implement crtc helper semantics relied upon by the fb helper drm/i915: don't update the fb base if there is no fb drm/i915: convert pointless error checks inset_configto BUGs drm/i915: don't save all the encoder/crtc state inset_configdrm/i915: stage modeset output changes
drm/i915: pushcrtc->fbupdate intopipe_set_basedrm/i915: remove crtc disabling special case
drm/i915: move output commit and crtc disabling intoset_modedrm/i915: extract adjusted mode computation
drm/i915: use staged outuput config intv->mode_fixupdrm/i915: use staged outuput config inlvds->mode_fixupdrm/i915: compute masks of crtcs affected inset_modedrm/i915: implement newset_modecode flow
drm/i915: pushcommit_output_statepast crtc disabling drm/i915: s/intel_encoder_disable/intel_encoder_noop drm/i915: WARN if the pipe won't turn off
drm/i915: switch the load detect code to the staged modeset config drm/i915: pushcommit_output_statepast the crtc/encoder preparing drm/i915: disable all crtcs at suspend time
drm/i915: no longer calldrm_helper_resume_force_modedrm/i915: add tons of modeset state checks
drm/i915: improve modeset state checking after dpms calls Merge the modeset-rework, basic conversion into drm-intel-next drm/fb helper: don't calldrm_helper_connector_dpmsdirectlyJani Nikula (2):
drm/i915: only enable sdvo hotplug irq if needed drm/i915: fix sdvo hotplug support check and activationPaulo Zanoni (3):
drm/i915: addgen7_render_ring_flush
drm/i915: add workarounds directly togen6_render_ring_flushdrm/i915: add workarounds togen7_render_ring_flush--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 4 lines · Stéphane Marchesin
Quoted 1 line
drm/i915: read out the modeset hw state at load and resume time
This commit regresses modeset on the samsung series 5 chromebook (it is basically a pineview machine with an lvds panel). I don't seem to be able to set any mode on it any longer.
Does that mean the kernel refuses to set the mode, or that you get a black screen?
For starters I guess we need:
- drm.debug=0xe dmesg from just before that commit
- same for latest 3.9-rc kernels, presuming it's not broken there
Latest upstream has a minor chance to work better I think since we've improved the pfit handling in the setup and teardown sequence a bit.
Generally lvds has been hit&miss on way too many machines unfortunately with things randomly breaking and getting fixed again (e.g. one of Chris' machines works again with the new code ...). And the commit above doesn't really change much in the code itself but it does change the order (and timing) of the different enable/disable codepaths.
Thanks, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
-lkml
Quoted 10 lines · Daniel Vetter
Quoted 4 lines · Stéphane Marchesin
Quoted 1 line
drm/i915: read out the modeset hw state at load and resume time
This commit regresses modeset on the samsung series 5 chromebook (it is basically a pineview machine with an lvds panel). I don't seem to be able to set any mode on it any longer.
Does that mean the kernel refuses to set the mode, or that you get a black screen?
I get a black screen.
Quoted 7 lines
For starters I guess we need:
- drm.debug=0xe dmesg from just before that commit
- same for latest 3.9-rc kernels, presuming it's not broken thereLatest upstream has a minor chance to work better I think since we've improved the pfit handling in the setup and teardown sequence a bit.
Quoted 6 lines
Generally lvds has been hit&miss on way too many machines unfortunately with things randomly breaking and getting fixed again (e.g. one of Chris' machines works again with the new code ...). And the commit above doesn't really change much in the code itself but it does change the order (and timing) of the different enable/disable codepaths.
So I did look at the thing a bit, and it triggers the workaround if (INTEL_INFO(dev)->gen < 4 && !intel_check_plane_mapping(crtc)) { which seems to be part of the problem (but not the whole problem as removing that gets me a corrupted display, looks like the second pipe stays enabled then).
Stéphane
Quoted 15 lines · Stéphane Marchesin
Quoted 8 lines
For starters I guess we need:
- drm.debug=0xe dmesg from just before that commit
- same for latest 3.9-rc kernels, presuming it's not broken thereLatest upstream has a minor chance to work better I think since we've improved the pfit handling in the setup and teardown sequence a bit.
Quoted 6 lines
Generally lvds has been hit&miss on way too many machines unfortunately with things randomly breaking and getting fixed again (e.g. one of Chris' machines works again with the new code ...). And the commit above doesn't really change much in the code itself but it does change the order (and timing) of the different enable/disable codepaths.
Quoted 5 lines
So I did look at the thing a bit, and it triggers the workaround if (INTEL_INFO(dev)->gen < 4 && !intel_check_plane_mapping(crtc)) { which seems to be part of the problem (but not the whole problem as removing that gets me a corrupted display, looks like the second pipe stays enabled then).
Well, that particular piece of lore took a few trials to get right. Can you please attach a drm.debug=0xe dmesg of the entire boot on latest kernels?
Thanks, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 23 lines · Daniel Vetter
Quoted 15 lines · Stéphane Marchesin
Quoted 8 lines
For starters I guess we need:
- drm.debug=0xe dmesg from just before that commit
- same for latest 3.9-rc kernels, presuming it's not broken thereLatest upstream has a minor chance to work better I think since we've improved the pfit handling in the setup and teardown sequence a bit.
Quoted 6 lines
Generally lvds has been hit&miss on way too many machines unfortunately with things randomly breaking and getting fixed again (e.g. one of Chris' machines works again with the new code ...). And the commit above doesn't really change much in the code itself but it does change the order (and timing) of the different enable/disable codepaths.
Quoted 5 lines
So I did look at the thing a bit, and it triggers the workaround if (INTEL_INFO(dev)->gen < 4 && !intel_check_plane_mapping(crtc)) { which seems to be part of the problem (but not the whole problem as removing that gets me a corrupted display, looks like the second pipe stays enabled then).
Quoted 3 lines
Well, that particular piece of lore took a few trials to get right. Can you please attach a drm.debug=0xe dmesg of the entire boot on latest kernels?
Also, anything in particular standing out in intel_reg_dump output on working/broken kernels?
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch