)]}' { "log": [ { "commit": "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "tree": "521737fc0829222c2739e4d50bf8546a39d6aa0e", "parents": [ "6e6bc67982573c221d12cbd123d34395f9f6e22e", "2ac863719e518ae1a8f328849e64ea26a222f079" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:01:56 2011 -0800" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux: (40 commits)\n vmwgfx: Snoop DMA transfers with non-covering sizes\n vmwgfx: Move the prefered mode first in the list\n vmwgfx: Unreference surface on cursor error path\n vmwgfx: Free prefered mode on error path\n vmwgfx: Use pointer return error codes\n vmwgfx: Fix hw cursor position\n vmwgfx: Infrastructure for explicit placement\n vmwgfx: Make the preferred autofit mode have a 60Hz vrefresh\n vmwgfx: Remove screen object active list\n vmwgfx: Screen object cleanups\n drm/radeon/kms: consolidate GART code, fix segfault after GPU lockup V2\n drm/radeon/kms: don\u0027t poll forever if MC GDDR link training fails\n drm/radeon/kms: fix DP setup on TRAVIS bridges\n drm/radeon/kms: set HPD polarity in hpd_init()\n drm/radeon/kms: add MSI module parameter\n drm/radeon/kms: Add MSI quirk for Dell RS690\n drm/radeon/kms: Add MSI quirk for HP RS690\n drm/radeon/kms: split MSI check into a separate function\n vmwgfx: Reinstate the update_layout ioctl\n drm/radeon/kms: always do extended edid probe\n ...\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "cd2b89e7e8c036903e7fa0c3dceca25e755fe78d", "tree": "4ec5275d9650283de7b3be6d2e5eb0cd2e63cde6", "parents": [ "bc1c4dc390c644106fa5b8d0fb44a473c4ba627c" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Tue Oct 25 23:35:53 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Nov 02 08:30:31 2011 +0000" }, "message": "vmwgfx: Reinstate the update_layout ioctl\n\nWe need to redefine a connector as \"connected\" if it matches a window\nin the host preferred GUI layout.\nOtherwise \"smart\" window managers would turn on Xorg outputs that we don\u0027t\nwant to be on.\n\nThis reinstates the update_layout and adds the following information to\nthe modesetting system.\na) Connection status \u003c-\u003e Equivalent to real hardware connection status\nb) Preferred mode \u003c-\u003e Equivalent to real hardware reading EDID\nc) Host window position \u003c-\u003e Equivalent to a real hardware scanout address\ndynamic register.\n\nIt should be noted that there is no assumption here about what should be\ndisplayed and where. Only how to access the host windows.\n\nThis also bumps minor to signal availability of the new IOCTL.\n\nBased on code originally written by Jakob Bornecrantz\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "00dfb8df5bf8c3afe4c0bb8361133156b06b7a2c", "tree": "8e3f02edd94d6ac4e2478df506202e219e2ad5ed", "parents": [ "06c9c2332cc3bffcc184f32ee503dc0a4eb83de0" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Mon Oct 31 08:54:41 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 01 16:01:58 2011 +0000" }, "message": "drm/radeon/kms: properly set panel mode for eDP\n\nThis should make eDP more reliable.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "a7331e5cb2cc680ac30337cec5299956a8454ced", "tree": "8a56f07f946f40fbbfda5c9c66cdac2e2dc65b72", "parents": [ "094803e0aab3fe75bbf8202a8f4b5280eaade375" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Sat Oct 22 10:36:19 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Nov 01 16:01:42 2011 +0000" }, "message": "drm: Introduce \"Virtual\" connectors and encoders\n\nThis will allow us to attach various properties specific to virtual\nmonitors in the future.\n\nNote that we don\u0027t export an EDID property for \"Virtual\" connectors.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b9075fa968a0a4347aef35e235e2995c0e57dddd", "tree": "cf9f9716784e790d8a43339653256d9cf9178ff3", "parents": [ "ae29bc92da01a2e9d278a9a58c3b307d41cc0254" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Oct 31 17:11:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 31 17:30:54 2011 -0700" }, "message": "treewide: use __printf not __attribute__((format(printf,...)))\n\nStandardize the style for compiler based printf format verification.\nStandardized the location of __printf too.\n\nDone via script and a little typing.\n\n$ grep -rPl --include\u003d*.[ch] -w \"__attribute__\" * | \\\n grep -vP \"^(tools|scripts|include/linux/compiler-gcc.h)\" | \\\n xargs perl -n -i -e \u0027local $/; while (\u003c\u003e) { s/\\b__attribute__\\s*\\(\\s*\\(\\s*format\\s*\\(\\s*printf\\s*,\\s*(.+)\\s*,\\s*(.+)\\s*\\)\\s*\\)\\s*\\)/__printf($1, $2)/g ; print; }\u0027\n\n[akpm@linux-foundation.org: revert arch bits]\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nCc: \"Kirill A. Shutemov\" \u003ckirill@shutemov.name\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de47725421ad5627a5c905f4e40bb844ebc06d29", "tree": "bc23b0405d4a79dcc866a8b2877f128ee0ea9ffc", "parents": [ "eb5589a8f0dab7e29021344228856339e6a1249c" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu May 26 13:46:22 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:32:32 2011 -0400" }, "message": "include: replace linux/module.h with \"struct module\" wherever possible\n\nThe \u003clinux/module.h\u003e pretty much brings in the kitchen sink along\nwith it, so it should be avoided wherever reasonably possible in\nterms of being included from other commonly used \u003clinux/something.h\u003e\nfiles, as it results in a measureable increase on compile times.\n\nThe worst culprit was probably device.h since it is used everywhere.\nThis file also had an implicit dependency/usage of mutex.h which was\nmasked by module.h, and is also fixed here at the same time.\n\nThere are over a dozen other headers that simply declare the\nstruct instead of pulling in the whole file, so follow their lead\nand simply make it a few more.\n\nMost of the implicit dependencies on module.h being present by\nthese headers pulling it in have been now weeded out, so we can\nfinally make this change with hopefully minimal breakage.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "1717c0e23f411147490c7a3312b894f0ea9a5fb1", "tree": "68c94629535328221188c7ebd41f9e413da41cb0", "parents": [ "83f30d0e0343ad010afbc3523007b68e8b439694" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 27 18:28:37 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 27 18:28:37 2011 +0200" }, "message": "Revert \"drm/ttm: add a way to bo_wait for either the last read or last write\"\n\nThis reverts commit dfadbbdb57b3f2bb33e14f129a43047c6f0caefa.\n\nFurther upstream discussion between Marek and Thomas decided this wasn\u0027t\nfully baked and needed further work, so revert it before it hits mainline.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "83f30d0e0343ad010afbc3523007b68e8b439694", "tree": "7f24184e5560f9daa63c34fa37a8824694822313", "parents": [ "9b553f72869584cc14d5724fbbc09f88de0f08de" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 27 18:15:10 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Oct 27 18:15:10 2011 +0200" }, "message": "Revert \"drm/radeon/kms: add a new gem_wait ioctl with read/write flags\"\n\nThis reverts commit d3ed74027f1dd197b7e08247a40d3bf9be1852b0.\n\nFurther upstream discussion between Thomas and Marek decided this needed\nmore work and driver specifics. So revert before it goes upstream.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9b553f72869584cc14d5724fbbc09f88de0f08de", "tree": "923d790483d32dd209bf1bf2cdfc7c7abbb68aa7", "parents": [ "c5c42360bc1cb14c7da3186683e9525b33b72656", "82d165557ef094d4b4dfc05871aee618ec7102b0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 24 05:48:39 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 24 05:48:39 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux into drm-core-next\n\n* \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux: (72 commits)\n drm/i915/dp: Fix eDP on PCH DP on CPT/PPT\n drm/i915/dp: Introduce is_cpu_edp()\n drm/i915: use correct SPD type value\n drm/i915: fix ILK+ infoframe support\n drm/i915: add DP test request handling\n drm/i915: read full receiver capability field during DP hot plug\n drm/i915/dp: Remove eDP special cases from bandwidth checks\n drm/i915/dp: Fix the math in intel_dp_link_required\n drm/i915/panel: Always record the backlight level again (but cleverly)\n i915: Move i915_read/write out of line\n drm/i915: remove transcoder PLL mashing from mode_set per specs\n drm/i915: if transcoder disable fails, say which\n drm/i915: set watermarks for third pipe on IVB\n drm/i915: export a CPT mode set verification function\n drm/i915: fix transcoder PLL select masking\n drm/i915: fix IVB cursor support\n drm/i915: fix debug output for 3 pipe configs\n drm/i915: add PLL sharing support to handle 3 pipes\n drm/i915: fix PCH PLL assertion check for 3 pipes\n drm/i915: use transcoder select bits on VGA and HDMI on CPT\n ...\n" }, { "commit": "a60f0e38d72a5e24085d6e7e27a4cadc20ae268a", "tree": "65dfb758c4b13423203aeb8535f547b5718cd256", "parents": [ "a2006cf5a7ad3463e7c1e9da2c4bc90499427558" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Oct 20 15:09:17 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Oct 20 23:22:01 2011 -0700" }, "message": "drm/i915: add DP test request handling\n\nDPCD 1.1+ adds some automated test infrastructure support. Add support\nfor reading the IRQ source and jumping to a test handling routine if\nneeded. Subsequent patches will handle particular tests; this patch\njust ACKs any requested tests by default.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "b73fe58cafc6954db0170a5d4ef2b4b6316f6709", "tree": "01e683ea648767045c463db2596a24b5bdd47615", "parents": [ "5c0422878fcdc279ae9a8e8b66972a15b5efb67f" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Tue Oct 04 15:16:48 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Oct 20 15:26:39 2011 -0700" }, "message": "drm: Add Panel Self Refresh DP addresses\n\nAdd the addresses and definitions I care about for Panel Self Refresh, as\ndocumented in the eDP spec.\n\nI\u0027m sending these out before some other patches because this should be a fairly\nsimple one to get upstream and not require too much fuss (where the others may\nhave some fuss).\n\nThis file is a mess with white spacing. I tried to stay consistent with the\nsurrounding code.\n\nv2: had some silly mistakes in v1 which Keith caught\n\nCc: Dave Airlie \u003cairlied@redhat.com\u003e\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "5c0422878fcdc279ae9a8e8b66972a15b5efb67f", "tree": "13ed982427828e6a031dd5fd642f25b15c300d63", "parents": [ "f372b85463dac2fc696443d4c5063db2af5dcead" ], "author": { "name": "Ben Widawsky", "email": "ben@bwidawsk.net", "time": "Mon Oct 17 15:51:55 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Oct 20 15:26:39 2011 -0700" }, "message": "drm/i915: ILK + VT-d workaround\n\nIdle the GPU before doing any unmaps. We know if VT-d is in use through\nan exported variable from iommu code.\n\nThis should avoid a known HW issue.\n\nSigned-off-by: Ben Widawsky \u003cben@bwidawsk.net\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "62addcb8c188eaa28968e27a02518404939851d7", "tree": "265f431c92c2c677474e390ada03397c56850a5b", "parents": [ "5438ae88d098c086cfb94be5327c49a04fc6bfd7", "64a742fac3a22f57303d8f1b7e347350a1c48254" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 10 20:05:21 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 10 20:05:21 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux into drm-core-next\n\n* \u0027drm-intel-next\u0027 of git://people.freedesktop.org/~keithp/linux:\n drm/i915: Dumb down the semaphore logic\n drm/i915: pass ELD to HDMI/DP audio driver\n drm: support routines for HDMI/DP ELD\n drm/i915: Enable dither whenever display bpc \u003c frame buffer bpc\n drm/i915: Enable dither whenever display bpc \u003c frame buffer bpc\n" }, { "commit": "57c5ee79acba9582762c09c269e0e2ae1adf1b31", "tree": "26b2148b81e7a7c1785d9d07d45c68bb1117bfb5", "parents": [ "8bf445cee3127de3779a395d08d1ada2ad70161e" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Mon Oct 10 12:23:26 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Oct 10 15:46:55 2011 +0100" }, "message": "vmwgfx: Add fence events\n\nAdd a way to send DRM events down the gpu fifo by attaching them to\nfence objects. This may be useful for Xserver swapbuffer throttling and\npage-flip done notifications.\n\nBump version to 2.2 to signal the availability of the FENCE_EVENT ioctl.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1c248b7d2960faec3e1b8f3f9c5d9d0df28e0a3c", "tree": "dff45afe42d7f7bb5c2bece7a3a5830b49aaa60b", "parents": [ "5383053627afab973ffe582a4db9646317bec726" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Tue Oct 04 19:19:01 2011 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 05 10:27:31 2011 +0100" }, "message": "DRM: add DRM Driver for Samsung SoC EXYNOS4210.\n\nThis patch is a DRM Driver for Samsung SoC Exynos4210 and now enables\nonly FIMD yet but we will add HDMI support also in the future.\n\nthis patch is based on git repository below:\ngit://people.freedesktop.org/~airlied/linux.git\nbranch name: drm-next\ncommit-id: 88ef4e3f4f616462b78a7838eb3ffc3818d30f67\n\nyou can refer to our working repository below:\nhttp://git.infradead.org/users/kmpark/linux-2.6-samsung\nbranch name: samsung-drm\n\nWe tried to re-use lowlevel codes of the FIMD driver(s3c-fb.c\nbased on Linux framebuffer) but couldn\u0027t so because lowlevel codes\nof s3c-fb.c are included internally and so FIMD module of this driver has\nits own lowlevel codes.\n\nWe used GEM framework for buffer management and DMA APIs(dma_alloc_*)\nfor buffer allocation so we can allocate physically continuous memory\nfor DMA through it and also we could use CMA later if CMA is applied to\nmainline.\n\nRefer to this link for CMA(Continuous Memory Allocator):\nhttp://lkml.org/lkml/2011/7/20/45\n\nthis driver supports only physically continuous memory(non-iommu).\n\nLinks to previous versions of the patchset:\nv1: \u003c https://lwn.net/Articles/454380/ \u003e\nv2: \u003c http://www.spinics.net/lists/kernel/msg1224275.html \u003e\nv3: \u003c http://www.spinics.net/lists/dri-devel/msg13755.html \u003e\nv4: \u003c http://permalink.gmane.org/gmane.comp.video.dri.devel/60439 \u003e\nv5: \u003c http://comments.gmane.org/gmane.comp.video.dri.devel/60802 \u003e\n\nChangelog v2:\nDRM: add DRM_IOCTL_SAMSUNG_GEM_MMAP ioctl command.\n\n this feature maps user address space to physical memory region\n once user application requests DRM_IOCTL_SAMSUNG_GEM_MMAP ioctl.\n\nDRM: code clean and add exception codes.\n\nChangelog v3:\nDRM: Support multiple irq.\n\n FIMD and HDMI have their own irq handler but DRM Framework can regiter\n only one irq handler this patch supports mutiple irq for Samsung SoC.\n\nDRM: Consider modularization.\n\n each DRM, FIMD could be built as a module.\n\nDRM: Have indenpendent crtc object.\n\n crtc isn\u0027t specific to SoC Platform so this patch gets a crtc\n to be used as common object.\n created crtc could be attached to any encoder object.\n\nDRM: code clean and add exception codes.\n\nChangelog v4:\nDRM: remove is_defult from samsung_fb.\n\n is_default isn\u0027t used for default framebuffer.\n\nDRM: code refactoring to fimd module.\n this patch is be considered with multiple display objects and\n would use its own request_irq() to register a irq handler instead of\n drm framework\u0027s one.\n\nDRM: remove find_samsung_drm_gem_object()\n\nDRM: move kernel private data structures and definitions to driver folder.\n\n samsung_drm.h would contain only public information for userspace\n ioctl interface.\n\nDRM: code refactoring to gem modules.\n buffer module isn\u0027t dependent of gem module anymore.\n\nDRM: fixed security issue.\n\nDRM: remove encoder porinter from specific connector.\n\n samsung connector doesn\u0027t need to have generic encoder.\n\nDRM: code clean and add exception codes.\n\nChangelog v5:\nDRM: updated fimd(display controller) driver.\n added various pixel formats, color key and pixel blending features.\n\nDRM: removed end_buf_off from samsung_drm_overlay structure.\n this variable isn\u0027t used and end buffer address would be\n calculated by each sub driver.\n\nDRM: use generic function for mmap_offset.\n replaced samsung_drm_gem_create_mmap_offset() and\n samsung_drm_free_mmap_offset() with generic ones applied\n to mainline recentrly.\n\nDRM: removed unnecessary codes and added exception codes.\n\nDRM: added comments and code clean.\n\nChangelog v6:\nDRM: added default config options.\n\nDRM: added padding for 64-bit align.\n\nDRM: changed prefix \u0027samsung\u0027 to \u0027exynos\u0027\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nSigned-off-by: Seung-Woo Kim \u003csw0312.kim@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nReviewed-by: Dave Airlie \u003cairlied@redhat.com\u003e\nReviewed-by: Rob Clark \u003crobdclark@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2fcd5a73bfd5341876f9ea6b5adcc1dd814226d4", "tree": "88aa55c24bc1fe620a0753ab1598fe2727b19352", "parents": [ "44031d25ccface0ae647d664347ae3d3a8016f5f" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Tue Oct 04 20:13:26 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Oct 05 10:17:17 2011 +0100" }, "message": "vmwgfx: Add present and readback ioctls\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "76adaa34db407f174dd06370cb60f6029c33b465", "tree": "0dd9e80ba2a6e24eb3e9c61e94b71ee9d760cdab", "parents": [ "578393cd1e6ebe2979664f11df630126c3f348a8" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Mon Sep 05 14:23:20 2011 +0800" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Sep 21 14:52:41 2011 -0700" }, "message": "drm: support routines for HDMI/DP ELD\n\nELD (EDID-Like Data) describes to the HDMI/DP audio driver the audio\ncapabilities of the plugged monitor.\n\nThis adds drm_edid_to_eld() for converting EDID to ELD. The converted\nELD will be saved in a new drm_connector.eld[128] data field. This is\nnecessary because the graphics driver will need to fixup some of the\ndata fields (eg. HDMI/DP connection type, AV sync delay) before writing\nto the hardware ELD buffer. drm_av_sync_delay() will help the graphics\ndrivers dynamically compute the AV sync delay for fixing-up the ELD.\n\nELD selection policy: it\u0027s possible for one encoder to be associated\nwith multiple connectors (ie. monitors), in which case the first found\nELD will be returned by drm_select_eld(). This policy may not be\nsuitable for all users, but let\u0027s start it simple first.\n\nThe impact of ELD selection policy: assume there are two monitors, one\nsupports stereo playback and the other has 8-channel output; cloned\ndisplay mode is used, so that the two monitors are associated with the\nsame internal encoder. If only the stereo playback capability is reported,\nthe user won\u0027t be able to start 8-channel playback; if the 8-channel ELD\nis reported, then user space applications may send 8-channel samples\ndown, however the user may actually be listening to the 2-channel\nmonitor and not connecting speakers to the 8-channel monitor.\n\nAccording to James, many TVs will either refuse the display anything or\npop-up an OSD warning whenever they receive hdmi audio which they cannot\nhandle. Eventually we will require configurability and/or per-monitor\naudio control even when the video is cloned.\n\nCC: Zhao Yakui \u003cyakui.zhao@intel.com\u003e\nCC: Wang Zhenyu \u003czhenyu.z.wang@intel.com\u003e\nCC: Jeremy Bush \u003ccontractfrombelow@gmail.com\u003e\nCC: Christopher White \u003cc.white@pulseforce.com\u003e\nCC: Pierre-Louis Bossart \u003cpierre-louis.bossart@intel.com\u003e\nCC: Paul Menzel \u003cpaulepanter@users.sourceforge.net\u003e\nCC: James Cloos \u003ccloos@jhcloos.com\u003e\nCC: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "2ae7b03c26948eddf7c0dd80e1f4eb09140f2698", "tree": "238191669a8bd282f65217a27f3f2986086a5d96", "parents": [ "ae2a104058e217548215bfe6c6c8a98752139c29" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 01 20:18:45 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 06 11:51:12 2011 +0100" }, "message": "vmwgfx: Bump major\n\nThis bumps driver major version as a result of previous incompatible\ninterface changes.\n\nIn addition, a leftover command definition is removed from the\nvmwgfx_drm.h header.\n\nAlso a strict version check is enforced on the exebuf ioctl.\n\nThis is intended to be the last major bump before exiting staging.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ae2a104058e217548215bfe6c6c8a98752139c29", "tree": "9f3fccec1c8f4e78b67b44fc6b4cdda10f3291da", "parents": [ "4f73a96bd76914009682432842ac04a32ab9115b" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 01 20:18:44 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 06 11:51:11 2011 +0100" }, "message": "vmwgfx: Implement fence objects\n\nWill be needed for queries and drm event-driven throttling.\n\nAs a benefit, they help avoid stale user-space fence handles.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6bcd8d3c782b7b2c98c8f414a6bb43cf6b84e53c", "tree": "ec6f664be6a2ff92e0512494c222af6e2776130b", "parents": [ "f63f6a59d3905ac73aeeb617b27ac31516549ed9" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 01 20:18:42 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 06 11:48:40 2011 +0100" }, "message": "vmwgfx: Fix confusion caused by using \"fence\" in various places\n\nThis is needed before we introduce the fence objects.\nOtherwise this will be even more confusing. The plan is to use the following:\n\nseqno: A 32-bit sequence number that may be passed in the fifo.\nmarker: Objects, carrying a seqno, that track fifo submission time. They\nare used for fifo lag based throttling.\nfence objects: Kernel space objects, possibly accessible from user-space and\ncarrying a 32-bit seqno together with signaled status.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f63f6a59d3905ac73aeeb617b27ac31516549ed9", "tree": "051927c6b2b8a1ff0816ea9e58aa462e55d884f4", "parents": [ "07999a7e0e409891cb27f34fa1da851d8484a5c5" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 01 20:18:41 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 06 11:48:35 2011 +0100" }, "message": "vmwgfx: Add functionality to get 3D caps\n\nSince we don\u0027t allow user-space to map the fifo anymore,\nadd a parameter to get fifo hw version and\nan ioctl to copy the 3D capabilities.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecranz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "07999a7e0e409891cb27f34fa1da851d8484a5c5", "tree": "26536a623b5086aa20fb9c2a69b7a2d1ce82e3c9", "parents": [ "fe0f5c657601c28d295b1d60691cce40e8b42d92" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 01 20:18:40 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 06 11:48:34 2011 +0100" }, "message": "vmwgfx: Remove the possibility to map the fifo from user-space\n\nThis was previously used by user-space to check whether a fence\nsequence had passed or not.\nWith fence objects that\u0027s not needed anymore.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fe0f5c657601c28d295b1d60691cce40e8b42d92", "tree": "efe3229d68f82519633fe0bd58a88f6f7e83ad0f", "parents": [ "781b8bdb2dde76ebd52c26954c09c4500f02522c" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 01 20:18:39 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 06 11:48:33 2011 +0100" }, "message": "vmwgfx: Remove the update layout IOCTL.\n\nIt doesn\u0027t seem like its needed. If this turns out to be an incorrect\nassumption, we can reinstate it.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "781b8bdb2dde76ebd52c26954c09c4500f02522c", "tree": "6050b4c6d2696dcce0aab44175618ef8332208ca", "parents": [ "2de59d0161d1c5e102e2140364cc27a2676e8816" ], "author": { "name": "Thomas Hellstrom", "email": "thellstrom@vmware.com", "time": "Thu Sep 01 20:18:38 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Sep 06 11:48:32 2011 +0100" }, "message": "vmwgfx: Remove the fifo debug ioctl\n\nIt was only used for bringup debugging, and probably doesn\u0027t work\nanymore. Remove it.\n\nSigned-off-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nReviewed-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d3ed74027f1dd197b7e08247a40d3bf9be1852b0", "tree": "9d4fbd62d8fb5d505c1b934f13bccb762ab47dff", "parents": [ "dfadbbdb57b3f2bb33e14f129a43047c6f0caefa" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Sun Aug 07 20:39:04 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Aug 31 19:25:48 2011 +0100" }, "message": "drm/radeon/kms: add a new gem_wait ioctl with read/write flags\n\nThe new DRM_RADEON_GEM_WAIT ioctl combines GEM_WAIT_IDLE and GEM_BUSY (there\nis a NO_WAIT flag to get the latter) with USAGE_READ and USAGE_WRITE flags\nto take advantage of the new ttm_bo_wait changes.\n\nAlso bump the DRM version.\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dfadbbdb57b3f2bb33e14f129a43047c6f0caefa", "tree": "0a6e00b5fa56d9f5a5b4dc833e3057e4660efd1c", "parents": [ "b464e9a25c27884eb8ee2c2bb904ec50bd3990ea" ], "author": { "name": "Marek Olšák", "email": "maraeo@gmail.com", "time": "Sat Aug 13 20:32:11 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Aug 31 19:25:35 2011 +0100" }, "message": "drm/ttm: add a way to bo_wait for either the last read or last write\n\nSometimes we want to know whether a buffer is busy and wait for it (bo_wait).\nHowever, sometimes it would be more useful to be able to query whether\na buffer is busy and being either read or written, and wait until it\u0027s stopped\nbeing either read or written. The point of this is to be able to avoid\nunnecessary waiting, e.g. if a GPU has written something to a buffer and is now\nreading that buffer, and a CPU wants to map that buffer for read, it needs to\nonly wait for the last write. If there were no write, there wouldn\u0027t be any\nwaiting needed.\n\nThis, or course, requires user space drivers to send read/write flags\nwith each relocation (like we have read/write domains in radeon, so we can\nactually use those for something useful now).\n\nNow how this patch works:\n\nThe read/write flags should passed to ttm_validate_buffer. TTM maintains\nseparate sync objects of the last read and write for each buffer, in addition\nto the sync object of the last use of a buffer. ttm_bo_wait then operates\nwith one the sync objects.\n\nSigned-off-by: Marek Olšák \u003cmaraeo@gmail.com\u003e\nReviewed-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "75ef8b3b9c0b76eb5a16cd838cb99a7deecceb85", "tree": "1d6a3762bbc157fe3fc65982f42452c97d539d4f", "parents": [ "302a8e8b06d312dcb3b718dfeb42aa912b5f426b" ], "author": { "name": "Rob Clark", "email": "rob@ti.com", "time": "Wed Aug 10 08:09:07 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 30 11:06:06 2011 +0100" }, "message": "drm/gem: add functions for mmap offset creation\n\nSigned-off-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "051963d4832ed61e5ae74f5330b0a94489e101b9", "tree": "4ade8f3af4f6ec99d8f76048707072708f5877e7", "parents": [ "5037f8acf448dd0de9868dc7410f45879d3d1a1b" ], "author": { "name": "Thomas Reim", "email": "reimth@gmail.com", "time": "Fri Jul 29 14:28:57 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:39:35 2011 +0100" }, "message": "drm: Separate EDID Header Check from EDID Block Check\n\n Provides function drm_edid_header_is_valid() for EDID header check\n and replaces EDID header check part of function drm_edid_block_valid()\n by a call of drm_edid_header_is_valid().\n This is a prerequisite to extend DDC probing, e. g. in function\n radeon_ddc_probe() for Radeon devices, by a central EDID header check.\n\n Tested for kernel 2.6.35, 2.6.38 and 3.0\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Thomas Reim \u003creimth@gmail.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nAcked-by: Stephen Michaels \u003cStephen.Micheals@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0b576372e86c8e6bee01506651b21ec0fe8a1698", "tree": "ed86064dad2db36348ab9c8305a910fe5cc48cec", "parents": [ "c41b9ee901bb2c7e3eacfa7e171de50c15d61c0b", "07b7ddd9b7f17a567e3ac2b33a4dffcb2a4524e0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:24 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Aug 04 14:22:24 2011 +0100" }, "message": "Merge branch \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 into drm-fixes\n\n* \u0027drm-intel-next\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: (42 commits)\n drm/i915: allow cache sharing policy control\n drm/i915/hdmi: HDMI source product description infoframe support\n drm/i915/hdmi: split infoframe setting from infoframe type code\n drm: track CEA version number if present\n drm/i915: Try enabling RC6 by default (again)\n Revert \"drm/i915/dp: Zero the DPCD data before connection probe\"\n drm/i915/dp: wait for previous AUX channel activity to clear\n drm/i915: don\u0027t use uninitialized EDID bpc values when picking pipe bpp\n drm/i915/pch: Save/restore PCH_PORT_HOTPLUG across suspend\n drm/i915: apply phase pointer override on SNB+ too\n drm/i915: Add quirk to disable SSC on Sony Vaio Y2\n drm/i915: provide more error output when mode sets fail\n drm/i915: add GPU max frequency control file\n i915: add Dell OptiPlex FX170 to intel_no_lvds\n drm/i915: Ignore GPU wedged errors while pinning scanout buffers\n drm/i915/hdmi: send AVI info frames on ILK+ as well\n drm/i915: fix CB tuning check for ILK+\n drm/i915: Flush other plane register writes\n drm/i915: flush plane control changes on ILK+ as well\n drm/i915: apply timing generator bug workaround on CPT and PPT\n ...\n" }, { "commit": "ebec9a7bf11f843b0602b06c402f04bf4213b35a", "tree": "dc99677c052f3a24bf55a87f9b88067f3de70102", "parents": [ "4e20fa65a3ea789510eed1a15deb9e8aab2b8202" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Wed Aug 03 09:22:54 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Wed Aug 03 17:43:10 2011 -0700" }, "message": "drm: track CEA version number if present\n\nDrivers need to know the CEA version number in addition to other display\ninfo (like whether the display is an HDMI sink) before enabling certain\nfeatures. So track the CEA version number in the display info\nstructure.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "757c26b804428ef10888b8e00f34994dbe361d3a", "tree": "4695afbf476ce9818bc01d34d4c266811365296c", "parents": [ "e08dc1325feaf49eec392ee52feb2974ec3f5155", "5a96a899bbdee86024ab9ea6d02b9e242faacbed" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 09:21:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 09:21:09 2011 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (135 commits)\n drm/radeon/kms: fix DP training for DPEncoderService revision bigger than 1.1\n drm/radeon/kms: add missing vddci setting on NI+\n drm/radeon: Add a rmb() in IH processing\n drm/radeon: ATOM Endian fix for atombios_crtc_program_pll()\n drm/radeon: Fix the definition of RADEON_BUF_SWAP_32BIT\n drm/radeon: Do an MMIO read on interrupts when not uisng MSIs\n drm/radeon: Writeback endian fixes\n drm/radeon: Remove a bunch of useless _iomem casts\n drm/gem: add support for private objects\n DRM: clean up and document parsing of video\u003d parameter\n DRM: Radeon: Fix section mismatch.\n drm: really make debug levels match in edid failure code\n drm/radeon/kms: fix i2c map for rv250/280\n drm/nouveau/gr: disable fifo access and idle before suspend ctx unload\n drm/nouveau: pass flag to engine fini() method on suspend\n drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing\n drm/nv40/gr: rewrite/split context takedown functions\n drm/nouveau: detect disabled device in irq handler and return IRQ_NONE\n drm/nouveau: ignore connector type when deciding digital/analog on DVI-I\n drm/nouveau: Add a quirk for Gigabyte NX86T\n ...\n" }, { "commit": "62cb70118c4efabb3c0a6f962168ddcad4344eef", "tree": "68c8877c9fd761435082b84ae53c579e2a79fb93", "parents": [ "04fee895ef98ffbb91a941b53a92d6949bb6d1c4" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Tue Jun 07 14:17:51 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 25 12:07:15 2011 +0100" }, "message": "drm/gem: add support for private objects\n\nThese small changes should allow GEM to be used with non shmem objects as\nwell as shmem objects. In the GMA500 case it allows the base framebuffer to\nappear as a GEM object and thus acquire a handle and work with KMS.\n\nFor i915 it ought to be trivial to get back the wasted memory but putting the\nsystem fb back into stolen RAM and in general I can imagine it allowing the\nuse of GEM and thus KMS with all the older cards that have their framebuffer\nfirmly placed in video RAM.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nTested-by: Rob Clark \u003crob@ti.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "df7976797fa9af161690dbf4dee81ed92cdc150f", "tree": "be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3", "parents": [ "f0b69efc29b024747a88ce020dada425e3193d5a", "9c54c0dd948d715ccfd79e97d852f80eeb53254a" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 13:40:42 2011 -0700" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 13:40:42 2011 -0700" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "842d452985300f4ec14c68cb86046e8a1a3b7251", "tree": "14c16182fe2b53292edcf8f35d07554b06fd6a2f", "parents": [ "02f8c6aee8df3cdc935e9bdd4f2d020306035dbe" ], "author": { "name": "Ole Henrik Jahren", "email": "olehenja@alumni.ntnu.no", "time": "Fri Jul 22 15:56:01 2011 +0200" }, "committer": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Fri Jul 22 13:36:44 2011 -0700" }, "message": "drm/i915: Fix typo in DRM_I915_OVERLAY_PUT_IMAGE ioctl define\n\nBecause of a typo, calling ioctl with DRM_IOCTL_I915_OVERLAY_PUT_IMAGE\nis broken if the macro is used directly. When using libdrm the bug is\nnot hit, since libdrm handles the ioctl encoding internally.\n\nThe typo also leads to the .cmd and .cmd_drv fields of the drm_ioctl\nstructure for DRM_I915_OVERLAY_PUT_IMAGE having inconsistent content.\n\nSigned-off-by: Ole Henrik Jahren \u003colehenja@alumni.ntnu.no\u003e\nAcked-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nCc: stable@kernel.org\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\n" }, { "commit": "e55b9422e186d208f162f056ee28b6eb6b9b81a9", "tree": "1b72616db7d9b2f651b354b11e74287a4910c3b9", "parents": [ "28a4a163b561c39ac0c798d420e0927f29e9d4c8" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 15 19:53:52 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jul 18 08:13:08 2011 +0100" }, "message": "drm/radeon/kms: add info query for backend map\n\nThe 3D driver need to get the pipe to backend\nmap to certain things. Add a query to get the\ninfo.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e3c1620434ac77b618ce74c024ace3559602ac99", "tree": "40b976b6914b40b44741a5b63c7a700a7884d592", "parents": [ "5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri Jul 15 14:39:10 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jul 15 16:10:55 2011 +0100" }, "message": "drm/radeon/kms: add new NI pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "58b6542b50ded4243c26c251c0507e5f658642f6", "tree": "f2cf26ee85607daf86983b3d10871e186a0c7dde", "parents": [ "d52589b785404c944e734ecc4e1d42326197613c" ], "author": { "name": "Jon Mason", "email": "jdmason@kudzu.us", "time": "Mon Jun 27 16:07:50 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jul 13 08:14:52 2011 +0100" }, "message": "DRM: remove drm_pci_device_is_pcie\n\ndrm_pci_device_is_pcie duplicates the funcationality of pci_is_pcie.\nConvert callers of the former to the latter. This has the side benefit\nof removing an unnecessary search in the PCI configuration space due to\nusing a saved PCIe capability offset.\n\n[airlied: update for new callsite]\n\nSigned-off-by: Jon Mason \u003cjdmason@kudzu.us\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "0d74f86f37306da8619eb049d88ab7ee523eec9c", "tree": "28d212fd4bd47370840db56e2598f58d179bc968", "parents": [ "20633442eb6ce7b0b55252a24b981afe42b3d361" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jun 08 17:06:15 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 21 12:33:18 2011 +1000" }, "message": "ttm: Fix spelling mistakes and remove unused #ifdef\n\n. and some comments to make it easier to understand.\n\nAckedby: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\n[v2: Added some more updates from Randy Dunlap]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "304eda32920b5e23f6b9bc12eb40c7dc52a464ba", "tree": "c36e760a7ea45158999fe541134bff7841af94c5", "parents": [ "a377e187df725fe7e62d2cec59ec290c5a605d93" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Thu Jun 09 00:24:59 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 21 12:32:33 2011 +1000" }, "message": "drm/gem: add hooks to notify driver when object handle is created/destroyed\n\nNouveau is going to use these hooks to map/unmap objects from a client\u0027s\nprivate GPU address space.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4a9a8b71e12d41abb71c4e741bff524f016cfef4", "tree": "e5b3589c7568897a2184646665ca2f67257b62a5", "parents": [ "f49dadb82dde88092827b6d058e7164e75e96759" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Tue Jun 14 06:13:55 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 16 16:30:54 2011 +1000" }, "message": "drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.\n\nSome RS690 chipsets seem to end up with floating connectors, either\na DVI connector isn\u0027t actually populated, or an add-in HDMI card\nis available but not installed. In this case we seem to get a NULL byte\nresponse for each byte of the i2c transaction, so we detect this\ncase and if we see it we don\u0027t do anymore DDC transactions on this\nconnector.\n\nI\u0027ve tested this on my RS690 without the HDMI card installed and\nit seems to work fine.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\n" }, { "commit": "12871a0bd67dd4db4418e1daafcd46e9d329ef10", "tree": "faf782dd816040d6cdaaccd7113956d8d29cd0e5", "parents": [ "ecff4fcc7bbaf060646d2160123f8dc02605a047", "f3aeceac61b6e2f3167717ea1793472108e47564" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 07 19:09:17 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 07 19:09:17 2011 -0700" }, "message": "Merge branch \u0027drm-radeon-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-radeon-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms/atom: fix PHY init\n drm/radeon/kms: add missing Evergreen texture formats to the CS parser\n drm/radeon/kms: viewport height has to be even\n drm/radeon/kms: remove duplicate reg from r600 safe regs\n drm/radeon/kms: add support for Llano Fusion APUs\n drm/radeon/kms: add llano pci ids\n drm/radeon/kms: fill in asic struct for llano\n drm/radeon/kms: add family ids for llano APUs\n drm/radeon: fix oops in ttm reserve when pageflipping (v2)\n drm/radeon/kms: clean up the radeon kms Kconfig\n drm/radeon/kms: fix thermal sensor reading on juniper\n drm/radeon/kms: add missing case for cayman thermal sensor\n drm/radeon/kms: add blit support for cayman (v2)\n drm/radeon/kms/blit: workaround some hw issues on evergreen+\n" }, { "commit": "3b68a26ec058fda2d6b470cdd8fedc5a3c854916", "tree": "f84c70be894efe71719c9a382f8d0942e83ee297", "parents": [ "89da5a375ad797ad5e38ad7a9ec64ea40afe8c7a" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue May 31 15:42:49 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 02 10:47:39 2011 +1000" }, "message": "drm/radeon/kms: add llano pci ids\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "98b98d316349e9a028e632629fe813d07fa5afdd", "tree": "caaf6a662a86c5e2a418f0929ca05f0748803ac5", "parents": [ "0d66cba1ac3ad38614077443d604d6a09cec99de", "931474c4c30633400ff0dff8fb452ae20e01d067" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 12:06:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 24 12:06:40 2011 -0700" }, "message": "Merge branch \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (169 commits)\n drivers/gpu/drm/radeon/atom.c: fix warning\n drm/radeon/kms: bump kms version number\n drm/radeon/kms: properly set num banks for fusion asics\n drm/radeon/kms/atom: move dig phy init out of modesetting\n drm/radeon/kms/cayman: fix typo in register mask\n drm/radeon/kms: fix typo in spread spectrum code\n drm/radeon/kms: fix tile_config value reported to userspace on cayman.\n drm/radeon/kms: fix incorrect comparison in cayman setup code.\n drm/radeon/kms: add wait idle ioctl for eg-\u003ecayman\n drm/radeon/cayman: setup hdp to invalidate and flush when asked\n drm/radeon/evergreen/btc/fusion: setup hdp to invalidate and flush when asked\n agp/uninorth: Fix lockups with radeon KMS and \u003e1x.\n drm/radeon/kms: the SS_Id field in the LCD table if for LVDS only\n drm/radeon/kms: properly set the CLK_REF bit for DCE3 devices\n drm/radeon/kms: fixup eDP connector handling\n drm/radeon/kms: bail early for eDP in hotplug callback\n drm/radeon/kms: simplify hotplug handler logic\n drm/radeon/kms: rewrite DP handling\n drm/radeon/kms/atom: add support for setting DP panel mode\n drm/radeon/kms: atombios.h updates for DP panel mode\n ...\n" }, { "commit": "428c4b51b7e133202db49021011f6af64b3276f8", "tree": "e31f09653d55101b5d0030273abd2711df89686f", "parents": [ "eac4dff6d3edc0aea1941db16c03ae19aa628a3c" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Fri May 20 04:34:25 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri May 20 20:02:29 2011 +1000" }, "message": "drm/dp: add some new DP regs for DP 1.2\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "752d2635ebb12b6122ba05775f7d1ccfef14b275", "tree": "787f76b453e15a03e7db938eaace598dc36273eb", "parents": [ "8eea1be174a1ea4b86323167bbadc8a6abdca613" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Apr 22 11:03:57 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 12:01:43 2011 +1000" }, "message": "drm: Take lock around probes for drm_fb_helper_hotplug_event\n\nWe need to hold the dev-\u003emode_config.mutex whilst detecting the output\nstatus. But we also need to drop it for the call into\ndrm_fb_helper_single_fb_probe(), which indirectly acquires the lock when\nattaching the fbcon.\n\nFailure to do so exposes a race with normal output probing. Detected by\nadding some warnings that the mutex is held to the backend detect routines:\n\n[ 17.772456] WARNING: at drivers/gpu/drm/i915/intel_crt.c:471 intel_crt_detect+0x3e/0x373 [i915]()\n[ 17.772458] Hardware name: Latitude E6400\n[ 17.772460] Modules linked in: ....\n[ 17.772582] Pid: 11, comm: kworker/0:1 Tainted: G W 2.6.38.4-custom.2 #8\n[ 17.772584] Call Trace:\n[ 17.772591] [\u003cffffffff81046af5\u003e] ? warn_slowpath_common+0x78/0x8c\n[ 17.772603] [\u003cffffffffa03f3e5c\u003e] ? intel_crt_detect+0x3e/0x373 [i915]\n[ 17.772612] [\u003cffffffffa0355d49\u003e] ? drm_helper_probe_single_connector_modes+0xbf/0x2af [drm_kms_helper]\n[ 17.772619] [\u003cffffffffa03534d5\u003e] ? drm_fb_helper_probe_connector_modes+0x39/0x4d [drm_kms_helper]\n[ 17.772625] [\u003cffffffffa0354760\u003e] ? drm_fb_helper_hotplug_event+0xa5/0xc3 [drm_kms_helper]\n[ 17.772633] [\u003cffffffffa035577f\u003e] ? output_poll_execute+0x146/0x17c [drm_kms_helper]\n[ 17.772638] [\u003cffffffff81193c01\u003e] ? cfq_init_queue+0x247/0x345\n[ 17.772644] [\u003cffffffffa0355639\u003e] ? output_poll_execute+0x0/0x17c [drm_kms_helper]\n[ 17.772648] [\u003cffffffff8105b540\u003e] ? process_one_work+0x193/0x28e\n[ 17.772652] [\u003cffffffff8105c6bc\u003e] ? worker_thread+0xef/0x172\n[ 17.772655] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772658] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772663] [\u003cffffffff8105f767\u003e] ? kthread+0x7a/0x82\n[ 17.772668] [\u003cffffffff8100a724\u003e] ? kernel_thread_helper+0x4/0x10\n[ 17.772671] [\u003cffffffff8105f6ed\u003e] ? kthread+0x0/0x82\n[ 17.772674] [\u003cffffffff8100a720\u003e] ? kernel_thread_helper+0x0/0x10\n\nReported-by: Frederik Himpe \u003cfhimpe@telenet.be\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36394\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "69f7876b2ab61e8114675d6092ad0b482e233612", "tree": "a55aefd08d6c5f617d277a99e11b5a707e162585", "parents": [ "0eacdba3a186e5d5b8a8bb421caacddc135e67e3", "645c62a5e95a5f9a8e0d0627446bbda4ee042024" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 10:45:40 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 16 10:45:40 2011 +1000" }, "message": "Merge remote branch \u0027keithp/drm-intel-next\u0027 of /ssd/git/drm-next into drm-core-next\n\n* \u0027keithp/drm-intel-next\u0027 of /ssd/git/drm-next: (301 commits)\n drm/i915: split PCH clock gating init\n drm/i915: add Ivybridge clock gating init function\n drm/i915: Update the location of the ringbuffers\u0027 HWS_PGA registers for IVB.\n drm/i915: Add support for fence registers on Ivybridge.\n drm/i915: Use existing function instead of open-coding fence reg clear.\n drm/i915: split clock gating init into per-chipset functions\n drm/i915: set IBX pch type explicitly\n drm/i915: add Ivy Bridge PCI IDs and driver feature structs\n drm/i915: add PantherPoint PCH ID\n agp/intel: add Ivy Bridge support\n drm/i915: ring support for Ivy Bridge\n drm/i915: page flip support for Ivy Bridge\n drm/i915: interrupt \u0026 vblank support for Ivy Bridge\n drm/i915: treat Ivy Bridge watermarks like Sandy Bridge\n drm/i915: manual FDI training for Ivy Bridge\n drm/i915: add swizzle/tiling support for Ivy Bridge\n drm/i915: Ivy Bridge has split display and pipe control\n drm/i915: add IS_IVYBRIDGE macro for checks\n drm/i915: add IS_GEN7 macro to cover Ivy Bridge and later\n drm/i915: split enable/disable vblank code into chipset specific functions\n ...\n" }, { "commit": "2bbd4492552867053b5a618a2474297e2b1c355d", "tree": "13f6e611009a3175af2aeebecb5a1d65cf3cd205", "parents": [ "ff68146acb98b689947692bffd38ec4ad67eb1cb" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri May 06 23:47:53 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon May 09 09:14:45 2011 +1000" }, "message": "drm: mm: fix debug output\n\nThe looping helper didn\u0027t do anything due to a superficial\nsemicolon. Furthermore one of the two dump functions suffered\nfrom copy\u0026paste fail.\n\nWhile staring at the code I\u0027ve also noticed that the replace\nhelper (currently unused) is a bit broken.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8aeb96f80232e9a701b5c4715504f4c9173978bd", "tree": "59852e4f90221689eef0ed0ae8b7ff51e598b90a", "parents": [ "498548ec69c6897fe4376b2ca90758762fa0b817" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue May 03 19:28:02 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 04 10:16:40 2011 +1000" }, "message": "drm/radeon/kms: fix gart setup on fusion parts (v2)\n\nOut of the entire GART/VM subsystem, the hw designers changed\nthe location of 3 regs.\n\nv2: airlied: add parameter for userspace to work from.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e2c85d8e3974c9041ad7b080846b28d2243e771b", "tree": "f125faf647ac4bef10758a5294531ccd88564526", "parents": [ "609cfda586c7fe3e5d1a02c51edb587506294167" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue May 03 15:15:55 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed May 04 09:28:59 2011 +1000" }, "message": "drm/radeon/kms: add some new pci ids\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": "1794d257fa7bab3ea5162f8abdca749996b65343", "tree": "ea8d035a218a0cb0ee83443b3c25bd8df25567e2", "parents": [ "bbb0aef5cfe95fe9b51a7eeba4a440b69037b01f" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Sun Apr 17 07:43:32 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:56:23 2011 +1000" }, "message": "drm: Export the command-line mode parser\n\nIn the absence of configuration data for providing the fixed mode for\na panel, I would like to be able to pass such modes along a separate\nmodule paramenter. To do so, I then need to parse a modeline from a\nstring, which drm is already capable of. Export that capability to the\ndrivers.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "bbb0aef5cfe95fe9b51a7eeba4a440b69037b01f", "tree": "858fdc7ee2b358827888f278fdfd0dddfbacc64b", "parents": [ "5ad3d8831f0c97257460c11ddcc1cc0466c762d4" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Apr 17 20:35:52 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:53:21 2011 +1000" }, "message": "drm: Verify debug message arguments\n\nAdd __attribute__((format (printf, 4, 5))) to drm_ut_debug_printk\nand fix fallout.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5ad3d8831f0c97257460c11ddcc1cc0466c762d4", "tree": "8ab86a7b1c0ebfcfdbf24270ac1f54ed1bed8a6e", "parents": [ "cb49ba0bb18632faa7c5ce1dcb095eaa70821c1d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Apr 17 20:35:51 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:53:02 2011 +1000" }, "message": "drm: Create and use drm_err\n\nReduce drm text size ~1% by using drm_err and\nprintf extension %pV to emit error messages.\n\nRemove unused macro DRM_MEM_ERROR.\n\n$ size drivers/gpu/drm/built-in.o*\n text\t data\t bss\t dec\t hex\tfilename\n 361159\t 9663\t 256\t 371078\t 5a986\tdrivers/gpu/drm/built-in.o.new\n 365416\t 9663\t 256\t 375335\t 5ba27\tdrivers/gpu/drm/built-in.o.old\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7394371d85699a1d6d49b61f65583d6cd902a6a2", "tree": "3c7a5c4721bb972f4f74d5f545ad11e512e3fb00", "parents": [ "da05a5a71ad8fc7c51d526151be193b7ef6e6c95" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Fri Apr 22 11:03:57 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:50:25 2011 +1000" }, "message": "drm: Take lock around probes for drm_fb_helper_hotplug_event\n\nWe need to hold the dev-\u003emode_config.mutex whilst detecting the output\nstatus. But we also need to drop it for the call into\ndrm_fb_helper_single_fb_probe(), which indirectly acquires the lock when\nattaching the fbcon.\n\nFailure to do so exposes a race with normal output probing. Detected by\nadding some warnings that the mutex is held to the backend detect routines:\n\n[ 17.772456] WARNING: at drivers/gpu/drm/i915/intel_crt.c:471 intel_crt_detect+0x3e/0x373 [i915]()\n[ 17.772458] Hardware name: Latitude E6400\n[ 17.772460] Modules linked in: ....\n[ 17.772582] Pid: 11, comm: kworker/0:1 Tainted: G W 2.6.38.4-custom.2 #8\n[ 17.772584] Call Trace:\n[ 17.772591] [\u003cffffffff81046af5\u003e] ? warn_slowpath_common+0x78/0x8c\n[ 17.772603] [\u003cffffffffa03f3e5c\u003e] ? intel_crt_detect+0x3e/0x373 [i915]\n[ 17.772612] [\u003cffffffffa0355d49\u003e] ? drm_helper_probe_single_connector_modes+0xbf/0x2af [drm_kms_helper]\n[ 17.772619] [\u003cffffffffa03534d5\u003e] ? drm_fb_helper_probe_connector_modes+0x39/0x4d [drm_kms_helper]\n[ 17.772625] [\u003cffffffffa0354760\u003e] ? drm_fb_helper_hotplug_event+0xa5/0xc3 [drm_kms_helper]\n[ 17.772633] [\u003cffffffffa035577f\u003e] ? output_poll_execute+0x146/0x17c [drm_kms_helper]\n[ 17.772638] [\u003cffffffff81193c01\u003e] ? cfq_init_queue+0x247/0x345\n[ 17.772644] [\u003cffffffffa0355639\u003e] ? output_poll_execute+0x0/0x17c [drm_kms_helper]\n[ 17.772648] [\u003cffffffff8105b540\u003e] ? process_one_work+0x193/0x28e\n[ 17.772652] [\u003cffffffff8105c6bc\u003e] ? worker_thread+0xef/0x172\n[ 17.772655] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772658] [\u003cffffffff8105c5cd\u003e] ? worker_thread+0x0/0x172\n[ 17.772663] [\u003cffffffff8105f767\u003e] ? kthread+0x7a/0x82\n[ 17.772668] [\u003cffffffff8100a724\u003e] ? kernel_thread_helper+0x4/0x10\n[ 17.772671] [\u003cffffffff8105f6ed\u003e] ? kthread+0x0/0x82\n[ 17.772674] [\u003cffffffff8100a720\u003e] ? kernel_thread_helper+0x0/0x10\n\nReported-by: Frederik Himpe \u003cfhimpe@telenet.be\u003e\nReferences: https://bugs.freedesktop.org/show_bug.cgi?id\u003d36394\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "da05a5a71ad8fc7c51d526151be193b7ef6e6c95", "tree": "148aca048b9e8b4542d019311bc1888666173172", "parents": [ "3b11228b54cc6bda4a72bb22984203c6eff4338a" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Apr 15 13:48:57 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:44:56 2011 +1000" }, "message": "drm: parse color format support for digital displays\n\nEDID 1.4 digital displays report the color spaces they support in the\nfeatures block. Add support for grabbing this data and stuffing it into\nthe display_info struct for driver use.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "3b11228b54cc6bda4a72bb22984203c6eff4338a", "tree": "accdc0765e163c0384b37b70f9f1601bc99fc52a", "parents": [ "e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Apr 15 12:49:23 2011 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 28 14:42:58 2011 +1000" }, "message": "drm: add bit depth parsing\n\nEDID 1.4 digital monitors report the bit depth supported in the input\nfield. Add support for parsing this out and storing the info in the\ndisplay_info structure for use by drivers.\n\n[airlied: tweaked to fix inter-patch dependency]\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316", "tree": "1b2140075e01d32af330370307004b9b73a9d796", "parents": [ "6565945b60922211c299968ba66a66617af32c9f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Apr 21 22:18:32 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 27 17:51:59 2011 +1000" }, "message": "drm/i915: restore only the mode of this driver on lastclose (v2)\n\ni915 calls the panic handler function on last close to reset the modes,\nhowever this is a really bad idea for multi-gpu machines, esp shareable\ngpus machines. So add a new entry point for the driver to just restore\nits own fbcon mode.\n\nv2: move code into fb helper, fix panic code to block mode change on\npowered off GPUs.\n\n[airlied: this hits drm core and I wrote it and it was reviewed on intel-gfx\n so really I signed it off twice ;-).]\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6565945b60922211c299968ba66a66617af32c9f", "tree": "fca477c8c1d8da6f918898fa6f1b75888779f47f", "parents": [ "834f0c353ae430c1a6ce023c9b77bbd3ff9241a7" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Apr 26 13:27:43 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Apr 27 17:03:56 2011 +1000" }, "message": "drm/radeon/kms: add info query for tile pipes\n\nneeded by mesa for htile setup.\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "5df23979bc628934febe02e80f9644ec67603ee8", "tree": "4b3dae80f394c673dd9452248dc9b885a5678fac", "parents": [ "758f231ea280d0e5f01d537f26ad8f5c0e3de1cc" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Mon Apr 04 01:25:18 2011 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 05 10:22:23 2011 +1000" }, "message": "drm: fix \"persistant\" typo\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "758f231ea280d0e5f01d537f26ad8f5c0e3de1cc", "tree": "23310cb39bc6668cab1e662ebf0e7de134b596ae", "parents": [ "fb9674bd2cd3c18f6c756ee123967e43be501263" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Mon Apr 04 11:03:16 2011 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Apr 05 09:21:16 2011 +1000" }, "message": "drm/radeon/kms: add some new ontario pci ids\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": "eccaca28e29861a63ebc067bfff59c7efa427371", "tree": "9a3ac124bb62876135ee41ebd5ff802d24323629", "parents": [ "97ea530f6fac1f9632b0c4792a2a56411454adbe" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Wed Mar 30 05:03:47 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 01 10:16:17 2011 +1000" }, "message": "drm: export drm_find_cea_extension to drivers\n\nNouveau needs access to this structure to build an ELD block for use\nby the HDA audio codec.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "51eab416c9b4b3ed16553d405ec4a5f67daa34cf", "tree": "f883ecb336132b9b069744a2a7b4a30c7954bf39", "parents": [ "1783e4bf6f4e5c3b13c09aff24da7dcc69fb3e2f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 24 20:54:35 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 24 21:28:46 2011 +1000" }, "message": "drm/vblank: update recently added vbl interface to be more future proof.\n\nThis makes the interface a bit cleaner by leaving a single gap in the\nvblank bit space instead of creating two gaps.\n\nSuggestions from Michel on mailing list/irc.\n\nReviewed-by: Michel Dänzer \u003cmichel@daenzer.net\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "19b01b5fbf0b78930b3b06ee6080539c17b5d1fd", "tree": "b2cfeb6aeae49bc4061ce8923a63b6b8bd4d6e1d", "parents": [ "b74ad5ae14def5e81ad0be3dddb96e485b861b1b" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Fri Mar 18 16:58:04 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 21 09:25:54 2011 +1000" }, "message": "drm/kernel: vblank wait on crtc \u003e 1\n\nBelow is a patch against drm-next branch of 2.6.38-rc8+ kernel that adds\nthe capability to wait on vblank events for CRTCs that are greater than 1\nand thus cannot be represented with primary/secondary flags in the legacy\ninterface. It was discussed on the dri-devel list in these two threads:\n\nhttp://lists.freedesktop.org/archives/dri-devel/2011-March/009009.html\nhttp://lists.freedesktop.org/archives/dri-devel/2011-March/009025.html\n\nThis patch extends the interface to drm_wait_vblank ioctl so that crtc\u003e1\ncan be represented. It also adds a new capability to drm_getcap ioctl so\nthat the user space can check whether the new interface to drm_wait_vblank\nis supported (and fall back to the legacy interface if not)\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nReviewed-by: Mario Kleiner \u003cmario.kleiner at tuebingen.mpg.de\u003e\nAcked-by: Mario Kleiner \u003cmario.kleiner at tuebingen.mpg.de\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nTested-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "34db18abd376b2075c760c38f0b861aed379415d", "tree": "c4174e39a2f445f17c25ab206d45c66217bbbf85", "parents": [ "e73f88af66fcc50083fae4b7e1c39b469179a97a", "47ae63e0c2e5fdb582d471dc906eb29be94c732f" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 14 14:15:13 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 14 14:15:13 2011 +1000" }, "message": "Merge remote branch \u0027intel/drm-intel-next\u0027 of ../drm-next into drm-core-next\n\n* \u0027intel/drm-intel-next\u0027 of ../drm-next: (755 commits)\n drm/i915: Only wait on a pending flip if we intend to write to the buffer\n drm/i915/dp: Sanity check eDP existence\n drm/i915: Rebind the buffer if its alignment constraints changes with tiling\n drm/i915: Disable GPU semaphores by default\n drm/i915: Do not overflow the MMADDR write FIFO\n Revert \"drm/i915: fix corruptions on i8xx due to relaxed fencing\"\n drm/i915: Don\u0027t save/restore hardware status page address register\n drm/i915: don\u0027t store the reg value for HWS_PGA\n drm/i915: fix memory corruption with GM965 and \u003e4GB RAM\n Linux 2.6.38-rc7\n Revert \"TPM: Long default timeout fix\"\n drm/i915: Re-enable GPU semaphores for SandyBridge mobile\n drm/i915: Replace vblank PM QoS with \"Interrupt-Based AGPBUSY#\"\n Revert \"drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU\"\n drm/i915: Allow relocation deltas outside of target bo\n drm/i915: Silence an innocuous compiler warning for an unused variable\n fs/block_dev.c: fix new kernel-doc warning\n ACPI: Fix build for CONFIG_NET unset\n mm: \u003casm-generic/pgtable.h\u003e must include \u003clinux/mm_types.h\u003e\n x86: Use u32 instead of long to set reset vector back to 0\n ...\n\nConflicts:\n\tdrivers/gpu/drm/i915/i915_gem.c\n" }, { "commit": "e73f88af66fcc50083fae4b7e1c39b469179a97a", "tree": "5c4a7a9a9c7223d017f3ab17708d6f57cebdb8d7", "parents": [ "9f35421e09c494c36079d7cf5724ae9f832431d7" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 14:50:28 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 15:56:22 2011 +1000" }, "message": "drm: add cap bit to denote if dumb ioctl is available or not.\n\nThis allows libkms to make an easier decision.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "9f35421e09c494c36079d7cf5724ae9f832431d7", "tree": "1c9ab806a43a30df918e9e12505823a387779e34", "parents": [ "e1e84017f95504348308085ae7cd0bfe268caf10" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 21 11:17:35 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Mar 04 14:47:30 2011 +1000" }, "message": "drm/core: add ioctl to query device/driver capabilities\n\nWe\u0027re coming to see a need to have a set of generic capability checks in\nthe core DRM, in addition to the driver-specific ioctls that already\nexist.\n\nThis patch defines an ioctl to do as such, but does not yet define any\ncapabilities.\n\n[airlied: drop the driver callback for now.]\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "64bc5524906e31c1144af29ba50c585afe333bb3", "tree": "5491e3ed0b5cf407cf1b28e4d7af862cde8735fe", "parents": [ "8aa75009bca5e700e9236c8e066d2f943069c883" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Mar 02 20:07:41 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Mar 03 11:57:06 2011 +1000" }, "message": "drm/radeon/kms: add cayman pci ids\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8d3c3ddfa85837e24fad6fa39318617cbb59e843", "tree": "f699dcaac2a11f0c9506ad111ae39fd5e3617c2d", "parents": [ "e8b2c3c47a53348aebbbeb5322e32937df958793", "6927faf30920b8c03dfa007e732642a1f1f20089" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 23:20:20 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 23:20:20 2011 +0000" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 into drm-intel-next\n" }, { "commit": "271d81b84171d84723357ae6d172ec16b0d8139c", "tree": "ca4d1952f3e47e69706be5609143ae4d1b8e291a", "parents": [ "5d9faa16a73f3317177ec42d5b5d826947458eb9" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 15:24:41 2011 +0000" }, "committer": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Tue Mar 01 16:01:02 2011 +0000" }, "message": "drm/i915: Allow relocation deltas outside of target bo\n\nUserspace has a legitimate requirement to use a delta that points to\noutside of the target bo, and so we need to enable this. (As this is an\nabi break, albeit a relaxation of the current restrictions, mark the change\nwith a new flag.)\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\n" }, { "commit": "486af1896f3a4a388410215c5a2014b9d09a79f5", "tree": "bf3a29e4b2e9004ee80269944309fcfdf05abaa1", "parents": [ "91132d6bb6481da7c8280905a5db424885c458d0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 01 14:32:27 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Mar 01 15:01:20 2011 +1000" }, "message": "drm/radeon: add new getparam for number of backends.\n\nThis allows userspace to work out how many DBs there are\nfor conditional rendering to work.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1922756124ddd53846877416d92ba4a802bc658f", "tree": "22b5b5e5457d5eab364cd2c860814b29874e56f7", "parents": [ "3c0556e9673f79e386b27768e27d18b3ce29e40e" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 24 08:35:06 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 28 15:24:35 2011 +1000" }, "message": "drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.\n\nThis fixes CVE-2011-1013.\n\nReported-by: Matthiew Herrb (OpenBSD X.org team)\nCc: stable@kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8f7286f8e4e80f7b868ba3d117ae900f0d207cbe", "tree": "018804469b7bce4033b4156442c904512282fab2", "parents": [ "26c0c9e33a2eb44b345d22d5928d5c8b7b261226" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Mon Feb 14 09:57:35 2011 +1000" }, "committer": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Fri Feb 25 06:46:07 2011 +1000" }, "message": "drm/nv50: support for compression\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\n" }, { "commit": "a2c06ee2fe5b48a71e697bae00c6e7195fc016b6", "tree": "ff1761280d173d8adc0a7e0339dc68fd44146c08", "parents": [ "63871f89d158e3f3e469dde00dd15763d474cb3c" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 14:24:01 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 14:24:01 2011 +1000" }, "message": "Revert \"ttm: Include the \u0027struct dev\u0027 when using the DMA API.\"\n\nThis reverts commit 5a893fc28f0393adb7c885a871b8c59e623fd528.\n\nThis causes a use after free in the ttm free alloc pages path,\nwhen it tries to get the be after the be has been destroyed.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "63871f89d158e3f3e469dde00dd15763d474cb3c", "tree": "0872202dbe52d6a8160215487ae0386c8e475a44", "parents": [ "de1e7cd63a8ec26a3bd3740708cfd72dd76509e2", "4546b2c1d6e256c716e5240f5d6198a078fd7a22" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:07:27 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:07:27 2011 +1000" }, "message": "Merge branch \u0027drm-mm-cleanup\u0027 into drm-next\n\n* drm-mm-cleanup:\n radeon: move blit functions to radeon_asic.h\n radeon: kill decls for inline functions\n radeon: consolidate asic-specific function decls for r600 \u0026 later\n drm/radeon: kill radeon_bo-\u003egobj pointer\n drm/radeon: introduce gem_to_radeon_bo helper\n drm/radeon: embed struct drm_gem_object\n drm: mm: add helper to unwind scan state\n drm: mm: add api for embedding struct drm_mm_node\n drm: mm: extract node insert helper functions\n drm: mm: track free areas implicitly\n drm/nouveau: don\u0027t munge in drm_mm internals\n" }, { "commit": "de1e7cd63a8ec26a3bd3740708cfd72dd76509e2", "tree": "52bc82a71f34e92895d22821543a2be011834505", "parents": [ "7811bddb6654337fd85837ef14c1a96a0c264745", "5a893fc28f0393adb7c885a871b8c59e623fd528" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:06:39 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 12:06:39 2011 +1000" }, "message": "Merge branch \u0027stable/ttm.pci-api.v5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into drm-next\n\n* \u0027stable/ttm.pci-api.v5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n ttm: Include the \u0027struct dev\u0027 when using the DMA API.\n nouveau/ttm/PCIe: Use dma_addr if TTM has set it.\n radeon/ttm/PCIe: Use dma_addr if TTM has set it.\n ttm: Expand (*populate) to support an array of DMA addresses.\n ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set.\n ttm: Introduce a placeholder for DMA (bus) addresses.\n" }, { "commit": "7811bddb6654337fd85837ef14c1a96a0c264745", "tree": "668ab27b5a002824f62434c9b8ffc0654e358ffd", "parents": [ "4cb81ac2028a18f3f872f56fb7527afe5f5d0278" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 26 18:33:25 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 11:16:40 2011 +1000" }, "message": "drm: Remove unused members from struct drm_open_hash\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b1f559ecdc6026ef783ccadc62a61e7da906fcb4", "tree": "0191b560a045c6490c326ef0c027797ba9886ffa", "parents": [ "60b212f8ddcdbbfa8595f40300756b9ea8dd387e" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 26 09:49:47 2011 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 11:13:11 2011 +1000" }, "message": "drm: Mark constant arrays of drm_display_mode const\n\n... and fixup some methods to accept the constant argument.\n\nNow that constant module arrays are loaded into read-only memory, using\nconst appropriately has some benefits beyond warning the programmer\nabout likely mistakes.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ae0cec2880a4dc6d90c7f8392bdc6705988389ca", "tree": "02a36c6ff5eb3e9f0554d9b5134ab374929c61fb", "parents": [ "b0b7af1884b7d807a3504804f9825d472de78708" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:15 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:32:57 2011 +1000" }, "message": "drm: mm: add helper to unwind scan state\n\nWith the switch to implicit free space accounting one pointer\ngot unused when scanning. Use it to create a single-linked list\nto ensure correct unwinding of the scan state.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b0b7af1884b7d807a3504804f9825d472de78708", "tree": "ba9e2dde9575caab3ae6f4b0a1d1ef15c09caf67", "parents": [ "9fc935debb33d90bf302ba42f7234b78e322f195" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:14 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:32:51 2011 +1000" }, "message": "drm: mm: add api for embedding struct drm_mm_node\n\nThe old api has a two-step process: First search for a suitable\nfree hole, then allocate from that specific hole. No user used\nthis to do anything clever. So drop it for the embeddable variant\nof the drm_mm api (the old one retains this ability, for the time\nbeing).\n\nWith struct drm_mm_node embedded, we cannot track allocations\nanymore by checking for a NULL pointer. So keep track of this\nand add a small helper drm_mm_node_allocated.\n\nAlso add a function to move allocations between different struct\ndrm_mm_node.\n\nv2: Implement suggestions by Chris Wilson.\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c", "tree": "2feb9852ab18e2f726136ae460e414ef40425129", "parents": [ "31a5b8ce8f3bf20799eb68da9602de2bee58fdd3" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:12 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:32:34 2011 +1000" }, "message": "drm: mm: track free areas implicitly\n\nThe idea is to track free holes implicitly by marking the allocation\nimmediatly preceeding a hole.\n\nTo avoid an ugly corner case add a dummy head_node to struct drm_mm\nto track the hole that spans to complete allocation area when the\nmemory manager is empty.\n\nTo guarantee that there\u0027s always a preceeding/following node (that might\nbe marked as hole_follows \u003d\u003d 1), move the mm-\u003enode_list list_head to the\nhead_node.\n\nThe main allocator and fair-lru scan code actually becomes simpler.\nOnly the debug code slightly suffers because free areas are no longer\nexplicit.\n\nAlso add drm_mm_for_each_node (which will be much more useful when\nstruct drm_mm_node is embeddable).\n\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "31a5b8ce8f3bf20799eb68da9602de2bee58fdd3", "tree": "59e1c0b9cf8b63ebcb6ca9607c6cc6610ad8c388", "parents": [ "a250b9fdc53a286d32e22f21170382a46b3a3ef5" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Fri Feb 18 17:59:11 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 23 10:18:20 2011 +1000" }, "message": "drm/nouveau: don\u0027t munge in drm_mm internals\n\nNouveau was checking drm_mm internals on teardown to see whether the\nmemory manager was initialized. Hide these internals in a small\ninline helper function.\n\nAcked-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5a893fc28f0393adb7c885a871b8c59e623fd528", "tree": "8d119f02b7d0ba7e60f0f554fa5000c2cce2fb87", "parents": [ "e0138c26cdeee8c033256ccd9e07d66db3c998be" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Tue Feb 22 13:24:32 2011 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Tue Feb 22 13:26:23 2011 -0500" }, "message": "ttm: Include the \u0027struct dev\u0027 when using the DMA API.\n\nThis makes the accounting when using \u0027debug_dma_dump_mappings()\u0027\nand CONFIG_DMA_API_DEBUG\u003dy be assigned to the correct device\ninstead of \u0027fallback\u0027.\n\nNo functional change - just cosmetic.\n\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "a250b9fdc53a286d32e22f21170382a46b3a3ef5", "tree": "46bca176ce307f951d3e154b7a41ddd43fdee0ac", "parents": [ "8410ea3b95d105a5be5db501656f44bbb91197c1" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Dec 15 07:13:55 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 13:09:42 2011 +1000" }, "message": "drm: add usb framework\n\nThis adds an initial framework to plug USB graphics devices\ninto the drm/kms subsystem.\n\nI\u0027ve started writing a displaylink driver using this interface.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8410ea3b95d105a5be5db501656f44bbb91197c1", "tree": "6cd27f207e50c13ba2f4a78d6323bc23f751e380", "parents": [ "ff72145badb834e8051719ea66e024784d000cb4" ], "author": { "name": "Dave Airlie", "email": "airlied@gmail.com", "time": "Wed Dec 15 03:16:38 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 13:09:36 2011 +1000" }, "message": "drm: rework PCI/platform driver interface.\n\nThis abstracts the pci/platform interface out a step further,\nwe can go further but this is far enough for now to allow USB\nto be plugged in.\n\nThe drivers now just call the init code directly for their\ndevice type.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ff72145badb834e8051719ea66e024784d000cb4", "tree": "39dc5fc512e3e0836713de9defb91ea8b4033aa2", "parents": [ "1f692a14cbfbeb11f9a9c16f25c8ecb8ab50d3d5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:16:14 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:16:14 2011 +1000" }, "message": "drm: dumb scanout create/mmap for intel/radeon (v3)\n\nThis is just an idea that might or might not be a good idea,\nit basically adds two ioctls to create a dumb and map a dumb buffer\nsuitable for scanout. The handle can be passed to the KMS ioctls to create\na framebuffer.\n\nIt looks to me like it would be useful in the following cases:\na) in development drivers - we can always provide a shadowfb fallback.\nb) libkms users - we can clean up libkms a lot and avoid linking\nto libdrm_*.\nc) plymouth via libkms is a lot easier.\n\nUserspace bits would be just calls + mmaps. We could probably\nmark these handles somehow as not being suitable for acceleartion\nso as top stop people who are dumber than dumb.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7f50684717511d30bba180902105c4cd4efca732", "tree": "5383f403f9a1493afc021ce7d5bd5a85df9a17e0", "parents": [ "8dbdea8444d303a772bceb1ba963f0e3273bfc5e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jan 25 23:17:16 2011 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 07 12:14:18 2011 +1000" }, "message": "drm: remove i830 driver\n\nThis driver is one of the last users of the big kernel\nlock, which is going away. All the hardware supported\nby this driver also works with the newer i915 driver,\nand recent X.org releases only work with that driver\nanyway.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: dri-devel@lists.freedesktop.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "63a507800c8aca5a1891d598ae13f829346e8e39", "tree": "40e315c767028ad27f42fa5d6aa5d2273f50674e", "parents": [ "619efb105924d8cafa0c1dd9389e9ab506f5425d" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Tue Feb 01 19:06:46 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Feb 02 12:50:41 2011 +1000" }, "message": "drm/radeon: remove 0x4243 pci id\n\n0x4243 is a PCI bridge, not a GPU.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d33815\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": "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": "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": "27e8b237944af967e0a808580278d432cb028455", "tree": "28d1b8ef8ad2477afeb7874f3bdf5e86a9434e96", "parents": [ "69a07f0b117a40fcc1a479358d8e1f41793617f2" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Dec 02 10:24:13 2010 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jan 27 16:07:58 2011 -0500" }, "message": "ttm: Expand (*populate) to support an array of DMA addresses.\n\nWe pass in the array of ttm pages to be populated in the GART/MM\nof the card (or AGP). Patch titled: \"ttm: Utilize the DMA API for\npages that have TTM_PAGE_FLAG_DMA32 set.\" uses the DMA API to make\nthose pages have a proper DMA addresses (in the situation where\npage_to_phys or virt_to_phys do not give use the DMA (bus) address).\n\nSince we are using the DMA API on those pages, we should pass in the\nDMA address to this function so it can save it in its proper fields\n(later patches use it).\n\n[v2: Added reviewed-by tag]\n\nReviewed-by: Thomas Hellstrom \u003cthellstrom@shipmail.org\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nTested-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\n" }, { "commit": "f9820a46dd7888b05a36e81166fb1abcc47dcc3f", "tree": "c29e32a8fe8b08bc42120ce66c6536afd5c102df", "parents": [ "e53beacd23d9cb47590da6a7a7f6d417b941a994" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Mon Nov 29 13:52:18 2010 -0500" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Jan 27 16:02:31 2011 -0500" }, "message": "ttm: Introduce a placeholder for DMA (bus) addresses.\n\nThis is right now limited to only non-pool constructs.\n\n[v2: Fixed indentation issues, add review-by tag]\n\nReviewed-by: Thomas Hellstrom \u003cthomas@shipmail.org\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nTested-by: Ian Campbell \u003cian.campbell@citrix.com\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": "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": "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": "c3307cd6a7ca91c257795c5275e887a3eafb6880", "tree": "e4ddaa114644f16ef44026c3f4e5376e90e9c25c", "parents": [ "0ba41e449fd0f45f5b29c1009020ab1b298bedda", "187f3da3d98a1740d71e1f5d4fb3c68df09ecca8" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 10 09:27:06 2011 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 10 09:27:06 2011 +1000" }, "message": "Merge branch \u0027drm-radeon-ni\u0027 of ../drm-radeon-next into drm-core-next\n\n* \u0027drm-radeon-ni\u0027 of ../drm-radeon-next: (30 commits)\n radeon: consolidate asic-specific function decls for pre-r600\n drm/radeon/kms: add NI pci ids\n drm/radeon/kms: don\u0027t enable pcie gen2 on NI yet\n drm/radeon/kms: add radeon_asic struct for NI asics\n drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init\n drm/radeon/kms: add ucode loader for NI\n drm/radeon/kms: add support for DCE5 display LUTs\n drm/radeon/kms: add ni_reg.h\n drm/radeon/kms: add bo blit support for NI\n drm/radeon/kms: always use writeback/events for fences on NI\n drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5\n drm/radeon/kms: add backend map workaround for barts\n drm/radeon/kms: fill gpu init for NI asics\n drm/radeon/kms: add disabled vbios accessor for NI asics\n drm/radeon/kms: handle NI thermal controller\n drm/radeon/kms: parse DCE5 encoder caps when setting up encoders\n drm/radeon/kms: dvo dpms updates for DCE5\n drm/radeon/kms: dac dpms updates for DCE5\n drm/radeon/kms: DCE5 atom dig encoder updates\n drm/radeon/kms: DCE5 atom transmitter control updates\n ...\n" }, { "commit": "2b2fd604bda01bfea9f1657ca468c134448e03a5", "tree": "1d583e96ec38551e11b9b9aca9a5afba7ec632f1", "parents": [ "0d1014a2f2d1ad660caafae6f62796a93307867f" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Thu Jan 06 21:19:35 2011 -0500" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 07 14:11:44 2011 +1000" }, "message": "drm/radeon/kms: add NI pci ids\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dfe63bb0ad9810db13aab0058caba97866e0a681", "tree": "ffc5e9335283001c072aa0377ba9fd92ac3b1919", "parents": [ "f598aa7593427ffe3a61e7767c34bd695a5e7ed0" ], "author": { "name": "James Simmons", "email": "jsimmons@infradead.org", "time": "Thu Dec 23 16:40:37 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 07 13:44:40 2011 +1000" }, "message": "drm: Update fbdev fb_fix_screeninfo\n\nIf you change the color depth via fbset or some other framebuffer aware\nuserland application struct fb_fix_screeninfo is not updated to this new\ninformation. This patch fixes this issue. Also the function is changed to\njust pass in struct drm_framebuffer so in the future we could use more\nfields. I\u0027m hoping some day fix-\u003esmem* could be set here :-)\n\nSigned-off-by: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" } ], "next": "9eba4a93ce520a627e876b0d1851d4f78a701c2b" }