)]}' { "log": [ { "commit": "bb5b583b52794efc7b59f70a78be1b66a98dd939", "tree": "762a25a712211fde3e6c13ec5baa2ae028f6153c", "parents": [ "811aaa55ba21ab37407018cfc01770d6b037d3fb", "b9e55f5a2720af59561b26dce20179deb118af1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 04 10:02:22 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 04 10:02:22 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)\n gpu/stub: fix acpi_video build error, fix stub kconfig dependencies\n drm/radeon/kms: dynamically allocate power state space\n drm/radeon/kms: fix s/r issues with bios scratch regs\n agp: ensure GART has an address before enabling it\n Revert \"agp: AMD AGP is used on UP1100 \u0026 UP1500 alpha boxen\"\n amd-k7-agp: remove non-x86 code\n drm/radeon/kms/evergreen: always set certain VGT regs at CP init\n drm/radeon/kms: add updated ib_execute function for evergreen\n drm/radeon: remove 0x4243 pci id\n drm/radeon/kms: Enable new pll calculation for avivo+ asics\n drm/radeon/kms: add new pll algo for avivo asics\n drm/radeon/kms: add pll debugging output\n drm/radeon/kms: switch back to min-\u003emax pll post divider iteration\n drm/radeon/kms: rv6xx+ thermal sensor fixes\n drm/nv50: fix display on 0x50\n drm/nouveau: correctly pair hwmon_init and hwmon_fini\n drm/i915: Only bind to function 0 of the PCI device\n drm/i915: Suppress spurious vblank interrupts\n drm: Avoid leak of adjusted mode along quick set_mode paths\n drm: Simplify and defend later checks when disabling a crtc\n ...\n" }, { "commit": "811aaa55ba21ab37407018cfc01770d6b037d3fb", "tree": "217516756f6804d655d3654747ce090043fa85dc", "parents": [ "89840966c57967fa5b36151c83b7c13fc9c5b3fd" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Feb 03 16:57:28 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 04 09:58:01 2011 -0800" }, "message": "drm: Only set DPMS ON when actually configuring a mode\n\nIn drm_crtc_helper_set_config, instead of always forcing all outputs\nto DRM_MODE_DPMS_ON, only set them if the CRTC is actually getting a\nmode set, as any mode set will turn all outputs on.\n\nThis fixes https://lkml.org/lkml/2011/1/24/457\n\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: stable@kernel.org (2.6.37)\nReported-and-tested-by: Carlos R. Mafra \u003ccrmafra2@gmail.com\u003e\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b9e55f5a2720af59561b26dce20179deb118af1a", "tree": "fb257f6a338424a901ade90fc8346909fb7c48fa", "parents": [ "0975b16274bad1f0bd5c5fd6ab759c5a9ee11949" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Feb 01 11:17:28 2011 -0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 12:48:18 2011 +1000" }, "message": "gpu/stub: fix acpi_video build error, fix stub kconfig dependencies\n\nThe comments under \"config STUB_POULSBO\" are close to correct,\nbut they are not being followed. This patch updates them to reflect\nthe requirements for THERMAL.\n\nThis build error is caused by STUB_POULSBO selecting ACPI_VIDEO\nwhen ACPI_VIDEO\u0027s config requirements are not met.\n\nERROR: \"thermal_cooling_device_register\" [drivers/acpi/video.ko] undefined!\nERROR: \"thermal_cooling_device_unregister\" [drivers/acpi/video.ko] undefined!\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nTested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0975b16274bad1f0bd5c5fd6ab759c5a9ee11949", "tree": "522e6af52e285c3616976709f868aa07e38c8cbe", "parents": [ "87364760de5d631390c478fcbac8db1b926e0adf" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Feb 02 18:42:03 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 09:46:35 2011 +1000" }, "message": "drm/radeon/kms: dynamically allocate power state space\n\nWe previously used a static array, but some new systems\nhad more states then we had array space, so dynamically\nallocate space based on the number of states in the vbios.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d33851\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "87364760de5d631390c478fcbac8db1b926e0adf", "tree": "176b18953a32d7709474872623a58c9a25d3011f", "parents": [ "a70b95c017e8b518e1e069853355e4e497453dbb" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Feb 02 19:46:06 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 09:46:30 2011 +1000" }, "message": "drm/radeon/kms: fix s/r issues with bios scratch regs\n\nThe accelerate mode bit gets checked by certain atom\ncommand tables to set up some register state. It needs\nto be clear when setting modes and set when not.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d26942\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "18ff84da29b3f0c073e0ce6e341663cc6bcb0ab7", "tree": "e6cffd18bebbd2069b2f78854306bace783de1b0", "parents": [ "129205910f882e25c728e0e415743f8451a4c470" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Feb 02 12:37:41 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 09:40:52 2011 +1000" }, "message": "drm/radeon/kms/evergreen: always set certain VGT regs at CP init\n\nThese should be handled by the clear_state setup, but set them\ndirectly as well just to be sure.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "129205910f882e25c728e0e415743f8451a4c470", "tree": "a8613b1fc625b70bf31284e9498289c9db6a56c6", "parents": [ "63a507800c8aca5a1891d598ae13f829346e8e39" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Feb 02 12:37:40 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Feb 04 09:40:51 2011 +1000" }, "message": "drm/radeon/kms: add updated ib_execute function for evergreen\n\nAdds new packet to disable DX9 constant emulation.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "619efb105924d8cafa0c1dd9389e9ab506f5425d", "tree": "d610de4c3488bbd539b7e449745c646299b48b19", "parents": [ "f523f74eac1897b13c05c88ce6e5de0a7c34578b" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 31 16:48:53 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 12:49:43 2011 +1000" }, "message": "drm/radeon/kms: Enable new pll calculation for avivo+ asics\n\nNew algo is used for r5xx+ and legacy is used for\nr1xx-r4xx, rv515.\n\nI\u0027ve tested on all relevant GPUs and monitors that I\nhave access to and have found no problems.\n\nFixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d26562\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d26552\nMay fix:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d32556\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f523f74eac1897b13c05c88ce6e5de0a7c34578b", "tree": "54c2a3f66eae2c094fb2fe7ed37dbd04ac47f949", "parents": [ "51d4bf840a27fe02c883ddc6d9708af056773769" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 31 16:48:52 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 12:49:41 2011 +1000" }, "message": "drm/radeon/kms: add new pll algo for avivo asics\n\nBased on the vbios code. This should hopefully\nfix the pll problems on a number of avivo asics\nonce it\u0027s enabled.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "51d4bf840a27fe02c883ddc6d9708af056773769", "tree": "c5399469bf7adec54b7bcfbd7061f45ba73e200e", "parents": [ "a6f9761743bf35b052180f4a8bdae4d2cc0465f6" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 31 16:48:51 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 12:49:39 2011 +1000" }, "message": "drm/radeon/kms: add pll debugging output\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a6f9761743bf35b052180f4a8bdae4d2cc0465f6", "tree": "bd84424d9788eea2f8ae3ffbbb17bda58e71fac9", "parents": [ "20d391d72519527d2266a0166490118b40ff998d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 31 16:48:50 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 12:49:38 2011 +1000" }, "message": "drm/radeon/kms: switch back to min-\u003emax pll post divider iteration\n\nSeems more reliable. Fixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d26552\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "20d391d72519527d2266a0166490118b40ff998d", "tree": "7e1c3cd7eeff2e3d3ebb2cb313dcd4199340d141", "parents": [ "e98ce0d7cfa6ee0650a63d45558a5121383995d9" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Feb 01 16:12:34 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 11:40:31 2011 +1000" }, "message": "drm/radeon/kms: rv6xx+ thermal sensor fixes\n\nSome fixes to the thermal sensor code:\n- handle negative numbers\n- properly handle temp calculation on different asics\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e98ce0d7cfa6ee0650a63d45558a5121383995d9", "tree": "40cc68e8a16dda2b6d4193bdf44194a5def3bbc3", "parents": [ "a55205e229e4e16559cc2593fdfc37902b248879", "c4534fdf5603ef53fce2f418df7b5a19e71281e3" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 11:29:02 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 11:29:02 2011 +1000" }, "message": "Merge remote branch \u0027nouveau/drm-nouveau-next\u0027 of /ssd/git/drm-nouveau-next into drm-fixes\n\n* \u0027nouveau/drm-nouveau-next\u0027 of /ssd/git/drm-nouveau-next:\n drm/nv50: fix display on 0x50\n drm/nouveau: correctly pair hwmon_init and hwmon_fini\n" }, { "commit": "a55205e229e4e16559cc2593fdfc37902b248879", "tree": "09286776b4c88e7721a4a313fe3064c1a79f9fd4", "parents": [ "e468e0017b656841b661e57a948c3b858d58b959", "5fe49d86f9d01044abf687a8cd21edef636d58aa" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 11:22:34 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 11:22:34 2011 +1000" }, "message": "Merge remote branch \u0027intel/drm-intel-fixes\u0027 of /ssd/git/drm-next into drm-fixes\n\n* \u0027intel/drm-intel-fixes\u0027 of /ssd/git/drm-next:\n drm/i915: Only bind to function 0 of the PCI device\n drm/i915: Suppress spurious vblank interrupts\n drm: Avoid leak of adjusted mode along quick set_mode paths\n drm: Simplify and defend later checks when disabling a crtc\n drm: Don\u0027t switch fb when disabling an output\n drm/i915: Reset crtc after resume\n drm/i915/crt: Force the initial probe after reset\n drm/i915: Reset state after a GPU reset or resume\n drm: Add an interface to reset the device\n drm/i915/sdvo: If at first we don\u0027t succeed in reading the response, wait\n" }, { "commit": "c4534fdf5603ef53fce2f418df7b5a19e71281e3", "tree": "454ecf52a7b9198b2019b7f8b2d9066443b77306", "parents": [ "8c06a3e02062a9beb71a9444c49fb0fbcaa1eed3" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 31 16:23:27 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Feb 02 10:17:48 2011 +1000" }, "message": "drm/nv50: fix display on 0x50\n\nAccidently busted a while back. We\u0027ll be creating objects that aren\u0027t\nnecessary here, but, they\u0027re never used so no harm..\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "8c06a3e02062a9beb71a9444c49fb0fbcaa1eed3", "tree": "18eb6ca1cc1fbd76903385e875f118121931ed59", "parents": [ "153e019ff398063b8486acadfad9adb806e99474" ], "author": { "name": "Lucas Stach", "email": "dev@lynxeye.de", "time": "Sun Jan 30 10:54:11 2011 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Feb 02 10:17:16 2011 +1000" }, "message": "drm/nouveau: correctly pair hwmon_init and hwmon_fini\n\nI broke this with my commit\n07cfe0e7a820ecad078c04e9c2a102521709145d\n\nThis fixes fdo #33434\n\nSigned-off-by: Lucas Stach \u003cdev@lynxeye.de\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "69bc70d4f97ce82153bed0afc9f432700c60390b", "tree": "2ee7e82ce2215cfadbc950cd8591d9b922801eb2", "parents": [ "ebf53826e105f488f4f628703a108e98940d1dc5" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Feb 01 11:17:28 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 02 10:18:42 2011 +1100" }, "message": "gpu/stub: fix acpi_video build error, fix stub kconfig dependencies\n\nThe comments under \"config STUB_POULSBO\" are close to correct,\nbut they are not being followed. This patch updates them to reflect\nthe requirements for THERMAL.\n\nThis build error is caused by STUB_POULSBO selecting ACPI_VIDEO\nwhen ACPI_VIDEO\u0027s config requirements are not met.\n\n ERROR: \"thermal_cooling_device_register\" [drivers/acpi/video.ko] undefined!\n ERROR: \"thermal_cooling_device_unregister\" [drivers/acpi/video.ko] undefined!\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5fe49d86f9d01044abf687a8cd21edef636d58aa", "tree": "c76602d2f959c02b72505568d21b78b9a88af255", "parents": [ "78c6e170badd22c86a5b50a7eb038a02024b8f03" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Feb 01 19:43:02 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Feb 01 21:53:59 2011 +0000" }, "message": "drm/i915: Only bind to function 0 of the PCI device\n\nEarly chipsets (gen2/3) used function 1 as a placeholder for multi-head.\nWe used to ignore these since they were not assigned to\nPCI_CLASS_DISPLAY_VGA. However with 934f992c7 we attempt to bind to all\nIntel PCI_CLASS_DISPLAY devices (and functions) to work in multi-gpu\nsystems. This fails hard on gen2/3.\n\nReported-by: Ferenc Wágner \u003cwferi@niif.hu\u003e\nTested-by: Ferenc Wágner \u003cwferi@niif.hu\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d28012\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "78c6e170badd22c86a5b50a7eb038a02024b8f03", "tree": "481dba4a9d30cf25ee25cda443a17cb6e209668c", "parents": [ "021a8455bedb01750fa8047c8576e19d5af9a99f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 10:48:04 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 12:38:47 2011 +0000" }, "message": "drm/i915: Suppress spurious vblank interrupts\n\nHugh Dickins found that characters in xterm were going missing and oft\ndelayed. Being the curious type, he managed to associate this with the\nnew high-precision vblank patches; disabling these he found, restored\nthe orderliness of his characters.\n\nThe oddness begins when one realised that Hugh was not using vblanks at\nall on his system (fvwm and some xterms). Instead, all he had to go on\nwere warning of a pipe underrun, curiously enough at around 60Hz. He\npoked and found that in addition to the underrun warning, the hardware\nwas flagging the start of a new frame, a vblank, which in turn was\nkicking off the pending vblank processing code.\n\nThere is little we can do for the underruns on Hugh\u0027s machine, a\nCrestline [965GM], which must have its FIFO watermarks set to 8.\nHowever, we do not need to process the vblank if we know that they are\ndisabled...\n\nReported-by: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "021a8455bedb01750fa8047c8576e19d5af9a99f", "tree": "2872cc833d54b2b42849c78db53c9d981e91d4e1", "parents": [ "ede3ff5204b0117d00609f4980df3b864cefe96f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 28 11:31:56 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 12:37:41 2011 +0000" }, "message": "drm: Avoid leak of adjusted mode along quick set_mode paths\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "ede3ff5204b0117d00609f4980df3b864cefe96f", "tree": "dda9eb0628576ad239f1315d05e94359db1f4770", "parents": [ "9334ef755f060e251f3f395caeda1a58b6834ea3" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 11:16:33 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 12:36:33 2011 +0000" }, "message": "drm: Simplify and defend later checks when disabling a crtc\n\nBy setting the FB of a CRTC to NULL, we are turning off the CRTC (and so\ndisable the unused encoders and connectors). As such we can simplify the\nlater tests by making sure the set-\u003emode is NULL. Setting the\nnum_connectors to zero means that we do not need to loop over the unused\nconnectors.\n\nAll current usage appears correct, this only builds additional defense\ninto the routine.\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d27722\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "9334ef755f060e251f3f395caeda1a58b6834ea3", "tree": "8032fbc2dbfd7675b6dd96275fbadb214ba5faa4", "parents": [ "5d1d0cc87fc0887921993ea0742932e0c8adeda0" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 28 11:53:03 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 31 12:35:51 2011 +0000" }, "message": "drm: Don\u0027t switch fb when disabling an output\n\nIn drm_crtc_helper_set_config, we call drm_crtc_helper_set_mode which\nmay return early and do no operation if the crtc is to be disabled. In\nthis case we merrily swap to the new fb, discarding the old_fb believing\nthat it has been cleaned up. However, due to the early return, the\nold_fb was not presented to the backend for correct reaping, and nor was\nthe new one - which is about to be reaped via the\ndrm_helper_disable_unused_functions(), leading to incorrect refcounting\nof the pinned objects.\n\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d27722\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d29857\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d29230\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "e468e0017b656841b661e57a948c3b858d58b959", "tree": "dc4cccb6ab68d778b92ca3d3b6313dad35eb9374", "parents": [ "1f0324caefd39985e9fe052fac97da31694db31e" ], "author": { "name": "Stefan Weil", "email": "weil@mail.berlios.de", "time": "Fri Jan 28 23:35:18 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 31 09:58:35 2011 +1000" }, "message": "drm/radeon: Fix wrong boolean operator\n\nThis error is reported by cppcheck:\ndrivers/gpu/drm/radeon/radeon_encoders.c:1066: warning: Mutual exclusion over || always evaluates to true. Did you intend to use \u0026\u0026 instead?\n\nIt looks like cppcheck is correct, so fix this. No test was run.\n\nCc: David Airlie \u003cairlied@linux.ie\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: dri-devel@lists.freedesktop.org\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Stefan Weil \u003cweil@mail.berlios.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "363aab29eb89b46d14d44e4a44a5fff57e30bcfc", "tree": "e4f3f897d0c537ab77c1195d7cb4681c86820f75", "parents": [ "bffb276fffc93000e05a19ee0bdee844dff6a88d", "b9020c9e5953f6938e1968ba0034b46292ac5d51" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 28 12:10:13 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 28 12:10:13 2011 +1000" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/nv50: fix regression on IGPs\n drm/radeon/kms: re-emit full context state for evergreen blits\n drm/radeon/kms: release CMASK access in preclose_kms\n drm/radeon/kms: fix r6xx+ scanout on BE systems\n drm/radeon/kms: clean up some magic numbers\n drm/radeon/kms: only enable HDMI mode if radeon audio is enabled\n radeon/kms: fix dp displayport mode validation\n drm/nvc0/grctx: correct an off-by-one\n drm/nv50: Fix race with PFIFO during PGRAPH context destruction.\n drm/nouveau: Workaround incorrect DCB entry on a GeForce3 Ti 200.\n drm/nvc0: implement irq handler for whatever\u0027s at 0x14xxxx\n drm/nvc0: fix incorrect TPC register setup\n drm/nouveau: probe for adt7473 before f75375\n drm/nouveau: remove dead function definition\n" }, { "commit": "b9020c9e5953f6938e1968ba0034b46292ac5d51", "tree": "a5155fc1a616da4832711e41bb761e4a7cec8d45", "parents": [ "1e644d6dce366a7bae22484f60133b61ba322911", "153e019ff398063b8486acadfad9adb806e99474" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Fri Jan 28 11:12:53 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Fri Jan 28 11:12:53 2011 +1000" }, "message": "Merge branch \u0027drm-nouveau-next\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes\n\n* \u0027drm-nouveau-next\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6:\n drm/nv50: fix regression on IGPs\n" }, { "commit": "153e019ff398063b8486acadfad9adb806e99474", "tree": "873812dd5057707068cd87c1c03fdf8749f3fa9a", "parents": [ "5d07929808a6430d3d844db4da828dfadbc49cd2" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jan 27 10:42:50 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 28 11:10:34 2011 +1000" }, "message": "drm/nv50: fix regression on IGPs\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "1e644d6dce366a7bae22484f60133b61ba322911", "tree": "12eb2e66e98ba7cef9d0464a1783d9559638d7b9", "parents": [ "dca0d6129f3ec77bcf42ce85bcd64c87e5cf0c04" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 27 17:01:52 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Fri Jan 28 10:59:31 2011 +1000" }, "message": "drm/radeon/kms: re-emit full context state for evergreen blits\n\nclear state doesn\u0027t seem to work properly in some cases\n\nFixes hangs in heavy 3D on some evergreen cards reported on\nIRC.\n\nMay fix:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d33381\npossibly others.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "dca0d6129f3ec77bcf42ce85bcd64c87e5cf0c04", "tree": "83b8dad1365a7bc2e08029693b1d90f8ff2a705a", "parents": [ "fa6bee46a655a750afb9a78a7ddf9a3bcda97db8" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Thu Jan 27 22:46:15 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Fri Jan 28 10:59:12 2011 +1000" }, "message": "drm/radeon/kms: release CMASK access in preclose_kms\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "fa6bee46a655a750afb9a78a7ddf9a3bcda97db8", "tree": "899ff04db8e6ab05b2179037645c762117b9355c", "parents": [ "d75ee3be44380040b9d2c7925298dc52e049768d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jan 25 11:55:50 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Thu Jan 27 13:54:13 2011 +1000" }, "message": "drm/radeon/kms: fix r6xx+ scanout on BE systems\n\nR6xx+ have per-block swappers. BE content in the\nframebuffer will now be swapped properly during scanout.\nUntested, however, the same code is reported working in\nthe UMS ddx.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "d75ee3be44380040b9d2c7925298dc52e049768d", "tree": "b7677fdbe19922c8e226dcb1419f9d94d17c51a2", "parents": [ "9453d621186426500aa50049dfa0a8b15c86201d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 24 23:24:59 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Thu Jan 27 13:53:30 2011 +1000" }, "message": "drm/radeon/kms: clean up some magic numbers\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "9453d621186426500aa50049dfa0a8b15c86201d", "tree": "110d40f8de05d4f243a14896a4af3e1ca513862d", "parents": [ "6bba2e116808ca12e30c8d88dfedabf8b8d67390" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 24 22:25:48 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Thu Jan 27 13:52:49 2011 +1000" }, "message": "drm/radeon/kms: only enable HDMI mode if radeon audio is enabled\n\nForce DVI mode if the user specifies radeon.audio\u003d0. The driver\ndoesn\u0027t handle HDMI mode properly in some cases.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d27731\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "6bba2e116808ca12e30c8d88dfedabf8b8d67390", "tree": "92df638a6de6df44a63bab207404ed67c76dba67", "parents": [ "52bb4a7391321b9f32c0b6e032d0a5e1796f1968" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Wed Jan 26 17:51:03 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Thu Jan 27 13:52:05 2011 +1000" }, "message": "radeon/kms: fix dp displayport mode validation\n\nCheck if there is a big enough dp clock \u0026 enough dp lane to\ndrive the video mode provided.\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nReviewed-By: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "52bb4a7391321b9f32c0b6e032d0a5e1796f1968", "tree": "e8d51066bc584605b41054c1c55a457efbed6e06", "parents": [ "6663050edd9c2e8b1e1f55c09459144d84c045f0", "5d07929808a6430d3d844db4da828dfadbc49cd2" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 26 17:12:42 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Jan 26 17:12:42 2011 +1000" }, "message": "Merge branch \u0027drm-nouveau-next\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes\n\n* \u0027drm-nouveau-next\u0027 of git://git.freedesktop.org/git/nouveau/linux-2.6:\n drm/nvc0/grctx: correct an off-by-one\n drm/nv50: Fix race with PFIFO during PGRAPH context destruction.\n drm/nouveau: Workaround incorrect DCB entry on a GeForce3 Ti 200.\n drm/nvc0: implement irq handler for whatever\u0027s at 0x14xxxx\n drm/nvc0: fix incorrect TPC register setup\n drm/nouveau: probe for adt7473 before f75375\n drm/nouveau: remove dead function definition\n" }, { "commit": "ac751efa6a0d70f2c9daef5c7e3a92270f5c2dff", "tree": "e2d3f799e20e2cbca80891ea17af7484f21d628f", "parents": [ "3689456b4bd36027022b3215eb2acba51cd0e6b5" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Tue Jan 25 15:07:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 26 10:50:06 2011 +1000" }, "message": "console: rename acquire/release_console_sem() to console_lock/unlock()\n\nThe -rt patches change the console_semaphore to console_mutex. As a\nresult, a quite large chunk of the patches changes all\nacquire/release_console_sem() to acquire/release_console_mutex()\n\nThis commit makes things use more neutral function names which dont make\nimplications about the underlying lock.\n\nThe only real change is the return value of console_trylock which is\ninverted from try_acquire_console_sem()\n\nThis patch also paves the way to switching console_sem from a semaphore to\na mutex.\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Thomas Gleixner \u003ctglx@tglx.de\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5d1d0cc87fc0887921993ea0742932e0c8adeda0", "tree": "8fa615b0d42876a59990afa6fa59ef8f5006dcf7", "parents": [ "f3269058e7a80083dcdf89698bfcd1a6c6f8fd12" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 15:02:15 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 25 19:23:29 2011 +0000" }, "message": "drm/i915: Reset crtc after resume\n\nBased on a patch by Takashi Iwai.\n\nReported-by: Matthias Hopf \u003cmat@mshopf.de\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d27272\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f3269058e7a80083dcdf89698bfcd1a6c6f8fd12", "tree": "7df29c8b63d107d28138a01fe2072388a63a22e0", "parents": [ "500f7147cf5bafd139056d521536b10c2bc2e154" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 15:17:08 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 25 19:23:29 2011 +0000" }, "message": "drm/i915/crt: Force the initial probe after reset\n\nUpon resume, like after a cold boot, we need to forcibly probe the\nanalog connector and cannot rely on the hotplug status.\n\nBased on a patch by Takashi Iwai.\n\nReported-by: Stefan Dirsch \u003csndirsch@suse.de\u003e\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d26952\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "500f7147cf5bafd139056d521536b10c2bc2e154", "tree": "ee18c9c05fa929d716bbd1c06d84549e197a9a36", "parents": [ "eb03355660b44cf6b1ed2f895085b9de8f74efbc" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 15:14:41 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 25 19:23:28 2011 +0000" }, "message": "drm/i915: Reset state after a GPU reset or resume\n\nCall drm_mode_config_reset() after an invalidation event to restore any\ncached state to unknown.\n\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "eb03355660b44cf6b1ed2f895085b9de8f74efbc", "tree": "2665733d7a13db780caf16a7920b7fe871079cdd", "parents": [ "d121a5d2a098ba6dd033dd195f5ccbf7558c37b6" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 15:11:08 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 25 19:23:28 2011 +0000" }, "message": "drm: Add an interface to reset the device\n\nIterate over the attached CRTCs, encoders and connectors and call the\nsupplied reset vfunc in order to reset any cached state back to unknown.\nUseful after an invalidation event such as a GPU reset or resuming.\n\nTested-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "d121a5d2a098ba6dd033dd195f5ccbf7558c37b6", "tree": "a17d4a1e88b651a4162eccf93bc638d368f791da", "parents": [ "8e934dbf264418afe4d1dff34ce074ecc14280db" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 25 15:00:01 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 25 19:23:27 2011 +0000" }, "message": "drm/i915/sdvo: If at first we don\u0027t succeed in reading the response, wait\n\nWe were not pausing after detecting the response was pending and so did\nnot allow the hardware sufficient time to complete before aborting. This\nlead to transient failures whilst probing SDVO devices.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d30235\nReported-by: Knut Petersen \u003cKnut_Petersen@t-online.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "5d07929808a6430d3d844db4da828dfadbc49cd2", "tree": "67079bb5e51938dfcfe3c53cb0a06a25c254d529", "parents": [ "34311c730147def6862304488ee1f7c3f4acd74b" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 21 22:34:13 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 25 11:05:01 2011 +1000" }, "message": "drm/nvc0/grctx: correct an off-by-one\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "34311c730147def6862304488ee1f7c3f4acd74b", "tree": "006f07372c49ee70724cb31d276edba5cb519e8d", "parents": [ "670820c0e6a9c82dd2f96663dc4c6aec2a18c32b" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Mon Jan 24 01:47:42 2011 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 25 11:04:53 2011 +1000" }, "message": "drm/nv50: Fix race with PFIFO during PGRAPH context destruction.\n\nReported-by: Xavier Chantry \u003cchantry.xavier@gmail.com\u003e\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "670820c0e6a9c82dd2f96663dc4c6aec2a18c32b", "tree": "a6d18716958d8529b4a79ac0f43caea9282e4f55", "parents": [ "51f73d64b46cb765cd5bee3b8d9f5980c44c6446" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Sat Dec 25 15:43:30 2010 +0100" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 25 11:04:50 2011 +1000" }, "message": "drm/nouveau: Workaround incorrect DCB entry on a GeForce3 Ti 200.\n\nFixes the DVI-D output on that board (fdo bug 32645).\n\nReported-by: Bryan Quigley \u003cBryanQuigley@Ubuntu.com\u003e\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "51f73d64b46cb765cd5bee3b8d9f5980c44c6446", "tree": "9a48557e7ce719a3fb3d651d2939ad9919d3bae4", "parents": [ "0f1cb203b46f8f836afdd2198060ff6169aa7272" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 21 13:53:21 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 25 11:04:44 2011 +1000" }, "message": "drm/nvc0: implement irq handler for whatever\u0027s at 0x14xxxx\n\nThis is just barely enough to stop a never-ending IRQ storm that can\nbe triggered by our 3D driver. We have no idea what this engine is..\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "0f1cb203b46f8f836afdd2198060ff6169aa7272", "tree": "4e18ffcce511597e797e5c5c1cab6f49137b02e6", "parents": [ "b26e72fbb58d3665a75b58679535a8e283da5a11" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 21 11:15:16 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 25 11:04:39 2011 +1000" }, "message": "drm/nvc0: fix incorrect TPC register setup\n\nWas hitting TPC+1\u0027s regs by accident, oops.\n\nReported-by: Christoph Bumiller \u003ce0425955@student.tuwien.ac.at\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "b26e72fbb58d3665a75b58679535a8e283da5a11", "tree": "f31ec60a2e8e80cf9e496ed4deecefdf72ba3d15", "parents": [ "1c2a679aa99d4b9d01004863d72d818534d4ac54" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Jan 19 15:54:10 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 25 11:04:34 2011 +1000" }, "message": "drm/nouveau: probe for adt7473 before f75375\n\nThere\u0027s a reported case where probing for f75375 causes the system\nto hang completely, in this case there\u0027s an adt7473 at the same\ni2c address.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "1c2a679aa99d4b9d01004863d72d818534d4ac54", "tree": "d1c2a2daceeca3cbe3379f71fcf3e6fd8d31b38d", "parents": [ "f01a9720cb149e76155dc6e0e051058450305f4f" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 18 14:46:19 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 25 11:04:30 2011 +1000" }, "message": "drm/nouveau: remove dead function definition\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "abb72c828878a2c69b2cfb33ac30007c8ecd735e", "tree": "a95ace4f34d86d55b3307bd53354d335e9f23563", "parents": [ "58bbf018a70c562437eeae121a5d021ba7fe56a5", "8e934dbf264418afe4d1dff34ce074ecc14280db" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Tue Jan 25 08:41:58 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Tue Jan 25 08:41:58 2011 +1000" }, "message": "Merge branch \u0027drm-intel-fixes-2\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes\n\n* \u0027drm-intel-fixes-2\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: (30 commits)\n drm/i915: Prevent uninitialised reads during error state capture\n drm/i915: Use consistent mappings for OpRegion between ACPI and i915\n drm/i915: Handle the no-interrupts case for UMS by polling\n drm/i915: Disable high-precision vblank timestamping for UMS\n drm/i915: Increase the amount of defense before computing vblank timestamps\n drm/i915,agp/intel: Do not clear stolen entries\n Remove MAYBE_BUILD_BUG_ON\n BUILD_BUG_ON: make it handle more cases\n module: fix missing semicolons in MODULE macro usage\n param: add null statement to compiled-in module params\n module: fix linker error for MODULE_VERSION when !MODULE and CONFIG_SYSFS\u003dn\n module: show version information for built-in modules in sysfs\n selinux: return -ENOMEM when memory allocation fails\n tpm: fix panic caused by \"tpm: Autodetect itpm devices\"\n TPM: Long default timeout fix\n trusted keys: Fix a memory leak in trusted_update().\n keys: add trusted and encrypted maintainers\n encrypted-keys: rename encrypted_defined files to encrypted\n trusted-keys: rename trusted_defined files to trusted\n drm/i915: Recognise non-VGA display devices\n ...\n" }, { "commit": "58bbf018a70c562437eeae121a5d021ba7fe56a5", "tree": "5a44a8c8f53710366e51208f63e86c3a441f256a", "parents": [ "b526ce2264e93b64853478ae50725a30c1dc7abf" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 24 17:14:26 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Tue Jan 25 08:41:04 2011 +1000" }, "message": "drm/radeon/kms: add new radeon_info ioctl query for clock crystal freq\n\nNeeded for timer queries in the 3D driver.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "8e934dbf264418afe4d1dff34ce074ecc14280db", "tree": "6fcbbafc58a1f444b065905a2b3a3e5427cc6c92", "parents": [ "b705120e4198315f4ae043de06c62f65e0851fd3" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 12:34:00 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:28:29 2011 +0000" }, "message": "drm/i915: Prevent uninitialised reads during error state capture\n\nerror_bo and pinned_bo could be used uninitialised if there were no\nactive buffers.\n\nCaught by kmemcheck.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b705120e4198315f4ae043de06c62f65e0851fd3", "tree": "d10bd8c952fa5ab18c9aacafeda37c72eb675c44", "parents": [ "8a327f23e23fa509e6e3c2263ae1cc0a67dec387" ], "author": { "name": "Michael Karcher", "email": "kernel@mkarcher.dialup.fu-berlin.de", "time": "Sun Jan 23 18:17:17 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:28:08 2011 +0000" }, "message": "drm/i915: Use consistent mappings for OpRegion between ACPI and i915\n\nThe opregion is a shared memory region between ACPI and the graphics\ndriver. As the ACPI mapping has been changed to cachable in commit\n6d5bbf00d251cc73223a71422d69e069dc2e0b8d, mapping the intel opregion\nnon-cachable now fails. As no bus-master hardware is involved in the\nopregion, cachable map should do no harm.\n\nTested on a Fujitsu Lifebook P8010.\n\nSigned-off-by: Michael Karcher \u003ckernel@mkarcher.dialup.fu-berlin.de\u003e\n[ickle: convert to acpi_os_ioremap for consistency]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "8a327f23e23fa509e6e3c2263ae1cc0a67dec387", "tree": "119abf09e1ec9babaf78e6889187f9d54864b118", "parents": [ "5a9a8d1a99c617df82339456fbdd30d6ed3a856b", "d315777b32a4696feb86f2a0c9e9f39c94683649" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 23 17:22:16 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:27:32 2011 +0000" }, "message": "Merge remote branch \u0027linus/master\u0027 into drm-intel-fixes\n\nMerge with Linus to resolve conflicting fixes for the reusing the stale\nHEAD value during intel_ring_wait().\n\nConflicts:\n\tdrivers/gpu/drm/i915/intel_ringbuffer.c\n" }, { "commit": "5a9a8d1a99c617df82339456fbdd30d6ed3a856b", "tree": "0aa92fdfa778a05353cbe82d4635597ba9e87114", "parents": [ "3885c6bbd0c6c9cc3c8e6d4f723abc87c593b07a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 23 13:03:24 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:26:31 2011 +0000" }, "message": "drm/i915: Handle the no-interrupts case for UMS by polling\n\nIf the driver calls into the kernel to wait for a breadcrumb to pass,\nbut hasn\u0027t enabled interrupts, fallback to polling the breadcrumb value.\n\nReported-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nTested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "3885c6bbd0c6c9cc3c8e6d4f723abc87c593b07a", "tree": "28462f6036dfd8fdf885bb7fd9afa510b3c90bf7", "parents": [ "4041b85323ca00faaf8cdae22ac5cc16f1af2451" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 23 10:45:14 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:26:31 2011 +0000" }, "message": "drm/i915: Disable high-precision vblank timestamping for UMS\n\nWe only have sufficient information for accurate (sub-frame) timestamping\nwhen the modesetting is under our control.\n\nReported-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nTested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nReviewed-by: Mario Kleiner \u003cmario.kleiner@tuebingen.mpg.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "4041b85323ca00faaf8cdae22ac5cc16f1af2451", "tree": "da7b5ca9716c388118ecc58dccd2bc87134b0cc3", "parents": [ "bee4a186c16bed0d7e91425ca9356c2e8c015f8d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sat Jan 22 10:07:56 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:26:30 2011 +0000" }, "message": "drm/i915: Increase the amount of defense before computing vblank timestamps\n\nReported-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nTested-by: Chris Clayton \u003cchris2553@googlemail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "bee4a186c16bed0d7e91425ca9356c2e8c015f8d", "tree": "66d01e18c48fb0dfd9970c169d0f5baa0adaa0fe", "parents": [ "934f992c763ae1e5eefcce8af769c16444085df7" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 21 10:54:32 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 24 18:26:25 2011 +0000" }, "message": "drm/i915,agp/intel: Do not clear stolen entries\n\nWe can only utilize the stolen portion of the GTT if we are in sole\ncharge of the hardware. This is only true if using GEM and KMS,\notherwise VESA continues to access stolen memory.\n\nReported-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nReported-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nTested-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nTested-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "b526ce2264e93b64853478ae50725a30c1dc7abf", "tree": "6cd488ff4a9d6fee8acc1a71f98fa428ad6ad4bb", "parents": [ "8d96fe9381fa235a81c73c8f940e2fcc84f41caf" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 20 23:35:58 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Mon Jan 24 11:05:29 2011 +1000" }, "message": "drm/radeon/kms: simplify atom adjust pll setup\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "8d96fe9381fa235a81c73c8f940e2fcc84f41caf", "tree": "eedf45c7dbee1b27694243d4820ff136a7321af6", "parents": [ "be23da8ad219650517cbbb7acbeaeb235667113a" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jan 21 15:38:22 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Mon Jan 24 11:05:25 2011 +1000" }, "message": "drm/radeon/kms: match r6xx/r7xx/evergreen asic_reset with previous asics\n\nDon\u0027t reset if the engine isn\u0027t busy. This matches the behavior of\nprevious asics. Reseting a non-hung block can lead to a hang.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d33272\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "be23da8ad219650517cbbb7acbeaeb235667113a", "tree": "4040dbdac4f1020eda34bbb3add3c78cb5a359a9", "parents": [ "369d7ec14cf2a07d3c7826d806f61477866ba523" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jan 18 18:26:11 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Mon Jan 24 11:05:18 2011 +1000" }, "message": "drm/radeon/kms: make the mac rv630 quirk generic\n\nSeems some other boards do this as well.\n\nReported-by: Andrea Merello \u003candrea.merello@gmail.com\u003e\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "369d7ec14cf2a07d3c7826d806f61477866ba523", "tree": "3dc842d1f81ce0778e091b554f1b22c532155f9d", "parents": [ "29d9ebc4820ee4e03776ddd9a34f3d0097595405" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Jan 17 18:08:58 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Mon Jan 24 11:05:12 2011 +1000" }, "message": "drm/radeon/kms: fix a spelling error in an error message\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "29d9ebc4820ee4e03776ddd9a34f3d0097595405", "tree": "8e8a4871f3f332e755d891828b5bf2cfaf85dbf0", "parents": [ "1bae4ce27c9c90344f23c65ea6966c50ffeae2f5" ], "author": { "name": "Michel Dänzer", "email": "daenzer@vmware.com", "time": "Tue Jan 11 10:44:54 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Mon Jan 24 11:01:26 2011 +1000" }, "message": "drm/radeon/kms: Initialize pageflip spinlocks.\n\nI\u0027m amazed but not really surprised this worked on x86...\n\nSigned-off-by: Michel Dänzer \u003cdaenzer@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@gmail.com\u003e\n" }, { "commit": "934f992c763ae1e5eefcce8af769c16444085df7", "tree": "782f06fc0cf77813499d3d77e47a23c0f613625e", "parents": [ "076e2c0eb83f1a0e2e7d0ae1e4d4c0f7b13f1f64" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 13:09:12 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 23 12:52:16 2011 +0000" }, "message": "drm/i915: Recognise non-VGA display devices\n\nStarting with SandyBridge (though possible with earlier hacked BIOSes),\nthe BIOS may initialise the IGFX as secondary to a discrete GPU. Prior,\nit would simply disable the integrated GPU. So we adjust our PCI class\nmask to match any DISPLAY_CLASS device.\n\nIn such a configuration, the IGFX is not a primary VGA controller and\nso should not take part in VGA arbitration, and the error return from\nvga_client_register() is expected.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "076e2c0eb83f1a0e2e7d0ae1e4d4c0f7b13f1f64", "tree": "8400486c1b98ef0cd0f960666c0e5b9beec81bab", "parents": [ "c7dca47bd6fbb7c215cb1ce6bc40398b4b017752" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 21 10:07:18 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 23 12:52:11 2011 +0000" }, "message": "drm/i915: Fix use of invalid array size for ring-\u003esync_seqno\n\nThere are I915_NUM_RINGS-1 inter-ring synchronisation counters, but we\nwere clearing I915_NUM_RINGS of them. Oops.\n\nReported-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nTested-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "8d99641f6c1af806cd5d9e6badce91910219a161", "tree": "ee841f807005a4a6234f6f502a13185d13a34870", "parents": [ "fc887b15d935ead2a00aef5779a18034e7c69ee1", "225c8e010f2d17a62aef131e24c6e7c111f36f9b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:14 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:14 2011 -0800" }, "message": "Merge branch \u0027akpm\u0027\n\n* akpm:\n kernel/smp.c: consolidate writes in smp_call_function_interrupt()\n kernel/smp.c: fix smp_call_function_many() SMP race\n memcg: correctly order reading PCG_USED and pc-\u003emem_cgroup\n backlight: fix 88pm860x_bl macro collision\n drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking\n MAINTAINERS: update Atmel AT91 entry\n mm: fix truncate_setsize() comment\n memcg: fix rmdir, force_empty with THP\n memcg: fix LRU accounting with THP\n memcg: fix USED bit handling at uncharge in THP\n memcg: modify accounting function for supporting THP better\n fs/direct-io.c: don\u0027t try to allocate more than BIO_MAX_PAGES in a bio\n mm: compaction: prevent division-by-zero during user-requested compaction\n mm/vmscan.c: remove duplicate include of compaction.h\n memblock: fix memblock_is_region_memory()\n thp: keep highpte mapped until it is no longer needed\n kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n" }, { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d7b9935a347ae954be907ea3d5eb4564ff124c53", "tree": "e830f6ce1e65300db9d6b00b94a9d144fc95c72f", "parents": [ "b23fffd778c312b8fb258d342051fcbdf6712128" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 13:19:55 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 16:18:25 2011 -0800" }, "message": "i915: Fix i915 suspend delay\n\nDuring system suspend, the \"wait for ring buffer to empty\" loop would\nalways time out after three seconds, because the faster cached ring\nbuffer head read would always return zero. Force the slow-and-careful\nPIO read on all but the first iterations of the loop to fix it.\n\nThis also removes the unused (and useless) \u0027actual_head\u0027 variable that\ntried to approximate doing this, but did it incorrectly.\n\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nCc: DRI mailing list \u003cdri-devel@lists.freedesktop.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c7dca47bd6fbb7c215cb1ce6bc40398b4b017752", "tree": "0255506bd3b12333addebf13b0b4ee804ea24f8b", "parents": [ "475553de2fc861d53396dd8fd14cc22f30ab97ab" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 17:00:10 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 17:26:57 2011 +0000" }, "message": "drm/i915/ringbuffer: Fix use of stale HEAD position whilst polling for space\n\nDuring suspend, Linus found that his machine would hang for 3 seconds,\nand identified that intel_ring_buffer_wait() was the culprit:\n\n\"Because from looking at the code, I get the notion that\n\"intel_read_status_page()\" may not be exact. But what happens if that\ninexact value matches our cached ring-\u003eactual_head, so we never even\ntry to read the exact case? Does it _stay_ inexact for arbitrarily\nlong times? If so, we might wait for the ring to empty forever (well,\nuntil the timeout - the behavior I see), even though the ring really\n_is_ empty.\"\n\nAs the reported HEAD position is only updated every time it crosses a\n64k boundary, whilst draining the ring it is indeed likely to remain one\nvalue. If that value matches the last known HEAD position, we never read\nthe true value from the register and so trigger a timeout.\n\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "475553de2fc861d53396dd8fd14cc22f30ab97ab", "tree": "927e0d19fcd0bde75128b2845eaa62ffc9cc1efb", "parents": [ "f7ab9b407b3bc83161c2aa74c992ba4782e87c9c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 09:52:56 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 11:21:16 2011 +0000" }, "message": "drm/i915: Don\u0027t kick-off hangcheck after a DRI interrupt\n\nHangcheck and error recovery is only used by GEM.\n\nReported-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "f7ab9b407b3bc83161c2aa74c992ba4782e87c9c", "tree": "b38b5c0c7bcf2b8335fe21c2df9d307d8fd70fb1", "parents": [ "e8616b6ced6137085e6657cc63bc2fe3900b8616" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 10:03:24 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 11:21:04 2011 +0000" }, "message": "drm/i915: Add dependency on CONFIG_TMPFS\n\nWithout tmpfs, shmem_readpage() is not compiled in causing an OOPS as\nsoon as we try to allocate some swappable pages for GEM.\n\nJan 19 22:52:26 harlie kernel: Modules linked in: i915(+) drm_kms_helper cfbcopyarea video backlight cfbimgblt cfbfillrect\nJan 19 22:52:26 harlie kernel:\nJan 19 22:52:26 harlie kernel: Pid: 1125, comm: modprobe Not tainted 2.6.37Harlie #10 To be filled by O.E.M./To be filled by O.E.M.\nJan 19 22:52:26 harlie kernel: EIP: 0060:[\u003c00000000\u003e] EFLAGS: 00010246 CPU: 3\nJan 19 22:52:26 harlie kernel: EIP is at 0x0\nJan 19 22:52:26 harlie kernel: EAX: 00000000 EBX: f7b7d000 ECX: f3383100 EDX: f7b7d000\nJan 19 22:52:26 harlie kernel: ESI: f1456118 EDI: 00000000 EBP: f2303c98 ESP: f2303c7c\nJan 19 22:52:26 harlie kernel: DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068\nJan 19 22:52:26 harlie kernel: Process modprobe (pid: 1125, ti\u003df2302000 task\u003df259cd80 task.ti\u003df2302000)\nJan 19 22:52:26 harlie kernel: Stack:\nJan 19 22:52:26 harlie udevd-work[1072]: \u0027/sbin/modprobe -b pci:v00008086d00000046sv00000000sd00000000bc03sc00i00\u0027 unexpected exit with status 0x0009\nJan 19 22:52:26 harlie kernel: c1074061 000000d0 f2f42b80 00000000 000a13d2 f2d5dcc0 00000001 f2303cac\nJan 19 22:52:26 harlie kernel: c107416f 00000000 000a13d2 00000000 f2303cd4 f8d620ed f2cee620 00001000\nJan 19 22:52:26 harlie kernel: 00000000 000a13d2 f1456118 f2d5dcc0 f1a40000 00001000 f2303d04 f8d637ab\nJan 19 22:52:26 harlie kernel: Call Trace:\nJan 19 22:52:26 harlie kernel: [\u003cc1074061\u003e] ? do_read_cache_page+0x71/0x160\nJan 19 22:52:26 harlie kernel: [\u003cc107416f\u003e] ? read_cache_page_gfp+0x1f/0x30\nJan 19 22:52:26 harlie kernel: [\u003cf8d620ed\u003e] ? i915_gem_object_get_pages+0xad/0x1d0 [i915]\nJan 19 22:52:26 harlie kernel: [\u003cf8d637ab\u003e] ? i915_gem_object_bind_to_gtt+0xeb/0x2d0 [i915]\nJan 19 22:52:26 harlie kernel: [\u003cf8d65961\u003e] ? i915_gem_object_pin+0x151/0x190 [i915]\nJan 19 22:52:26 harlie kernel: [\u003cc11e16ed\u003e] ? drm_gem_object_init+0x3d/0x60\nJan 19 22:52:26 harlie kernel: [\u003cf8d65aa5\u003e] ? i915_gem_init_ringbuffer+0x105/0x1e0 [i915]\nJan 19 22:52:26 harlie kernel: [\u003cf8d571b7\u003e] ? i915_driver_load+0x667/0x1160 [i915]\n\nReported-by: John J. Stimson-III \u003cjohn@idsfa.net\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "e8616b6ced6137085e6657cc63bc2fe3900b8616", "tree": "c21be366c9407849418e6698d8450f67d4dc5574", "parents": [ "4efe070896e1f7373c98a13713e659d1f5dee52a" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 09:57:11 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 20 11:20:53 2011 +0000" }, "message": "drm/i915: Initialise ring vfuncs for old DRI paths\n\nWe weren\u0027t setting up the vfunc table when initialising the old DRI\nringbuffer, leading to such OOPSes as:\n\nBUG: unable to handle kernel NULL pointer dereference at (null)\nIP: [\u003c(null)\u003e] (null)\nPGD 10c441067 PUD 1185e5067 PMD 0\nOops: 0010 [#1] PREEMPT SMP\nlast sysfs file: /sys/class/dmi/id/chassis_asset_tag\nCPU 3\nModules linked in: i915 drm_kms_helper drm fb fbdev i2c_algo_bit\ncfbcopyarea video backlight output cfbimgblt cfbfillrect autofs4 ipv6\nnfs lockd fscache nfs_acl auth_rpcgss sunrpc coretemp hwmon_vid mousedev\nusbhid hid option usb_wwan snd_hda_codec_via asus_atk0110 atl1e\nusbserial snd_hda_intel snd_hda_codec firmware_class snd_hwdep snd_pcm\nsnd_seq snd_timer snd_seq_device processor parport_pc thermal snd\nthermal_sys parport 8250_pnp button rng_core rtc_cmos shpchp hwmon\nrtc_core ehci_hcd pci_hotplug uhci_hcd soundcore tpm_tis i2c_i801\nrtc_lib tpm serio_raw snd_page_alloc tpm_bios i2c_core usbcore psmouse\nintel_agp sg pcspkr sr_mod evdev cdrom ext3 jbd mbcache dm_mod sd_mod\nata_piix libata scsi_mod unix\nJan 18 15:49:29 lithui kernel:\nPid: 3605, comm: Xorg Not tainted 2.6.36.2 #5 P5KPL-CM/System Product\nName\nRIP: 0010:[\u003c0000000000000000\u003e] [\u003c(null)\u003e] (null)\nRSP: 0018:ffff8801150d1d40 EFLAGS: 00010202\nRAX: 000000000001ffff RBX: ffff88011a011b00 RCX: 000000000001a704\nRDX: ffff880118566028 RSI: ffff880118566028 RDI: ffff880117876800\nRBP: ffff8801150d1d48 R08: ffff8801195fe300 R09: 00000000c0086444\nR10: 0000000000000001 R11: 0000000000003206 R12: ffff880117876800\nR13: ffff880118566000 R14: ffff880117876820 R15: ffff8801150d1df8\nFS: 00007f1038d456e0(0000) GS:ffff880001780000(0000)\nknlGS:0000000000000000\nCS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\nCR2: 0000000000000000 CR3: 00000001187e7000 CR4: 00000000000006e0\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess Xorg (pid: 3605, threadinfo ffff8801150d0000, task\nffff88011b016e40)\nStack:\nffffffffa043b8e6 ffff8801150d1d98 ffffffffa041768b dead000000000000\n\u003c0\u003e 0000000000000048 00007f1023f2a000 0000000000000044 0000000000000008\n\u003c0\u003e ffff88010d26bd80 ffff880117876800 ffff8801150d1df8 ffff8801150d1ea8\nCall Trace:\n[\u003cffffffffa043b8e6\u003e] ? intel_ring_advance+0x16/0x20 [i915]\n[\u003cffffffffa041768b\u003e] i915_irq_emit+0x15b/0x240 [i915]\n[\u003cffffffffa03ea7b1\u003e] drm_ioctl+0x1f1/0x460 [drm]\n[\u003cffffffffa0417530\u003e] ? i915_irq_emit+0x0/0x240 [i915]\n[\u003cffffffff810dd8f1\u003e] ? do_sync_read+0xd1/0x120\n[\u003cffffffff81025b1f\u003e] ? do_page_fault+0x1df/0x3d0\n[\u003cffffffff810ed5c7\u003e] do_vfs_ioctl+0x97/0x550\n[\u003cffffffff8115c2ea\u003e] ? security_file_permission+0x7a/0x90\n[\u003cffffffff810edb19\u003e] sys_ioctl+0x99/0xa0\n[\u003cffffffff810024ab\u003e] system_call_fastpath+0x16/0x1b\nCode: Bad RIP value.\nRIP [\u003c(null)\u003e] (null)\nRSP \u003cffff8801150d1d40\u003e\nCR2: 0000000000000000\n\nReported-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nTested-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d29153\nBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id\u003d23172\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "4efe070896e1f7373c98a13713e659d1f5dee52a", "tree": "fab6799395ea600cb71674919d978ef36d60783e", "parents": [ "1ffa325bac55982d72a61ccab1a4190501e37148" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Tue Jan 18 11:25:41 2011 -0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 18 19:30:24 2011 +0000" }, "message": "drm/i915: make the blitter report buffer modifications to the FBC unit\n\nWithout this change, blits to the front buffer won\u0027t invalidate FBC\nstate, causing us to scan out stale data. Make sure we update these\nbits on every FBC enable, since they may get clobbered if we shut off\nthe display.\n\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d26932\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "1ffa325bac55982d72a61ccab1a4190501e37148", "tree": "357afa5393b50c3d2c61620587ec68b1d4ebee2d", "parents": [ "e6f597a1425b5af64917be3448b29e2d5a585ac8" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Jan 17 13:35:57 2011 -0800" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 18 09:50:08 2011 +0000" }, "message": "drm/i915: set more FBC chicken bits\n\nAdd a couple of missing workaround bits for ILK \u0026 SNB. These disable\nclock gating on a couple of units that would otherwise prevent FBC from\nworking.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "25b2ec5b643c9ea784e5a51e5e9602cd536965f2", "tree": "a6a7f9f7423f2957819d362cadad37a53da5ee0f", "parents": [ "fd909c3718da3fb8c5c0530f93ae21d85dc31471" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jan 11 13:36:55 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 17 12:21:57 2011 +1000" }, "message": "drm/radeon/kms: balance asic_reset functions\n\nFirst, we were calling mc_stop() at the top of the function\nwhich turns off all MC (memory controller) clients,\nthen checking if the GPU is idle. If it was idle we\nreturned without re-enabling the MC clients which would\nlead to a blank screen, etc. This patch checks if the\nGPU is idle before calling mc_stop().\n\nSecond, if the reset failed, we were returning without\nre-enabling the MC clients. This patch re-enables\nthe MC clients before returning regardless of whether\nthe reset was successful or not.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nCc: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fd909c3718da3fb8c5c0530f93ae21d85dc31471", "tree": "ee836221bd3411e4442cc23c41bf1ac81d4f425a", "parents": [ "d42dd579ac1498e23f29465225fa3eee4520f5e5" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Jan 11 18:08:59 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 17 12:21:38 2011 +1000" }, "message": "drm/radeon/kms: remove duplicate card_posted() functions\n\nUse the common one for all asics.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d42dd579ac1498e23f29465225fa3eee4520f5e5", "tree": "0781d5ae64b039a23bfdc2ec2c7356b679247d18", "parents": [ "394d83c17fac2b7bcf05cb99d1e945135767bb6b" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jan 12 20:05:11 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 17 12:21:34 2011 +1000" }, "message": "drm/radeon/kms: add module option for pcie gen2\n\nSwitching to pcie gen2 causes problems on some\nboards. Add a module option to turn it on/off.\n\nThere are gen2 compatability issues with some\nmotherboards it seems.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d33027\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "394d83c17fac2b7bcf05cb99d1e945135767bb6b", "tree": "9be374bdbe45946eb068aa85e77f82e939d04638", "parents": [ "51fda92223f5b668cccffd51bf3d7bedc93609ff" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 13 13:55:12 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 17 12:20:55 2011 +1000" }, "message": "drm/radeon/kms: fix typo in evergreen safe reg\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "51fda92223f5b668cccffd51bf3d7bedc93609ff", "tree": "326cb5d43889b55fad0b76cba9621a5c107b602f", "parents": [ "e78bf5e6cbe837daa6ab628a5f679548742994d3", "f01a9720cb149e76155dc6e0e051058450305f4f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 17 12:20:31 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 17 12:20:31 2011 +1000" }, "message": "Merge remote branch \u0027nouveau/drm-nouveau-next\u0027 of /ssd/git/drm-nouveau-next into drm-fixes\n\n* \u0027nouveau/drm-nouveau-next\u0027 of /ssd/git/drm-nouveau-next:\n drm/nouveau: fix gpu page faults triggered by plymouthd\n drm/nouveau: greatly simplify mm, killing some bugs in the process\n drm/nvc0: enable protection of system-use-only structures in vm\n drm/nv40: initialise 0x17xx on all chipsets that have it\n drm/nv40: make detection of 0x4097-ful chipsets available everywhere\n" }, { "commit": "f01a9720cb149e76155dc6e0e051058450305f4f", "tree": "35f4477449f4e6ba3eb87726e2befd6f8493c8ed", "parents": [ "8b464bfed674fc25d39d8a686010ebe509c8f62a" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 17 11:22:38 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 17 11:28:59 2011 +1000" }, "message": "drm/nouveau: fix gpu page faults triggered by plymouthd\n\nThe switch to separate BAR and channel address spaces made the fbcon memory\naddress calculation incorrect on NV50+ boards, this commit fixes that.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "8b464bfed674fc25d39d8a686010ebe509c8f62a", "tree": "6c518cb466d186473af95b3ed6b7fe2756b960c4", "parents": [ "c906ca0fbf237b77ba2101a2fa9050317137fde8" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 14 15:46:30 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 17 11:28:54 2011 +1000" }, "message": "drm/nouveau: greatly simplify mm, killing some bugs in the process\n\nReviewed-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "c906ca0fbf237b77ba2101a2fa9050317137fde8", "tree": "1251a50df91560beca35ec047a80226b212e59b3", "parents": [ "1380da4979728bdd6af0086a8c8e186da14ae673" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Jan 14 10:27:02 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 17 11:28:50 2011 +1000" }, "message": "drm/nvc0: enable protection of system-use-only structures in vm\n\nSomehow missed this in the original merge of the nvc0 code.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "1380da4979728bdd6af0086a8c8e186da14ae673", "tree": "f8d9b0e227c0d539f760ad5d8e353206c0bb0c9b", "parents": [ "c693931d93facab671bafdcebf515520663c22fc" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 11 17:22:33 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 17 11:28:43 2011 +1000" }, "message": "drm/nv40: initialise 0x17xx on all chipsets that have it\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "c693931d93facab671bafdcebf515520663c22fc", "tree": "1b478c4367de1337c62c247653a0ef98b71fbbcf", "parents": [ "07cfe0e7a820ecad078c04e9c2a102521709145d" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jan 11 14:23:12 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Jan 17 11:28:31 2011 +1000" }, "message": "drm/nv40: make detection of 0x4097-ful chipsets available everywhere\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "3632ef8909118db9584e1bed9538dc180adb32f8", "tree": "033925e11aef3c700492b4da0a1332f710de1299", "parents": [ "8473dbb43db92fa8de7c24d1973aaf1e0276a89f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Jan 15 09:27:00 2011 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 16:10:28 2011 -0800" }, "message": "Revert \"drm: Update fbdev fb_fix_screeninfo\"\n\nThis reverts commit dfe63bb0ad9810db13aab0058caba97866e0a681.\n\nThis commit was causing nouveau not to work properly, for -rc1 I\u0027d\nprefer it worked and we can look if this is useful for 2.6.39.\n\nCc: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "891cc2283216bf76f387546f0e220caf8ce9fbf9", "tree": "b9ff8012a509fedf74834cee23adf9e0b3d8e5ad", "parents": [ "d73b388459b1ee2e80f8ff9c1916d75640d7d920", "22ab70d3262ddb6e69b3c246a34e2967ba5eb1e8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 10:30:09 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 10:30:09 2011 -0800" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel\n\n* \u0027drm-intel-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:\n drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS\n agp/intel: Fix device names of i845 and 845G\n drm/i915: Disable GPU semaphores on SandyBridge mobile\n drm/i915/execbuffer: Clear domains before beginning reloc processing\n drm/i915/execbuffer: Reorder relocations to match new object order\n drm/i915: Fix error handler to capture the first batch after the seqno\n drm/i915: Add a module option to override the use of SSC\n drm/i915/panel: The backlight is enabled if the current value is non-zero\n drm/i915/debugfs: Correct format after changing type of err object \u0027size\u0027\n" }, { "commit": "22ab70d3262ddb6e69b3c246a34e2967ba5eb1e8", "tree": "c611dff37b94eae99c4fad3c7162c941df0b81d1", "parents": [ "53371edaef692bef7eee8070bd680401ccf65706" ], "author": { "name": "Knut Petersen", "email": "knut_petersen@t-online.de", "time": "Fri Jan 14 15:38:10 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 14 16:36:20 2011 +0000" }, "message": "drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS\n\nSigned-off-by: Knut Petersen \u003cknut_petersen@t-online.de\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "1591192d3a17adeebd03be0ce5888b88bddfaf89", "tree": "8df7fdb4e5480838fff9162adb09904f2b107986", "parents": [ "595dad76a0d213adc3dbe4f463f7887e905082b9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 14 09:46:38 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Jan 14 09:51:05 2011 +0000" }, "message": "drm/i915: Disable GPU semaphores on SandyBridge mobile\n\nHopefully, this is a temporary measure whilst the root cause is\nunderstood. At the moment, we experience a hard hang whilst looping\nurbanterror that has been identified as a result of the use of\nsemaphores, but so far only on SNB mobile.\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d32752\nTested-by: mengmeng.meng@intel.com\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "52cfd503ad7176d23a5dd7af3981744feb60622f", "tree": "0a8aeaaf4acbc86ac682f18632b8070c1c6b7ba1", "parents": [ "dc8e7e3ec60bd5ef7868aa88755e9d4c948dc5cc", "4263d9a3ae4d15785897d0543bb59316c84ee605" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 20:15:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 20:15:35 2011 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (59 commits)\n ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework\n ACPI: fix resource check message\n ACPI / Battery: Update information on info notification and resume\n ACPI: Drop device flag wake_capable\n ACPI: Always check if _PRW is present before trying to evaluate it\n ACPI / PM: Check status of power resources under mutexes\n ACPI / PM: Rename acpi_power_off_device()\n ACPI / PM: Drop acpi_power_nocheck\n ACPI / PM: Drop acpi_bus_get_power()\n Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()\n ACPI / Fan: Rework the handling of power resources\n ACPI / PM: Register power resource devices as soon as they are needed\n ACPI / PM: Register acpi_power_driver early\n ACPI / PM: Add function for updating device power state consistently\n ACPI / PM: Add function for device power state initialization\n ACPI / PM: Introduce __acpi_bus_get_power()\n ACPI / PM: Introduce function for refcounting device power resources\n ACPI / PM: Add functions for manipulating lists of power resources\n ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes\n ACPICA: Update version to 20101209\n ...\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "595dad76a0d213adc3dbe4f463f7887e905082b9", "tree": "ce0daf549d86f2d19cbc56153d51e17c0385d028", "parents": [ "dd6864a4edb9b2d0055a7f30e17cbc521098b1be" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 13 11:03:48 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 13 16:06:05 2011 +0000" }, "message": "drm/i915/execbuffer: Clear domains before beginning reloc processing\n\nAfter reordering the sequence of relocating objects, commit 6fe4f1404,\nwe can no longer rely on seeing all reloc targets prior to performing\nthe relocation. As a result we were ignoring the need to flush objects\nfrom the render cache and invalidate the sampler caches, resulting in\nrendering glitches. So we need to clear the relocation domains earlier.\n\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nTested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "dd6864a4edb9b2d0055a7f30e17cbc521098b1be", "tree": "5c3b41913378fe69c506f54f9ac3ee45a1809f6c", "parents": [ "c37d9a5de94a6fe60a756af350cd21aa9bbbc8a1" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 12 23:49:13 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 13 16:06:05 2011 +0000" }, "message": "drm/i915/execbuffer: Reorder relocations to match new object order\n\nOn the fault path, commit 6fe4f140 introduction a regression whereby it\nchanged the sequence of the objects but continued to use the original\nordering of relocation entries. The result was that incorrect GTT offsets\nwere being fed into the execbuffer causing lots of misrendering and\npotential hangs.\n\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nTested-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "c37d9a5de94a6fe60a756af350cd21aa9bbbc8a1", "tree": "baf3dbb044dfcec7add270661400e097026153df", "parents": [ "a76150302d6e7ebc43e1a1ddaee7fd51db8da3b3" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 12 20:33:01 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 13 16:06:05 2011 +0000" }, "message": "drm/i915: Fix error handler to capture the first batch after the seqno\n\nWhilst we had no older batches on the active list, everything was fine.\nHowever, if the GPU is free running and the requests are only being\nreaped by the periodic retirer, than the current seqno may not be at the\nstart of the list. In this case we need to select the first batch after\nthe last seqno written by the gpu and not inclusive of the seqno.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a76150302d6e7ebc43e1a1ddaee7fd51db8da3b3", "tree": "18237da2f01fa732d5dfc9c567d17209ca6b418c", "parents": [ "c8303e7f3f3093c16ef0fa5f73280637c89d4368" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 12 17:04:08 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Thu Jan 13 16:05:58 2011 +0000" }, "message": "drm/i915: Add a module option to override the use of SSC\n\nIn order to workaround the issue with LVDS not working on the Lenovo\nU160 apparently due to using the wrong SSC frequency, add an option to\ndisable SSC.\n\nSuggested-by: Lukács, Árpád \u003clukacs.arpad@gmail.com\u003e\nBugzillla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d32748\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "c8303e7f3f3093c16ef0fa5f73280637c89d4368", "tree": "9d75bf6845964bf6dbe6b59bc129ad45590dfd6f", "parents": [ "833bcb00c478c674fda0aaea089c1a92abd2da01" ], "author": { "name": "Indan Zupancic", "email": "indan@nul.nu", "time": "Wed Jan 12 11:59:19 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 12 20:24:50 2011 +0000" }, "message": "drm/i915/panel: The backlight is enabled if the current value is non-zero\n\n... and not if the maximum is non-zero. This fixes the typo introduced\nin 47356eb6728501452 and preserves the backlight value from boot.\n\n[ickle: My thanks also to Indan Zupancic for diagnosing the original\n regression and suggesting the appropriate fix.]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org # after 47356eb6728501452\n" }, { "commit": "833bcb00c478c674fda0aaea089c1a92abd2da01", "tree": "f4e6e3c479cea85970e7dac6b1bd272b5d915013", "parents": [ "f878133bf022717b880d0e0995b8f91436fd605c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 12 12:14:13 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 12 20:24:50 2011 +0000" }, "message": "drm/i915/debugfs: Correct format after changing type of err object \u0027size\u0027\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "9e0c20bceb611917a7546172ac617d07e5af0cfa", "tree": "961e9397fd1d913d2f0d5cd88fb05a70b68d955d", "parents": [ "fe3ded5078e957d80c43837e1966429cf0029c10", "82069552555cf951d9ade5c1aec61dd40b0765b5" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 12 05:02:10 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Wed Jan 12 05:02:10 2011 -0500" }, "message": "Merge branch \u0027acpi-video\u0027 into release\n" }, { "commit": "6fe4f14044f181e146cdc15485428f95fa541ce8", "tree": "c063724f6c4fc109a7af0c5f0799113e7527b2ae", "parents": [ "809b63349ce6eb6603e7dab482c642f28135a2db" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 10 17:35:37 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 11 22:55:48 2011 +0000" }, "message": "drm/i915/execbuffer: Reorder binding of objects to favour restrictions\n\nAs the mappable portion of the aperture is always a small subset at the\nstart of the GTT, it is allocated preferentially by drm_mm. This is\nuseful in case we ever need to map an object later. However, if you have\na large object that can consume the entire mappable region of the\nGTT this prevents the batchbuffer from fitting and so causing an error.\nInstead allocate all those that require a mapping up front in order to\nimprove the likelihood of finding sufficient space to bind them.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "809b63349ce6eb6603e7dab482c642f28135a2db", "tree": "e267d1640e6323cbbd93b7786973cf3f67d9c76c", "parents": [ "092de6f225638ec300936bfcbdc67805733cc78c" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 10 17:33:15 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 11 22:55:48 2011 +0000" }, "message": "drm/i915: If we hit OOM when allocating GTT pages, clear the aperture\n\nRather than evicting an object at random, which is unlikely to alleviate\nthe memory pressure sufficient to allow us to continue, zap the entire\naperture. That should give the system long enough to recover and reap\nsome pages from the evicted objects, forestalling the allocation error\nfor the new object.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "092de6f225638ec300936bfcbdc67805733cc78c", "tree": "8abd0bf021c0dee7c4a55ee46ed58a65b68f8b0b", "parents": [ "36cf17423095882ec0f8f2c04d1bd0ee812149df" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 10 14:21:05 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 11 22:55:39 2011 +0000" }, "message": "drm/i915/evict: Ensure we completely cleanup on failure\n\n... and not leave the objects in a inconsistent state.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "36cf17423095882ec0f8f2c04d1bd0ee812149df", "tree": "3ecb28846e2c19cf33d0846b8c5b24d96c933844", "parents": [ "08c18323547ce6d70eab3b37eca894baf114ad85" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 10 12:09:12 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 11 22:55:29 2011 +0000" }, "message": "drm/i915/execbuffer: Correctly clear the current object list upon EFAULT\n\nBefore releasing the lock in order to copy the relocation list from user\npages, we need to drop all the object references as another thread may\nusurp and execute another batchbuffer before we reacquire the lock.\nHowever, the code was buggy and failed to clear the list...\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: stable@kernel.org\n" }, { "commit": "08c18323547ce6d70eab3b37eca894baf114ad85", "tree": "19ebe49ae46b97dae394efaf32d4528cb46ef895", "parents": [ "a779e5abda0367aa9d53c0931d9687743afe503d" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Mon Jan 10 00:00:24 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 11 22:16:56 2011 +0000" }, "message": "drm/i915/debugfs: Show all objects in the gtt\n\nUseful for determining the layout.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "a779e5abda0367aa9d53c0931d9687743afe503d", "tree": "3cbccb434e44d5c1c4cbacebd4e611872f4b1503", "parents": [ "0a58705b2fc3fa29525cf2fdae3d4276a5771280" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Jan 09 21:07:49 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Jan 11 22:16:56 2011 +0000" }, "message": "drm/i915: Record AGP memory type upon error\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" } ], "next": "0a58705b2fc3fa29525cf2fdae3d4276a5771280" }