--- xserver-xorg-video-intel-2.9.1.orig/ChangeLog +++ xserver-xorg-video-intel-2.9.1/ChangeLog @@ -0,0 +1,22952 @@ +commit 9acf10762b5f3d3b1b33ea07792a936a25e45010 +Author: Carl Worth +Date: Mon Oct 26 04:53:13 2009 -0700 + + Update version to 2.9.1 + +commit 61c89e56f361fa860f18985137d6bf53f48c16ac +Author: Carl Worth +Date: Mon Oct 26 04:51:58 2009 -0700 + + NEWS: Add notes for the 2.9.1 release. + + Thanks to everyone for providing nice descriptions of the bug fixe at: + + http://wiki.x.org/wiki/Intel29Branch + +commit 8e4fc7d3ba0baa6b680c685429060cb62a08f89f +Author: Carl Worth +Date: Mon Oct 26 04:40:51 2009 -0700 + + Revert "Check whether the DVI-I/D is connected or disconnected based on EDID" + + This reverts commit 02fe9be695f7e209944bd0f7b67950f93619feee as it + was causing regressions detecting DVI monitors for several people. + + See: + + http://bugs.freedesktop.org/show_bug.cgi?id=24458 + http://bugs.freedesktop.org/show_bug.cgi?id=24458 + http://bugs.freedesktop.org/show_bug.cgi?id=24458) + +commit 22b85d0198508a13273ab58fd5fa3a127880a0be +Author: Albert Damen +Date: Wed Oct 7 21:55:42 2009 +0200 + + Drop frontbuffer from crtc in I830CloseScreen + + By dropping the frontbuffer from the crtc, the new frontbuffer + can be properly added to the crtc when the xserver is reset. + + Signed-off-by: Albert Damen + (cherry picked from commit fcc2ee48b866b81c79315ff10189b56fc201539d) + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=24383 + +commit 7ccf084b7a281d8aa877f91401d3df7192da408c +Author: Chris Wilson +Date: Mon Oct 12 14:33:08 2009 +0100 + + uxa: Free the ScratchPixmapHeader after its associated Picture + + Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24459 + Intel Driver > 2.8: Cairo rendering bug, triggered in QtCurve GTK engine + + Signed-off-by: Chris Wilson + (cherry picked from commit 7e8f32d0a7279dce1976f87612833d9092554cfe) + +commit f858cbe246c5d3a788ae25551b49142c5cc91f1a +Author: Dave Airlie +Date: Fri Oct 9 14:16:06 2009 +1000 + + drmmode: with 1.7 server, set mode major doesn't get gamma setup. + + Noticed this on Fedora, where 1.7 server does gamma via the randr + codepaths however kms doesn't have this call which happens in the + non set_mode_major path. + + probably should be backported to released drivers. + + Signed-off-by: Dave Airlie + (cherry picked from commit 8a77877f9c2c6a8a1308bc1a3be9e7ad88bc7f49) + +commit 2841a4cd8c6c64fdf4b2203ab73b57b38a50f651 +Author: Carl Worth +Date: Mon Sep 28 20:03:11 2009 -0700 + + Increment version to 2.9.0 + + And add a reminder to RELEASING that the incremented version number + needs to be committed, (since I forgot to do this with 2.8.99.902). + +commit a790aff4fef7d0c86b7b9c0da4afdc9c0aba6636 +Author: Carl Worth +Date: Mon Sep 28 20:02:28 2009 -0700 + + NEWS: Add notes for the 2.9.0 release. + + Just renamed notes as from 2.8.99.902. + +commit a92bbcc94904684e7709b3ddaad82bc04607af26 +Author: Carl Worth +Date: Tue Sep 22 17:08:23 2009 -0700 + + Increment version to 2.8.99.902 + +commit ae00a0923717caec6d0dad94527da26397bd12ce +Author: Carl Worth +Date: Tue Sep 22 15:14:38 2009 -0700 + + NEWS: Add notes for 2.8.99.902 + +commit 7e7db7ac530b5282b0841585959597b54fcc633b +Author: Matthias Hopf +Date: Mon Aug 17 19:24:03 2009 +0200 + + Add new backlight driver "samsung". + +commit 7ae1d0dde6cef3437b67dbc21384cb179616a6c0 +Author: Zhao Yakui +Date: Mon Aug 31 13:51:01 2009 +0800 + + Skip setting tv format property if output crtc is NULL + + When TV is not connected and X start, after plugging TV cable again, + system will crash because output crtc is NULL. This patch will return, + do not handle crtc immediately, meanwhile set value will be effective + until user really enable output by xrandr command. + + Signed-off-by: Ma Ling + Signed-off-by: Zhao Yakui + +commit 02fe9be695f7e209944bd0f7b67950f93619feee +Author: Zhao Yakui +Date: Tue Sep 22 10:58:38 2009 +0800 + + Check whether the DVI-I/D is connected or disconnected based on EDID + + When the monitor is digital type for SDVO-DVI D, there should exist the EDID. If + there is no EDID, it should be detected as disconnected. + + Signe-off-by: Zhao Yakui + +commit 762e406d138ac80854b6a23b1078b52f6581f0d8 +Author: Chris Wilson +Date: Tue Sep 22 01:34:37 2009 +0100 + + Revert "8xx: Fallback for any non-affine transformation." + + This reverts commit 505025053d66d415e1c23ac858b9238fa8541d37. + + In theory, the non-affine paths work -- at least for the stated test case, + so re-enable them and avoid the slow work-around. + + Signed-off-by: Chris Wilson + +commit 2cc1f3cb6034dddd65b3781b0cde7dff4ac1e803 +Author: Keith Packard +Date: Sat Sep 19 17:30:57 2009 -0700 + + i8xx: Format projective texture coordinates correctly. + + Projective texture coordinates must be delivered as TEXCOORDFMT_3D + using TEXCOORDTYPE_HOMOGENOUS. This meant selecting the correct type + in i830_texture_setup, the correct format in i830_emit_composite_state + and sending only 3 coordinates in i830_emit_composite_primitive. + + Signed-off-by: Keith Packard + [ickle: tweaked to fix up a couple of use-before-initialised] + Signed-off-by: Chris Wilson + +commit 00e8de212b46a243f243b437b7eb866315ab89b3 +Author: Chris Wilson +Date: Mon Sep 21 22:14:21 2009 +0100 + + Check the correct Picture for error during creation. + +commit bd817e2d733dfdb1140874b06595ccd1ef39159b +Author: Keith Packard +Date: Mon Sep 21 17:21:17 2009 -0700 + + Split i915/i830 composite_emit_primitive into two functions. + + The i915 and i830 take similar but different data when emitting the + primitives, instead of trying to share code here, just split this + apart and avoid potentially breaking things later on. + + Signed-off-by: Keith Packard + +commit 5e80297d088e8cdbf66d765f7d252dab66c8df86 +Author: Keith Packard +Date: Fri Sep 18 21:05:23 2009 -0700 + + Remove DGA support from the driver. + + The xf86DiDGA code required that the scanout buffer always be + mappable, stay be at a fixed address in the aperture and have a + constant size. With frame buffer resizing, the latter two are no + longer true, and with KMS, we'd really prefer to not allow the former. + + The only option available to the driver is to completely disable DGA + as the modes code has internal calls to the xf86DiDGA code when + fetching new modes from the hardware. + + A fix for the DiDGA code will be added to the X server which will + automatically initialize DGA for mode switching and input, but not + frame buffer access, and not require any driver cooperation. + + Thus, the correct solution is for the driver to not call xf86DiDGAInit + at all. For old servers, this eliminates a potential catastrophic + problem where random memory is written by the X server. New servers + will get the DIX-based behaviour automatically. + + Signed-off-by: Keith Packard + +commit 4758311842a16600287c8f9f77ce0af1a31b9264 +Author: Keith Packard +Date: Fri Sep 18 20:59:52 2009 -0700 + + Remove vestigial internal rotation which broke KMS DGA/VidMode modesetting. + + Pre-2.0, the driver supported rotation internally, rather than relying + on the X server rotation support. The last piece of this dealt with + rotating the mouse coordinates and also tried to preserve rotation + across DGA/VidModeExtension modesetting requests. + + That latter bit of code broke under KMS as the rotation value was + never initialized, and when set to zero would create an invalid + configuration. This would confuse xrandr which would bail before + making any changes, leaving the user without a way to recover. + + Signed-off-by: Keith Packard + +commit 505025053d66d415e1c23ac858b9238fa8541d37 +Author: Carl Worth +Date: Mon Sep 21 13:50:09 2009 -0700 + + 8xx: Fallback for any non-affine transformation. + + There are definitely bugs in the 8xx code dealing with non-affine + transformations. Disable that code for now to get things working. + + Fixes bug #22947 ([855GM, xf86-video-intel-2.8.0] "Freeze" when RENDER extension is being used) + +commit b4d29452b929a3ef224d3625e4bc66b787c5edb7 +Author: Zhenyu Wang +Date: Mon Sep 21 15:28:09 2009 +0800 + + More dumps for Arrandale LVDS + + Signed-off-by: Zhenyu Wang + +commit 57fc09cef28bad2e3e8455b93ef2927118f8a3a3 +Author: Chris Wilson +Date: Sun Sep 20 01:02:39 2009 +0100 + + Avoid fallbacks for a1 src/mask + + Carl Worth did the hard work in identifying that the regression in + cairo between X.org 1.6 and 1.7 was caused by cairo sending an a1 + mask to the server in 1.7 whereas in 1.6 cairo used local fallbacks + (as the source was using RepeatPad, which triggers cairo's + 'buggy_pad_reflect' fallback for X.org 1.6). This was causing the driver + to do a fallback to handle the a1 mask instead, which due to the GPU + pipeline stall is much more expensive than the equivalent fallback in + cairo. + + Reference: + cairo's performance downgrades 4X with server master than server-1.6. + https://bugs.freedesktop.org/show_bug.cgi?id=23184 + + The fix is a relatively simple extension of the current + uxa_picture_from_pixman_image() to use CompositePicture() instead of + CopyArea() when we need to convert to a new format. + + Signed-off-by: Chris Wilson + +commit 33f98e4056706f4c30bb4327677ac49e82058231 +Author: Keith Packard +Date: Thu Sep 17 18:16:02 2009 -0700 + + Don't destroy bufmgr at CloseScreen time + + Under KMS, the bufmgr is not initialized at InitOutput time and so it + won't be re-initialized during server regen. Thus we must leave the + bufmgr running during regen and cannot destroy it in CloseScreen. + + Under UMS, each place the bufmgr is initialized, it checks to see if + it has already happened. Hence, we can safely leave the bufmgr running + across server regen for UMS too. + + Signed-off-by: Keith Packard + +commit ee9ad853574e3ee1a210db6207b84ecd466e08ee +Author: Keith Packard +Date: Thu Sep 17 17:57:40 2009 -0700 + + Make sure DRM output properties are freed after we're done with them. + + drmmode_output_get_modes was fetching output properties but only + freeing some of them. + + Signed-off-by: Keith Packard + +commit b8c5c996e888485c3a16d645c8490592534a7882 +Author: Jesse Barnes +Date: Tue Sep 15 19:45:47 2009 -0700 + + Eliminate cursor flicker + + We can update the cursor without hiding and showing it. In fact, doing the + hide/show causes noticable flicker when running in KMS mode. + + Signed-off-by: Jesse Barnes + +commit c2abfa8e54acab61250dba1e435760e3b1499c8c +Author: Chris Wilson +Date: Fri Sep 4 17:10:25 2009 +0100 + + Avoid fallbacks for compositing gradient patterns + + Currently when asked to composite using a gradient source or mask, we + fallback to using fbComposite(). This has the side-effect of causing a + readback on the destination surface, stalling the GPU pipeline. Instead, + like uxa_trapezoids(), we can use pixman to fill a scratch pixmap and then + copy that to an offscreen pixmap for use with uxa_composite(). + + Speedups on i915: + firefox-talos-svg: 710378.14 -> 549262.96: 1.29x speedup + + No slowdowns. + + Thanks to Søeren Sandmann Pedersen for spotting the missing + ValidatePicture(). + + Signed-off-by: Chris Wilson + +commit efbcf29dd1a1ca058b7a2a93f0685102c06c9369 +Author: Carl Worth +Date: Wed Sep 9 09:32:48 2009 -0700 + + Update version to 2.8.99.901 for snapshot. + +commit 54fa27fcd97a6735d8eb6073f5ec7d0d40a7327f +Author: Carl Worth +Date: Wed Sep 9 09:27:01 2009 -0700 + + NEWS: Add notes for the 2.8.99.901 snapshot + +commit 1a77ca74bc829e019a06fe9ad559f013054c27ff +Author: Chris Wilson +Date: Wed Sep 9 12:09:05 2009 +0100 + + i915: Restore nearest sampling + + My recent commit [94fc93] to use the pixel centre for sampling with the i830 + broke the i915. This restores the previous sampling coordinates for the + i915 whilst preserving the correct coordinates for i830. + + Fixes: gnome characters disappear + http://bugs.freedesktop.org/show_bug.cgi?id=23803 + + Signed-off-by: Chris Wilson + +commit ce10b5b6fca086eb4af45c1db28352e06ee4ce0b +Author: Zhenyu Wang +Date: Tue Sep 8 00:56:34 2009 +0800 + + Add B43 chipset support + + Signed-off-by: Zhenyu Wang + +commit 94fc93d4e2b88565dca17f72903d8991213c9ee8 +Author: Chris Wilson +Date: Sat Sep 5 09:35:10 2009 +0100 + + i830/i915: Set the sample position to the pixel center. + + And in particular we apply the nearest sample bias separately for + src/mask. + + Fixes cairo/test: + device-offset-scale + finer-grained-fallbacks + mask-transformed-{similar,image} + meta-surface-pattern + pixman-rotate + surface-pattern-big-scale-down + text-transform + + Signed-off-by: Chris Wilson + +commit ced0cc8bb28106c18473777bb184872786325e99 +Author: Chris Wilson +Date: Sat Sep 5 09:05:36 2009 +0100 + + i830: Update comments + + i830_composite() is no longer shared with i915 but + i830_emit_composite_primitive() is. + + Signed-off-by: Chris Wilson + +commit 8863706e25a73f68993d946e2f1c1040bae0f9c5 +Author: Chris Wilson +Date: Sat Sep 5 09:03:56 2009 +0100 + + i830: Trim composite setup + + Remove a couple of redundant NOOPs from the setup and correct the required + space checking for atomic batch operation. + +commit a9b12111f9787950ad6b8f295a70a872c5933c93 +Author: Chris Wilson +Date: Sat Sep 5 00:57:39 2009 +0100 + + i830: remove padding NOOPs from composite + + Bumps aa10text up from 249k to 260k! + + These NOOPs have existed uncommented since + 04d1584737fd0d14e99608a97281fd7b1549ae0e. + + Signed-off-by: Chris Wilson + +commit 9c1bf6d01ca307b7a9b91e181ad7f341862e5e1c +Author: Chris Wilson +Date: Fri Sep 4 23:31:44 2009 +0100 + + i830: do not use stale mask transform + + Not only were incorrectly falling back if we had non-affine + transformations, but we made the decision based on a stale transformation + matrix. + + Related bug 22877: + batch_start_atomic horribly breaks performance after a while + https://bugs.freedesktop.org/show_bug.cgi?id=22877 + + Signed-off-by: Chris Wilson + Tested-by: Maximilian Grothusmann + +commit e903b3ebad29d943c05ff550940034c3a43e0235 +Author: Matthias Hopf +Date: Thu Sep 3 16:34:08 2009 +0200 + + Don't set backlight level if going on->on. + + Otherwise changed backlight will be reset upon DPMS switch off, because first + this function is called with DPMSModeOn. + +commit 91f26937c1a3a4f33da86aa6b62ab9b288a54e15 +Author: Matthias Hopf +Date: Tue Aug 18 18:44:38 2009 +0200 + + Use "Backlight" as backlight brightness property. + + BACKLIGHT is now deprecated, though still usable. + +commit dbc8944ee9e6755ab11dfc7375c3394f531a49ce +Author: Matthias Hopf +Date: Tue Aug 18 18:34:45 2009 +0200 + + Add get_property support. + + So far only BACKLIGHT is changed. + +commit c18fc7955dc2aec878dd3bea1d51aaecf3f08858 +Author: Matthias Hopf +Date: Tue Aug 18 18:05:45 2009 +0200 + + Don't ignore backlight level change to the same level. + + If set externally to a different level, this would result in a no-op. + OTOH if the display is switched off (DPMS) you do not want the change to take + place immediately, but rather to be saved and set later when the display is + active again. + +commit fe7693c94a396b9d17bb66a000178750a432ce3a +Author: Zhenyu Wang +Date: Wed Sep 2 22:57:33 2009 +0800 + + Make DGA optional + + As DGA is optional in xserver, we should check this too instead + of always trying to init DGA. + + Found when update xserver to 6fffcd5825454a7fe58ffbcfb219f007cf38e731, + but not update xf86dgaproto, which caused X fails to start. + + Signed-off-by: Zhenyu Wang + +commit 5812531e08147576de776b2dd64e7f94c08eb851 +Author: Carl Worth +Date: Fri Jul 31 11:20:23 2009 -0700 + + debug: i830_valid_command: Return invalid for subopcodes with no name + + Previously the code would always return the count, before ever looking + into the _3d_cmds table to see if there was actually a valid command. + + Thanks to Alan Coopersmith who reported that the code was confusing + parfait: + + https://bugs.freedesktop.org/show_bug.cgi?id=21666 + +commit 7c48c21b22bf5862c5a35bda1635753cc5a7197c +Author: Zou Nan hai +Date: Thu Aug 27 09:47:12 2009 +0800 + + set correct value for indirect access check bound + +commit 6361c3b9af39265df9222b1f3b6fb9c4197087c1 +Author: Keith Packard +Date: Tue Aug 25 19:23:27 2009 -0700 + + Fix SHM functions to work with server after 1.6.0 + + Signed-off-by: Keith Packard + +commit 2786a66719a6dbb735eb7c551c412475c30ffa51 +Author: Keith Packard +Date: Tue Aug 25 18:35:54 2009 -0700 + + KMS: allocate one bo per crtc for cursor + + The KMS API doesn't provide for sharing a single bo for multiple + cursor images, so allocate one bo for each crtc to hold the cursor + image. KMS also only supports ARGB cursors, so don't bother to + allocate buffers for two color cursors. + + Signed-off-by: Keith Packard + +commit e51126c57132492c664f86981c55b166dbb54c79 +Author: Keith Packard +Date: Tue Aug 25 18:34:25 2009 -0700 + + Add cursor registers to debug dump output. + + Signed-off-by: Keith Packard + +commit 5fa8d04d9c86f343802c05bd3e11c6e733f01b63 +Author: Keith Packard +Date: Tue Aug 25 18:33:04 2009 -0700 + + Reload cursors as needed when setting new modes. + + Cursor images may need rotation, or positions updated when new modes + are set. The server provides a convenience function, + xf86_reload_cursors for precisely this purpose. Just call it after the + new mode is set. + + Signed-off-by: Keith Packard + +commit 1fc3f467ab3edd405adc569ac7f629077e6ffb9d +Author: Jesse Barnes +Date: Tue Aug 25 09:46:10 2009 -0700 + + Add KMS only build flag + + Rather than refactoring all our init code only to have it go away when + we remove UMS, this patch adds a build time flag to allow the driver to + assume KMS support. + + With this flag active, the driver will not request that I/O or MEM be + enabled at probe time, which can allow the server (if other drivers also + cooperate) to run as a non-root user. + + Signed-off-by: Jesse Barnes + +commit 5dccd1be3ab80b642ef2022446f5bdc1656ed943 +Author: Wu Fengguang +Date: Fri Aug 21 14:57:11 2009 +0800 + + Add HDMI audio registers + + Dump some of the audio registers at server startup time. + + (II) intel(0): AUD_CONFIG: 0x00000004 + (II) intel(0): AUD_HDMIW_STATUS: 0x00000000 + (II) intel(0): AUD_CONV_CHCNT: 0x00000000 + (II) intel(0): VIDEO_DIP_CTL: 0x20000600 + (II) intel(0): AUD_PINW_CNTR: 0x00000040 + (II) intel(0): AUD_CNTL_ST: 0x00002000 + (II) intel(0): AUD_PIN_CAP: 0x00000094 + (II) intel(0): AUD_PINW_CAP: 0x004073bd + (II) intel(0): AUD_PINW_UNSOLRESP: 0x80000008 + (II) intel(0): AUD_OUT_DIG_CNVT: 0x00000001 + (II) intel(0): AUD_OUT_CWCAP: 0x00006211 + (II) intel(0): AUD_GRP_CAP: 0x00000004 + + Signed-off-by: Wu Fengguang + +commit 38e97d2366738e83e76c72353b65edb13a9d2c7f +Author: Wu Fengguang +Date: Fri Aug 21 11:31:13 2009 +0800 + + Add intel_audio reg dumping program + + It can dump HDMI audio registers for G45. + + Signed-off-by: "Wang, Zhenyu Z" + Signed-off-by: Wu Fengguang + +commit 6955fc7a74edf6034a292c31a304577c35e925e6 +Author: Kristian Høgsberg +Date: Thu Aug 20 16:48:58 2009 -0400 + + kms: Don't use fb offset when using shadow buffer + +commit 465a4ab416b2e5ad53b96702720331a44fffa2fe +Author: Eric Anholt +Date: Wed Aug 12 19:29:31 2009 -0700 + + Align the height of untiled pixmaps to 2 lines as well. + + The 965 docs note, and it's probably the case on 915 as well, that the + 2x2 subspans are read as a unit, even if the bottom row isn't used. If + the address in that bottom row extended beyond the end of the GTT, a + fault could occur. + + Thanks to Chris Wilson for pointing out the problem. + +commit a3962e6f74ddd954ae1390d150a347745d7bdb24 +Author: Jesse Barnes +Date: Tue Aug 18 10:56:50 2009 -0700 + + Print block length of backlight table + + For debugging VBIOS dumps + +commit 320f21669900f99a7daf8f2294f37be9ad71d05f +Author: Jesse Barnes +Date: Mon Aug 17 15:19:41 2009 -0700 + + Dump LVDS backlight info from bios_reader + + Add LVDS backlight and power VBT structures and dump from the BIOS reader. + +commit a50916530426a662f5ed262892080b860a445da3 +Author: Matthias Hopf +Date: Mon Aug 17 15:53:15 2009 +0200 + + Add BACKLIGHT property support in KMS case. + +commit 376397c21eb9a7e4ea79d349af41da81c1af861f +Author: Zhenyu Wang +Date: Tue Aug 18 10:01:12 2009 +0800 + + Fix VGA plane disabling + + Only apply on G4X with SR01 bit5 workaround for VGA plane disable, and + restore behavior back for other chips to make sure other modes got disabled + too. + + For bug #17235, #19715, #21064, #23178 + + Signed-off-by: Zhenyu Wang + +commit 926c7e7d30458078f8185d4e0b9b32b40102b3d5 +Author: Matthias Hopf +Date: Thu Aug 13 13:59:55 2009 +0200 + + Add HP Mini 5101 to quirks list. + +commit 713820197755ea53003b36a920922c3c525eeeea +Author: Adam Jackson +Date: Tue Aug 11 14:50:03 2009 -0400 + + Fix the chip names printed in the log to be less obnoxious. + + Names taken from pci.ids. Pineview appears to be a platform not a GMCH, + so use the G/GM convention to distinguish. + +commit e8f0763d405a8152c74c28792c52fe12c1d41dd5 +Author: Eric Anholt +Date: Fri Aug 7 18:24:44 2009 -0700 + + Fix math in the tiling alignment fix. + +commit 222b52ef16895823fbf3a0fc0be4eb23b930ed1b +Author: Eric Anholt +Date: Fri Aug 7 18:05:29 2009 -0700 + + Align tiled pixmap height so we don't address beyond the end of our buffers. + +commit 62494407e529cfa68529b7267155a12d75418f21 +Author: Zhenyu Wang +Date: Thu Aug 6 13:52:54 2009 +0800 + + Fix typo in bios_reader for invalid pointer cast + + Fixed locally for af45482a52999b52bf41468c458808e30c100e35, but pushed + wrong commit. + +commit 79b6851148574419389ac8055b0c31b8bdac3ab3 +Author: Eric Anholt +Date: Wed Aug 5 12:45:16 2009 -0700 + + Fix sampler indexes on i965 planar video. + + We only set up one sampler, because all of our sampling is the same. By + using a non-zero index for the other two samplers, we'd dereference (likely) + zeroed data, resulting in using NEAREST filtering. This was a regression in + 40671132cb3732728703c6444f4577467fa9223f which incidentally switched from + having 6 samplers to 1. + + Bug #22895, #19856 + +commit f4e4c1a8544e264c5a1da02f4e7990a1beecf71e +Author: Zou Nan hai +Date: Wed Aug 5 15:00:37 2009 +0800 + + It seems that indirect data upper bound check in STATE_BASE_ADDRESS + is not acting like what bspec told on 965gm. + G45+ follow bspec, but we have to set it to a large value for 965gm. + +commit af45482a52999b52bf41468c458808e30c100e35 +Author: Zhao Yakui +Date: Fri Jul 24 10:44:20 2009 +0800 + + Calculate the DVO relative offset in LVDS data entry to get the DVO timing + + Now the DVO timing in LVDS data entry is obtained by using the + following step: + a. get the entry size for every LVDS panel data + b. Get the LVDS fp entry for the preferred panel type + c. get the DVO timing by using entry->dvo_timing + + In our driver the entry->dvo_timing is related with the size of + lvds_fp_timing. For example: the size is 46. + + But it seems that the size of lvds_fp_timing varies on the differnt + platform. In such case we will get the incorrect DVO timing because of + the incorrect DVO offset in LVDS panel data entry. + + Calculate the DVO timing offset in LVDS data entry to get the DVO timing + a. get the DVO timing offset in the LVDS fp data entry by using the + pointer definition in LVDS data ptr + b. get the LVDS data entry + c. get the DVO timing by adding the DVO timing offset to data entry + + https://bugs.freedesktop.org/show_bug.cgi?id=22787 + + Signed-off-by: Zhao Yakui + +commit 50e2a6734de43a135aa91cd6e6fb5147e15ce315 +Author: Dave Airlie +Date: Tue Jul 28 18:26:25 2009 +1000 + + intel: drop RES_SHARED_VGA not needed anymore + +commit f3387310f312a4a9e1d691974834c3d290c2fa32 +Author: Dave Airlie +Date: Tue Jul 28 18:27:10 2009 +1000 + + xserver: fix up for stable build + + reported by Arkadiusz Miskiewicz + +commit 9bc0096f9de4b85ca6d6a5db109e49c4364bcee7 +Author: Dave Airlie +Date: Tue Jul 28 13:55:39 2009 +1000 + + intel: since driver depends on newer server don't need to wrap this + + drop resource/RAC interactions + +commit 9a3b568d62a0b48f4a42ea5377740b2df1af432a +Author: Dave Airlie +Date: Tue Jul 28 13:32:30 2009 +1000 + + intel: update for resources/RAC API removal + +commit 3418c6c16b108e45f67f3c868d28932266f7a0bc +Author: Krzysztof Halasa +Date: Tue Jul 28 10:47:44 2009 +0800 + + h/v bias in 3DSTATE_DEST_BUFFER_VARIABLES is 4-bits wide + + Fixes bug #22370 + +commit 378445738494663f2ee1615598d4c77b870745af +Author: Dave Airlie +Date: Tue Jul 28 10:10:13 2009 +1000 + + intel: remove unneeded includes + + none of these need the resource includes + +commit 8084f76d86f048ca5b82da089fffa9665dbbcdd5 +Author: Keith Packard +Date: Sun Jul 26 13:14:05 2009 -0700 + + Allow DRM mode setting to include transformations + + This removes the explicit transform disabling code in drm_set_mode_major. + Without a fixed X server, transforms will still be broken, but even a fixed + X server can't work around this driver bug. + + Signed-off-by: Keith Packard + +commit 9a45ace207199eb40e95dc6d2670b3096e66ecd9 +Author: Xiang, Haihao +Date: Thu Jul 23 11:09:53 2009 +0800 + + XvMC: enable XvMC/XvMC-VLD on IGDNG + +commit 043b4a866ab51acffc52d2d71db3475007747571 +Author: Xiang, Haihao +Date: Thu Jul 23 11:07:13 2009 +0800 + + add compiled shader programs for XvMC/XvMC-VLD on IGDNG + +commit 7684adaa370e8b0bd22e6e7dd1d5fa05f6142bab +Author: Xiang, Haihao +Date: Thu Jul 23 10:57:22 2009 +0800 + + Check the version of intel-gen4asm tool in configure.ac + +commit 7dc95b4f1dfecbeb7e9f4a0c35fda32d020be8fe +Author: Xiang, Haihao +Date: Fri Jul 24 10:39:05 2009 +0800 + + XvMC: pin XvMC buffers under KMS. + + Under KMS, the buffer allocated by i830_allocate_memory + isn't pinned anymore. However currently 915 XvMC needs + static offsets. + + Fixes bug #22872 + +commit 12c5aeca7a3db92d3522d00f5daf338d522e2176 +Author: Eric Anholt +Date: Thu Jul 16 13:34:09 2009 -0700 + + 8xx render: Add limited support for a8 dests. + + This improves aa10text performance from 74k to 569k on my 855 laptop. + This also causes my 865 to hang on aa10text like it does on rgb10text, + thanks to actually hitting render accel. + +commit 6b7728491c3b771bcba2c7ffd75330c0a0b37f44 +Author: Eric Anholt +Date: Wed Jul 15 16:38:07 2009 -0700 + + Only align DRI2 tiled pixmaps to the DRI2 tiled pixmap alignment requirement. + + This should save significant amounts of memory for glyph and other small + pixmap storage. + + Bug #21387 + +commit 22f7cbc32b70a89d55c79bbea39fb10c50a310ec +Author: Eric Anholt +Date: Thu Jul 9 23:56:22 2009 -0700 + + uxa: Tell the driver when we're just going to immediately map the pixmap. + + This lets the driver allocate a nice idle buffer object instead of a + busy one, reducing runtime of firefox-20090601 on my G45 from 50.7 (+/- .41%) + to 48.4 (+/- 1.1%). + +commit 5ef3db45e059df136162584d00d4b0b511456a33 +Author: Eric Anholt +Date: Thu Jul 9 19:24:38 2009 -0700 + + uxa: Skip fill of temporary alpha picture that just gets copied over. + + This was needed when we were doing the mask computations in this pixmap, + but now they're done in a temporary and then uploaded later. + + This reduces runtime of firefox-20090601 from 52.6 (+/- .96%) to 50.7 + (+/- .41%) seconds on my G45. + +commit 6f3fc6b20f3daedab02e31f49678d4d2ff0fa7a3 +Author: Keith Packard +Date: Tue Jul 21 12:32:10 2009 -0700 + + drmmode_output_get_modes: Replace existing EDID property blob with new one + + This synchronizes the X EDID data with the kernel EDID data each time the + kernel data may have changed. Otherwise, X ends up stuck with the first EDID + data it sees, failing to accomodate to different monitors. + + Signed-off-by: Keith Packard + +commit 840a787a191b31ece5068e10daed04bee70bb1a2 +Merge: 0a4c4c5 5d50a94 +Author: Carl Worth +Date: Mon Jul 20 23:00:06 2009 -0700 + + Merge branch '2.8' + +commit 5d50a949b3c5d0ad2bc4cf48ab25da1f707a4f6f +Author: Carl Worth +Date: Mon Jul 20 22:59:37 2009 -0700 + + Increment version number to 2.8.0 for release. + +commit b12220bd81f3a0509a3746dac3258e53f3879b23 +Author: Carl Worth +Date: Mon Jul 20 22:59:02 2009 -0700 + + NEWS: Add notes for 2.8.0 release + + Many thanks to Gordon for his notes from http://intellinuxgraphics.org/2009Q2.html + +commit 0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890 +Author: Peter Hutterer +Date: Thu Jul 16 11:40:15 2009 +1000 + + Update to xextproto 7.1 support. + + DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers + need to include dpmsconst.h if xextproto 7.1 is available. + + SHM is now shm.h instead of shmstr. Requires definition of ShmFuncs that's + not exported by the server. + + Signed-off-by: Peter Hutterer + +commit 57c7cbade9556e7b21867e61353f0928fd553616 +Author: Owain Ainsworth +Date: Thu Jul 16 20:38:43 2009 +0100 + + accessing a pixmap if prepare_access fails is verboten. + + Don't do it, treat this the same as every other prepare access call in uxa. + + Reviewed-by: Keith Packard + Signed-off-by: Owain Ainsworth + +commit bb3007384298cb57625ec0b3868dff9b23568f3e +Author: Eric Anholt +Date: Thu Jul 16 12:56:07 2009 -0700 + + Really fix i915 render. Fail at commit --amend. + +commit 8dd7ccf37e2de6d80b556e6d18af244cefc1e417 +Author: Eric Anholt +Date: Thu Jul 16 11:40:51 2009 -0700 + + Fix 915-class Render after the 8xx-class Render fix. + + The two shared i830_composite.c, so giving i830 atomic batch support + triggered anger about starting i830's atomic area while in i915's atomic + area. Instead, split the emit-a-primitive stuff from the state emission. + +commit a1e6abb5ca89d699144d10fdc4309b3b78f2f7a9 +Author: Eric Anholt +Date: Wed Jul 15 14:15:10 2009 -0700 + + Use batch_start_atomic to fix batchbuffer wrapping problems with 8xx render. + + Bug #22483. + +commit e386e7b14b139f15205e14b173e8222bf38d9e18 +Author: Keith Packard +Date: Wed Jul 15 09:43:04 2009 -0700 + + Reset framebuffer offset when rebinding aperture (22760). + + scrn->fbOffset may be changed when binding objects to the aperture during + server initialization or VT enter. This was accidentally removed when the + NoAlloc option was eliminated. + + Signed-off-by: Keith Packard + +commit b74bf3f9a65af9e72921d4e9028d9d4d023f8bc6 +Author: Barry Scott +Date: Mon Jul 13 16:34:20 2009 -0700 + + Fix XV scan line calculation when rotated. + +commit 82905c7c0b871a97ec435a765c2ca407903ba595 +Author: Carl Worth +Date: Mon Jul 13 05:29:49 2009 -0700 + + Increment version to 2.7.99.902 + +commit 925bc6cbd430a00928fac2ef58724dd37c3bc349 +Author: Carl Worth +Date: Mon Jul 13 05:27:40 2009 -0700 + + RELEASING: Fix typo in instructions + +commit 67c0afc7b7446a7b98aa7c65043ddba4c7c72b82 +Author: Carl Worth +Date: Mon Jul 13 05:27:06 2009 -0700 + + NEWS: Add notes for 2.7.99.902 + +commit 34c674dd45879b8ba8395b93b16c8a9e7b848f1f +Author: Keith Packard +Date: Sat Jul 11 22:53:42 2009 -0700 + + Remove vestiges of NoAccel options from i830_driver.c + + The enum and OptionInfoRec weren't removed in the initial patch + + Signed-off-by: Keith Packard + +commit 33d6e7a2355dfb8ad324c4fa28ce61c7e051b435 +Author: Keith Packard +Date: Sat Jul 11 22:53:11 2009 -0700 + + intel.man: Mark NoAccel option as i810/i815 only + + The NoAccel option is not valid for other chips. + + Signed-off-by: Keith Packard + +commit ed8a9a94e1a670ca35311c9ed83d0c479530d41a +Author: Keith Packard +Date: Fri Jul 10 17:13:14 2009 -0700 + + i830_uxa_prepare_access: Flush and wait for idle for non-bo pixmaps + + Without kernel support and explicit knowledge about where in the ring the + last rendering operation for a specific pixmap was, we must synchronize with + any outstanding rendering before accessing a pixmap which does not have a + buffer object. + + Signed-off-by: Keith Packard + +commit cb19ac207b784d814f6f389110fd1b21a0f34e8b +Author: Keith Packard +Date: Fri Jul 10 14:01:02 2009 -0700 + + KMS: Keep screen pixmap devPrivate.ptr NULL during init and resize + + The frame buffer only has a valid address between prepare_access and + finish_access calls, so remove all other attempts to compute an address from + the driver. + + Signed-off-by: Keith Packard + +commit 704b88dd50a7e7e3f362264b86d0401bee8603aa +Author: Keith Packard +Date: Wed Jul 8 13:06:47 2009 -0700 + + i830_bind_memory: Under UMS: Bind GEM bos with dri_bo_pin, else through the GART + + We only need to get static offsets for objects when not running KMS, + otherwise the kernel will manage those as needed for us. + + Binding objects is done in one of two ways. For GEM buffer objects, we use + dri_bo_pin. For GART allocated memory, we bind that to the GART. + +commit 7b273732f70e91df8b41d5c48e1379271557dd8e +Author: Keith Packard +Date: Wed Jul 8 11:53:13 2009 -0700 + + Allocate GTT space for GEM only under UMS + + GEM requires GTT space to map objects. Under KMS, the kernel driver has + already provided all available GTT space to GEM, so the X server need not do + anything. + + Signed-off-by: Keith Packard + +commit 56bfee8705f5d7d965227013b205dbc4c93e220c +Author: Keith Packard +Date: Fri Jul 10 14:49:20 2009 -0700 + + Always set screen pixmap data pointer at init and resize times + + For non-DRM environments, the screen pixmap will be GART allocated memory + and not a libdrm buffer object and so uxa will only use devPrivate.ptr to + find the associated memory. Make sure devPrivate.ptr is set each time the + framebuffer is allocated so that uxa will be able to draw to it. + + Signed-off-by: Keith Packard + +commit 98087a0b966d5dc69faf72719153a2c878ba3de1 +Author: Keith Packard +Date: Wed Jul 8 11:47:25 2009 -0700 + + Make xorg.conf DRI option work under KMS. Fix name of I830AccelMethodInit + + KMS mode does not call I830AccelMethodInit as that does the user + modesetting initialization (yes, it was misnamed), but that means that the DRI option + was ignored. Create a new i830_check_dri_option function to do the option + detection, then remove that from I830AccelMethodInit, which is renamed + i830_user_modesetting_init to reflect what it actually does. + + Signed-off-by: Keith Packard + +commit d655a3ff423e69c19a5dc07140cbf3caaa32cb86 +Author: Keith Packard +Date: Wed Jul 8 18:06:40 2009 -0700 + + Remove NoAccel support + + This removes yet another 'debugging' option that hasn't seen real use in a + long time, and wasn't supported under KMS in any case. + + Signed-off-by: Keith Packard + +commit 4e4b947f0b13f4a62606ccfd5729d5eb26ca0e92 +Author: Eric Anholt +Date: Thu Jul 9 15:52:16 2009 -0700 + + Remove bad comment about 3DSTATE_DRAWING_RECTANGLE size. + +commit 9155cfca75a207bce0fad945f32f0cb33eab8c4e +Author: Eric Anholt +Date: Thu Jul 9 14:16:07 2009 -0700 + + Fix lols in trying to figure out whether this is a 64-bit build. + + Noticed by: Michel Dänzer + +commit 40e7c9505265823786cf730214db84812a5e494e +Author: Eric Anholt +Date: Mon Jul 6 11:54:50 2009 -0700 + + Refuse to allocate giant BOs on 32-bit systems. + + The overcommit of address space combined with these buffers hitting SW + fallbacks all the time means that we're probably better off telling the + application "no" instead of likely silently failing later. + + Bug #22601. + +commit 6337cd23e692cae789d07f429442c425c18e1d4f +Author: Eric Anholt +Date: Wed Jul 1 15:54:38 2009 -0700 + + Initialize the other argument to drmSetInterfaceVersion. + + The kernel ignores it if dd_major is -1, anyway. + +commit 216d939858abc924f2e32c95518f937f29ea018e +Author: ling.ma@intel.com +Date: Tue Jul 7 14:26:02 2009 +0800 + + enable sdvo lvds scaling function + + Currently we implemented basic sdvo lvds function, + But except for sdvo lvds fixed mode, we can not switch + to other modes, otherwise display get black. The patch + intends to work for all modes whose HDisplay and VDisplay + are lower than fixed mode. + + Signed-off-by: Ma Ling + +commit 0402f4f331148084552bd3963dbcb3fb900be8ea +Author: Simon Farnsworth +Date: Thu Jun 18 12:33:47 2009 +0100 + + Raise XV limit to 2048x2048 to match hardware limits. + + The bigrequests limit isn't present in current X servers (tested using + textured video on a 965 with both image and window at 2048x2048 on a + 1920x1200 display, and image at 2048x2048, window at 1024x1024). + + Remove the artificial limit, enabling full-screen HD video when + rotated. + +commit a66357832388ba9db21a4b3bf8311d9d1f1ab308 +Author: Keith Packard +Date: Tue Jul 7 14:13:57 2009 -0700 + + non-DRI FB resize failed to assign the screen pixmap devPrivate.ptr (22328) + + When not using DRI, the screen pixmap is not in a bo, and so the usual + enable/disable access functions don't adjust the pixmap devPrivate field, + leaving it to the frame buffer allocation code to assign this correctly. + + During mode setting and fb resizing, FB access is disabled, and the + screen pixmap devPrivate is stashed away by xf86EnableDisableFBAccess, + to be restored when FB access is turned back on. This means that we have to + set the pixmap devPrivate.ptr (in case xf86EnableDisableFBAccess doesn't + do this), along with storing the address in the scrn->pixmapPrivate field. + + Signed-off-by: Keith Packard + Reviewed-by: Jesse Barnes + +commit c889b34e432198d5410a068eff3089ff5314ac27 +Author: Chris Wilson +Date: Tue Jul 7 18:05:01 2009 +0100 + + Check for a valid I830Ptr before closing master. + + After failing to become DRM master, the X server dies attempting to close + the master fd during free: + + (EE) intel(0): [drm] failed to set drm interface version. + (EE) intel(0): Failed to become DRM master. + (EE) intel(0): failed to get resources: Bad file descriptor + (EE) intel(0): Kernel modesetting setup failed + + Backtrace: + 0: X(xorg_backtrace+0x3b) [0x8133a3b] + 1: X(xf86SigHandler+0x55) [0x80c7945] + 2: [0xb805d400] + 3: /usr/lib/xorg/modules/drivers//intel_drv.so [0xb7b4bfcc] + 4: X(xf86DeleteScreen+0x6b) [0x80d465b] + 5: X(InitOutput+0x548) [0x80b0158] + 6: X(main+0x1cb) [0x807220b] + 7: /lib/tls/i686/cmov/libc.so.6(__libc_start_main+0xe5) [0xb7d107a5] + 8: X [0x8071881] + Saw signal 11. Server aborting. + ddxSigGiveUp: Closing log + ddxSigGiveUp: re-raising 11 + Segmentation fault + + Signed-off-by: Chris Wilson + +commit 705042f497b7b3843c2dcc5c160fb8dfeac1472a +Author: Keith Packard +Date: Mon Jul 6 13:49:31 2009 -0700 + + Handle DRI2INFOREC version 3 + + This DRI2 version does not support the old CreateBuffers/DestroyBuffers + interface anymore. + + Signed-off-by: Keith Packard + +commit 2ebc7d32e47b5edd5b776c39f936ed4e053caac2 +Author: Keith Packard +Date: Thu Jul 2 13:13:14 2009 -0700 + + Update to multi-API DRI2 interface + + The DRI2 interface was changed to support both old and new drivers in an + API/ABI compatible fashion. This change syncs the intel driver with the new + version of the DRI2 API. + + Signed-off-by: Keith Packard + +commit f6f79eb629184366b1355743d601129a526da90c +Author: Rémi Cardona +Date: Mon Jul 6 11:01:31 2009 +0200 + + remove unused shader program + + This file is not even referenced by any Makefile.am + + Acked-by: Zhenyu Wang + +commit 7e722ada533777c5e9ddf44bb4d770bacf8e13bf +Author: Zhenyu Wang +Date: Mon Jul 6 16:25:13 2009 +0800 + + Disable FBC on IGDNG + + Don't make FBC count for memory allocation. + + Signed-off-by: Zhenyu Wang + +commit 74227141923a2f5049592219ab80e8733062a5d9 +Author: Barry Scott +Date: Tue Jun 23 14:14:50 2009 +0100 + + Fix segv for clipped movie window + + When playing a movie that is clipped on its left and right edges the Xorg + server will SEGV sometimes. This is because the intel driver ignores the + clipping info when it copies the planes out of the XV data. + + The check for the optimised copy was wrong to ignore the width required. + Which leads to too much data being copied by the memcpy. It the source buffer + happens to end exactly on a page boundary the server will SEGV. + + As we reviewed the code we checked the calculation of src1, src2 and src3. + The patch includes additional comments to make it clear what the elements of + the calculation are. + + This bug exists in git head and we also see it in 2.4.1. + + Barry + + Reviewed-by: Ian Romanick + +commit c1755599db1d9a20954b84ccc07afd892bb6ac9e +Author: Jesse Barnes +Date: Thu Jul 2 13:04:51 2009 -0700 + + Clear the bo on the rotate scratch pixmap + + Since the scratch pixmap header will be re-used after allocation, we + need to clear its bo attachment when we stop using it, otherwise a later + user will use a bogus bo. + + Reviewed-by: Keith Packard + Signed-off-by: Jesse Barnes + +commit 324b4686204feb3a7370eeecaff8ba44635f73ca +Author: Daniel Vetter +Date: Thu Jul 2 14:15:37 2009 +0200 + + Xv i830_display_video splitup: extract i830_update_scaling_factors + + Just moved the code, no other changes. + + Signed-off-by: Daniel Vetter + +commit c2410addbfb99fcd7069591d9f387c35ed760522 +Author: Daniel Vetter +Date: Thu Jul 2 14:15:36 2009 +0200 + + Xv i830_display_video splitup: extract i830_update_polyphase_coeffs + + To slightly clean up the implementation of i830_update_polyphase_coeffs, + introduce the two small helper functions i830_limit_coeff and + i830_store coeffs_in_overlay_regs. + + Signed-off-by: Daniel Vetter + Reviewed-by: Ian Romanick + +commit 795c11c49cf10525f02127a3629d35378d802fa7 +Author: Daniel Vetter +Date: Thu Jul 2 14:15:34 2009 +0200 + + Xv i830_display_video splitup: extract i830_update_dst_box_to_crtc_coords + + Just moved the code ouf of line. + + Signed-off-by: Daniel Vetter + +commit 4100abdf5d208bbcbb4ceabad0572c04221443c9 +Author: Daniel Vetter +Date: Tue Jun 30 13:12:45 2009 +0200 + + Xv: kill !textured condition + + This is in the overlay path and therefore always true. + + Signed-off-by: Daniel Vetter + +commit b0df0fe91e2b800ed096f369850aa1af4be2f157 +Author: Daniel Vetter +Date: Tue Jun 30 13:12:44 2009 +0200 + + Xv overlay: implement GAMMA5 errata + + - also ensure that the most significant byte is zero + - while I was looking at the code, add the Overlay suffix to + SetPortAttribute like in the textured case. + + Signed-off-by: Daniel Vetter + +commit 5ef4d3cde1335350d82469ebbaed1b547a59552c +Author: Daniel Vetter +Date: Tue Jun 30 13:12:43 2009 +0200 + + Xv: kill unneeded indirection + + overlay and textured video have the exact same QueryImageAttributes + function. + + Signed-off-by: Daniel Vetter + +commit 1e4784bf26e3c154f5673f7b5add3ef7af3b1474 +Author: Eric Anholt +Date: Tue Jun 30 19:52:36 2009 -0700 + + uxa: Fix segfault on source-only picture usage with FallbackDebug. + + Bug #22107. + +commit 7e79fc8aa93df4df37c25cf37ee0ec6c7caca1d9 +Author: Zhenyu Wang +Date: Tue Jun 30 15:40:34 2009 +0800 + + Fix 945GM VT switch in UMS + + Bug #19578. We should set private intel_crtc state according + to current, as fail to do so pipe A needs active won't be taken + care of. Also make sure pipe swap operation always set during + VT switch. + + Signed-off-by: Zhenyu Wang + +commit 50392ac8234d643c8a99e1753bdb196c0062a891 +Author: Zhenyu Wang +Date: Mon May 18 13:53:33 2009 +0800 + + Load fbcon too if kernel mode setting is checked on + + If i915 module has already been loaded and kms check is true, + it would be nice to load fbcon module too. + + Signed-off-by: Zhenyu Wang + +commit 058ad9e6ab4a00ff66046d94c2129056011ebee9 +Author: Jesse Barnes +Date: Tue Jun 30 16:02:19 2009 -0700 + + Don't try to pin buffers in KMS mode + + The only things we try to pin in KMS mode are the cursor objects and + front buffer, and those are taken care of by the kernel anyway, so we + shouldn't even bother trying to pin them (well, not entirely true, + XvMC tries to pin as well, but it needs work w/KMS anyway). + + Signed-off-by: Jesse Barnes + +commit cec9fc6f6cffce186606f39982d0d78ff7c63bbf +Author: Jesse Barnes +Date: Tue Jun 30 12:27:59 2009 -0700 + + Make KMS set_resource function return TRUE + + This is what's expected by the server, and allows the EDID for example + to be exported in the KMS case. + + Signed-off-by: Jesse Barnes + +commit 53e248af4365232416d2143a791a07c6751f8319 +Author: Jesse Barnes +Date: Tue Jun 30 12:00:28 2009 -0700 + + Use DVO timing block instead of fp_timing when parsing LFP data + + The KMS side was correct, but the UMS patch was broken. We need to use + the DVO timing block of the LFP data to get the timing, not the + fp_timing block. + + Fixes fdo bug #22529. + + Signed-off-by: Jesse Barnes + +commit 362883c2f9a3442f7678e6e815f41b21baaa3f53 +Author: Jesse Barnes +Date: Mon Jun 29 16:26:15 2009 -0700 + + Add a few error messages for DRM initialization + + Makes it easier to see where things go wrong. + + Signed-off-by: Jesse Barnes + +commit afac333bef4a0ac934f0e4d933dc5053d81ca88c +Author: Zhenyu Wang +Date: Tue Jun 30 11:10:52 2009 +0800 + + Remove unused packed yuv sampler shader programs + + Signed-off-by: Zhenyu Wang + +commit 150c9adebc0b502f19c970783f411928e5a5c3b1 +Author: Zhenyu Wang +Date: Tue Jun 30 10:42:41 2009 +0800 + + Xv: fix domain usage for binding table on i965+ chips + + Signed-off-by: Zhenyu Wang + +commit 7770958e42d60966d95702e75c704e20ae2d90dd +Author: Zhenyu Wang +Date: Tue Jun 30 10:41:26 2009 +0800 + + Add XV support on IGDNG + + This brings necessary change for IGDNG for texture video support + from 2D render code. + + Signed-off-by: Zhenyu Wang + +commit f806fe7d675b966680a63406167ce37e4f8a1ae8 +Author: Xiang Haihao +Date: Thu Jun 25 15:39:32 2009 +0800 + + Enable 2D composite on IGDNG + + This patch enables 2D composite on IGDNG. IGDNG requires + new compiled shader programs for Gen5 and some command changes. + The most notable is the layout of vertex element has changed, + but we tried to keep it as origin to not change shader programs. + Also vertex buffer state requires end address of vertex buffer + instead of origin max index. + + Signed-off-by: Zhenyu Wang + +commit 9fb34012f667e37f480085696ef9c2632d6eb7e1 +Author: Zhenyu Wang +Date: Thu Jun 25 15:30:04 2009 +0800 + + Add new compiled shader program for IGDNG + + Also check intel-gen4asm tool here for new -g option, which is + required to compile new programs. + + Signed-off-by: Zhenyu Wang + +commit 488acc4595bb7f40130afcb8bcb05656ff3ae82c +Author: Zhenyu Wang +Date: Thu Jun 25 14:05:40 2009 +0800 + + Move shader programs under its own subdirectory + + Signed-off-by: Zhenyu Wang + +commit 170cae0c8d58fc141de1d8a2f17a4328d39c1263 +Author: Jesse Barnes +Date: Mon Jun 29 12:55:43 2009 -0700 + + Only get the VBIOS in non-KMS mode + + In KMS mode, the kernel takes care of this for us, so don't bother. + +commit 6511c082459789cf279e7a4528775a1c821ad8cc +Author: Jesse Barnes +Date: Mon Jun 29 12:53:51 2009 -0700 + + Output error info if we fail to get DRM resources + + Useful for debugging. + +commit 00eb73286c3512a362dce00efdeae740772d0dcd +Author: Jesse Barnes +Date: Mon Jun 29 09:12:28 2009 -0700 + + Use swapbuffers_wait control + + Commit 1eec83a203c48822400742a1fb184b2cb52c62f7, which added the new + SwapbuffersWait option, didn't actually include the code which used it. So + add a test to DRI2's CopyRegion call, only emitting the scanline wait + command if the swapbuffers_wait option is set. + + Signed-off-by: Jesse Barnes + +commit f53b3239dbc0ed723774e386e07ac9d8ce96bb89 +Author: Zhenyu Wang +Date: Thu Jun 25 10:22:23 2009 +0800 + + Disable XvMC on 915G/GM in KMS + + These chips require physical address for XvMC surface, which + is not available in KMS case. Instead of crashing X, disable it now. + + Signed-off-by: Zhenyu Wang + +commit f0270bbb47baed78a0ff6189ae20d3ac322ec02b +Author: Jesse Barnes +Date: Wed Jun 24 14:42:08 2009 -0700 + + Fix i830_crtc_on to only check outputs associated with the given CRTC + + Otherwise we may end up returning a false positive if some other output & crtc + are on, but not the one in question, again leading to hangs. + + Reported-by: Eric Anholt + Signed-off-by: Jesse Barnes + +commit 5d80e24b5fc6d6028028da6ded35389c08bfce29 +Author: Jesse Barnes +Date: Wed Jun 24 13:12:25 2009 -0700 + + Treat disabled CRTCs as "not covering" for scanline wait purposes + + Now that swapbuffers does a scanline wait to avoid tearing, it's + important to take into account the CRTC status to avoid hangs. If we + do a scanline wait when the CRTC is off (due to DPMS for example) we'll + hang the GPU. So add some code to check the CRTC DPMS status to the + i830_covering_crtc function, returning NULL if none of the covering + CRTCs are actually active. KMS vs UMS logic is hidden in new i830* + functions, cleaning up both DRI2 & video paths a bit. + + Fixes fdo bug #22383. + + Signed-off-by: Jesse Barnes + +commit 6d025e679a99778496576af9a6a6fa8c043ae811 +Author: Alan Coopersmith +Date: Tue Jun 23 09:53:14 2009 -0700 + + Harden i830 render in case check_composite didn't throw out bad formats. + + Fixes a warning in a static analysis program, and the code's a little + clearer. + + Bug #21667 + +commit 1eec83a203c48822400742a1fb184b2cb52c62f7 +Author: Jesse Barnes +Date: Tue Jun 23 15:05:03 2009 -0700 + + Add option to control swapbuffers behavior + + Until we get triple buffering, we'll want this so users can avoid taking a + performance hit on apps that render slower than the refresh rate. + + Fixes fdo bug #22234. + + Signed-off-by: Jesse Barnes + +commit bfeeac6de096256fca82244338bb45d53ee53cbc +Author: Zou Nan hai +Date: Tue Jun 23 11:31:37 2009 +0800 + + i915 xvmc, fix fd.o bug #22103 + +commit 15af8ea6ab6998bbab9f4eeda227565c409da229 +Author: Jesse Barnes +Date: Mon Jun 22 11:11:06 2009 -0700 + + Fix LFP data block fetch + + Apparently the proper way to do this is to use the LFP data pointer block to figure out the LFP data block entry size, then use that plus the panel index to calculate an offset into the LFP data block array. + + Fixes fdo bug #19450. + + Signed-off-by: Jesse Barnes + +commit 534e73ad4f234a04755917f2bf17ba821c27eb52 +Author: Zhao Yakui +Date: Thu Jun 18 09:46:32 2009 +0800 + + Don't change the blank/sync width when calculating scaled modes + + Don't the change the blank/vsync width while doing LVDS scaled modes. + And use the border instead of border minus one. + + At the same time, make sure the horizontal border and hsync are even for + the LVDS that works in dual-channel mode. So both horizontal border and hsync + start are also changed to be even, even for the LVDS in single-channel + mode. + + https://bugs.freedesktop.org/show_bug.cgi?id=20951 + + Signed-off-by: Jesse Barnes + Signed-off-by: Zhao Yakui + +commit b5cd2130f97591f4a387db1b98c940c30bc6404c +Author: ling.ma@intel.com +Date: Tue Jun 16 16:52:25 2009 +0800 + + TV: Set correct voltage level override values + + We detect TV connect status by setting DAC voltage level override + values as 0.7 voltage for DAC_A/B/C. The corresponding 2-bits shold be 0x2, + In order correctly to set last bit as 0, at first we must clean it. + + It fixed freedesktop.org bug #21204 + + Signed-off-by: Ma Ling + +commit a6cdcd9fee0164f79075063fd163d142a55fcbc5 +Author: ling.ma@intel.com +Date: Tue Jun 16 16:47:52 2009 +0800 + + Set hot plug interrupt to detect HDMI output + + We detect HDMI output connection status by writing to HOT Plug Interrupt + Detect Enable bit in PORT_HOTPLUG_EN. The behavior will generate an specified + interrupt, which is caught by audio driver, but during one detection driver + set all Detect Enable bits of HDMIB, HDMIC and HDMID, which generate wrong + interrupt signals for current output, according to the signals audio driver + misunderstand device status. The patch intends to handle corresponding output + precisely. + + It fixed fredesktop bug #21371 + + Signed-off-by: Ma Ling + +commit 6b93afc564a5e74b0eaaa46c95f557449951b3b9 +Author: Bryce Harrington +Date: Wed May 27 03:40:52 2009 -0700 + + add pipe a force quirk for Dell mini + + Add quirk to solve issue with black screen and hang occuring after closing the + lid with attached external monitor, on Dell Mini. + + Fixes fdo bug #21960. + + Signed-off-by: Bryce Harrington + +commit eb09014ce10428bbcab04e155186382975545f0a +Author: Li Peng +Date: Tue Jun 16 15:29:57 2009 -0700 + + don't wait for vblank on rotated displays + + We may hang or wait for the wrong line if the display is rotated, so just skip + the wait in that case. + + Fixes fdo bug #22196. + +commit 6c56521bdc0443c0656271caaa795feb13bc1d6b +Author: Bryce Harrington +Date: Wed May 27 05:18:53 2009 -0700 + + pipe-a quirk for thinkpad x30 + + Fixes freeze when closing lid on ThinkPad X30. + + Fixes FDO bug # 21976. + + Signed-off-by: Bryce Harrington + +commit 246cec965958e94babf5377e6f221522b05fb458 +Author: Zhao Yakui +Date: Wed Jun 10 11:17:28 2009 +0800 + + Fix EDID for LVDS output device to add the default modes + + Fix the EDID for the LVDS output device to add the default modes.This is + similar to what we have done in UMS mode. + a. When there exists the EDID, either find the DS_RANGES block or replace + a DS_VENDOR block, smashing it into a DS_RANGES block with open refresh + to match all the defaults modes. + b. When there is no EDID, we will construct a bogus EDID and add a DS_RANGES + block with the open refresh to match all the default modes. + + http://bugs.freedesktop.org/show_bug.cgi?id=20801 + http://bugs.freedesktop.org/show_bug.cgi?id=21094 + http://bugs.freedesktop.org/show_bug.cgi?id=21346 + http://bugs.freedesktop.org/show_bug.cgi?id=21417 + http://bugs.freedesktop.org/show_bug.cgi?id=21671 + + Signed-off-by: Zhao Yakui + +commit 5d1dc7677004d445a7a781decd8c1ef9747c14fb +Author: Zhao Yakui +Date: Wed Jun 10 11:17:27 2009 +0800 + + Get the LVDS panel limit and check whether the given modeline is valid + + When the connector type is LVDS, it will traverse the mode list returned by + KMS kernel to get the LVDS panel limit. Then it will use the panel limit to + check whether the given modeline is valid. If the given modeline exceeds + the LVDS panel limit, it will be invalid. + + http://bugs.freedesktop.org/show_bug.cgi?id=20801 + http://bugs.freedesktop.org/show_bug.cgi?id=21094 + http://bugs.freedesktop.org/show_bug.cgi?id=21346 + http://bugs.freedesktop.org/show_bug.cgi?id=21417 + http://bugs.freedesktop.org/show_bug.cgi?id=21671 + + Signed-off-by: Zhao Yakui + +commit 115e28639fbf6a1eba636dafac02fadd83036c75 +Author: Zhao Yakui +Date: Wed Jun 10 11:17:26 2009 +0800 + + Add the private data for the LVDS connector + + Add the private data when the connector type is LVDS. + We can use the private_data to store the LVDS panel limit. + For example: Hdisplay, Vdisplay. + + http://bugs.freedesktop.org/show_bug.cgi?id=20801 + http://bugs.freedesktop.org/show_bug.cgi?id=21094 + http://bugs.freedesktop.org/show_bug.cgi?id=21346 + http://bugs.freedesktop.org/show_bug.cgi?id=21417 + http://bugs.freedesktop.org/show_bug.cgi?id=21671 + + Signed-off-by: Zhao Yakui + +commit 3da549f5b350dd42516e5cb3576f7fefe012d95e +Author: Zhao Yakui +Date: Wed Jun 10 11:37:03 2009 +0800 + + GFX: Initialize the SDVO device based on the valid slave address + + When the slave address is found for the SDVO port, the SDVO device will + be initialzied. + When the slave address is not found for the SDVO port, it will return + the slave address by using the following flowchart: + a. If the SDVO device info is found for another SDVO port, it will return + the slave address that is not used. For example: if 0x70 is used, then 0x72 + is returned. + b. If no SDVO device info is found for another SDVO port, it will return + 0x70 for SDVOB and 0x72 for SDVOC. + + http://bugs.freedesktop.org/show_bug.cgi?id=20429 + + Signed-off-by: Zhao Yakui + +commit 51b87b9913ba164d4d5de79e558233915b37a0a5 +Author: Zhao Yakui +Date: Wed Jun 10 11:37:02 2009 +0800 + + parse general definition block to get the SDVO device info + + The general definition block contains the child device tables, which include + the child device info. For example: device slave address, device dvo port, + device type. + We will get the info of SDVO device by parsing the general definition blocks. + Only when a valid slave address is found, it is regarded as the SDVO device. + And the info of DVO port and slave address is recorded. + + http://bugs.freedesktop.org/show_bug.cgi?id=20429 + + Signed-off-by: Zhao Yakui + +commit 6ba148bbd78783f59eed3d898638c39b950dcd89 +Author: Zhao Yakui +Date: Wed Jun 10 11:37:01 2009 +0800 + + Dynamically get the number of child device in general definition block + + The size of general definition block varies on different platform/machines. + In such case the number of child device is also different. + And it will be better to get the number of child device in general definition + block dynamically. + + The number of child device can be calculated by the following formula: + (block_size - block_header_size) / + sizeof( struct child_device_config) + + http://bugs.freedesktop.org/show_bug.cgi?id=20429 + + Signed-off-by: Zhao Yakui + +commit cdbf84f20295c8a78624318aa6fdfff3f5c8ce27 +Author: Keith Packard +Date: Thu Jun 11 13:57:09 2009 -0700 + + intel_batch_init: test have_gem, not directRenderingType + + Under KMS, directRenderingType will get set to DRI_NONE during driver + initialization. When the first batch buffer is allocated, as + directRenderingType is DRI_NONE, the GEM bufmgr would get trashed as + intel_batch_init called a fake-bufmgr specific function. + + Signed-off-by: Keith Packard + +commit 6d062e9e9fc4ac92a5dc2941b4ed0251a1dc6e11 +Author: Julien Cristau +Date: Thu Jun 11 17:15:04 2009 +0200 + + Fix xvmc build + + If we don't find xext.pc, disable xvmc instead of failing configure + Also add dependencies on xfixes and dri2proto (src/xvmc/dri2.h includes + and ). + +commit 9d3c3b056c1d4da6ef7afd3f71a5994fad810632 +Author: Carl Worth +Date: Wed Jun 10 15:30:45 2009 -0700 + + Increment version to 2.7.99.901 + + This is the first release candidate for 2.8.0 + +commit e2622045155f5aa79bacbec8f81c1231194f3033 +Author: Carl Worth +Date: Wed Jun 10 15:30:09 2009 -0700 + + NEWS: Summarize new developments for 2.7.99.901 + +commit e5bfa2702a31566fa94fa75f7289d7cbe9825420 +Author: Lukasz Kurylo +Date: Wed Jun 10 07:55:31 2009 -0700 + + DRI2 copyregion: don't wait for scanlines that won't happen + + In some configurations, it's possible to wait for a scanline outside of + a given CRTC range. Make sure that can't happen to fix multihead cases + with dead space. + + Fixes fdo bug #22203. + + Signed-off-by: Lukasz Kurylo + +commit cda5561716891484aa6f1c4a234be8d88f17f659 +Author: Zou Nan hai +Date: Wed Jun 10 16:43:30 2009 +0800 + + add missing files for previous commit + +commit 6d500be3cdecd7617dc6119b58ae273eea478af7 +Author: Zou Nan hai +Date: Wed Jun 10 15:53:24 2009 +0800 + + enable MC on g45 for player without vld patch + +commit 88da9b48737229b305da4423e9aa43a09ccdcfac +Author: Zhenyu Wang +Date: Wed Jun 10 10:45:51 2009 +0800 + + Add new chipset register dumps + + Signed-off-by: Zhenyu Wang + +commit 0d56ef94be0592aec9aa83e4a5e4ff13348640c2 +Author: Zhenyu Wang +Date: Fri Jun 5 12:59:07 2009 +0800 + + Disable composite on new chipset for now + + This depends on updated intel-gen4asm be ready for new chip. + + Signed-off-by: Zhenyu Wang + +commit 440ccc44f51d3a5d6f46c28cfcc576cad155fbbc +Author: Zhenyu Wang +Date: Fri Jun 5 12:56:04 2009 +0800 + + Add new register definitions + + Signed-off-by: Zhenyu Wang + +commit 0d8a9e2c6f58115b9b8449de52e795699ed032af +Author: Zhenyu Wang +Date: Fri Jun 5 12:51:51 2009 +0800 + + Update intel_gtt utility for new chipset GTT check + + Signed-off-by: Zhenyu Wang + +commit fb524caa3e2f1f516717669642bb4b2244f9e7e4 +Author: Zhenyu Wang +Date: Mon Jun 8 10:22:14 2009 +0800 + + Remove fixed MMIO size + + Use pci resource size instead, which will get the correct MMIO range. + New chipset uses obviously larger MMIO range. + + Signed-off-by: Zhenyu Wang + +commit 4f40b33ef4b069b18a6a18406da83a23ca6e1127 +Author: Zhenyu Wang +Date: Fri Jun 5 11:57:57 2009 +0800 + + Add new chipsets PCI ids + + Desktop and mobile version of new chipsets are added. + Also do memory config like Intel 4 series chipset. + + Signed-off-by: Zhenyu Wang + +commit accdbd23676d812d2345f86d8e3ee62f108841ff +Author: Carl Worth +Date: Fri May 29 15:34:20 2009 -0700 + + UXA: Rasterize trapezoids to system memory, not a pixmap + + Since we're only doing software rasterization right now, anyway, it + makes more sense to just rasterize to system memory and then upload + to a pixmap once complete. This avoids expensive read-modify-write + cycles. + + This results in a 2.4x speedup for a real-world test case that's + heavy on trapezoids, which is swfdec running on the following file: + + http://michalevy.com/wp-content/uploads/Giant%20Steps%202007.swf + + Many thanks to Chris Wilson for his cairo-traces repository and + cairo-perf-trace tool which makes it so easy to measure things + like this. + +commit b5e32c9cf896a0b93d193d797a8e83b4aa4691fb +Author: Carl Worth +Date: Fri May 1 13:51:39 2009 -0700 + + Rename i830_exa.c to i830_uxa.c + + It was just confusing otherwise, (since the EXA code has all been + removed now). + +commit ee539e58c3bf39766c560d625f6e4158d419e64e +Author: Kristian Høgsberg +Date: Mon Jun 8 21:14:14 2009 -0400 + + Fall back to fb pixmaps for backing glyph pictures + + GEM pads pixmaps to 512 byte stride and backs them with a kernel side + buffer objects. We typically don't render out of glyph pictures, so + we're incurring a lot of overhead per glyph by allocating a GEM pixmap + per glyph. By looking at the usage hint, we can fall back to + fbCreatePixmap for pixmaps backing glyph pictures, which gives us + a nice tight malloced pixmap. The fast path for text rendering is + compositing from the glyph cache pixmap to the destination, which + shouldn't be significantly affected. + + Quick bit of testing: + (firefox-20090601) + xlib-rgba-before 384512.49: 1.01x + xlib-rgba-after 389633.94: 1.00x + The difference being within the margin of error for the benchmark. + + Signed-off-by: Eric Anholt + Tested-by: Chris Wilson + +commit 4698b3bd79452ae2066a3d195cf58dd5e30c93f3 +Author: Xiang, Haihao +Date: Fri Jun 5 10:43:50 2009 +0800 + + xvmc: don't include xf86dri.h + +commit 4d9f3a21ab9b2737fe7a5a088c2da1b0c2be7f04 +Merge: b8e360b 52054b6 +Author: root +Date: Thu Jun 4 10:27:41 2009 +0800 + + Merge branch 'xvmc-vld' + +commit b8e360bf2b77d28559d15a7c0f9c766848eb6ced +Author: Eric Anholt +Date: Wed Jun 3 10:12:25 2009 +0000 + + Fix segfault in DRI2 vblank syncing if the region isn't onscreen. + + Also, fix some weirdness in the checking for whether the target was the + screen. + +commit 5901a67fc85ac80fabfa98b78202a388445275c3 +Author: Eric Anholt +Date: Wed Jun 3 10:00:50 2009 +0000 + + Fix some drawable abuse in i830_dri.c + + We were casting pixmaps to drawables even if they weren't pixmaps. They did + happen to work out since we only used the drawable record out of them. + +commit 5e48146777921b693c828af9566a77422cc4f85f +Author: Eric Anholt +Date: Wed Jun 3 09:57:10 2009 +0000 + + Replace some pixmap-related idioms with inline functions to do so. + +commit ea0b00e675281b2914450992501566122f9affe0 +Author: Ma Ling +Date: Mon Jun 1 17:13:53 2009 +0800 + + Provide mode line from VBT to xorg. + + If sdvo get modes function can't find modes from EDID, + transmit sdvo lvds modes from VBT to xorg. + + Signed-off-by: Ma Ling + +commit 9e7ee50bea5f65003f1d70cc06d8c1ace1282548 +Author: Ma Ling +Date: Mon Jun 1 17:13:22 2009 +0800 + + Fetch mode line from VBT, then keep it. + + Parse SDVO LVDS option section, then according to panel type + fetch fixed mode line from SDVO LVDS DTDS section . + + Signed-off-by: Ma Ling + +commit 88f766be008008d76c150e3ac16f09d4ecbb6d53 +Author: Ma Ling +Date: Fri May 15 15:22:11 2009 +0800 + + Wait doubled regis to be stable for load pipe detection + + We have two approaches for VGA detections: hot plug detection for 945G onwards + and load pipe detection for Pre-945G. load pipe detection will get one free + pipe ,and set border color as red and blue, then check CRT status by + swf register. Because pipe registers in hires mode are double buffered, + once set force border bit in pipeconf register, we have to wait for + a vblank until it is effective, otherwise result is unstable. + + It fixed freedesktop bug #20463 + + Signed-off-by: Ma Ling + +commit 6a635be5ea2b2df9d6b9a8006325244394038474 +Author: Ma Ling +Date: Fri May 15 14:01:18 2009 +0800 + + Set activation periods as 64 cdclk sync up with KMS + + We use force CRT detect trigger bit(1 << 3) to detect VGA in hot plug mode, + which triggers a CRT hotplug/unplug detection cycle independent of the + interrupt enable bit(1 << 9), so keep bit 9. + And although spec says CRT_HOTPLUG_ACTIVATION_PERIOD_64(1 << 8) is only useful + for mobile platform, it is also required to detect vga on G4x platform correctly. + Tested the patch on G45/G43/Q45 platforms with no regressions + + It fixed freedesktop.org bug #21120 and part of bug #21210. + + Signed-off-by: Ma Ling + +commit ec2fde7c8250fdc30984f16c8a1d3587d70b0144 +Author: Jesse Barnes +Date: Tue Jun 2 16:42:56 2009 +0100 + + Sync DRI2 CopyRegion to vertical retrace + + Akin to the Xv code, wait for the scanline to be outside the range to be + copied by the DRI2 CopyRegion hook. + + Fixes fdo bug #20664. + + Reviewed-by: Eric Anholt + Signed-off-by: Jesse Barnes + +commit 704771f1c595df481d244a6f074e9f5620d4a720 +Author: Adam Jackson +Date: Thu May 28 15:03:45 2009 -0400 + + Remove useless loader symbol lists. + +commit 8e942b70cb9a784b3f1311affd6fc74c4bcf68bb +Author: Carl Worth +Date: Thu May 21 13:12:52 2009 -0700 + + Revert "Rely on BO pixmaps being present in acceleration paths." + + This reverts commit 4653a7db622ad54a3182d93c81331765d930db34. + + Eric was getting a little too ambitious about our brave, new world. + We do still want the driver to work with old, non-GEM kernels + after all. + +commit 1a039f4371bec455cad43f0fb7b329f2ee09a974 +Author: Eric Anholt +Date: Mon Apr 27 17:45:02 2009 -0700 + + Fold GEM detection into DRM master open. + + We don't have anything to do with the DRM unless it's GEM-enabled, unless + we were to support GEM-but-not-DRI2, which doesn't seem useful. + + Compilation fixes by Carl Worth + +commit a04a51c9bb6066454e0fda3c7897f97dab436358 +Author: Eric Anholt +Date: Mon Apr 27 17:29:36 2009 -0700 + + Open the DRM and keep the handle throughout server startup to finish. + + This will let us configure the server from start to finish with the + most pertinent information available (KMS vs UMS, DRI2 vs non-DRI). Also, + we now close the DRI2 fd at terminate, which we didn't before. + + This duplicates some code from DRI1 for getting a master FD like I'd done in + DRI2, but given that we weren't loading DRI1 ourselves, this is also a + bogosity cleanup, and avoids allocating the extra DRI1 private. + +commit c3bf8b980134a2761701e4bc18235695a1cb07a4 +Author: Eric Anholt +Date: Thu May 21 11:05:01 2009 -0700 + + Fix backwards logic on whether to sync to vblank or not. + + Thanks to Michel Dänzer for catching it. + +commit ad2128825ba28551cfef203da017151e2eac32ef +Author: Kristian Høgsberg +Date: Wed May 20 12:32:10 2009 -0400 + + Only return FALSE when dri_bo_map() fails + + Small typo in the previous commit. + +commit 09beee378cecd1079e7a9fa6eee8f084d680d37e +Author: Eric Anholt +Date: Mon May 18 18:01:05 2009 -0700 + + Don't do GTT maps on objects bigger than half the available aperture size. + + The basic problem is that software fallbacks will do single instructions that + copy from one GTT-mapped BO into another GTT-mapped BO. If we can't get both + of them bound simultanously, we fault one in, retry the instruction, fault the + other in (kicking out #1), retry the instruction, fault #1 back in + (kicking out #2), etc. + + Note that we'll still get into a nasty spot if you do a composite operation + with a mask where all 3 are big-but-less-than-half-available-aperture, where + you'll thrash. It at least means you'll make progress, though, since each + instruction will only be operating on two BOs at at time, and the situation + seems unlikely. + + Bug #20152 (3/3) + +commit 52054b6a4c1ca5117c9750361f71aedd91220c39 +Author: Li Shao Hua +Date: Tue May 19 16:27:32 2009 +0800 + + switch XvMC to gem + +commit 34660fd2df5d61b77ed7041d32ac29053fc94f5a +Author: Eric Anholt +Date: Fri May 15 23:21:05 2009 -0700 + + Only sync XV to vblank when drawing to the frontbuffer. + + This fixes emitting syncs to random pipes with boxes bigger than that + pipe's vertical, leading to GPU hangs. + + Bug #21738 + +commit b622860429e00d6ab4407980232659c283a8fe8d +Author: Xiang Hai hao +Date: Mon May 18 17:12:30 2009 +0800 + + DRI2 for XvMC + +commit 50c10ededba15dd0c118f1b65756362061491090 +Merge: 13c730e 87332a7 +Author: Zou Nan hai +Date: Mon May 18 17:11:28 2009 +0800 + + Merge branch 'master' into xvmc-vld + +commit 87332a7cc16af82aa47e07fbf90da3635b071dbf +Author: Keith Packard +Date: Mon May 11 13:52:00 2009 -0700 + + Use drm_intel_bo_disable_reuse API to flag scanout and cursor buffers + + Buffers referenced by the kernel for scanout or cursor display should not be + reused by the driver. Use the new drm API to disable reuse of these buffers. + + Signed-off-by: Keith Packard + +commit ebe05200df381c0e6ee636f0f83440bfedea9bcb +Author: Jesse Barnes +Date: Fri May 15 08:50:17 2009 -0700 + + Add --enable-debug flag to configure + + Defaults to enabled. + +commit 04772b6c09a88f0483c2a7efc48029967c77b9bc +Author: Keith Packard +Date: Thu May 14 16:57:11 2009 -0700 + + If DRM can't figure out which pipe to sync on, then don't sync at all. + + Syncing to the wrong pipe can wedge the hardware if the exclusion area is + larger than the vtotal + + Signed-off-by: Keith Packard + +commit 128c1c3b7d57b157604788f82bf9fd389839068f +Author: Carl Worth +Date: Wed Apr 29 14:43:56 2009 -0700 + + Use libdrm to lookup pipe for tear-free sync of XV + + Previously, the code was trying to examine a driver_private field, + but those fields are only set by the userland-modesetting code so + would fail in the case of KMS. This fixes bug #21076: + + [945GME] [KMS] XV_SYNC_TO_VBLANK does not prevent tearing of xv video + https://bugs.freedesktop.org/show_bug.cgi?id=21076 + +commit 2572fcc6196aff7a2f1095d211fd85d8668647ca +Author: Wu Fengguang +Date: Thu Apr 30 19:51:26 2009 +0800 + + README: kill an evil dot + + To make copy and paste a more pleasure. + + Signed-off-by: Wu Fengguang + Signed-off-by: Eric Anholt + +commit b9462516d18bc57be5f33f57adb6c3e8beede5ff +Author: Eric Anholt +Date: Tue May 12 18:53:27 2009 -0700 + + Remove dead "avail" variable from XAA stuff. + +commit 1c68bc376a9cb3c0a010c8e28f69a776755c8f64 +Author: Jesse Barnes +Date: Wed May 13 13:19:53 2009 -0700 + + Add new have_gem flag + + Prior to this patch, code that wanted to check whether GEM was present + would look at pI830->memory_manager. This turned out to be occasionally + problematic in the KMS case, since memory_manager didn't always get set + correctly. So add a new pI830->have_gem flag to make things clear in + the various code paths, and set it after GEM initializes or when KMS is + detected. + + Reviewed-by: Eric Anholt + Tested-by: Magnus Kessler + Signed-off-by: Jesse Barnes + +commit 52367847087206b92f18c40d356d36ab9ee89d39 +Author: Keith Packard +Date: Thu May 7 14:58:02 2009 -0700 + + Load i915 and fbcon when checking for KMS + + Signed-off-by: Keith Packard + Signed-off-by: Eric Anholt + +commit ff7494b4c4b1bd8bb6f169402a9edbe9780787bb +Author: Keith Packard +Date: Thu May 7 14:58:01 2009 -0700 + + Add DP link and GMCH M and N registers + + Signed-off-by: Eric Anholt + +commit e54a23bff068416ccbdb75d538dc7dcd40a6c95c +Author: Keith Packard +Date: Thu May 7 16:35:19 2009 -0700 + + Fallback when VT inactive + + While the VT is inactive, pI830->batch_bo will be NULL, so use that as a + simple check for when to not use the accelerator. The alternative is to + ignore VT switch and just keep drawing, which would also be fine. + + Bug #21468. + + Signed-off-by: Keith Packard + [anholt: Removed extra return FALSE -- I830FALLBACK does that.] + Signed-off-by: Eric Anholt + +commit 660bd745c21c56e330d844fe4c8eaae862a77483 +Author: Wu Fengguang +Date: Thu Apr 30 18:42:18 2009 +0800 + + Remove the offset parameter from i830_allocator_init() + + offset is redundant. i830_allocator_init() is only called + in one place with offset=0. + + Acked-by: Magnus Kessler + Signed-off-by: Wu Fengguang + Signed-off-by: Eric Anholt + +commit b1f5cc3349f6811ff4d8dc64cc291788d6726372 +Author: Carl Worth +Date: Tue May 12 11:45:03 2009 -0700 + + RELEASING: Better instructions for where to send announcements + + The xorg-announce list doesn't need to hear about development + snapshots and release candidates. The intel-gfx list is good for + that. + +commit f16ee218845ec48940ea457b921d34896d80a807 +Author: Alan Coopersmith +Date: Sun May 10 16:25:24 2009 -0700 + + Fix "Unkown" typo in two FatalError messages + + Signed-off-by: Alan Coopersmith + +commit 8d27247829fe4f55691ce68f9f4b14810fb34b32 +Author: Stijn van Drongelen +Date: Tue May 5 16:37:06 2009 +0200 + + Fix typo in (unused) INTEL_BIOS_32 macro + + Debian bug#527062 + + [jcristau: fix same typo in bios_reader.c] + Signed-off-by: Julien Cristau + +commit a8a771a853478e5f45f71d0eff3c4d55bf24d0ad +Author: Arkadiusz Miśkiewicz +Date: Wed Apr 29 00:21:18 2009 +0200 + + Restore CFLAGS after tests. + + Reverts single line of broken commit e5133a94dc78411eaef324131ea8056aeb81779e. + + Signed-off-by: Eric Anholt + +commit 8255cca2c9092f7ecb798944aa8f03fa3efcfa6c +Author: Keith Packard +Date: Fri May 1 18:34:43 2009 -0700 + + Split i915 textured video commands to fit into batch buffers. + + i915 textured video commands are quite long, but must be contained in the + same batch buffer as the 3D setup commands. When the number of clip rects + for the video becomes too large for the associated commands to fit in the + same batch buffer, this change breaks the sequence into pieces, ensuring + that each batch contains the necessary setup sequence. + + Signed-off-by: Keith Packard + +commit e5e0fb846bda3e1757b89e50d5244d28457b9fe3 +Author: Keith Packard +Date: Fri May 1 12:26:04 2009 -0700 + + Call down to lower CloseScreen before shutting down DRM allocator + + Lower level functions will destroy objects that are managed by the DRM + allocator, so make sure those are done before the allocator shuts down. + + Signed-off-by: Keith Packard + +commit cfb98f3da936907945f48dad4c2345930f7beb60 +Author: Keith Packard +Date: Fri May 1 12:23:32 2009 -0700 + + Revert "Leave allocator running until lower-level CloseScreens are done" + + Uh, oops -- the FD used to talk to the kernel is closed before the + allocator_fini function is called now. + + This reverts commit 1872869e6ffcc8e6cab820c508fe5404d7e8ff9c. + +commit 11a853bd8e5d907fe7f5bd907453bcdac9032861 +Author: Keith Packard +Date: Fri May 1 11:51:13 2009 -0700 + + Hold reference to video binding table until all rects are painted. + + The optimization of unreferencing the binding table when the relocation is + posted causes the object to be dereferenced for each box in the clip list, + causing general chaos in the buffer manager. It's easier to just hold a + reference to the object until all of the boxes are painted and then drop it. + + Signed-off-by: Keith Packard + +commit ed492131c13715b73c14d328d0668120acb58b40 +Author: Keith Packard +Date: Fri May 1 11:50:17 2009 -0700 + + 3D_STATE_VERTEX_BUFFERS takes four 32-bit values, not three. + + The spec says this command takes an extra (mbz) 32-bit value, so let's + provide it with one. + + Signed-off-by: Keith Packard + +commit 66d1536a2ecc7a3d44da4c0dbe6c85aaa4e05791 +Author: Keith Packard +Date: Fri May 1 11:48:51 2009 -0700 + + Don't bother to enable VF statistics during 965 video playback + + This was used while bringing up the driver to debug vertext fetches. + + Signed-off-by: Keith Packard + +commit 1872869e6ffcc8e6cab820c508fe5404d7e8ff9c +Author: Keith Packard +Date: Fri May 1 11:46:51 2009 -0700 + + Leave allocator running until lower-level CloseScreens are done + + The lower level close screen functions will free allocated objects, causing + a crash if the allocator isn't still available. + + Signed-off-by: Keith Packard + +commit 1142353b487c155a31011923fbd08ec67e60f505 +Author: Keith Packard +Date: Fri May 1 11:44:13 2009 -0700 + + intel_batch_start_atomic: fix size passed to intel_batch_require_space (*4) + + intel_batch_start_atomic takes an argument in 32-bit units, and so it must + multiply that by 4 before passing it to intel_batch_require_space, which + takes an argument in bytes. + + We should figure out what units we want to use and use the same everywhere... + + Signed-off-by: Keith Packard + +commit 8232177a005127a0001af4b14c3beb766958ef11 +Author: Keith Packard +Date: Thu Apr 30 15:30:05 2009 -0700 + + Allow cursors to roam past 2048x2048 limit. + + There's no reason to clip cursor positions to an artificial limit; the + hardware cursor limits always mirror the hardware display limits. + + Signed-off-by: Keith Packard + +commit 417f3784b7fae8de3559c7607a2de60661a6a448 +Author: Carl Worth +Date: Tue Apr 28 20:42:22 2009 -0700 + + Add doltlibtool to DISTCLEANFILES + + Otherwise make distcheck fails. + +commit bc9a688476f02233450eb05dfb40acbf337d679b +Author: Carl Worth +Date: Tue Apr 28 20:37:13 2009 -0700 + + NEWS: Add notes for 2.7.99.1 snapshot + +commit a90cab43209bba52d35b953f3d686a19c154fc43 +Author: Kristian Høgsberg +Date: Tue Apr 28 13:12:55 2009 -0400 + + Remove a handful of pointless comments + + CVS keywords, comments about how the source was once reformatted, + and the ad-hoc changelog comment in in i830_driver.c + +commit c231b41f3f3eb3ba9c8436d5fd93a30704ed437c +Author: Eric Anholt +Date: Tue Apr 21 15:55:01 2009 -0700 + + Remove checks for xf86RotateFreeShadow, introduced in server 1.4. + +commit e5133a94dc78411eaef324131ea8056aeb81779e +Author: Eric Anholt +Date: Tue Apr 21 15:49:01 2009 -0700 + + unifdef LIBPCIACCESS and XSERVER_LIBPCIACCESS. + + Depending on new server means these are always present. + +commit 4653a7db622ad54a3182d93c81331765d930db34 +Author: Eric Anholt +Date: Mon Apr 20 22:05:54 2009 -0700 + + Rely on BO pixmaps being present in acceleration paths. + +commit 1784efc1f0c74edda8c78fb1b0cdd989f0a088ad +Author: Eric Anholt +Date: Mon Apr 20 18:25:59 2009 -0700 + + Remove XF86DRM_MODE. + + We now depend on server 1.6 and current libdrm, so no need to ifdef it. + +commit d82ea4372fb74654eb0f37d996977003473846ed +Author: Eric Anholt +Date: Mon Apr 20 13:20:03 2009 -0700 + + Replace I830Sync's irq emit/wait code with bufmgr use. + + This pre-GEM code was all sorts of broken -- see intel_bufmgr_fake.c for + the hoops that must be jumped to use that kernel interface successfully. + Yet we continued to use it even with KMS/DRI2/UXA, which may account for + some hangs. + +commit 612c1f1f1859ce0cef41049d79cc473657d48612 +Author: Eric Anholt +Date: Mon Apr 20 16:16:48 2009 -0700 + + Remove I830_XV ifdef. + + The developers of the driver don't ever run or test without XV. Don't do it. + +commit af6892f2b873dd508994d8bbf3d67e719b535e35 +Author: Eric Anholt +Date: Mon Apr 20 16:07:05 2009 -0700 + + Replace i830WaitSync with just I830Sync(), as nearly all callers had it wrong. + + People were trying to BEGIN_BATCH()/ADVANCE_BATCH() then i830WaitSync on the + results, which wouldn't necessarily wait and lead to various painful bugs, + since only EXA called MarkSync and only for certain rendering operations. + +commit 393abc15b76804580bfee0760ddbd1fb77e66c02 +Author: Eric Anholt +Date: Mon Apr 20 15:58:35 2009 -0700 + + Now that video destination pixmaps are always in BOs, no more MarkSync. + +commit dc71573292c215f49716f4dc1ebc416c6b172995 +Author: Eric Anholt +Date: Fri Apr 17 15:13:34 2009 -0700 + + Remove can_resize, which is now always true (except when a bug interfered) + +commit 96df22740b2cdc4f82a4a36c0f77663105d9337e +Author: Eric Anholt +Date: Fri Apr 17 15:11:12 2009 -0700 + + unifdef I830_USE_UXA. + + We only have on acceleration architecture now, and you can always build it + if you're building the driver. + +commit fa81ae1637bfd7b73b43355b78c88a9b84c0393c +Author: Eric Anholt +Date: Fri Apr 17 14:01:47 2009 -0700 + + Remove EXA support. + + UXA has completely replaced EXA at this point. UXA is the same rendering + core as EXA, but relying on kernel memory management or a fake bufmgr instead + of trying to manage memory in the X Server. + +commit 1b10745a2528622a32271f64c35fcdb7b7154d11 +Author: Eric Anholt +Date: Fri Jan 23 08:39:59 2009 -0800 + + Remove XAA support. + + While EXA/UXA aren't completely good replacements (see bugzilla for + performance and stability problems), we are pretty sure at this point that + it's the right way to go and that having multiple acceleration architectures + is getting in the way of producing a stable codebase. + +commit 30c226eeb35f034c3ddb881e77454051dc210298 +Author: Eric Anholt +Date: Thu Jan 22 17:54:49 2009 -0800 + + Remove DRI1 support. + + This was blocked on wide distribution of X Server 1.6 (now in the current or + next version of major distributions) and solutions for a couple of significant + architectural problems (vblank sync and frontbuffer rendering, which we now + have code or good plans for). + + This includes disabling XVMC which is DRI1-only currently. + +commit 47591334a183881704a121ae06ebc2fadebe6f73 +Author: Eric Anholt +Date: Fri Apr 17 13:54:47 2009 -0700 + + Remove pre-server-1.5 support. + +commit 3187c7698b93f1d0e07798e9c42ca2877d55e055 +Author: Eric Anholt +Date: Mon Apr 27 14:50:54 2009 -0700 + + Fix assert at startup with DRI initialiation failure. + + In this path, we'd make it to allocator_init -> init_bufmgr without + GEM and without FbBase being initialized, leading to assertion failure + to catch this mistake. + + Comedy ensued when trying to move just the MapMem up, leading to the rest + of the commit. Some day (like tomorrow after I rebase intel-cleanup) I'll + clean this path up. + + Tested with 2 X Servers on 2.6.28 (one gets DRI2, one fails successfully), + 2 UMS X Servers on 2.6.30rc2 (each gets DRI2), and 2 KMS X Servers on + 2.6.30rc2 (success all around). + +commit fbaf13c93511547c563129527797fbef8628652e +Author: Eric Anholt +Date: Mon Apr 27 16:05:50 2009 -0700 + + Don't clear the framebuffer if it isn't currently bound. + + This segfault can be triggered in non-KMS memory init before the EnterVT, + and will happen anyway at EnterVT time. + +commit ab878118b9fb46c437a02f824d29f4a206e7fd80 +Author: Eric Anholt +Date: Mon Apr 27 16:00:05 2009 -0700 + + Don't initialize DRI2 if the fd we get is not master-capable. + +commit 385ac2197b64574f30620a203e675d8da0e1472f +Author: Eric Anholt +Date: Mon Apr 27 15:28:21 2009 -0700 + + Fix drmSetMaster/DropMaster error messages. + +commit 5b05a589efb23b2fc09b06e4271174d922b1ab02 +Author: Pierre Willenbrock +Date: Sat Apr 25 22:58:20 2009 +0200 + + format == 0 means "use default" in I830DRI2CreateBuffer + + Reviewed-by: Ian Romanick + +commit e55d943126cdd3eac7dfec5f40e794f89dbf038b +Author: Eric Anholt +Date: Mon Apr 27 11:18:07 2009 -0700 + + Don't try to do anything for I830Sync when VT switched. + + Fixes a crash with fake bufmgr and UXA. + +commit 9748aa5594a8357754c06dd82108b131260b1a71 +Author: Shuang He +Date: Sat Apr 18 11:48:08 2009 +0800 + + Free front buffer bo when X exit + + It's needed when KMS or DRI2 is enabled, or there will be memory leak. + Also fixes a segfault at startup with fake bufmgr. + + Signed-off-by: Eric Anholt + +commit b8ca146b060e6f76bf048f1f6cf6ee89d38d015e +Author: Alan Coopersmith +Date: Fri Apr 24 16:03:27 2009 -0700 + + Fix UXA to build with Sun compilers (use __func__ instead of __FUNCTION__) + + Signed-off-by: Alan Coopersmith + +commit 5d6f4f6eb7a4dcbe1ce5a134d882e56f958ed2ba +Author: Ian Romanick +Date: Fri Apr 24 12:28:13 2009 -0700 + + DRI2: If the SDK supports it, use the DRI2GetBuffersWithFormat interfaces + + If DRI2INFOREC_VERSION is defined in the server's dri2.h and has a + value greater than 1, compile to use the CreateBuffer and + DestroyBuffer interfaces. The format parameter parameter to + CreateBuffer is assumed to be the bits-per-pixel of the buffer. + + Signed-off-by: Ian Romanick + Reviewed-by: Kristian Høgsberg + +commit 106e4b44c5af6552cbd079c4ec34def9dcfb168a +Author: Zhenyu Wang +Date: Fri Apr 24 10:55:09 2009 +0800 + + SDVO: switch bus once for i2c transfer + + Before sdvo try to get edid by i2c bus, it must do switch control bus to ddc active state from sdvo only state. + However if current state has been ddc active state, redundant switch operation in our driver will cause error- + "Unable to write to SDVOCTRL_E for SDVOB Slave 0x70". The patch will do switch control bus only one time during + whole edid transmission. + + It has fixed bug #19937 + + Signed-off-by: Zhenyu Wang + Tested-by: Ma Ling + Signed-off-by: Ma Ling + +commit 8f64837e56b2de0fb8a9100d1a844fd3f18d751c +Author: Shaohua Li +Date: Mon Feb 23 15:19:25 2009 +0800 + + Disable FBC on IGD for UMS + + It appears the new chip doesn't support FBC currently. + + Signed-off-by: Shaohua Li + Signed-off-by: Zhenyu Wang + +commit 7b01aa5cc41620da5bb48f391ff98d9e82572e52 +Author: Eric Anholt +Date: Wed Apr 22 09:03:21 2009 -0700 + + Revert "fix overflow warning on videoRam" + + This reverts commit 08ebde4715b87867184d42b60762cd774e151f5c, which was + apparently untested and broke KMS. + +commit ceb3a2eaf9090d67e4dfcbed188125108ceab78d +Author: Zdenek Kabelac +Date: Tue Apr 21 18:58:23 2009 -0700 + + Remember allocated offscreenImages memory for freeing it in CloseScreen() + + Signed-off-by: Zdenek Kabelac + [anholt: renamed the member to match the variable name] + Signed-off-by: Eric Anholt + +commit 701c6bef14b5d464847cc42c5ccb66fdeb157f1a +Author: Zdenek Kabelac +Date: Tue Apr 21 18:53:07 2009 -0700 + + free allocated name inside sdvo_destroy + + Signed-off-by: Zdenek Kabelac + Signed-off-by: Eric Anholt + +commit fe71217ca86eb7ae8081bf3e26d30f2002d27691 +Author: Zdenek Kabelac +Date: Tue Apr 21 18:51:02 2009 -0700 + + Unreference allocated bos in i965 render error paths + + Signed-off-by: Zdenek Kabelac + Signed-off-by: Eric Anholt + +commit b8b6ca830b1fd6956c76a5417462ca55174cb881 +Author: Zdenek Kabelac +Date: Tue Apr 21 18:47:03 2009 -0700 + + Fix leak of some 965 render state on VT switch. + + Signed-off-by: Zdenek Kabelac + [anholt: fixed up unneeded != NULL checks] + Signed-off-by: Eric Anholt + +commit d7ca870e1ce251d42e3689a8e1e7d080ab1325fb +Author: Albert Damen +Date: Sun Apr 5 16:36:35 2009 +0200 + + Fix crash with XV with large virtual display + + If a virtual display with width > 2048 is used, the first time + an XV buffer is needed will result in a BadAlloc error message, + but the next time X would crash. + + Signed-off-by: Eric Anholt + +commit 04ed92e3db8d9fcf2a1089ed433ab67bf0969655 +Author: Eric Anholt +Date: Tue Apr 21 15:17:31 2009 -0700 + + Remove dead xoffset/yoffset from pre-randr. + +commit ab2c988767aec854d3c1702bee1e5a06bd00870c +Author: Eric Anholt +Date: Tue Apr 21 14:53:45 2009 -0700 + + Remove dead monitor detect debugger. + + watch xrandr works fine. + +commit 928a37041defcca6f57f9452ba62e67524cb4510 +Author: Eric Anholt +Date: Mon Apr 20 15:46:11 2009 -0700 + + Replace a bunch of #ifdef debug flushing/syncing with a single function. + + This removes it from a callsite where it would have just resulted in a + fatalerror. + +commit 1fc93ee184ceefaea9528bb46ae82884c44d9b36 +Author: Eric Anholt +Date: Mon Apr 20 14:42:31 2009 -0700 + + Staticize a bunch of functions and variables in the driver. + + This cleans up findstatic.pl output for the i830+ code, which resulted in + removing some code. The only odd part of this commit is the + if (0) i830_sdvo_dump() in i830_sdvo.c -- it tells the compiler that the code + is used, without using it since we want the code around while debugging. + It's also in a likely place to ask for the dump, so I think it's OK. + +commit b2d7928f195f6439ecd140e6280b958b8a1f534b +Author: Eric Anholt +Date: Mon Apr 20 14:48:59 2009 -0700 + + Use a static inline to replace if (0) to an unused stub function. + +commit 093f51646b2f2301c907e14d0ad4b1f80ff60a16 +Author: Eric Anholt +Date: Mon Apr 20 14:36:52 2009 -0700 + + Remove unused i830_output_type_names + +commit c774ef282bfb0c594479bbab3527fe5fda2a8559 +Author: Eric Anholt +Date: Mon Apr 20 14:29:17 2009 -0700 + + Remove dead mono cursor load code. + +commit 75c531b9652b3919ddbf51f8eec804e6bdbb2331 +Author: Eric Anholt +Date: Fri Apr 17 14:03:39 2009 -0700 + + Rename EXA rendering functions to UXA, since we're keeping them post-EXA. + +commit 40dbba5cf710a6e392afca73965aa48fa3953d1f +Author: Eric Anholt +Date: Fri Apr 17 15:15:27 2009 -0700 + + Remove some dead i830.h struct members. + +commit 84f69081abaeef8b05cafb64d3102eb2abdf9a8e +Author: Julien Cristau +Date: Thu Apr 16 14:27:15 2009 +0200 + + Require xserver 1.3 + + I don't think anyone tests this against an old server anymore. + + Signed-off-by: Eric Anholt + +commit 08ebde4715b87867184d42b60762cd774e151f5c +Author: Zhenyu Wang +Date: Mon Apr 20 09:43:09 2009 +0800 + + fix overflow warning on videoRam + + Note that pScrn->videoRam is an 'int'. + + i830_driver.c: In function ‘I830ScreenInit’: + i830_driver.c:3019: warning: overflow in implicit constant conversion + + Signed-off-by: Wu Fengguang + +commit 5a07ab502fe1e58e7e37fe554fb42d8d2c8c53ec +Author: Ian Romanick +Date: Fri Apr 17 20:59:04 2009 -0700 + + DRI2: Respect the src and dst parameters of CopyRegion. + + Signed-off-by: Ian Romanick + +commit 2e3b95ed0197971e81ab7509245c899e96859d5b +Author: Carl Worth +Date: Wed Apr 15 18:54:19 2009 -0700 + + Increment version to 2.7.99.1 + + This is the number we want for any development snapshots along + what will eventually become 2.8.0. (Once we get to 'release + candidates' we'll bump this up to 2.7.99.901.) + +commit c9e174b31ae3b9a138ae696d563420a841062f57 +Author: Carl Worth +Date: Wed Apr 15 18:52:38 2009 -0700 + + RELEASING: Note that --with-xserver-source is needed for make distcheck + + I was always forgetting this without this reminder. + +commit 73c3be1aa033e8c5c7ee777eb2fd43c19668fa86 +Author: Carl Worth +Date: Wed Apr 15 18:18:14 2009 -0700 + + README: Fix typos in chipset list, and point to how_to_report_bug web page + + Thanks to Gordon Jin for these suggestions. + +commit c51dddb724a79a75491369a4c3e8b7b26231e7ac +Author: Carl Worth +Date: Wed Apr 15 18:07:17 2009 -0700 + + AUTHORS: Add Robert Lowery to the authors file + + Rob got missed from my first scan since one commit lists his name as + just 'Rob' and 3 commits don't attribute him as author: + + 83d304c61ad5fdc58b0a9309dbd1e5a3f6cd9b01 + 7552d80e367fe38bbc594fe94abd649917fe54d5 + 6eecef4fed8a21dfdabef42eb69fd150b96167b2 + +commit 4b5edde5da4b3e955eb2d77004de81e47bec7f69 +Author: Robert Lowery +Date: Wed Apr 15 18:03:31 2009 -0700 + + Fix typo in comment + + Thanks to Robert Lowery for the sharp eyes on this one. + +commit 3fd5a1ecd1d5140ae07ccc279298bcadd515e97f +Author: Carl Worth +Date: Wed Apr 15 16:44:11 2009 -0700 + + RELEASING: Update instructions to reflect some minor process improvements + + We've added a NEWS file now, so that needs to be updated for each release. + + We're also now using tag names of just rather than + xf86-video-intel-. + +commit e1cace16a6130dcdd93965d2329a349d49200fa6 +Author: Carl Worth +Date: Wed Apr 15 16:33:12 2009 -0700 + + NEWS: Add note about broken PAT code in some kernels + + Hoping to cut off some false bug reports here. + +commit 9ffd1951d1f2fd2f53273d04ea29de050f07af55 +Author: Carl Worth +Date: Wed Apr 15 16:14:44 2009 -0700 + + Add AUTHORS and NEWS to EXTRA_DIST + + These new files don't do us much good if we don't distribute them in + our releases. + +commit e4cd9de2933ada3e2a4b43552729ae3a370128bf +Author: Carl Worth +Date: Wed Apr 15 16:14:03 2009 -0700 + + Add a NEWS files with release-notes for 2.7.0 + + It will be nice to have release-notes under revision control, as well + being able to document issues in an obviously time-sensitive file, + (as opposed to README where we were documenting some of this previously). + +commit 506c810f8f3db89048dda9777902f142ffeb86aa +Author: Carl Worth +Date: Wed Apr 15 16:10:52 2009 -0700 + + Clarify that the default acceleration is UXA if KMS is available. + + Stale documentation considered harmful of course. + +commit b9716b836cb2b4569c90b81f344932ac668dc5bf +Author: Carl Worth +Date: Wed Apr 15 15:39:06 2009 -0700 + + Add a new AUTHORS file + + This is a sorted list of everyone with more than 2 commits in the git + revision history. We also list some historical authors mentioned in the + man page, (with code presumably pre-dating the beginning of revision + history). + +commit 8deb3a3709a9aaa549be404566715a01246354d9 +Author: Carl Worth +Date: Wed Apr 15 15:38:11 2009 -0700 + + README: Remove almost all time-sensitive information + + This was all very stale, and is better convered in intel.man. We replace + this with a list of pointers to where to get current information, (man + page, web site, and mailing list). + +commit 9b615a52671aacf34666f90ecfff98651ce6afe2 +Author: Li Peng +Date: Fri Apr 10 14:39:35 2009 +0800 + + Turn on front buffer tiling in KMS. + + This code disabled front buffer tiling in KMS. Turn it on since kernel + handles all tiling now, this improves performance of x11perf -aa10text + from 97k to 286k on my 945GME. + + Should help with #20761, if not totally fix it. + + Acked-by: Jesse Barnes + Signed-off-by: Li Peng + +commit 053432991c812146f6e7c6f13c6ace55385c825f +Author: Ma Ling +Date: Mon Apr 13 14:27:35 2009 +0800 + + update manpage for BROADCAST_RGB property + +commit 62ba7211fe9b6aada125ebfe34cf7161e817ad6b +Author: Ma Ling +Date: Mon Apr 13 14:24:57 2009 +0800 + + set broadcast RGB mode for integrated HDMI output. + +commit 69388953ce889080d5f014123d89bf3eb45f3d8d +Author: Ma Ling +Date: Mon Apr 13 14:23:06 2009 +0800 + + set broadcast RGB mode for HDMI and TMDS from SDVOX output + + Almost all digital TVs accept broadcast RGB values from 16 to 235 for each channel, + otherwise for those uncompensated videos, when RGB values are set from 0 to 255, + they will shows black and whiter clamping, which seriously degrades picture quality. + The patch will enable the broadcast RGB mode for hdtv according to user's setting. + It fixed bug #14486 + +commit 6d345c49f693cc5cffaa00b94559d2afcb3a0864 +Author: Carl Worth +Date: Fri Apr 10 14:07:14 2009 -0700 + + Add a RELEASING file documenting the release process + + Thanks to Jesse Barnes for the original recipe. + +commit 7e516b6d24d8c0c6549a9a60fcf487e3a1615020 +Author: Jesse Barnes +Date: Wed Apr 8 16:38:08 2009 -0700 + + Silence warning in i830_dmi_store_field + + Just add a dummy ret variable to shut up gcc. + +commit 620e97bbd6a811ad69b8ac94df1fe2c9edf65549 +Author: Jesse Barnes +Date: Wed Apr 8 15:49:00 2009 -0700 + + Don't enable kernel execbuf fencing w/EXA + + If we enable kernel execbuf fence register management, it's best if the + kernel manages all fence registers. This works fine if the accel + method is managing pixmaps or doesn't use offscreen pixmaps. However + with EXA, pixmap accesses are done relative to the framebuffer BAR + mapping (pI830->FbBase) and the Screen pixmap address. So if we try to + set the screen pixmap to point at a GTT mapped (and therefore properly + fenced) address, later calls to intel_get_pixmap_offset() will call + into EXA, which will use the pseudo-random pixmap addr and the EXA + offscreen base addr (which is really just FbBase) to calculate the + offset. This will fail. So disable kernel fence reg management in the + EXA case (this is easier than adding proper EXA pixmap management to + xf86-video-intel, and makes more sense since we'll be removing EXA soon + anyway). + + Fixes FDO #21027. + + Also happens to fix FDO #21029 (as tested by Carl Worth +Date: Tue Apr 7 12:31:07 2009 -0700 + + Fix value for MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW + + Since the change to scan-line based video sync, (rather than vblank- + based), we've only been getting tear-free video on one of the two + pipes. This fixes that bug by using the correct constant for waiting + on PIPEA. + +commit 940c2aad4d174b6609bdc49f8c99a4bc37926516 +Author: Carl Worth +Date: Mon Apr 6 14:36:33 2009 -0700 + + Don't clip video to CRTC in the case of textured video + + Since we're not limited by a single overlay plane on a single pipe, + we want to not clip at all, (so that the correct video appears on + both pipes). + + This fixes bug #20980 which shows a video spanning two pipes + being rendered incorrectly. + +commit 63b4b5efac936c674dedad8125a8dbac4f000908 +Author: Zhenyu Wang +Date: Tue Apr 7 10:53:08 2009 +0800 + + quirk LVDS on ibase MB890 855GM board + + fix bug #19529 + +commit 5d9d9a2e466474a0508a15b294a91507ccb3ccc1 +Author: Carl Worth +Date: Mon Apr 6 14:02:08 2009 -0700 + + Fix new video sync-to-blank code for multi-head + + We need to account for a non-zero Y offset for the CRTC. Without + this, we don't sync to the correct region, so tearing becomes + visible again. + +commit 3d4ee3cac1d63dfdf7b54c8ba577f3b77637499f +Author: Carl Worth +Date: Mon Apr 6 11:31:20 2009 -0700 + + Remove support for 'auto'(-1) value of XV_SYNC_TO_VBLANK + + We previously had a heurstic here where we would only sync to vblank + for windows that covered more than 25% of the screen. We don't need + this anymore since the new approach to sync, (WAIT_FOR_SCANLINE_WINDOW), + is not excessively costly for small windows. + +commit bc3312fd7c03d09a231dfebfe390fe668ad15d1e +Author: Carl Worth +Date: Mon Apr 6 11:16:40 2009 -0700 + + Use WAIT_FOR_SCAN_LINE instead of WAIT_FOR_VBLANK + + Either way, the goal is tear-free video playing. But waiting for + a scan-line window not only has the advantage of being cheaper + for small windows, but also avoids hanging the GPU in the case + of the pipe getting turned off, (by screensaver, for example), + while a batch is waiting for a VBLANK that will never occur. + + This fixes that GPU hang. + +commit 6cd914ef315036ce8e91c7b6492994353e8ed2d8 +Author: Jesse Barnes +Date: Fri Apr 3 11:15:18 2009 -0700 + + Fix offset in begin_gtt_access case + + Don't use bo->virtual in the begin_gtt_access case, use the framebuffer + mapping and bo offset instead. + + Reviewed-by: Eric Anholt + Signed-off-by: Jesse Barnes + +commit 13c730e003e805e19deee0996b2af30f69e54c4d +Author: Zou Nan hai +Date: Wed Apr 1 15:12:55 2009 +0800 + + fix + 1.multiple instance + 2.memory leak + +commit fad714c40078d22fff82dc0692a344f66ddf9680 +Author: Zhenyu Wang +Date: Wed Apr 1 10:11:35 2009 +0800 + + SDVO: fix output flag dumping for unknown type + + Found by Hugo Jacques + +commit 00de1757dd5776962bdd4c8968181878c2ebf4c9 +Author: Hugo Jacques +Date: Wed Apr 1 10:10:05 2009 +0800 + + SDVO: add composite TV out support + +commit 087f72e1f5d7d11b8795ba80a842874f5a9bb01d +Author: Jesse Barnes +Date: Tue Mar 31 07:50:10 2009 -0700 + + Match GTT unmap with map in KMS rotation case + + Missed this when the GTT unmap call was added. If we don't do this we + trigger an assertion in libdrm, since the buffer has never been mapped + normally. + + Fixes bug #20943. + + Signed-off-by: Jesse Barnes + +commit 4f046af760b92c07f59664359453933fb5358e3d +Author: Zhenyu Wang +Date: Tue Mar 31 13:49:44 2009 +0800 + + Disable LVDS detect methods + + Both methods ACPI lid and SWF bit have issues in LVDS detect from + wider testing. Fallback to origin code. + +commit e964d4e53af3a47de6d09c884be1cc0044d03bea +Author: Albert Damen +Date: Mon Mar 30 11:38:02 2009 -0700 + + Non-GEM allocations incorrectly force TILE_NONE (bug 20797) + + With -intel 2.6.3 performance was very bad when using a non gem enabled kernel + (2.6.27) and EXA. For example sauerbraten ran with 4 fps and screensaver GLBlur + with 1 fps. With -intel 2.6.1 performance was good using the same kernel. + + Git bisecting led me to commit f1ed73c1ef3e3daa9f695194dcc813167cbcb53d (in 2.6 + branch) "Make i830_allocate_memory take tiling parameters" as first bad commit. + + Using gdb I found tiling was set exactly the same in 2.6.3 as in 2.6.1, so that + was good (TILE_XMAJOR for front, back and depth buffers). + Looking further I found the line mem->tiling = TILE_NONE; (line 961 in + src/i830_memory.c) at the end of i830_allocate_memory suspicious, as + mem->tiling now already gets set via i830_allocate_aperture and some buffers do + have tiling. Removing that line indeed fixed the performance issue. Now + sauerbraten runs with 30+ fps and GLBlur runs smoothly. + +commit 51cf8a453c2bc2e8604bfc41a649e971c1ba5026 +Author: Jesse Barnes +Date: Mon Mar 30 11:27:56 2009 -0700 + + Require libdrm 2.4.6 for GTT unmap support + + Need the new functions available. + +commit 8dabcc40747bfd478f296728741240241698f165 +Author: Jesse Barnes +Date: Mon Mar 30 09:53:40 2009 -0700 + + Tiling fixes, third set + + Hopefully this concludes the fixes necessary to deal with the various + combinations of kernel and user level tiling. We have several cases to + handle: + 1) KMS (kernel handles all tiling) + 2) UMS w/memory management + kexec fencing (kernel handles all tiling) + 3) UMS w/memory mangement but no kexec fencing (userland handles tiling) + 4) UMS w/o memory management (userland handles tiling) + + For cases (1) & (2) we can use GTT mapping, which will give us good + performance and take care of allocating fence registers as needed. It's + important *not* to have userland set up fence regs in this case, since + the kernel will be using all of them. + + For case (3), we use the begin/end GTT map functions provided by libdrm, + in combination with pinning and fence register setup in i830_memory.c to + deal with tiled surfaces. This also gives us good performance and + correctness. + + For case (4) we use the old style virtual mapping + offset for dealing + with surfaces; note that UXA doesn't seem to work in this configuration + regardless of these fixes. + + Fixes bug #20803. + + Reviewed-by: Eric Anholt + Signed-off-by: Jesse Barnes + +commit 375b2e40fcb17e94538a75392950e2533c1bb031 +Author: Zhenyu Wang +Date: Wed Mar 25 11:13:52 2009 +0800 + + Disable LVDS config parsing from VBT for now + + As wider tests showed that this doesn't work for all VBIOS, so + disable it for now and reenable it after we get reliable method. + +commit defa6971c6b639ab72d9d4c85c4607d5f852b2b0 +Author: Zou Nan hai +Date: Thu Mar 26 15:24:29 2009 +0800 + + enable UV half pixel + +commit 69c84f2c8204771b68f40ed64e64657237b54546 +Author: Zhenyu Wang +Date: Thu Mar 26 13:52:05 2009 +0800 + + gitignore intel_lid + +commit fe96e517699e37cc990a14dfb48b9611a02254ed +Author: Zhenyu Wang +Date: Thu Mar 26 10:54:02 2009 +0800 + + xvmc: add missed vld g4i sources in Makefile and fix distcheck + + Don't miss the vld shader programs for dist. + +commit 91886f82a1155ca24eb895f77678ea1edfccf9fe +Author: Zhenyu Wang +Date: Thu Mar 26 10:51:05 2009 +0800 + + xvmc: move 965 mc media programs to shader/mc directory + + Also include some missed g4i files in Makefile.am, fix shader build. + +commit ebcb64fdc8a45105f529d5e15c335514ecaf1a05 +Author: Zou Nan hai +Date: Wed Mar 25 16:11:33 2009 +0800 + + XvMC VLD extension support for G4X + +commit e6af995b24767815ab30364385768867e80605c2 +Author: Zhenyu Wang +Date: Mon Mar 23 19:19:58 2009 +0800 + + KMS: hook up output properties for randr + + This gets output properties from kernel, then hook them up + for randr. So we can control output properties through randr + like in UMS. + + Signed-off-by: Zhenyu Wang + +commit b5b377806422c9538fa9f846819ad253c1a50846 +Author: Ma, Ling +Date: Wed Mar 25 14:39:46 2009 +0800 + + disable center mode for 965GM and G4X platform + + When disabling VGA mode, usually we don't need to touch VGA center mode. + However because of hardware reason, for Cresline, Cantiga & Eaglelake platform, + we have to disable center mode as well. The patch fixed bug- TV Out strobing regression, + reported by Robert Lowery in intel-gfx@lists.freedesktop.org mailing list. + + Signed-off-by: Ma Ling + +commit 74d0713e002a9781ed00fdd10eb6f75907ae796c +Author: Kalev Lember +Date: Fri Mar 20 02:21:41 2009 +0200 + + Fix VT switch with XV overlay video enabled. + + drm_intel_bo_unpin() was called with NULL argument. + + Signed-off-by: Kalev Lember + +commit b345b4e6adf00f8b2626e5c2563fc159e2295cc5 +Author: Rémi Cardona +Date: Fri Nov 14 13:55:52 2008 +0100 + + clean up man page generation and remove all traces of the i810 driver + + The i810 compatibility symlink has been broken since libpciaccess, so just + let it die. + +commit 48b91e066878db63a1558e4cd3e6d12ff9c49197 +Author: Jesse Barnes +Date: Fri Mar 20 12:33:22 2009 -0700 + + Don't manage fences part two + + Don't try to clear fences that were never installed. Missed this bit in + the last fix for #20265. + +commit 28319d60aa2d793c209043c1ce2d38b14c66a4be +Author: Zhenyu Wang +Date: Fri Mar 20 13:14:15 2009 +0800 + + Add a lid status test program "intel_lid" + +commit 636d252f3b1eac687f7b11952e949c383cb86ed4 +Author: Jesse Barnes +Date: Thu Mar 19 13:25:29 2009 -0700 + + Don't install fences if the kernel is managing them + + If execbuffer is setting up fences, it also means that the kernel is + managing them at pin time, so installing one in the 2D driver in that + case is an error. The fence should stick around as long as the buffer + is pinned (the kernel won't steal these), though it will be freed at + leavevt and re-allocated at entervt. + + On 965+ chips, the pin ioctl will *not* install a fence reg, but that's + also ok because all 965+ operations include tiling bits, and sw + fallbacks will be protected by prepare/finish access hooks, which will + either access the backing store or use the GTT, which will ensure proper + fencing at fault time. + + Fixes #20265. + + Acked-by: Eric Anholt + +commit d92e6158c86d7da873913461ef7e828bd411d8c4 +Author: Carl Worth +Date: Thu Mar 19 10:06:03 2009 -0700 + + Revert the rest of the EXA_VERSION_MAJOR bump + + This was mistakenly added in the unrelated change in revision + fe08b81d0f5d6f96e0124e6286bd24aba6e140ad + and wasn't completely reverted in the later revision + 78a60e1b66fe2e8449702dd43d9b062d279af8f1 + +commit 85e6b528582c2397ee9eb2132cd0d05ce12eb43d +Author: Ma Ling +Date: Thu Mar 19 09:10:19 2009 -0700 + + Set SSC frequency for 8xx chips correctly + + All 8xx class chips have the 66/48 split, not just 855. + + Fixes #18358. + +commit bedc894a565ce3c7a50990e3f78953fc2432ad40 +Author: Jesse Barnes +Date: Wed Mar 18 20:19:44 2009 -0700 + + Re-enable disabled outputs after rotation + + The server may have made a DPMS call before doing rotation, so after we + do the mode set with the rotated framebuffer, we need to re-enable the + corresponding output(s). + + Fixes bug #20573. + +commit 6deb26ae7bd796e88a5dd90df5f6c35fbc44e798 +Author: Jesse Barnes +Date: Wed Mar 18 09:36:58 2009 -0700 + + Create known output configuration at EnterVT time + + Since we added the pipe A force quirk (leaving pipe A on all the time), + DPMS calls to disable it have silently returned, leaving the pipe on. + If another driver (like vesafb) has enabled it, we may end up with a bad + configuration, leading to hangs or blank screens at VT switch time. + + Fixes bug #19603. + +commit 7c94227dd4fa2164bebb36234958053bf1d26c12 +Author: Ma Ling +Date: Tue Mar 17 10:33:15 2009 +0800 + + Use best PLL timing values for G4X platform + + construct function to find precise parameters from internal spreadsheet + table on G4X platform. + + Signed-off-by: Ma Ling + +commit 48db5bde9298f1126dfb42f4be8a3d61166abfd8 +Author: Ma Ling +Date: Tue Mar 17 10:41:02 2009 +0800 + + Define documented PLL timing limits for G4X platform + + These timings on G4X platform were specified by internal spreadsheet from the chipset group. + + Signed-off-by: Ma Ling + +commit 78a60e1b66fe2e8449702dd43d9b062d279af8f1 +Author: Keith Packard +Date: Mon Mar 16 08:41:52 2009 -0700 + + Revert EXA_DRIVER_KNOWN_MAJOR bump + + This was mistakenly added in the unrelated change in revision + fe08b81d0f5d6f96e0124e6286bd24aba6e140ad + +commit 1a6e70cd98abc63f24f710819961c24601afb59b +Author: Zhenyu Wang +Date: Mon Mar 16 10:19:39 2009 +0800 + + TV: fix contrast and saturation for 945G + + Bug #20670. + +commit 4e95327323e3d081b565147f7738eb49c28542bc +Author: Zhenyu Wang +Date: Mon Mar 16 09:30:22 2009 +0800 + + TV: force TV as connected with TV_Connector option + + In order to bypass failure in TV load detect, TV_Connector option + will always force TV as connected with user specified connector type. + +commit d9dbdb325543bd747cd1bfb3e1142ea6daf2b637 +Author: Eric Anholt +Date: Fri Mar 13 15:48:40 2009 -0700 + + Add shave support, enabled by default. + + This cuts down build system noise so that warnings are more visible. The + old style output can be reenabled for build system debugging using + "make V=1", or --disable-shave at configure time. + +commit c3a82106a1a1a94c9e1e465c7dc0d828c1cbf50d +Author: Eric Anholt +Date: Fri Mar 13 15:29:45 2009 -0700 + + Move contributed m4 (dolt) to a subdirectory so we can include it with others. + +commit e0aba04da0323efc079ce0a2b78139c4d0d49fa5 +Author: Eric Anholt +Date: Fri Mar 13 13:37:35 2009 -0700 + + Add DCC register dumping. + +commit a57814cc13f4287eccaf1906963b80c9205c680c +Author: Eric Anholt +Date: Fri Mar 13 13:20:35 2009 -0700 + + Add dumping of 915 and 945 fence registers. + + The debug dumper functions can now return NULL to indicate no output, so + we get appropriate results on 915, 945, and 965. + +commit 8166a7ff5c2c1e3736dd06a8453c4e4d769d8b75 +Author: Eric Anholt +Date: Fri Mar 13 13:12:33 2009 -0700 + + Add PGETBL_CTL to the debug output. + + It's nice to know when it gets stomped on. + +commit fe08b81d0f5d6f96e0124e6286bd24aba6e140ad +Author: Keith Packard +Date: Mon Mar 2 07:39:41 2009 -0800 + + Use CopyArea to load glyphs from per-glyph pixmap to cache pixmap + + With glyphs sitting in per-glyph pixmaps, there's no reason to use the CPU + to move them to the cache pixmap, and lots of reasons to use the accelerator. + + Signed-off-by: Keith Packard + +commit 2026c57cf0a352d9e6f9d208cfb7d4d550614477 +Author: Kalev Lember +Date: Fri Mar 13 21:32:08 2009 +0200 + + Fix Xv crash with overlay video. + + Bug #20585. + +commit 3ef9d85371a97ea5baee0c47787b3bb3cdaf5135 +Author: Jesse Barnes +Date: Fri Mar 13 12:21:34 2009 -0700 + + Use UXA when KMS is active + + EXA doesn't support KMS, so force UXA on if KMS is detected. And warn + the user if they've specified something other than UXA in their + xorg.conf. + + Fixes bug #20620. + +commit dc3ff0b514b609448025680778f0e95e1980a5d8 +Author: Zhenyu Wang +Date: Thu Mar 12 16:32:02 2009 +0800 + + Revert "SDVO: Switch control bus only before DDC access" + + This reverts commit ddedf19f889da2ce6d69a3afce4665e2245682fa. + + After i2c STOP, control bus will return back to internal + registers. So this brings back to origin code that we switch + to DDC bus before START. But it's ideal to only issue DDC + bus switch after STOP, not before every START, which might eliminate + some complains from SDVO device, that will be another patch later. + +commit c6b0135d209bdad3dbc641d0e264596eaf6f99d3 +Author: Zhenyu Wang +Date: Thu Mar 12 16:31:01 2009 +0800 + + SDVO: reset privates before output setup + + For multifunction encoder, forget to reset these values + will cause wrong output type in later mode setting + operations. + +commit 28e7f0d71fa09e15a68ab4f0de169474b6235093 +Author: Dan Nicholson +Date: Tue Mar 10 20:16:03 2009 -0700 + + Fix dist of xvmc sources + + The XVMC AM_CONDITIONAL is only needed around the library expression. + None of the other definitons will cause anything to be built without + libXvMC, but they're needed for 'make dist'. + + Signed-off-by: Dan Nicholson + +commit 73db44e7ac524e84e5f0fda2d60069a9e954ad1b +Author: Kristian Høgsberg +Date: Wed Mar 11 11:10:57 2009 -0400 + + Drop Legacy3D option, only use fixed texture space with non-gem. + + With this change, we always expect the 3D driver to use GEM textures + when the 2D driver uses GEM. When GEM is not available or disabled, + we fall back to legacy fixed textures. + +commit 2fcf4fcccfe7cfa1425985d21a144137eca07f4e +Author: Zhenyu Wang +Date: Tue Mar 10 14:21:36 2009 +0800 + + SDVO: fix pixel multiplier setting for TV + + We should use preferred input timing's clock for correct + pixel multiplier setting, otherwise we might get inconsistent + multiplier setting on pipe and SDVO device for some modes. + +commit fb6e00f40f713a87c760fc7603159ed11ea9b0d5 +Author: Eric Anholt +Date: Mon Mar 9 20:06:30 2009 -0700 + + Fix XV with non-GEM kernels by allocating a larger fake bufmgr. + + Ideally we'd not be using the EXA offscreen memory manager and just hand all + that memory to the fake bufmgr for non-GEM, but the fake bufmgr's too slow for + that, at least currently. So compromise and take enough memory that it will + succeed at XV allocations but hopefully not anger tiny-aperture systems too + much. + + Bug #20563. + +commit dc12c4b3eb297b2f225409eacf1f3cd521453ab6 +Author: Eric Anholt +Date: Sat Mar 7 23:22:54 2009 -0800 + + Flip the update_dri_buffers test around to only run when DRI1 is active. + + Fixes segfaults at startup with DRI2 and load detection, or with DRI disabled + entirely. + +commit 646e12a9783d1d48ef21841f0909287a876731a4 +Author: Xiang, Haihao +Date: Mon Mar 9 10:59:36 2009 +0800 + + typo in intel.man + +commit 73aa23d9150121a4e4b70a78cab910acd164abf5 +Author: Eric Anholt +Date: Fri Dec 5 13:06:05 2008 -0800 + + DRI1: Update sarea (and other information) when CRTC configuration changes. + + Bug #14423. + + Signed-off-by: Eric Anholt + +commit abb213d933ac0d808fc10d4f8d88d7b8cef76346 +Author: Eric Anholt +Date: Fri Mar 6 14:33:46 2009 -0800 + + Document the UXA AccelMethod. + + Signed-off-by: Eric Anholt + +commit 568297d327cc321f1186afc54b38d08db3f2914d +Author: Eric Anholt +Date: Thu Jan 22 17:08:19 2009 -0800 + + Don't allocate the render power saving context in KMS mode. + + That would be the kernel's job if it chooses to do it. + + Signed-off-by: Eric Anholt + +commit 4e1144108424a4525bbd97c3d5a56de06760bdd9 +Author: Eric Anholt +Date: Fri Mar 6 14:30:05 2009 -0800 + + unused variable warning fix. + + Signed-off-by: Eric Anholt + +commit 043a76a040d4576b7a8397dca805466a99bfcdd6 +Author: Eric Anholt +Date: Fri Mar 6 14:29:22 2009 -0800 + + clean up arguments to i830_allocate_framebuffer since zaphod removal. + + Signed-off-by: Eric Anholt + +commit b23f57b310b693f56af273526383221a4f8b96f5 +Author: Eric Anholt +Date: Thu Jan 22 17:17:09 2009 -0800 + + Use REGION_EQUAL in place of a local implementation. + + Signed-off-by: Eric Anholt + +commit 6b61f9945f54df7469f2b2d702b621d4d6064c3f +Author: Eric Anholt +Date: Thu Jan 22 17:19:04 2009 -0800 + + nuke unused define. + + Signed-off-by: Eric Anholt + +commit c3a747cb54acc1b037b559313e6a2113ae2ac4c7 +Author: Dan Nicholson +Date: Wed Nov 26 09:57:24 2008 -0800 + + man: Put option defaults on separate indented line + + The groff .IP macro is used to put the option defaults in a new indented + paragraph so they are separated from the explanations. + + Signed-off-by: Dan Nicholson + [anholt: hand-applied due to conflicts. mistakes are my own] + Signed-off-by: Eric Anholt + +commit d2af21a66d7e1d1dd62c6aa8fb41d3fd6045bcd7 +Author: Eric Anholt +Date: Fri Feb 27 23:38:00 2009 -0800 + + Remove configurable support for disabling XV. + + google shows one instance of this being used a year and a half ago. + +commit 755757669f0cad670cfa084d33d7c3e928d27855 +Author: Eric Anholt +Date: Fri Feb 27 22:57:15 2009 -0800 + + Remove configured SW cursor support. + + Any time we actually need SW cursors, it gets enabled automatically. + +commit 917b20ead3cacf1e88314f20edde6a02b97b96d7 +Author: Eric Anholt +Date: Fri Feb 27 23:01:28 2009 -0800 + + Remove StolenOnly support. + + We rely on having AGPGART present to successfully allocate video memory as + we configure it by default. Admit that fact, and remove support for + non-AGPGART/KMS setups. + +commit 73b7190421132ad73179c3fb7bb0e06c427dce5c +Author: Eric Anholt +Date: Fri Feb 27 22:51:22 2009 -0800 + + intel: Nuke shared-entity support (zaphod mode). + + It's been broken for years now, and KMS offers a much better chance of getting + this working sensibly without making a mess of the 2D driver. + +commit e9d6bbbe0b41e29c58a79844decd81771da85dd4 +Author: Eric Anholt +Date: Tue Mar 3 16:45:03 2009 -0800 + + remove more page flipping leftovers. + +commit 1cc9b1423c5df591c615ef9588b6eefd81448f80 +Author: Lukáš Hejtmánek +Date: Fri Mar 6 14:44:03 2009 -0500 + + Fix another VT switch leak + + The batch_bo buffer object is reallocated on enter VT, so we need to + unref it on leave vt. + + Signed-off-by: Lukas Hejtmanek + +commit 67fef27f4b76490be085d232aba0ca9cbb3c5e59 +Author: Xiang, Haihao +Date: Fri Mar 6 09:40:07 2009 +0800 + + Xv: free tearing on textured video + + Add an Xv attribute XV_SYNC_TO_VBLANK which has three values -1(auto), 0(off) + and 1(on) to control whether textured adapter synchronizes the screen + update to the vblank. The default value is -1(auto). + +commit 0d20bbbc2005a51f427a9ae6b6a66dbbb101dbab +Author: Zhenyu Wang +Date: Thu Feb 19 14:24:24 2009 +0800 + + SDVO: handle multifunction encoder (try 2) + + For SDVO encoder that advertise multiple functions, + we have to get attached display to determine current + output, and update output's name according with + current type. + +commit d4c64f01b9429a8fb314e43f40d1f02bb8aab30f +Author: Lukas Hejtmanek +Date: Wed Mar 4 17:33:27 2009 -0500 + + Fix serious memory leak at Enter/LeaveVT + + This fixes huge memory leak at each VT switch (about 600 BOs + 6MB + of RSS of Xserver). + +commit 095a001f755201d3c19335b67a84c57b1d080a83 +Author: Kristian Høgsberg +Date: Wed Mar 4 17:10:24 2009 -0500 + + Use drmSetMaster() and drmDropMaster() in enter/leave VT + + This allows multiple X server to use DRI and makes it possible to run + multiple X servers under KMS. This requires a 2.6.29 kernel to work. + On older kernels it will just log a warning and DRI will fail to + initialize for the second X server. + +commit 14bb61e0c2e28725a2f6167d3263649bc845be18 +Author: Zhenyu Wang +Date: Mon Mar 2 16:55:45 2009 +0800 + + SDVO: only check digital monitor when EDID exists + +commit 42e34e90e2e4048b38481cab61cef46f932eada7 +Author: Zhenyu Wang +Date: Tue Mar 3 22:55:35 2009 +0800 + + TV: add property control for TV attributes + + This is based on Jesse's origin patch for bug #12763. + But export integer range to user instead of hardware float + point format, and fix different real format on 965G and 945G + for contrast and saturation. + +commit aa9da5e393c804019720503fe58bdd247fe1eabd +Author: Zhenyu Wang +Date: Tue Mar 3 20:26:19 2009 +0800 + + TV: add option to set TV connector type + + This can let user override non-stable driver TV load detect, + and set connector type manually, e.g for s-video to component + converter, this patch seems must needed to use HD modes. + +commit ab1ef05cc0fd5ba9768c26cc51bc2c7b52baa45f +Author: Zhenyu Wang +Date: Thu Feb 19 20:23:02 2009 +0800 + + TV: update output and crtc modes when TV format change (try 3) + + This is to fix bug #16566, change TV format will cause BadMatch + error when crtc config apply. Everytime when we change TV format, + we may generate a new list of modelines as TV clock changed. After + randr get info request, new modelines will be probed and randr output's + modes will be renewed too. But crtc's mode failed to be updated, + as it never can find a matching mode now within new modes list. + So get info will return an invalid crtc's mode, later set crtc + config will pass that info, and xserver catches a bad match. + + This patch trys to refresh output modes and setup crtc's mode + with new modelines in TV format change. So get info would be + sure to turn valid crtc mode that reference in current new modelines. + +commit a67a911a93ff3c0b3d2e6f6fb20c0787b9d4d41d +Author: Zhenyu Wang +Date: Thu Feb 19 01:00:33 2009 +0800 + + TV: sort input mode lines + +commit bd360e7517835626bee54bec968cdc78908c6545 +Author: Adam Jackson +Date: Mon Mar 2 10:33:35 2009 -0500 + + KMS: Wire up output DPMS. + +commit 2d0aa553609a0e64fa4b2e755b9b1e244e5c3fa1 +Author: Zhenyu Wang +Date: Mon Mar 2 15:26:44 2009 +0800 + + Skip LVDS config parsing on pre-9xx chips. + + 855GM laptops seems pretty broken when parsing this block. + +commit 55359ef9ab0a2be42a55e0279835f76a191d6c74 +Author: Zhenyu Wang +Date: Fri Feb 27 09:02:30 2009 +0800 + + Update driver feature block definition for missed fields + +commit 38a7683561cee7fffab174c2a166bfd51b51ba27 +Author: Eric Anholt +Date: Fri Feb 27 22:55:44 2009 -0800 + + warnings cleanup + +commit 5bfd73cd31ba197a62f549cdbad1a1270b571027 +Author: Eric Anholt +Date: Fri Feb 27 19:09:49 2009 -0800 + + Only allocate pixmaps aligned for tiling when requested by DRI2 GetBuffers. + + This saves massive quantities of memory on pre-965 since the DRI2 tiling + enable caused the minimum size of any pixmap to be 1MB. + +commit f53bdad1412f841075232455837578f00709c6ef +Author: Shaohua Li +Date: Mon Feb 23 15:19:23 2009 +0800 + + Intel video driver patch + + This is the intel video driver patch for a new chip, which is G33-like + and has some clocking setting related register changes. This patch adds + the pci id and DPLx/FPx register changes. + + The gtt tool should just work to me, as the chip hasn't any changes + against G33 on this side. + + Signed-off-by: Shaohua Li + Signed-off-by: Eric Anholt + +commit 22dc9a5580d77cc4707bfb8e19474e611a06ae9a +Author: Eric Anholt +Date: Tue Feb 24 18:22:20 2009 -0800 + + Fix UXA for server 1.4. + +commit cb1f7ec0876746c1b52b63cdb508544e9e4e32e3 +Author: Eric Anholt +Date: Tue Feb 24 21:23:59 2009 -0800 + + uxa: Fix composite fallback debug printing of main memory versus bo info. + + It was just printing whether it was a pixmap (it is), instead of whether the + pixmap was offscreen. + +commit 635eaa511f28fb673fe306e46ed5370e78a8a534 +Author: Eric Anholt +Date: Tue Feb 24 21:48:11 2009 -0800 + + Regard the screen pixmap as suitable for acceleration. + + With UXA on the fake bufmgr, the screen pixmap doesn't have a BO and so + no acceleration was occurring. + +commit 70e0261208654c6c875ad462da2734c6aa9eeb96 +Author: Eric Anholt +Date: Tue Feb 24 20:54:05 2009 -0800 + + Disable fb resizing for DRI1-only server so that DRI1 can initialize. + +commit d7aa330db31100b7cb54d8165f9a4b94329ece32 +Author: Eric Anholt +Date: Tue Feb 24 20:34:10 2009 -0800 + + Fix up i915 composite and common solid/copy code to use check_aperture. + + This could fix complaints about binding BOs and resulting failure to render. + +commit a625a07022ea7f6757b288fcc2ffb9e27c7f8341 +Author: Xiang, Haihao +Date: Wed Feb 25 16:48:22 2009 +0800 + + XvMC: fix broken xvmc on 965 + +commit f6d8ae69b0f97e696c142f06c8038f336ed024f9 +Author: Zhenyu Wang +Date: Wed Feb 25 09:57:00 2009 +0800 + + Use LVDS config in Driver feature BDB for integrated LVDS check + + The LVDS config bits in VBT driver feature block is used by vendor + to identify the board implement of integrated LVDS/eDP or SDVO LVDS. + And video bios uses these bits for LVDS enabling or not. So check + these bits for integrated LVDS might eliminate more quirks. + +commit 8718551f14e064b461e80a583597f0ea9fb8ca9f +Author: Zhenyu Wang +Date: Wed Feb 25 09:54:03 2009 +0800 + + Update LVDS config bits definition in driver feature block + + ALL_LVDS is actually not defined before and include GM45. + Embedded DP bit will be used for newer chips. + +commit 9d8e5c21a1688b915bf39261d4c3b0bf2906daef +Author: Eric Anholt +Date: Tue Feb 24 14:05:15 2009 -0800 + + Fix distcheck from drmmode_display.h deletion. + +commit f4e2f522a5c5b03ea530b9eb67e9d1a9a96274ce +Author: Eric Anholt +Date: Sat Feb 21 20:36:58 2009 -0800 + + Don't do AdjustFrame in KMS mode. + + This was hit by xv86vm's SwitchMode path, and for that the CRTC offsets + get set at mode setting time anyway. + +commit 170f00e161931fdaa8c2812fc710649e1d6d977a +Author: Kristian Høgsberg +Date: Tue Feb 24 14:07:23 2009 -0500 + + Remove a handful of unused variable warnings. + +commit a6b31f38ebf470c61de0e10b0ce2af0d7ee1684b +Author: Kristian Høgsberg +Date: Tue Feb 24 13:58:20 2009 -0500 + + Update kms to work with drmModeModeInfo API update. + +commit 13ee9402e9822d6f57e3ebcc5ae658ce8322118e +Author: Adam Jackson +Date: Mon Feb 23 15:44:26 2009 -0500 + + Limit CRT DAC speed better. + + Verified against the public docs for i8xx parts, although not 9xx yet. + +commit 668b2352a47bcfba75fe0492a5805726222755eb +Author: Keith Packard +Date: Mon Feb 23 13:31:51 2009 -0800 + + Revert "Limit CRT DAC speed better." + + This reverts commit 8fd0e46571c7ba15c05f0a759113f8ca842c76a2. + + This doesn't even build. Please try again. + +commit 8fd0e46571c7ba15c05f0a759113f8ca842c76a2 +Author: Adam Jackson +Date: Mon Feb 23 15:44:26 2009 -0500 + + Limit CRT DAC speed better. + + Verified against the public docs for i8xx parts, although not 9xx yet. + +commit 73bc7f113969834d00cd92be8374dbadc62f96a9 +Author: Kristian Høgsberg +Date: Mon Feb 23 15:16:51 2009 -0500 + + KMS: Fix bug that prevented EDID data from getting propagated. + +commit ef952760551ad15cb9f63025d1e087645949a227 +Author: Kristian Høgsberg +Date: Sun Feb 15 22:10:42 2009 -0500 + + Use stat() and the dev_t to find the drm device filename. + + Simpler and more robust. Works when we haven't set the device PCI ID, + ie when not going through the legacy DRI module. + +commit 81c652e9a666a7459bcc5217c8a5ec518b6e00da +Author: Helge Bahmann +Date: Sat Feb 21 10:10:04 2009 -0800 + + Move disable_render_standby to EnterVT instead of startup. + + Otherwise, with a pre-2.6.28 older kernel the disable would be lost at + resume time and cause hangs. + + Bug #20214 + +commit 0621ba12a3b694720e67a49b25ca52f0e09b3802 +Author: Eric Anholt +Date: Wed Feb 18 13:32:44 2009 -0800 + + uxa: Ask for BOs ready for rendering for pixmaps. + + The assumption is that we're almost always accelerating our drawing to + new pixmaps (fill, copy, etc.). + +commit 5018d0f16cb8b44c743b5b37d194fe806d955568 +Author: Kristian Høgsberg +Date: Fri Feb 20 15:34:29 2009 -0500 + + KMS: Hook up rotated shadow buffers. + +commit beca598bc2848093b710bd47828d622205d273df +Author: Kristian Høgsberg +Date: Fri Feb 20 11:08:51 2009 -0500 + + Access the Xv buffer through the GTT for the non-KMS case. + +commit e97e2571703e3d6188bf18f211b793fc50383f9c +Author: Kristian Høgsberg +Date: Thu Feb 19 16:41:49 2009 -0500 + + Fix i915 textured video to work with the i830_memory -> bo change. + + Forgot to update i915_video.c in 872aadc7102bd5131e1582ede081e22672911ba2. + +commit 96da26b6813a8c1da8a43036c375aa0d2bb70f16 +Author: Kristian Høgsberg +Date: Thu Feb 19 16:40:19 2009 -0500 + + Dont allocate overlay registers in KMS mode. + +commit 872aadc7102bd5131e1582ede081e22672911ba2 +Author: Kristian Høgsberg +Date: Wed Feb 18 17:26:06 2009 -0500 + + Make Xv used a buffer object instead of i830_memory. + + We still pin the buffer object in case of overlay, but for textured video + we're now no longer using i830_memory for Xv anymore. + +commit 527e8177cde3abbabbcdccee0dbc0dcc0068a1be +Author: Zhenyu Wang +Date: Wed Feb 18 11:26:58 2009 +0800 + + bios_reader: parse driver feature BDB + +commit 62ca1c479825ffa0e9cf444b4e25080150faa45b +Author: Zhenyu Wang +Date: Wed Feb 18 10:49:00 2009 +0800 + + Fix SDVO mulitiplier setting for 945G + + Wrong SDVO multiplier setup has been slipped + in SDVO TV patch. Thanks Michael Fu to point this out! + +commit 723b6065093adb56a2d7204bd990ceae41bfafc9 +Author: Kristian Høgsberg +Date: Tue Feb 17 13:48:04 2009 -0500 + + KMS: Hook up crtc::gamma_set. + +commit 506bbb8341c052499057834a669b82787454b426 +Author: Zhenyu Wang +Date: Mon Feb 16 14:09:49 2009 +0800 + + Safely init SDVO found variable + + Found by Michael Fu for my last SDVO detect fix. + +commit 9d464bd5b0d2724f5edb26e859888ceb6a248f9b +Author: Zhenyu Wang +Date: Fri Feb 13 11:15:48 2009 +0800 + + Fix SDVO/HDMI detect + + SDVOC detect bit is only valid for HDMIC. + And for SDVO devices, SDVOB detect bit should be used + to probe all possible SDVO outputs. + +commit 48445d2e939328495b4abe0fb7e579dfcef727bb +Author: Zhenyu Wang +Date: Fri Feb 13 11:11:18 2009 +0800 + + SDVO: remove ForceSDVODetect option + + Which is just a hack to hide our SDVO detect drawback, + we will have SDVO/HDMI detect fix later. + +commit ddedf19f889da2ce6d69a3afce4665e2245682fa +Author: Zhenyu Wang +Date: Fri Feb 13 10:09:42 2009 +0800 + + SDVO: Switch control bus only before DDC access + + Instead of set control bus switch before every i2c start, + just set once before doing DDC. This should eliminate some + encoders returning error during that. + +commit f1ca56e17d0ecd4f1299061a6b3272bfd289e123 +Author: Zhenyu Wang +Date: Fri Feb 13 10:02:02 2009 +0800 + + SDVO: Fix TV support + + As SDVO TV uses SDVO_TVClkIn from SDVO encoder for clock reference, + it needs to generate proper PLL for current input clock. This uses + fixed PLL table from vbios for this. And possible sdvo mulitiplier + has to be setup correctly. This makes TV output stable on my 945GCLF2 + board with NTSC-M format. + +commit acde0ef683d6ec33d0b478923ffb11bd6785798f +Author: Zhenyu Wang +Date: Fri Feb 13 09:53:57 2009 +0800 + + SDVO: fix CREATE_PREFERRED_INPUT_TIMING command + +commit 824b2f0c5530c3196901c961757e6677b042caf3 +Author: Zhenyu Wang +Date: Fri Feb 13 09:50:45 2009 +0800 + + SDVO: fix usage for SET_TV_FORMAT and GET_SDTV_RESOLUTION_SUPPORT command + + They both needs parameters. + +commit 62c0c2f5549a51c5df209f7353a19ca301f221be +Author: Zhenyu Wang +Date: Fri Feb 13 09:48:34 2009 +0800 + + SDVO: fix error in modeline and DTD convert + +commit 37c67088a887e6380571e6eec8a8f058e3e24717 +Author: Zhenyu Wang +Date: Wed Feb 11 15:15:27 2009 +0800 + + SDVO: check EDID info for DVI-I + + For SDVO DVI-I, check EDID info for digital output, + otherwise mark it to be disconnected as analog output + is driven by VGA then. + +commit 38079bc0f1038da77048bbf6e5c10758f9fb8a55 +Author: Zhenyu Wang +Date: Wed Feb 11 14:41:58 2009 +0800 + + SDVO: Fix for HDMI encode and audio setup (try 5) + + SDVO HDMI encode and audio is not setup in detect, + which fails in hotplug case for HDMI audio. Fix to + check current encode type and set flag for HDMI audio + enabling. + + Check and set HDMI encode state in get_modes. + +commit 3012d85cc5eb58c2447e93c05c39dc14feaae988 +Author: Eric Anholt +Date: Tue Feb 10 18:47:28 2009 -0800 + + uxa: Fix breakage from UXA_FALLBACK conversion from "do {} while (0)" construct. + + Thanks to keithp for post-commit review. + +commit 5009127de7d9527ae329d1c2fbc7283648bde2e6 +Author: Eric Anholt +Date: Tue Feb 10 18:23:35 2009 -0800 + + uxa: Fix driver against fbDoCopy -> miDoCopy change in the server. + +commit b53977f4c53c7c8f562f909e985b8d5a7b2526f3 +Author: Eric Anholt +Date: Tue Feb 10 18:22:46 2009 -0800 + + uxa: Fix failure to --amend in further changes in previous commit. + +commit 5212ec6515c6562f66b86fc16928b601bf04e49b +Author: Eric Anholt +Date: Tue Feb 10 15:35:20 2009 -0800 + + uxa: hook up the fallback debug to the driver's fallback debug option. + +commit 3aa8591abfbe8db0f13912910c850fdd748808df +Author: Ma Ling +Date: Fri Feb 6 09:14:15 2009 +0800 + + Don't disable vga centering bit. + + commit id b9f5915ce812144ffd9d2aa42e8ba856129c35e, + which resolved bug #17235, but generate new regression-bug #19715. + This patch intends to resolve bug #17235, and avoid regression as well. + We have successfully re-tested it for bug #17235 and #19715 respectively. + +commit 9fe5fca3fe761a4f11857d9766138a60f471a9e6 +Author: Zhenyu Wang +Date: Wed Feb 4 06:00:39 2009 +0800 + + TV quirk for HP Compaq nx6310 + +commit 5c370091620b38447172ebeffbc6ed3256e86c9d +Author: Kristian Høgsberg +Date: Mon Feb 2 12:02:00 2009 -0500 + + Fix front buffer memset() for non-KMS case. + + Missed the pI830->FbBase condition when removing the KMS hook. + +commit 2013799b20599a58de48cb21a5a389e898a58af1 +Author: Kristian Høgsberg +Date: Mon Feb 2 11:51:47 2009 -0500 + + Un-revert the I915_SETPARAM_NUM_USED_FENCES commit reverted by accident. + + Oops, my bad. Reverted 8d4bc36fae50b09a73ba2cfab920adb32141a358 + since my kernel doesn't yet have the new param, committed + the revert by accident. + +commit 127330bfd53ac7571bdd12a551142528b972893f +Author: Kristian Høgsberg +Date: Mon Feb 2 11:02:59 2009 -0500 + + Fix last-minute "cleanup" that broke the patch. + +commit 0cb87ccfe97b0e016e47dcf236fd5ce78dddfc4b +Author: Kristian Høgsberg +Date: Fri Jan 30 17:53:03 2009 -0500 + + Implement front buffer resize for KMS. + + This adds back the resize hook so we can resize the front buffer under + kernel mode setting as well. + + The patch also pulls the drmmode_* structs from drmmode_display.h into + drmmode_display.c and eliminates the header file. + +commit 66bc44e8f9a0505c0b11b8042243ca74079da85f +Author: Eric Anholt +Date: Tue Jan 27 15:43:58 2009 -0800 + + dri2: Use modesetting's master fd instead of opening our own non-master. + + This fixes failure to auth DRI2 clients under KMS. + +commit 8d4bc36fae50b09a73ba2cfab920adb32141a358 +Author: Jesse Barnes +Date: Mon Jan 26 17:14:06 2009 -0800 + + Support tiled back/depth on 915-class hardware with DRI2. + + Set alignments, tile settings and flags correctly in the 2D driver to support + tiled rendering. UXA's create pixmap function currently assumes the worst + about the alignment constraints; that should probably be fixed. Some of the + 1M alignment fixes could probably be done more cleanly as well. + +commit 6c0ca1676bf60529dd331cc739abdf68fa9e918d +Author: Eric Anholt +Date: Wed Jan 21 15:52:02 2009 -0800 + + Don't forget the new state bos in check_aperture. + + They're tiny so it shouldn't have been a problem, but play it safe. This is + another <5% loss on top of the previously reported value, bringing the whole + series to about 8%. + +commit 57a02b50c60c10a25ff0f3cd93af9f37fa0d1b11 +Author: Jesse Barnes +Date: Mon Jan 26 14:58:28 2009 -0800 + + Fixup bogus VBT modes when detected + + Several VBT modes out in the wild have H or VSyncEnd values greater than + the H or VTotal value. This clearly ends up creating a bad mode, + causing some panels to either ignore the timing or display some sort of + corrupt image. + + Check for these cases and fix them up by default, making things work for + several Dell and Sony machines. + + Fixes FDO bug #17292. + +commit e20e1cf76fb00ba4f933a1ed6d1a4896be346c91 +Author: Bill Nottingham +Date: Sat Jan 24 08:36:20 2009 +0800 + + Quirk MSI IM-945GSE-A LVDS, TV outputs. + + The IM-945GSE-A claims to have a TV output, and always claims a connected + LVDS output. It has neither. + +commit 05ff561234cc2b93fe1ea2a35041fa2e119a7e38 +Author: Vincent Mussard +Date: Sat Jan 24 08:33:16 2009 +0800 + + quirk for AOpen MP45 + +commit fbf003ef2767a1a9f5e4064f04a17992030d8f5c +Author: Eric Anholt +Date: Fri Dec 5 17:27:13 2008 -0800 + + Move i965 render sampler state to BOs. + + This eliminates the pinned memory allocation for 965 render state. + +commit befd4ad8beae39377f804e06c7cbd926ec4251db +Author: Eric Anholt +Date: Tue Jan 20 14:43:08 2009 -0800 + + Move i965 render kernels to BOs. + +commit 5d705de5d11297f4d6bd5237fb67619e703745bc +Author: Eric Anholt +Date: Fri Dec 5 15:30:35 2008 -0800 + + Move 965 render unit state to BOs. + + This is a first step in a series of changes to avoid requiring a pinned object, + which gets in the way of doing non-root KMS. This change appears to result in + about a 2-6% loss in x11perf -aa10text, which better algorithms in libdrm could + make up for (it hasn't really had to deal with code this bad before). + +commit 64b08ed5ad46ccd76964972e39bfed8721a920aa +Author: Eric Anholt +Date: Tue Jan 20 17:13:52 2009 -0800 + + Remove 965 render wm scratch space, which was just unused. + +commit f126aabdf8952177bb15f392041da7a7094eb31b +Author: Eric Anholt +Date: Wed Jan 21 12:52:36 2009 -0800 + + Fix build with server 1.4. + + Debian "unstable" is still stuck with this ancient version. + +commit 253b8db298f38676e47dc902534465054f7b58b8 +Author: Jesse Barnes +Date: Wed Jan 21 09:02:13 2009 -0800 + + Don't run in KD_TEXT mode even with KMS + + Leaving the VT in KD_TEXT mode keeps the kernel's blanking code active, + so when a DPMS event happens, the fb console is restored rather than X's + configuration. On the downside it means the kernel won't print messages + in the background, which would be visible if a panic or emergency switch + occurred. The proper fix here is a new kernel mode, which we can move + to when ready. + +commit 131b414feb2ecabe31b538d65725ac4427a4387a +Author: Jesse Barnes +Date: Wed Jan 21 09:01:05 2009 -0800 + + Tear down batchbuffers unconditionally on LeaveVT + + Even if KMS is enabled we should do this, to avoid running batches that + depend on other state we tear down in LeaveVT. + +commit b6f3ce32e295929f461a7bc37e61f126fb51e4aa +Author: Eric Anholt +Date: Tue Jan 20 10:45:23 2009 -0800 + + Use drm_intel_bo_subdata to put render vb data in. + + This improves performance by avoiding repeated map/unmap cycles, which are + a bit expensive on my machine with lock debugging on in the kernel. It could + do much better if we did more than 18 or so floats at a time. + +commit 9a8bbb1951ad0ca0a9407a97348fc7fa03127900 +Author: Eric Anholt +Date: Mon Jan 19 19:34:50 2009 -0800 + + Move i965 render vb setup to use time, and decouple state emit from it. + + The require_space had failed since it only checked for the space required + by the batch emits in the function itself, but not in the + i965_emit_composite_state() that it called (the state we were concerned about + having set up for that 12 * 4 dwords to follow!). This is replaced by + intel_batch_start_atomic(), which will catch such mistakes in the future. + +commit 3d739597c4f5817079efd9067ad5db2f4105f765 +Author: Eric Anholt +Date: Tue Jan 20 10:37:20 2009 -0800 + + Move i965 render transform setup from emit_composite_state to prepare_composite. + +commit e20f7278f3abb44a3a151ac91f83c45cf1a2745a +Author: Eric Anholt +Date: Mon Jan 19 20:31:31 2009 -0800 + + i965: Pull check_aperture out to a separate function and make it dtrt. + + Previously it wouldn't count the pixmaps that were about to be used, which + is pretty much the only purpose of having the pain around. This also + eliminates the check_twice confusion with emit_batch_header_for_composite(). + +commit 013e2adfbf955cb21450b610091542ebd54392c2 +Author: Eric Anholt +Date: Mon Jan 19 20:24:20 2009 -0800 + + Move filter computation from emit_batch_header to prepare_composite. + +commit a340fe5e4227ebea5493e658eb6289624b07ab0b +Author: Eric Anholt +Date: Mon Jan 19 19:11:41 2009 -0800 + + Use intel_emit_reloc from video to prettify 965 render bind_bo setup. + +commit aefe198ca427a5ad69717f49948eb3ede713bb28 +Author: Eric Anholt +Date: Mon Jan 19 18:57:01 2009 -0800 + + Move i965 render state bo setup back to prepare_composite. + + We want the objects to be created once per prepare/done both for efficiency and + so we can handle aperture checking better. + +commit 946c7ef8170e74ac178c83b1465242d57fa86f2e +Author: Eric Anholt +Date: Mon Jan 19 14:43:20 2009 -0800 + + Do check_aperture_space and batch_start_atomic for i965 video. + + This increases the overhead for video in the presence of cliprects, but we + were already doing nasty things in that case and don't seem to care. This + could fix potential bad rendering or hangs with video, particularly with + DRI2. + +commit 7be668179a12918918cad863f6936ced4ab78dbf +Author: Eric Anholt +Date: Mon Jan 19 14:29:25 2009 -0800 + + Move 965 video setup to a separate function so we can move it around. + +commit c7db3201106f07f3228c989014d6db5ace5378f6 +Author: Owain G. Ainsworth +Date: Tue Jan 13 18:46:41 2009 +0000 + + Remove the pageflipping infrastructure. + + It was broken on current kernels, and deprecated anyway. + +commit c82adfd0169317efb6c2f9de0f315651f9adbae1 +Author: Owain G. Ainsworth +Date: Tue Jan 13 17:09:00 2009 +0000 + + Remove triple-buffering support + + It never worked with any upstream linux kernel, and is quite heavily + deprecated. A new solution based around DRI2 will probably be + forthcoming. Pageflipping itself is next. + +commit ada44c1c0edcd3ea9e41ed6b6fdb2bf0e87c9c67 +Author: Kshitij Kulshreshtha +Date: Tue Jan 20 11:35:36 2009 +0800 + + Support sysfs backlight control for Sony laptops in xf86-video-intel + + The sony_laptop kernel module (since v2.6.23) supports backlight control + via the sysfs interface: + /sys/class/backlight/sony + + This patch will enable xf86-video-intel to use this backlight control method + for Sony VAIO Laptops with Intel integrated video. + +commit d89de6d60a86105a198d904821853e6ed7de3305 +Author: Eric Anholt +Date: Fri Jan 16 16:59:17 2009 -0800 + + Protect i915 textured video against batchbuffer wrapping. + +commit 15780c53f5717936ea10ac87aff8a881c172f1dc +Author: Eric Anholt +Date: Sat Jan 17 16:23:38 2009 -0800 + + Fix i915 batch_start_atomic counting. + +commit fc46cb6403387215d13aa28d720f205688ae9d67 +Author: Eric Anholt +Date: Sat Jan 17 12:47:53 2009 -0800 + + Fix libdrm version number requirement regression that got spammed in. + +commit 1459f794e2a4b9032807c3794b00a33fa6392837 +Author: Dave Airlie +Date: Sat Jan 17 22:14:26 2009 +1000 + + intel: fix DRI2 should be DRI_DRI2 + +commit db43b7870a37ea273941302096a6f00120dfae71 +Author: Eric Anholt +Date: Thu Jan 15 19:05:52 2009 -0800 + + Re-emit i915 composite setup when the batchbuffer wraps. + + This also introduces tests to make sure that we asked for enough reserved space + and that we don't allow wrapping at the wrong time. + + This fixes a hang during text rendering with DRI2 and a GL client running, + but could potentially affect text rendering with GEM in general with an + exceptional batchbuffer setup. + +commit cab5b7a7b0e17414f98b2363b0961c87f32f9c05 +Author: Eric Anholt +Date: Thu Jan 15 09:31:55 2009 -0800 + + Fix invarient state emits for DRI2 (do it per batch, since there's no lock). + +commit 9f306193c4b128ec72c5b4db16d07302cee50ab5 +Author: Owain G. Ainsworth +Date: Tue Jan 13 18:42:44 2009 +0000 + + Fix ioctl type. + + I915_EMIT_IRQ is a read/write ioctl, not a write only. Found by OpenBSd's + kernel code which checks these things a long more strongly than Linux. + +commit 1e8588ad5087c69eb77399cfaab8e4ec15eb4da9 +Author: Owain G. Ainsworth +Date: Tue Jan 13 17:02:59 2009 +0000 + + use ifdef __linux__ where needed. + + since modesetting is compiled by default now, ifdef __linux__ the linux + only includes and ioctls. + +commit db9f5915ce812144ffd9d2aa42e8ba856129c35e +Author: Ma Ling +Date: Wed Jan 14 14:46:52 2009 +0800 + + Disable VGA plane reliably + + This fixes #17235, VGA random hang on recent G45/43 board. + From spec, SR01 bit 5 should be set before VGA plane disable through + control register, otherwise we might get random crash and lockups. + +commit a4b023c17b9c3bd65fb9466ddb8a953f60244402 +Author: Keith Packard +Date: Tue Jan 13 20:01:49 2009 -0800 + + Assign rotation memory dri_bo to rotation pixmap. + + As the rotation memory and rotation pixmap are allocated separately (to make + rotation at startup work), the allocate dri_bo needs to be set in the pixmap + for acceleration to work. This restores the performance in rotated modes. + + Signed-off-by: Keith Packard + +commit f659cc37e61364a408355b9a6a44d39f4d759935 +Author: Jesse Barnes +Date: Tue Jan 13 16:49:41 2009 -0800 + + bios_reader: make mode timing output friendlier + + Print out the calculated mode line values (as i830_bios.c uses) and + check for validity against known problems. + +commit c80f1a9c5131721eaf87d12a7a67e603cdfed63b +Author: Bernhard Rosenkraenzer +Date: Tue Jan 13 10:35:19 2009 -0800 + + UXA: Declare glyph cache picture as component-alpha when necessary. + + Without this, rendering component-alpha glyphs may break without a mask. + + Bug #19534. Ported from fix by Michel Dänzer in + xserver commit 639f289dcdbe00a516820f573c01a8339e120ed4 + +commit 3d206f9e46b5237bda7ca3c0f92d64c45ee8bdf5 +Author: Ma Ling +Date: Tue Jan 13 10:26:40 2009 +0800 + + set continuous-frequency flag in get modes function + + http://bugs.freedesktop.org/show_bug.cgi?id=19247 + Because latest xorg will check whether the display is continuous frequency through one flag in monitor info structure, + if not it doesn't touch default modes. When laptop failed to fetch edid, We don't set the flag. In i830_lvds.c, + so currently we can not get default modes except only one mode line from bios. + In order to achieve default modes from xserver successfully,I set the flag and other EDID features. + +commit 3354e660b0744976871683ce226f17e873f26b50 +Author: Keith Packard +Date: Wed Nov 26 16:32:12 2008 +0800 + + Fix LVDS EDID to match all possible default modes + + If the EDID data from the LVDS doesn't indicate support for a wide range of + continuous frequencies, it will not match any of the default modes although + our LVDS scaler logic ignores refresh rates when programming LVDS modes. Fix + this by smashing the compute EDID data to open up the sync rates. + + Signed-off-by: Keith Packard + +commit f1e9ca4e4fb3ddb083252aea79c67c5e5e71f29c +Author: Alan Coopersmith +Date: Fri Jan 9 16:30:15 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + +commit 91c49067abab262edce54d33af8bfc03eee20f2e +Author: Ian Romanick +Date: Wed Jan 7 21:45:54 2009 -0800 + + Prevent redefinitions of CARD8 and friends. Fixes build. + +commit 934008a2cbcec0c790580750c672c0367a9e4c55 +Author: Eric Anholt +Date: Tue Jan 6 10:55:59 2009 -0800 + + Always enable KMS if server's new enough, and remove option. + + The API should be stable at this point, and we don't want to allow mistakes. + +commit 342120be0956bfc12822d1ffbfbd8aaabf3e922f +Author: Eric Anholt +Date: Mon Jan 5 23:21:07 2009 -0800 + + Fix pin leakage with EXA GTT-mapping shortcut, and crash with UXA on KMS. + +commit 9a5082d2920c1a212fe935b5a093013e8035c321 +Author: Eric Anholt +Date: Mon Jan 5 23:28:50 2009 -0800 + + Disable DRI2 buffer tiling on non-965, as those need fence regs for 2D blits. + + This fixes glReadPixels failure on single-channel 915GM, as the software code + for readpixels was actually the only code in the driver doing tiling against + these buffers (everything else says "rely on fence registers", since the 2D + blits don't have a "don't rely on fence registers" option). + +commit 7736b65be4fb4d5c59d7aedb1e64da976bb10ae9 +Author: Keith Packard +Date: Mon Dec 15 15:49:01 2008 -0800 + + FatalError on batchbuffer map failure + + Yes, it would be nice to do something other than crash here. + + Signed-off-by: Keith Packard + +commit 632f816c72cb4b48b690fd92d1cc1d5a9c9285c7 +Author: Keith Packard +Date: Mon Dec 15 15:43:34 2008 -0800 + + uxa: handle uxa_prepare_access failure + + uxa_prepare_access may fail to map the pixmap into user space. Recover from + this without crashing. + + Signed-off-by: Keith Packard + +commit 90b28a56553d809374fa6d9b9529b7a8b583488c +Author: Keith Packard +Date: Mon Dec 15 15:41:28 2008 -0800 + + Handle drm_bo_map failure in 965 video and composite paths. + + These two paths allocate a number of objects directly. + + Signed-off-by: Keith Packard + +commit 8237faf8f3ca73ecdf0ef009a7d361b318726f6f +Author: Keith Packard +Date: Mon Dec 15 15:35:35 2008 -0800 + + Resize framebuffer on screen size change (requires UXA and DRI2) + + Signed-off-by: Keith Packard + +commit 21bd4e8974e4c0e83f5f95adb0fc17290444caf5 +Author: Keith Packard +Date: Mon Dec 15 15:19:00 2008 -0800 + + Make i830_allocate_memory take tiling parameters. + + This eliminates the separate i830_allocate_memory_tiled function which means + that all memory objects will have tiling parameters set correctly. + + Signed-off-by: Keith Packard + +commit 1f61e97904dfe5f8c08bb9f284cfdfe878f7e541 +Author: Zhenyu Wang +Date: Wed Dec 31 22:56:57 2008 +0800 + + UXA: Fallback to dri_bo_map() if pin failed + + This fixes VT switch issue with UXA after Eric's + aae4008096399a0e84abc7c016b35092caf9db25 on 2D side. + +commit 830bf916724afd21b7947f797c22a8c8aab7a0a4 +Author: Eric Anholt +Date: Mon Dec 29 13:42:44 2008 -0800 + + Don't touch the pipestat regs for detecting FIFO underrun. The kernel owns them. + + Since we don't perform any synchronization with the kernel on these regs, we + could race with the kernel to write stale values and end up not having vblank + interrupts enabled when somebody was waiting on one. + +commit d96f774d1bb39640486c72338fe8b19ee1ceaa23 +Author: Eric Anholt +Date: Mon Dec 29 13:57:24 2008 -0800 + + warning fix. + +commit 59b0fbb9be880d489374b141f818948a2721a2ef +Author: Henry unbongo +Date: Mon Dec 29 13:54:38 2008 -0800 + + Add support for SDVO LVDS. + +commit 750d8e105831718d4a44a145fdb87571fa9f9d8e +Author: Eric Anholt +Date: Mon Dec 29 12:44:26 2008 -0800 + + Fix compile failure after 45f45c73469f1bd46a1b6fb206f2e9e5e4fd66b3 + +commit 45f45c73469f1bd46a1b6fb206f2e9e5e4fd66b3 +Author: Eric Anholt +Date: Mon Dec 29 11:26:11 2008 -0800 + + Remove logical context setup. + + This should be a noop. If it wasn't a noop, it means that on pre-g33 chipsets + we were spamming some data into a page of system memory because we used a + virtual instead of a physical address. It was also supposed to not work when + we submit it from a batchbuffer, as we have been doing for some time now. + This code has existed since about the beginning of the driver's existence, + with no justification. + +commit 3544bbe22d8cf2640289e1e4febe755a47f26631 +Author: Eric Anholt +Date: Mon Dec 29 10:41:02 2008 -0800 + + Add PCI write posting to LeaveVT path when we're about to wait on write results. + +commit 7b67914b23b54d4d9566190440a3430e40615aa8 +Author: Eric Anholt +Date: Fri Mar 28 15:51:50 2008 -0700 + + Add SDVO LVDS register definitions. + +commit 8464fc285d7b22fd45b7af616fd52aa15e16638a +Author: Eric Anholt +Date: Mon Dec 29 09:51:45 2008 -0800 + + Rely on libdrm 2.4.3 and stop checking for xf86drmMode.h. + +commit c1dde7ac06ce6470c74198b2560ee67d28fb0aea +Author: Eric Anholt +Date: Mon Dec 22 16:49:57 2008 -0800 + + Remove old mergedfb includes and defines, which bother spatch. + +commit 75799d2834be84b016391ec95b221df32380e3e7 +Author: Zhenyu Wang +Date: Tue Dec 30 00:55:30 2008 +0800 + + Bug #18004: Add Aopen 915GM LVDS quirk + +commit cfaaf6af777ad8e56da5a077bdc01f4f2d7bc4d6 +Author: Zhenyu Wang +Date: Mon Dec 29 21:17:44 2008 +0800 + + Don't count vertex buffer in second aperture size check + + With batch flush notify vertex buffer will be unreferenced, + so don't count it in later aperture check. Also adding + uninitialized vertex buffer check in batch flush notify. + +commit b710a688a7383df320f9d4e765b48331310a4d1d +Author: Dave Airlie +Date: Mon Dec 29 12:50:25 2008 +1000 + + intel/kms: disable overlay when it needs physical address + + We can't do phy address allocations, need kernel support for this. + + Signed-off-by: Dave Airlie + +commit 649374b88b330838133d78be1953ce8b18ddd2c6 +Author: Dave Airlie +Date: Mon Dec 29 12:48:11 2008 +1000 + + intel: don't call enter/leave VT for KMS enabled systems + + Signed-off-by: Dave Airlie + +commit 408f7139354a942f29334795b5480a0b6bb6142a +Author: Dave Airlie +Date: Mon Dec 29 12:47:30 2008 +1000 + + exa: fix map gtt call to use current API + +commit fcd280b730f86ea54ecd89d3e037e71f8375b5f5 +Author: Zhenyu Wang +Date: Mon Dec 29 10:05:17 2008 +0800 + + Bug #19239: Add a quirk for broken ACPI lid state + + For broken hardware/bios with incorrect ACPI LID state, + there's machine that can not be fixed in ACPI way, customed + DSDT that reprogram _LID method to read EC state. Although + this is ACPI issue, this quirk can be used to work around that. + +commit 6b9f421b792c701e909d81ae2b6e6a47fb069b0b +Author: Dave Airlie +Date: Mon Dec 29 11:51:58 2008 +1000 + + modeset: transformPresent is a new API member + +commit a320541e51818833a6a445707835fbf70e9babd4 +Author: Dave Airlie +Date: Mon Dec 29 11:34:51 2008 +1000 + + modeset: fix xf86CrtcRotate API change across server versions + +commit e38fd84fcccc18284b649a60b4cfd8e24eaf059d +Author: Ma Ling +Date: Mon Dec 22 10:35:52 2008 +0800 + + SDVO: reset pixel repeat in avi frame + + For #19115, the root cause is avi_if.u.avi.PR in + i830_sdvo_set_avi_infoframe() belongs to element for + interlaced mode based on CEA_861B, but currently we + don't support interlaced mode. So it should be set as 0. + +commit d8e89b26ef5ef2c15e5d34162b14d279a7f0bb1c +Author: Zou Nan hai +Date: Fri Dec 19 09:34:14 2008 +0800 + + [965-xvmc] remove the vblank wait code, drm not support mutlple client + to wait on vblank now. + +commit aae4008096399a0e84abc7c016b35092caf9db25 +Author: Eric Anholt +Date: Wed Dec 17 14:25:22 2008 -0800 + + uxa: Do a hack to use the aperture mapping instead of bo_map in sw fallbacks. + + Because of how fallbacky the uxa rendering core is, and our inability (without + wfb in userland or page faulting in the kernel) to tell the kernel just where + we're going to fall back, the clflush overhead can become outrageous, for + example with emacs and xcompmgr. Instead of using drm_intel_bo_map, pin the + buffer and do the fallback to the aperture mapping. This gets us the bad old + performance that fb is designed for, instead of bad new performance. + +commit 74bc420940de4ed02705211ddebbc4033c032242 +Author: Peter Alfredsen +Date: Fri Dec 19 08:10:06 2008 +0800 + + xvmc: fix up needed libs + +commit 555eea5411cf8c725df5f1b4cb80198fa6a1225b +Author: Zou Nan hai +Date: Wed Dec 17 13:55:07 2008 +0800 + + wait vblank before render to fix tearing + +commit ed267072db7c58ee16a458fd3dc24ce3a2d0061d +Author: Robert Noland +Date: Wed Dec 17 09:27:30 2008 +0800 + + Fix drmOpen for non-linux 965 XvMC + + drmOpen by name only works on linux after falling back to groping around + in /proc. This doesn't work on other OS. + + Signed-off-by: Robert Noland + +commit ecdd706873c1f990f4a78fbaecf7380411edabcd +Author: Eric Anholt +Date: Sun Dec 14 16:09:25 2008 -0800 + + uxa: Correctly prepare/finishaccess of stipple in ValidateGC (and only it) + + This avoids prepare/finish_access_gc overhead when we're not changing things + (since GCTile is already handled) and get us the RW flag for the prepare on + of the stipple pixmap so thing will be synced correctly. + +commit e6479f96e5d8da39fcbb5376c4a66a1f924ec4e4 +Author: Kristian Høgsberg +Date: Mon Dec 15 14:54:20 2008 -0500 + + Quiet some KMS warnings. + +commit 30fb0ef53e19b759715f1ee14b81b11c81d79045 +Author: Zhenyu Wang +Date: Tue Dec 16 00:39:45 2008 +0800 + + Revert " [965 xvmc] update dual prime g4b files" + + This reverts commit ea2b6b405e4c8b1bfb4bc568d0453a39a9194a8f. + + Duplicate with Keith's commit. No idea what's diff target + of this one. + +commit ea2b6b405e4c8b1bfb4bc568d0453a39a9194a8f +Author: Zou Nan hai +Date: Mon Dec 15 09:19:43 2008 +0800 + + [965 xvmc] update dual prime g4b files + +commit d917583c19e2eb20a559eddaa100ce71d8fbe48c +Author: Pierre Willenbrock +Date: Mon Dec 15 09:08:30 2008 +0800 + + closedir only after finishing use of any results from readdir + +commit 865735d8408ee6b75be8fb1a8ab32b2a53dd3adb +Author: Keith Packard +Date: Fri Dec 12 11:07:20 2008 -0800 + + Dump out fence registers by default, add fence end registers as well + + In debugging the frame buffer resize code, I needed to see what the server + was doing to the fence registers, so I added this debug code. Seems useful + enough to include it. + + Signed-off-by: Keith Packard + +commit f3e59e59b54696667b127c82327e16b14d7bab22 +Author: Zou Nan hai +Date: Fri Dec 12 11:18:25 2008 -0800 + + Update binary versions of the dual-prime kernels + + Signed-off-by: Keith Packard + +commit 80d588e9c49719ec494e705edfc14c78908bbc3f +Author: Zhenyu Wang +Date: Fri Dec 12 18:27:29 2008 +0800 + + Don't warn on ring enabled in GEM + +commit 60c4ee9ece8ea57e61b1590dfeb69d08555e465c +Author: Zhenyu Wang +Date: Fri Dec 12 18:00:09 2008 +0800 + + Fix directRenderingType check + + Don't miss classic texture memory allocation in DRI. + +commit edf765155497d89ecac328a5b268ecf60e2f377c +Author: Zou Nan hai +Date: Thu Dec 11 15:41:59 2008 +0800 + + [965-xvmc] fix dual prime kernel, flush issue on G4x + +commit 80e2d90139dd99f50beb4f9353599608624b777d +Author: Zhenyu Wang +Date: Thu Dec 11 13:45:17 2008 +0800 + + Let lid status be unknown if no acpi lid object found + +commit 83377b543defdca7226d7c1a7794e4ff3d8b4c84 +Author: Bryce Harrington +Date: Thu Dec 11 09:38:27 2008 +0800 + + Pipe-A quirk for HP 2730p (bug #18852) + +commit 6c4e134a1a30785c2e5c6d57b21fde54a2dd3413 +Author: Bryce Harrington +Date: Thu Dec 11 09:34:15 2008 +0800 + + PipeA quirk for Quanta/W251U (launchpad bug #244242) + +commit 1e974ff6b8446ecd64677b3c9aba60ca850923cc +Author: Zhenyu Wang +Date: Wed Dec 10 10:54:31 2008 +0800 + + Try to always probe SDVOC on 965G/965GM + + Detect bit of SDVOC is reserved on 965G/965GM, instead of ignore SDVOC + this trys to always probe it on these chipsets. + +commit f5f67e1b54e67b4bfc3db3482b2693211be81d63 +Author: Zhenyu Wang +Date: Wed Dec 10 10:36:07 2008 +0800 + + bug #17395: Quirk CRT for Sony VGC-LT71DB + +commit d8b764fbd27dc9c8b28386093931b8d38855bd19 +Author: Keith Packard +Date: Tue Dec 9 21:51:14 2008 -0800 + + Add RandR 1.3 panning support by supporting the crtc set_origin function + + RandR 1.3 panning support can use the regular mode setting interface, but + that's really slow. Providing set_origin makes it nice and snappy. + + Signed-off-by: Keith Packard + +commit 4d7a95959d8223aec41550eb19f60b3edd7210a1 +Author: Zhenyu Wang +Date: Tue Dec 9 19:48:11 2008 +0800 + + Try to add LVDS detect support + + This one trys to use lid status for LVDS detect, + which works when internal panel is not used as primary + display alone, or there's no internal panel at all. + ACPI button driver's lid state interface is preferred, + and SWF state is also checked if ACPI method failed. + +commit 0fe61b0b7e3bbe8ced1b0ad2be72c438d200c64b +Author: Zhenyu Wang +Date: Tue Dec 9 19:19:58 2008 +0800 + + Remove Cappuccino SlimPRO SP625F 855GM LVDS quirk + + It breaks bug #18462 on IBM 855GM with same subdevice ids. + +commit bea98cdfd93fc1181a06c51e57fcab227ff4827e +Author: Carl Worth +Date: Fri Dec 5 15:42:53 2008 -0800 + + Set vertex_buffer_bo to NULL after unreference. + + Which is just being tidy. We initially were looking at this code + path due to a report of a crash on server shutdown which started + after this unreference call was added. Setting this to NULL + apparently didn't avoid the crash, but it's a good thing to do + regardless. + +commit ce7efc2e3676c8f80206415480dda91e5e021396 +Author: Carl Worth +Date: Thu Dec 4 11:41:02 2008 -0800 + + Don't smash fixed_mode if skip_panel_detect is set. + + Without this change, setting LVDSFixedMode to false is not effective + as i830_bios_init calls i830_parse_panel_data which in turns sets + a fixed_mode. To fix this we still call parse_panel_data to set + the various lvds_options but we return before setting fixed_mode. + +commit e8b95efbf5d9c3a5b75b2bb8b5b51844b5fcdfbc +Author: Carl Worth +Date: Wed Dec 3 13:49:52 2008 -0800 + + i965: Add batch_flush_notify hook to create new vertex-buffer bo + + This avoids mapping a buffer object which is being referenced + by a batch that has already been flushed, (which is a terribly + expensive operation). + + On my machine this brings the performance of x11perf -aa10text + from 85k back to 150k, (where it was before a recent kernel + upgrade). Also, before this patch, when I used my X server + actively performance would drop as low as 15k---hopefully that + bug is gone with this change. + +commit 768f317cf0da4cd6682af2e71e71c3e130e05182 +Author: Zhenyu Wang +Date: Mon Dec 8 10:33:13 2008 +0800 + + Fix DRI2 compiling warning + +commit 95596f51503bb468364719aec9083d59999e34b7 +Author: Zhenyu Wang +Date: Mon Dec 8 10:30:12 2008 +0800 + + Fix TV compiling warning + +commit c47b6d1def917fad5ad2b5a3e4167edfd354f2c8 +Author: Kristian Høgsberg +Date: Sat Dec 6 21:20:52 2008 -0500 + + Make sure DRI/DRI2 can initialize properly with KMS. + +commit 70af658d4e94cc372f9e9c831611f70b3c1cecab +Author: Kristian Høgsberg +Date: Sat Dec 6 19:19:21 2008 -0500 + + Simplify crtc preinit a bit. + +commit 3ad9c9a82d7b359b9b711070628e6ff07a2aa9f7 +Author: Kristian Høgsberg +Date: Sat Dec 6 19:17:39 2008 -0500 + + Fix KMS compilation. + +commit 2e3c098c5ed9a8451713dc754a5f086992249336 +Author: Eric Anholt +Date: Fri Dec 5 12:21:53 2008 -0800 + + uxa: Reject solid/copy to under-8bpp destinations. + + EXA wouldn't create pixmaps for under-8bpp, but UXA does. Fixes + mis-rendering in xfwm, evolution message compose, firefox link + drag'n'drop, and I'm sure more. Big thanks to Pierre Willenbrock for + debugging the issue! + + Bug #18050 + +commit 261c20a479f6ec1e94c2ba801323072227cc3ade +Author: Eric Anholt +Date: Fri Dec 5 12:13:26 2008 -0800 + + uxa: Add in EnableDisableFBAccess handling like examodule.c did. + + This fixes assertion failures when rendering text while VT switched. + +commit caecd6031e416705b1f0a7051535211feaebdedd +Author: Eric Anholt +Date: Thu Dec 4 15:18:08 2008 -0800 + + Remove the extra memory allocation for 965 video state now that it's all in BOs. + +commit 48c113ade26d5ad64999cd5cc288495c10e02fc4 +Author: Eric Anholt +Date: Thu Dec 4 15:10:49 2008 -0800 + + Emit proper relocations to pixmaps in BOs in i965 video. + +commit ae2cd8b75e41393e072e27064ecefecf1aa1bc6c +Author: Eric Anholt +Date: Thu Dec 4 15:02:12 2008 -0800 + + Move i965 video surface state and binding table to BOs. + +commit 1b3c3c9d79305abe1785fdaef26a950dafa8890f +Author: Eric Anholt +Date: Thu Dec 4 14:30:56 2008 -0800 + + Move i965 video vertex data to BOs. + + This eliminates extra syncing when clipping is involved. + +commit 84825972597042f0aa6784594dace96be96a0234 +Author: Eric Anholt +Date: Thu Dec 4 14:26:09 2008 -0800 + + Move remaining i965 video programs to BOs. + +commit 40671132cb3732728703c6444f4577467fa9223f +Author: Eric Anholt +Date: Thu Dec 4 14:20:21 2008 -0800 + + Move i965 video wm and sampler state to BOs. + +commit 48803eb7463ad14f3109f67fcf4ccff4362baaa2 +Author: Eric Anholt +Date: Thu Dec 4 13:22:12 2008 -0800 + + Stop allocating unused scratch space for i965 video. + +commit f3fe46b557a4dd7e212c2790fb47142d375c1c75 +Author: Eric Anholt +Date: Thu Dec 4 13:18:06 2008 -0800 + + Move i965 video vs/sf state to BOs. + +commit 4b9d3eac57a972c055c4acd7a10dfe8aa918131c +Author: Eric Anholt +Date: Thu Dec 4 13:11:13 2008 -0800 + + Move i965 video cc state to BOs. + +commit 176e92d89fdfb199780014722feab6ac25836dcc +Author: Eric Anholt +Date: Thu Dec 4 12:53:37 2008 -0800 + + Move I965DisplayVideoTextured unit state setup to separate functions. + +commit 61929f4c641e2ecb145ad2b22f7092d40e31ae6d +Author: Eric Anholt +Date: Thu Dec 4 11:44:35 2008 -0800 + + Move I965DisplayVideoTextured surface/sampler setup to separate functions. + +commit 73d03cb93ca761ee555b87558882e26bd2f10d91 +Author: Eric Anholt +Date: Thu Dec 4 11:37:38 2008 -0800 + + Move debug code for I965DisplayVideoTextured to separate functions. + +commit df01d8f0791bd825c96d9d5e20313d5ffcfeb532 +Author: Zhenyu Wang +Date: Thu Dec 4 16:11:33 2008 +0800 + + Change master version to 2.6.99.1 + +commit b156b3165e1aae5df0353737d0335ac2e653f5fd +Author: Julien Cristau +Date: Wed Dec 3 04:35:38 2008 +0100 + + Don't unconditionally define DRI2 + + xorg-server.h will define it if the server has dri2 support. + +commit 8d7cbab267e8fbcb2fcf90b18346b60607277266 +Author: Zhenyu Wang +Date: Thu Dec 4 18:43:03 2008 +0800 + + Fix maxium backlight level restored issue + + The origin check for bring back max value for '0' + backlight level is ok for legacy or combo control method + as '0' mostly doesn't act in ideal lowest level. But it + breaks in using kernel control method which should provide + a reasonable backlight range. + + This is tested fine on T61 with thinkpad_acpi module. + +commit 32e7d47925b445a85847d77651b258e117aaaffe +Author: Zhenyu Wang +Date: Thu Dec 4 09:24:31 2008 +0800 + + Disable XvMC on DRI2 for now + +commit 293f6232c6c0ce12802a2123edfab4551d25e266 +Author: Dave Airlie +Date: Wed Dec 3 16:51:25 2008 -0800 + + uxa: don't call composite routines with no buffer. + + We can get a case with gnome-terminal + links, where we get two arrays + of glyphs all with 0 width and 0 heights in them. If this happens + we manage to get to this case without any buffer setup and segfault. + + (cherry picked from commit 717c7492a0f6ba3fb3eabda33515881eef314155) + +commit 457a680afd0d8f835131ea72be0c3c618c2892c7 +Author: Eric Anholt +Date: Wed Dec 3 13:17:26 2008 -0800 + + Enable tiling for DRI2 back/depth buffers. + + This results in allocation overhead for small (8x8-128x128 or so) pixmaps with + DRI2, but we're interested in looking at tiling them in general in the near + future, anyway. + +commit b662ecccb5c036fcc4aa19026642bde0a1ca2ac8 +Author: Eric Anholt +Date: Wed Dec 3 10:50:33 2008 -0800 + + Re-enable composite accel on 965 with UXA. + + This was blocked on getting 965 render aware of BO pixmaps, which is happily + now the case. + +commit d426f799f541cb32fab134f2af068c6cd31923d9 +Author: Paulo Cesar Pereira de Andrade +Date: Wed Dec 3 14:59:21 2008 -0200 + + Include prior to including "edid.h" from the sdk. + +commit 07f5a8223187c1abc79c104d2fa5859a54cecd30 +Author: Robert Lowery +Date: Wed Dec 3 09:48:23 2008 +0800 + + TV: add support to set TV margins in xorg.conf + +commit 00ae7a571b6413aa2530e4f1310f8f4646631946 +Author: Eric Anholt +Date: Tue Dec 2 13:08:23 2008 -0800 + + UXA: Add support for tiled front/back/depth by cutting over to the GTT map. + +commit 34d54db945c67a2fee0a38cc9eafc463b8413669 +Author: Eric Anholt +Date: Tue Dec 2 13:01:56 2008 -0800 + + Remove DRI_MM defines which are always true now. + +commit f7540df184a75a749cabcfa2da8974d3d0714ea6 +Merge: 5f34702 ee87f7b +Author: Keith Packard +Date: Mon Dec 1 19:06:09 2008 -0800 + + Merge commit 'origin/dri2' + +commit 5f347020a52b583e19d333361ea7bf2591255899 +Author: Paulo Cesar Pereira de Andrade +Date: Sat Nov 29 02:35:59 2008 -0200 + + Export libIntelXvMC and libI80XvMC symbols. + + This is a side effect of adding the visibility flags to XORG_CFLAGS. + +commit ec7fd3d1b477928f9bffde1a72d7f3fdea89e629 +Merge: d978cd4 baec75a +Author: Zou Nan hai +Date: Thu Nov 27 10:48:09 2008 +0800 + + Merge branch '965-xvmc' + + Conflicts: + + src/common.h + src/i830_hwmc.c + src/i830_video.c + +commit d978cd4b453ea588ed2fc2f2cb4ec26856fe00d4 +Author: Wu Fengguang +Date: Thu Nov 20 00:47:25 2008 -0800 + + refresh batch_bo reference after intel_batch_flush() + + The call into intel_batch_flush() will invalidate the pI830->batch_bo + stored in bo_table[0]. Fix it by re-read the refreshed value. + + Signed-off-by: Wu Fengguang + Signed-off-by: Eric Anholt + +commit ee87f7becc2138348ec0d948829db6e86cee86da +Merge: 3dd7f0f a5b1e62 +Author: Kristian Høgsberg +Date: Wed Nov 12 16:40:37 2008 -0500 + + Merge commit 'origin/master' into dri2 + + Conflicts: + src/i830_dri.c + src/i830_driver.c + src/i830_memory.c + +commit 30c29627c859f1f6780aa652d6de4fa985b63dd0 +Author: Jesse Barnes +Date: Thu Nov 13 12:35:02 2008 -0800 + + Make sure DRM library paths are included + + We need @DRM_LIBS@ in order to find drm_intel if installed in a + non-standard path. + +commit 42ec6938bdea3a5b065a4248fdca5f031415191e +Author: Ma Ling +Date: Fri Nov 7 14:23:41 2008 +0800 + + enable Intel G35 SDVO HDMI audio output + + Set the SDVO_AUDIO_ENABLE bit to enable SDVO HDMI audio output of the + Intel G35 chipset. + + Signed-off-by: Ma Ling + Signed-off-by: Wu Fengguang + +commit 42b3903c3fda95a7c536cb957d8163d8dc54a9a1 +Author: Wu Fengguang +Date: Fri Nov 7 14:23:40 2008 +0800 + + enable Intel G45 integrated HDMI audio output + + Enable audio output for the integrated HDMI of Intel G45 chipset + by introducing the SDVO_AUDIO_ENABLE bit. + + Signed-off-by: Wu Fengguang + +commit 293f4a8b6d1ca8a47d14c4d4b5904b85a8167e12 +Author: Wu Fengguang +Date: Thu Nov 13 09:50:37 2008 +0800 + + introduce i830_hdmi_priv.has_hdmi_sink + + HDMI is compatible with DVI, and we've seen many boards that + use HDMI port for DVI output. + + So Zhenyu proposed this flag: i830_hdmi_priv.has_hdmi_sink + to indicate the presence of HDMI capable monitors. + + Signed-off-by: Wu Fengguang + +commit 667923559219429b0c5fec12a0164f7eba1f8f2d +Author: Jesse Barnes +Date: Tue Nov 11 12:55:06 2008 -0800 + + Default to FULL_ASPECT panel fitting + + Now that 8xx is fixed, we should be able to preserve aspect ratio by + default. + + Fixes fdo bz #18033. + +commit 65cd0fbb018b2c18f1571dc0924c7d92eaf794ad +Author: Zhenyu Wang +Date: Tue Nov 11 09:36:50 2008 +0800 + + TV: fix contrast and saturation for 915/945G + + 915/945G uses exponent-mantissa format instead of + fixed-point format on 965G. + +commit a5b1e62337d4e8840347bb186db48697f0690a19 +Author: Zhenyu Wang +Date: Fri Nov 7 16:06:26 2008 +0800 + + quirk LVDS on Asus Eee box + + Reported by Yang Sheng + +commit 9942cfa6dcc70a09ea38f738b1e73e3f005080b9 +Author: Keith Packard +Date: Thu Nov 6 15:04:27 2008 -0800 + + Use long crt hotplug activation time on GM45. + + The GM45 b-spec requires the use of the longer hotplug activation period, + but does not require looping twice over the detection logic. With this + patch, CRT detection appears solid on my GM45. + + Signed-off-by: Keith Packard + +commit 226efa7c74c0ed8a7b974a3727c5d7322c8ef815 +Author: Zhenyu Wang +Date: Wed Oct 29 22:41:20 2008 +0800 + + TV: subcarrier fix for NTSC and PAL + + Using subcarrier DDA values from spec give more close result to + standard frequency. + +commit 3651341292d90b7ded4c3f013bcb0f46537a113a +Author: Zhenyu Wang +Date: Wed Oct 29 20:41:46 2008 +0800 + + TV: fix timing parameters for PAL, 480p, 1080i + +commit b404afb755b608b02bcf0be1f8fe8a38d3d7bc1e +Author: Zhenyu Wang +Date: Wed Oct 29 20:32:18 2008 +0800 + + TV: save serveral TV_CTL register fields in mode set + + Driver should keep those fields according with spec. + +commit 2ae91f0ffdadfb393d526b94e21914a31aa14232 +Author: Zhenyu Wang +Date: Wed Oct 29 20:26:44 2008 +0800 + + TV: fix default contrast and saturation modifier + + Color knobs was set with higher modifier which caused strong color + on TV screen. Setting fixed point modifier to default 1.0 makes picture + on TV look nicer. + +commit c4cab00ef7f57fc27776f53263aacec2edf6f959 +Author: Zhenyu Wang +Date: Wed Oct 29 20:26:03 2008 +0800 + + TV: white space cleanup + +commit b130f94f26111e1a12ce869292915504588d0369 +Author: Zhenyu Wang +Date: Thu Nov 6 10:14:00 2008 +0800 + + SDVO: fix more command definition errors + +commit 3ab979da5c867fb862e33a80b973a35d56d56a55 +Author: Zhenyu Wang +Date: Mon Nov 3 16:05:28 2008 +0800 + + SDVO: add command for set monitor power state + + SDVO encoder power state must be higher than monitor's state. + This only adds command and doesn't enable monitor power state + setting yet. + +commit f558a4972d1cca03785da025170259c61541ee63 +Author: Zhenyu Wang +Date: Mon Nov 3 16:01:40 2008 +0800 + + SDVO: add GetScaledHDTVResolutionSupport command + +commit cd8cbff5d7921d2f4fdac106c3d54414310af94d +Author: Zhenyu Wang +Date: Mon Nov 3 15:20:18 2008 +0800 + + SDVO: fix sdvo tv format and sdtv resolution request/reply definition + +commit 61672b8c458ecf449138c51aeb12cf24dbbd59d9 +Author: Zhenyu Wang +Date: Mon Nov 3 14:59:53 2008 +0800 + + SDVO: add HDMI audio encrypt change bit for GetInterruptEventSource command + +commit 45fb04474d0e67643a633dcc3aeb4efe7fd71ea1 +Author: Zhenyu Wang +Date: Mon Nov 3 14:51:14 2008 +0800 + + SDVO: fix wrong order of sdvo version's major/minor + +commit 5cbf1e72711e906b5309694045b56933e14dca06 +Author: Zhenyu Wang +Date: Thu Nov 6 09:46:54 2008 +0800 + + Make IS_GM45 into IS_G4X define + + Those are identical that using one define is much clear. + And it can also apply fixes for GM45 too, which is missing with + origin define. + +commit 78b6cff3b6ec9513ede3e71d81a828967e6c0068 +Author: Eric Anholt +Date: Wed Nov 5 14:39:19 2008 -0800 + + i965: Support render acceleration with pixmaps in BOs. + + This required reordering the relocation emits for surface/binding table + so that we didn't add new relocations to things that had already been + relocated at (the check_aperture requirement). + +commit 801f0eac4f7b0071ed21eb9c68c5a951e1cc409a +Author: Eric Anholt +Date: Wed Nov 5 13:29:39 2008 -0800 + + Make I830FALLBACK debugging a runtime instead of compile-time option. + +commit d828b0802c939cb12664db4dd157a4944a4db01b +Author: Maxim Levitsky +Date: Wed Nov 5 13:47:09 2008 -0800 + + Add an option to make the overlay be the first XV adaptor. + +commit 040d9bf9d8748d1ed8f977a6356d198def978b51 +Author: Eric Anholt +Date: Thu Oct 30 13:55:07 2008 -0700 + + Remove the CheckDevices timer. + + This was an early attempt to support display switch hotkey. It never really + worked, as the events didn't show up when they should. It also cost a wakeup + every second to check just in case, instead of taking an interrupt like we can + now using ACPI. Additionally, some machines apparently get stuck with the + event set and end up DDCing checking for new devices every second and + smashing your video modes. + +commit 08914cceda6c57530023cdcdb5ad7e4024f36a6e +Author: Carl Worth +Date: Thu Oct 30 16:46:06 2008 -0700 + + Use buffer objects for binding table and surface-state objects. + + Instead of having a static array for these and doing an ugly sync + everytime we recycle the array, we now simply allocate short-lived + buffer objects for this dynamic state. The dri layer, in turn, can + take care of efficiently reusing objects as necessary. + + On a GM965 this change was tested to improve the performance of + x11perf -aa10text from roughly 120000 to 154000 glyphs/sec. + +commit 47cc3d79da8174ba30ca130b0fb6c7d9c871caed +Author: Carl Worth +Date: Thu Oct 30 16:53:57 2008 -0700 + + Unreference the vertex_buffer_bo in gen4_render_state_cleanup + + This avoids leaking one buffer object. + +commit 88700acf30f9eab8f96c197c7d113ce38c0af6e7 +Author: Carl Worth +Date: Mon Oct 27 14:23:02 2008 -0700 + + Rename gen4_dynamic_state to gen4_vertex_buffer + + We don't actually plan to put any other data in this structure, so it + doesn't make sense to have a generic name, (since we'll only be using + it for our vertex buffer). + +commit 9e95722763e2379d14a6b46c3750a44713da5135 +Author: Carl Worth +Date: Thu Oct 23 15:43:19 2008 -0700 + + 965: Move composite setup to new _emit_batch_header_for_composite + + This function is the new name for _allocate_dynamic_state now that + it also emits everything to the batch necessary for setting up a + composite operation. This happens in prepare_composite() every + time and in composite() whenever our vertex buffer fills up. + + It's not yet strictly necessary to be redoing this setup in + composite() but it will be soon when the setup starts referring + to buffer objects for surface state and binding table. This + move prepares for that. + +commit fcb2a5a1253c505913e66b08107c0a9f57b07bad +Author: Carl Worth +Date: Wed Oct 22 17:12:47 2008 -0700 + + Use buffer object for vertex buffer (in new gen4_dynamic_state) + + This begins the process of separating the dynamic data from the + static data, (still to move are the surface state and binding + table objects). The new dynamic_state is stored in a buffer + object, so this patch restores the buffer-object-for-vertex-buffer + functionality originally in commit 1abf4d3a7a and later reverted + in 5c9a62a29f. + + A notable difference is that this time we actually do use + check_aperture_space to ensure things will fit, (assuming + there's a non-empty implementation under that). + +commit 7e68786cf746b6b984b184080578db1947b268ed +Author: Jesse Barnes +Date: Thu Oct 30 13:40:23 2008 -0700 + + Don't modify render standby if kernel mode setting is active + + Since we can't bang on registers directly in that case. + +commit 87ea531c5dc5b39809395b277c330854aaaaf019 +Author: Adam Jackson +Date: Fri Oct 24 14:47:27 2008 -0400 + + Quirk: No LVDS on Dell Studio Hybrid + +commit 4d5360b1f3666bca4ed44c7f1b9217b8157c74b9 +Author: Carl Worth +Date: Wed Oct 22 16:17:39 2008 -0700 + + Use consistent idiom for obtaining static_state + + This doesn't make any difference, but it's cleaner to have + each function follow the same idiom for obtaining these pointers. + +commit 36fc53d068673497e77796ba69e010d08c359447 +Author: Carl Worth +Date: Wed Oct 22 15:45:51 2008 -0700 + + Rename state_base_offset to static_state_offset in gen4_static_state_init + + More cleanup here, and again no functional change. + +commit 8fda7df0071046d057eeaf74328668b227af52a9 +Author: Carl Worth +Date: Wed Oct 22 15:28:24 2008 -0700 + + Rename gen4_state_init to gen4_static_state_init + + This follows naturally from the structure rename. + + Also we make things less muddled by having this function + actually accept a pointer to a gen4_static_state_t rather + than a gen4_state_t, (and then fetching the desired pointer + out from that). + + Again, no intended change in functionality here. + +commit acba4238116f2ead7be88d49c4c56c7cd6d7f3b8 +Author: Carl Worth +Date: Wed Oct 22 15:12:57 2008 -0700 + + Rename gen4_state_t to gen4_static_state_t + + It doesn't contain only static data yet, but it will soon, so + this renaming prepares for that. Also, this helps make things + more clear between gen4_render_state_t and gen4_state_t which + were muddled before, (particularly because the corresponding + identifiers were render_state and card_state). The card_state + identifier is now known as static_state which should be less + confusing. + + This change is strictly search-and-replace with no functional + changes. + +commit c6550fa53d92c21dc677b86ebcd528a4ac640764 +Author: Carl Worth +Date: Wed Oct 22 14:51:42 2008 -0700 + + Ignore intel_gtt binary + + We simply forgot to add this to .gitignore when it was created. + +commit ee3df629eaa388f09bec33ad04d443359d63ea7f +Author: Dave Airlie +Date: Mon Oct 20 18:46:49 2008 -0700 + + Default kernel mode setting to off, add configure flag to enable + + Should help avoid unpleasantness. + +commit 55cb65c6fdcf932d09e97abfa5374ee574676798 +Author: Eric Anholt +Date: Sun Oct 19 21:22:37 2008 -0700 + + Enable Option "Legacy3D" for 965 as well, and clarify both the docs and code. + + Signed-off-by: Eric Anholt + Acked-by: Keith Packard + +commit 28bb056f8cd326770590157412835318863b4134 +Author: Keith Packard +Date: Sat Oct 18 19:37:09 2008 -0700 + + Use pipes, not planes for sarea geometry data + + Vblank in the kernel is far simpler if it deals with pipes instead of + planes, so we're changing both user and kernel side. This is the user mode + side. This fixes both i830_crtc_dpms and i830PipeSetBase, the two functions + which copy geometry from the crtc to the sarea. + + Signed-off-by: Keith Packard + +commit 546e2aca5b8b5d9f486d119ea2872ccd2b056054 +Author: Keith Packard +Date: Tue Oct 14 14:38:05 2008 -0700 + + Reduce incidence of MI_FLUSH usage. + + This tracks whether the last command in each batch is an MI_FLUSH command + and avoids appending another MI_FLUSH in the non-GEM cases. + + Signed-off-by: Keith Packard + +commit 9b91cdf7ac88982880c887ffb0811c92157a7945 +Author: Keith Packard +Date: Sun Oct 19 14:24:46 2008 -0700 + + No need to check for drmCommandWriteRead; we link against libdrm + + My checks for DRM enabled were a bit too extensive; drmCommandWriteRead is + part of libdrm which the driver is always linked against. Only the symbols + in the DRI module need to be checked here. + + Signed-off-by: Keith Packard + +commit c25437a69490b09acff335a81a38aa540f0822f5 +Author: Keith Packard +Date: Sun Oct 19 13:39:04 2008 -0700 + + Remove accidental 'return;' left at the top of I830DRIInitBuffers + + I was testing the behaviour of the XAA-based DRI buffer drawing code for + tiled buffers and accidentally left I830DRIInitBuffers disabled. + + Signed-off-by: Keith Packard + +commit ae224be27bb4432f25dae851debea6966bf31261 +Author: Keith Packard +Date: Tue Oct 14 14:35:36 2008 -0700 + + Check for DRI module before initializing GEM mm + + GEM requires the DRI extension module currently, so make sure that is loaded + (by checking for the DRIQueryVersion symbol) before trying to call it. This + allows the server to start with the DRI extension disabled. + + Signed-off-by: Keith Packard + +commit 7ddea0447c8972104d43cd7966f5ce89b4cca20c +Author: Keith Packard +Date: Fri Oct 17 00:07:09 2008 -0700 + + Handle differently tiled front/back/depth/third in DRI window management + + When moving or clearing the extra buffer contents associated with DRI + windows, the XAA code needs to see which buffer is being manipulated in the + Setup functions to program the tiling values correctly. Calling + I830SelectBuffer and not then calling I830Setup... would result in mis-tiled + rendering. + + Signed-off-by: Keith Packard + Signed-off-by: Eric Anholt + +commit c946383afc644ae7740e3c3146424fdd86c05285 +Author: Keith Packard +Date: Fri Oct 17 00:07:08 2008 -0700 + + XAA tiling support was mis-computing adjusted pitch (>>4 instead of >>2) + + This may well explain why XAA never worked well on tiled front buffers; + tiled buffers require a different pitch programming on 965 than non-tiled + buffers, in dwords rather than bytes. + + Signed-off-by: Keith Packard + Signed-off-by: Eric Anholt + +commit 871728a0cbba12579c830e67020cc0c69c1611bb +Author: Zhenyu Wang +Date: Thu Oct 16 10:35:17 2008 +0800 + + Don't handle irq in GEM mode + +commit 2419bce9efbff63529074e64af5ec5c2e62e368b +Author: Zhenyu Wang +Date: Thu Oct 16 10:28:16 2008 +0800 + + Make GTT dumper work on other 9XX chips + +commit 986c8df79e83c369655ad786a6bf6342b53c535d +Author: Adam Jackson +Date: Thu Oct 16 10:24:04 2008 +0800 + + Fix Mac mini crash in DDC mode probe + + SDVO on Mac mini trys to get EDID from CRT port, which + failed with recent DVI-I change. + +commit 6707371176147340fabc9ab6f1e3d6d5ac980662 +Author: Eric Anholt +Date: Wed Oct 15 08:12:11 2008 -0700 + + Remove gratuitous flushing in EXA after solid operations. + + This snuck in with the UXA rename commit. + +commit 3dd7f0f9423bb891bc99cd3b77dc3d57e057a7ef +Author: Kristian Høgsberg +Date: Tue Oct 14 23:57:10 2008 -0400 + + Update to DRI2 changes. + + Implement DRI2CopyRegion and provide drm device filename to DRI2 module. + +commit 282f51c3f0e5bc2cedd2f60f458ca2662290d471 +Merge: 8a54e3b 4dd0068 +Author: Kristian Høgsberg +Date: Tue Oct 14 23:13:40 2008 -0400 + + Merge commit 'origin/master' into HEAD + +commit 4dd00681dd0f9fce8dfd4592b46418edbbd2eeb4 +Author: Eric Anholt +Date: Tue Oct 14 11:33:33 2008 -0700 + + Fix broken stolen memory counting on G4X. + + On the GM45 we were assuming too little stolen memory (mostly harmless, + except when it wasn't, until the AGP fix), and on the G45 we were assuming too + much stolen memory, which was quite harmful when we touched the page that + didn't get mapped. + + Future stolen memory accounting should use src/reg_dumper/intel_gtt before and + after enabling AGP on the chipset to confirm that only the GTT entries not + mapped to stolen are replaced, and that all of the unmapped GTT entries are + replaced with the constant scratch page. + +commit e7e49bed7e254256f8cc0d4afcdfadc6dadf19e6 +Author: Eric Anholt +Date: Tue Oct 14 10:38:05 2008 -0700 + + Add a GTT dumper for G4x debugging. + +commit 1c6ea4ab4772453da915306045add8d147d567f2 +Author: Julien Cristau +Date: Sun Oct 12 15:10:22 2008 +0200 + + Typo fix + + Reported by Tomas Carnecky on IRC + +commit 6cb4150160bb1e1365773561fb53294ad9248a0e +Author: Zhenyu Wang +Date: Sun Oct 12 08:07:44 2008 +0800 + + Bug #17892: Fix possible crash in CRT probe + + Introduced in patch for DVI-I CRT probe, if no EDID + CRT monitor is connected, origin code destroys default + DDC bus which causes crash in later get_modes call. + Change it to setup and destroy DDC bus as needed in + get_modes, so we always reprobe and get current state. + +commit 140451abb41fbd68d5aac4736c1cf1ec2805dd9e +Author: Keith Packard +Date: Thu Oct 9 18:18:34 2008 -0700 + + For non-DRM, add NOOPs after BATCH_BUFFER_START to verify completion + + In non-DRM mode, the driver waits for the hardware by checking the ring + pointers; when the ring is empty, it assumes the hardware is idle. However, + the hardware updates the ring pointers before executing a command, so if the + MI_BATCH_BUFFER_START is the last command in the ring, the driver will think + the hardware is idle while it may still be processing the contents of the + batch buffer. Placing NOOPs after the BATCH_BUFFER_START allows the driver + to know that the hardware has completed the batch buffer. + + Signed-off-by: Keith Packard + +commit d09d938bf26ea0c44352ff6e7a57ba43f4047fdb +Author: Keith Packard +Date: Thu Oct 9 18:17:13 2008 -0700 + + i830 nondrm batch buffer insertion was missing ADVANCE_LP_RING() call + + The ring commands to insert a batch buffer to the ring in i830 form were not + terminated by a call to ADVANCE_LP_RING(). This surely would have caused + chaos. + + Signed-off-by: Keith Packard + +commit d24010b7b3f2419beb40dc5ae1e8aeb3e04b5a93 +Author: Carl Worth +Date: Thu Oct 9 14:29:04 2008 -0700 + + Disable frame buffer compression by default for GM965. + + We haven't found a way to make FBC work reliably with GM965 yet, + (it often fails to notice CPU writes). This appears to be a + specific problem with this device, (as we haven't gotten similar + bug reports for subsequent devices such as GM45). So FBC is + now disabled by default for GM965 but can still be enabled with + the FrameBufferCompression option for experimenting/debugging. + + This resolves bug #16257: + + [GM965 EXA] Frame-buffer compression broken for CPU writes (XPutImage) + https://bugs.freedesktop.org/show_bug.cgi?id=16257 + +commit 4128b01ec84ffa0f03c335c36738f383376d9381 +Author: Zhenyu Wang +Date: Thu Oct 9 09:19:41 2008 +0800 + + Remove Lenovo T61 TV quirk + + BIOS already says no integrated TV, and this quirk blocks TV + on R61i which has the same subdevice id as T61. + +commit 74571363539426abeb0a1af11f3bb545d91ed6c2 +Author: Zhenyu Wang +Date: Wed Oct 8 15:36:10 2008 +0800 + + Put forware VBIOS data parsing + + i830_bios_init() is called too late after output init, which + makes bios data mostly useless, and caused all TV init fail as + tv_present flag is not set. + +commit 111dd151dedf535464d638461f9485ec2939780e +Author: Lukas Hejtmanek +Date: Tue Oct 7 15:07:08 2008 +0200 + + Fix driver build against server master. + + Broken by 3a4151b69daa478ac6edf042d604ee41e8429c0d + +commit 3a4151b69daa478ac6edf042d604ee41e8429c0d +Author: Eric Anholt +Date: Mon Oct 6 17:00:08 2008 -0700 + + Fix driver build against server 1.4.2. + + This disables UXA and DRM modesetting pre-1.5, due to privates handling + issues. + +commit 3621183cf4acef23414e8d69c34b1e587f52ec67 +Author: Eric Anholt +Date: Mon Oct 6 16:59:16 2008 -0700 + + Fix bios_reader build against old servers. + + The server's pci_device structure ends up conflicting with libpciaccess's. + Just don't include the server structure for this non-server tool. + +commit 080d36648f92d3b9a559e5458687fa82afab411f +Author: Eric Anholt +Date: Wed Oct 1 16:13:09 2008 -0700 + + Add support for RepeatPad and RepeatReflect to 915 and 830-class Render accel. + +commit 5e04b5ad1b618655e201cbf1f5b2585aa6be0c17 +Merge: 979bb10 260cbcf +Author: Jesse Barnes +Date: Mon Oct 6 16:08:12 2008 -0700 + + Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 979bb109c6d76fe18b9e29f55afb2548f890bbfe +Author: Jesse Barnes +Date: Mon Oct 6 16:05:46 2008 -0700 + + Document more VBIOS functionality + + Document a few more VBT structures and comment on VBIOS communication a + bit. There should be enough there now for a sufficiently motivated + developer to start implementing support for hotkeys and other features + on pre-IGD OpRegion machines. + +commit 260cbcfe61868175ba3e649ce07d43f57601f9be +Author: Carl Worth +Date: Mon Oct 6 13:17:59 2008 -0700 + + Document and use 'legacy' border color mode + + It's very convenient that the hardware supports this non-default + mode since it's exactly what is specified by the Render extension. + This provides a more efficient means of fixing bug #16820: + + [EXA] Composition result in black for areas outside of source-surface bo + https://bugs.freedesktop.org/show_bug.cgi?id=16820 + + without the software fallback we had in the earlier fix, + (commit 76c9ece36e6400fd10f364ee330faea470e2da64 ). + +commit 98ca9e2af1b0a67ed91e10cf661af70dfba44d43 +Author: Carl Worth +Date: Mon Oct 6 13:16:37 2008 -0700 + + Rename default_color to border_color + + This is consistent with the documentation, (and just plain makes + more sense). + +commit 175b30e3828266a89021c2439119545099d72715 +Author: Carl Worth +Date: Mon Oct 6 12:48:07 2008 -0700 + + Revert "Fallback to software for RepeatNone with transformed RGB-only pictures." + + This reverts commit 76c9ece36e6400fd10f364ee330faea470e2da64. + + We've learned a new technique that should let us avoid this fallback + to software. See following commit. + +commit 21cce1998a10db520c390eb5061814867564c583 +Author: Shuang He +Date: Mon Oct 6 09:48:21 2008 +0800 + + Fix a typo in G965 texture video code + +commit 76c9ece36e6400fd10f364ee330faea470e2da64 +Author: Carl Worth +Date: Thu Oct 2 20:40:14 2008 -0700 + + Fallback to software for RepeatNone with transformed RGB-only pictures. + + We wish it wouldn't, but the hardware ignores the alpha in the + BorderColor we set when the source picture format has no alpha + in it, (and it uses alpha of 1.0 where we want 0.0). For now, + fallback for these cases. This gives a correct result, but + obviously is not as fast as we would like. + + This fixes bug #16820: + + [EXA] Composition result in black for areas outside of source-surface bounds + https://bugs.freedesktop.org/show_bug.cgi?id=16820 + +commit f1dbc266ccfe26c6b9a272e40a5bbe9afaa4f2e0 +Author: Eric Anholt +Date: Thu Oct 2 14:45:12 2008 -0700 + + Work around libpciaccess reporting a 0 rom size by guessing. + + I required the following patch on top of this to work around libpciaccess + brokenness. libpciaccess reports 0 rom size if there's no rom resource, + even if the rom file exists in sysfs. + +commit 8304b405e0dc2f31fd2d2fd82e150ba502ab74e2 +Author: Keith Packard +Date: Mon Sep 29 17:37:28 2008 -0700 + + Eliminate INT10 call to get BIOS contents + + libpciaccess (and the old X server PCI code as well) provides a function to + get the ROM contents. Code to use that was already present in the driver and + used if the INT10 function failed. Skip the INT10 and just use libpciaccess + as that eliminates several module loads and scary use of vm86. + + Signed-off-by: Keith Packard + +commit ab2b70f831314f81a581bfb1e48d059a3a2b0b06 +Author: Carl Worth +Date: Wed Oct 1 16:05:16 2008 -0700 + + Prefer repeatType field over using both repeat and repeatType. + + Eric informed me that the repeat field exists only for backwards + compatibility with old drivers that weren't prepared for values + other than 0 or 1 here. Since we are, we can just ignore that + field and examine only repeatType. So the code's a (tiny) bit + simpler this way. + +commit 128223ee9b7880e640056475462eca9a88415492 +Author: Carl Worth +Date: Wed Oct 1 15:29:04 2008 -0700 + + Add support for RepeatPad and RepeatReflect. + + It's quite simple to support these modes---we simply need to + turn on the support for them in the hardware. + + These changes have been verified with the extend-pad and + extend-reflect tests in cairo's test suite. However, this + currently required using a custom-modified version of cairo. + The issue is that released versions of cairo, (and even + cairo master so far), don't pass RepeatPad and RepeatReflect + to Render, (due to various bugs and workarounds in cairo + and pixman). I do plan to fix those issues in cairo, so that + in a future release of cairo, (1.8.2 perhaps?), the cairo + test suite will usefully test these new repeat modes in our + driver. + +commit b7279f1be1b913c1c6ee8ebfb95c97800217a821 +Author: Carl Worth +Date: Wed Oct 1 15:26:39 2008 -0700 + + Examine picture repeatType as well as repeat field. + + The existing switch statement was switching on the Boolean + repeat field rather than the correct repeatType field. This + had not caused any problem before as only two possible repeat + values were supported (RepeatNone = 0 and RepeatNormal = 1) + so they were always the same as the repeat field. + + Soon, however, we'll be supporting more repeat types, so we'll + need to switch on the correct value. + +commit ffcbbb071f1cde90fe0dc4887a05dd66c0e66985 +Merge: 1eb46d0 bf8a3ff +Author: Jesse Barnes +Date: Tue Sep 30 16:59:35 2008 -0700 + + Merge branch 'master' into xf86-video-intel-2.5-branch + +commit bf8a3ffeaa4df9ecbad7abff9a44d714de2fa104 +Author: Jesse Barnes +Date: Tue Sep 30 16:59:02 2008 -0700 + + Revert "Use -Werror by default" + + This reverts commit f315e9d1ad92562195ce42b956d4be6b31e8a13e. The world + isn't ready for a warning free build. + +commit 1eb46d055b147941fa529ac582c336a114f47892 +Merge: 8408995 497b742 +Author: Jesse Barnes +Date: Tue Sep 30 12:54:27 2008 -0700 + + Merge branch 'master' into xf86-video-intel-2.5-branch + +commit 497b7420c4a76df553ed53322a390a1c754ce30c +Author: Olivier Fourdan +Date: Tue Sep 30 12:53:11 2008 -0700 + + Fix ordering of VGA vs. plane disable + + From the Intel 965 Programmer’s Reference Manual, volume 3, + chapter 2.2.2 "Mode Switch Programming Sequence". + + The disable sequence should be: + + - Disable planes (VGA or hires) + - Disable pipe + - Disable VGA display in 0x71400 bit 31 + + This patch implements that order plus waits for a vblank at the end. + + Fixes bug #17756. + +commit a4568740ee296bc392843fd324d2a047e7862187 +Author: Jesse Barnes +Date: Tue Sep 30 12:48:32 2008 -0700 + + Be more verbose about panel data in VBIOS dumper + + Dump more panel data, including number of expected entries. Had to + refactor things a bit, but now each function should get size information + so further checking can be added more easily. + +commit fa2586a40f20e73ec7420466638e8f595e0da987 +Author: Jesse Barnes +Date: Tue Sep 30 12:46:20 2008 -0700 + + Use VBT LFP info pointers by default + + On some machines it appears that the LFP info pointers give us more + accurate panel info than if we index into the LFP data table using the + panel type index. Early reports indicate that using the pointers + doesn't cause regressions, so switch to them by default to help 8xx + machines. + + Fixes bug 17310 (and hopefully 17658 too). + +commit f315e9d1ad92562195ce42b956d4be6b31e8a13e +Author: Jesse Barnes +Date: Tue Sep 30 12:07:52 2008 -0700 + + Use -Werror by default + +commit f082e877d54dbafa437fd05e9c07e870cd513be9 +Author: Jesse Barnes +Date: Tue Sep 30 12:06:46 2008 -0700 + + Work around gcc uninitialized variable warnings + + GCC isn't smart enough to analyze the control flow and figure out that + these are false positives, but initializing them shouldn't hurt, so work + around it. + +commit 836d24f2cc3836fbd1695cf1f88c2af975b4862c +Author: Keith Packard +Date: Mon Sep 29 19:02:51 2008 -0700 + + Use uintptr_t instead of uint64_t to hold pointer value + +commit baec75a56d91546443a2e04812face4997bc764b +Author: Zou Nan hai +Date: Sun Sep 28 11:18:40 2008 +0800 + + [965-xvmc] 965q indirect media data workaround + +commit 11d304e99c0e11c28901ec28115d9c8b81a2b9cc +Author: Zhenyu Wang +Date: Sun Sep 28 10:08:26 2008 +0800 + + Bug #16631: add option for SDVO force detect + + Some ADD2 card doesn't get SDVO detect status setup right, + which disabled outputs on those cards. This adds a new + option "ForceSDVODetect" to probe all SDVO ports anyway. + +commit 1cc15ba454fdf54a7dea9da066e0a023a4742fab +Author: Zhenyu Wang +Date: Fri Sep 26 10:01:52 2008 +0800 + + Render register clock gating disable fix on 4 series chipset + +commit d6b2696f9ac14a81598e0147698209ad428fd45d +Author: Zhenyu Wang +Date: Fri Sep 26 09:53:03 2008 +0800 + + Do force CRT detect sequence twice on 4 series chipset + +commit d8a007b056e3d6c3e132ecac06368b21d2ac4123 +Author: Zhenyu Wang +Date: Fri Sep 26 09:44:59 2008 +0800 + + Bug #16515: Fix VT switch with DVI on G45 + + On DVI, centered VGA mode is used instead of native mode VGA, and + PLL on pipe is used instead of VGA PLL setting. So make sure PLL + settled down in restore time. + +commit a428892b76dba4c55e2ae28933d30e98d9fd646d +Author: Jesse Barnes +Date: Tue Sep 23 12:36:11 2008 -0700 + + Update supported hardware list + +commit 3c2f7d84785954eb91341f85abb175f299b2797d +Author: Zou Nan hai +Date: Tue Sep 23 17:15:42 2008 +0800 + + [965-xvmc] IGD support + +commit 08ab23bb87563517d5653bddf82763b5ef641bed +Author: Zou Nan hai +Date: Tue Sep 23 14:57:18 2008 +0800 + + [965-xvmc] optimize, pack some payload + +commit 8408995ffbf705aa0bc09ab72c58c2e31a4b70c3 +Merge: d18b86a afa630b +Author: Jesse Barnes +Date: Mon Sep 22 18:38:54 2008 -0700 + + Merge branch 'master' into xf86-video-intel-2.5-branch + +commit afa630b448e5993850433c9f0b129758ec4d37b5 +Author: Bryce Harrington +Date: Mon Sep 22 18:38:35 2008 -0700 + + Add TV out quirk for HP Compaq nx6110 + + Adds a TV out quirk for HP Compaq nx6110. Fixes bz #17683. + +commit 204a6281aa59e29027793ba5c84a5d9af7dc9e90 +Author: Jesse Barnes +Date: Mon Sep 22 18:38:03 2008 -0700 + + Revert "Add no TV out quirk for HP Compaq nx6110" + + This reverts commit 6a46022df57d09109fc119fedce99c156715a4d4. It should have + been attributed to Bryce. + +commit d18b86aa7fc9270e24ed9ea861ebbbbb54558fee +Merge: 9a7da65 6a46022 +Author: Jesse Barnes +Date: Mon Sep 22 18:03:39 2008 -0700 + + Merge branch 'master' into xf86-video-intel-2.5-branch + +commit 6a46022df57d09109fc119fedce99c156715a4d4 +Author: Jesse Barnes +Date: Mon Sep 22 13:26:58 2008 -0700 + + Add no TV out quirk for HP Compaq nx6110 + + Hopefully we can fix the VBT parsing code so we don't need this, but for the + time being it seems necessary. Fixes bz #17683. + +commit 10909d9b665864bda2b1654de009d556cd068726 +Author: Jesse Barnes +Date: Mon Sep 22 13:11:55 2008 -0700 + + Add Cappuccino SlimPRO SP625F to no LVDS quirks list + + Looks like this platform might contain VBTs that indicate an LFP is present + even though it isn't. Intended to fix bz #11368. + +commit 9a7da65e624060a37eef989963a9c79f13df30d3 +Merge: 043b6e7 2f93cfb +Author: Jesse Barnes +Date: Mon Sep 22 09:59:52 2008 -0700 + + Merge branch 'master' into xf86-video-intel-2.5-branch + +commit 2f93cfbc7e96acc32efb5e1ca49b817a81cba6e3 +Author: Zhenyu Wang +Date: Fri Sep 19 15:20:55 2008 +0800 + + Fix output detection for DVI-I + + For CRT this trys to probe all possible port for EDID and + detects got confirmed by EDID's d/a type bit. + For HDMI/DVI, also using EDID d/a type bit to ensure it should + handle the connect or not. + +commit 1fbe4d602816c9dfc5fba917b9fdc257d8d025b0 +Author: David Schleef +Date: Thu Sep 18 15:37:00 2008 +0800 + + Bug #17277: fix upscaling limit + + Oh duh (i830_video.c): + + /* Clamp dst width & height to 7x of src (overlay limit) */ + if(drw_w > (src_w * 7)) + drw_w = src_w * 7; + + if(drw_h > (src_h * 7)) + drw_h = src_h * 7; + + The condition I see in the documentation appears to be src_h/drw_h < 8, that + is, src_h < 8*drw_h. It appears this was "fixed" incorrectly in e784e152. + It seems difficult to believe that this limitation would exist at all for the + texture unit. + +commit bc36608e321e01a2be792688b4b734bb7c0667f7 +Author: Zhenyu Wang +Date: Thu Sep 18 10:42:33 2008 +0800 + + Check display stride limit when allocate front buffer + +commit 043b6e71b83eb05339a6f8c4814e6941f8b9695a +Author: Xiang, Haihao +Date: Tue Sep 16 13:21:43 2008 -0700 + + Move bufmgr init earlier so it's available at I830DRIDoMappings time. + + Fixes a crash with non-GEM mode. Bug #17540. + (cherry picked from commit 62b75df84c893bf28e20014cf88ce45064611dc9) + +commit 0a2d17f7c2ea9b695df1855aab4ccc519546d8e5 +Author: Xiang, Haihao +Date: Tue Sep 16 11:49:39 2008 -0700 + + Put back check for pI830->hw_status in setting hws in non-GEM mode. + + Fixes crashes on non-GEM systems with physical hardware status page. + + Bug #17540 + (cherry picked from commit 188d58dac9a87b56dbc34ec219cd196928bbcf64) + +commit 62b75df84c893bf28e20014cf88ce45064611dc9 +Author: Xiang, Haihao +Date: Tue Sep 16 13:21:43 2008 -0700 + + Move bufmgr init earlier so it's available at I830DRIDoMappings time. + + Fixes a crash with non-GEM mode. Bug #17540. + +commit 188d58dac9a87b56dbc34ec219cd196928bbcf64 +Author: Xiang, Haihao +Date: Tue Sep 16 11:49:39 2008 -0700 + + Put back check for pI830->hw_status in setting hws in non-GEM mode. + + Fixes crashes on non-GEM systems with physical hardware status page. + + Bug #17540 + +commit e2743a409a02978ca8e953dbbeeb96f61bbd5ce6 +Author: Jesse Barnes +Date: Fri Sep 12 14:22:48 2008 -0700 + + Only BO map render state if kernel mode setting is active + + We'll probably end up doing this differently, but avoid this path for now. + +commit 95b3e3a65a60aa264fbbfd141df980b534005264 +Merge: 94a86fa ec17c88 +Author: Jesse Barnes +Date: Fri Sep 12 13:42:06 2008 -0700 + + Merge branch 'master' into xf86-video-intel-2.5-branch + + Conflicts: + + configure.ac - resolved version number conflict + +commit 8a54e3be5c5057fe8e3c52c03401fdada7978c45 +Author: Keith Packard +Date: Fri Sep 12 12:47:13 2008 -0700 + + Fix mis-merge of DRI2 changes related to pI830->directRenderingType + + The old code had a directRendering boolean, the new one has an enum. A bunch + of the merges failed to remove the '!' in front of the old name, breaking a + bunch of 'we don't have DRI' tests. + +commit d8d95d8c71f2cd4bab277f44132ece7963714a5b +Author: Eric Anholt +Date: Thu Sep 11 16:11:46 2008 -0700 + + Fix build failures that should have been in the previous merge commit. + +commit ec17c88a0ed7c9cf4ad68aa52a7a891946a1c0f4 +Author: Zhenyu Wang +Date: Thu Sep 11 16:14:47 2008 +0800 + + Add support for G41 chipset + + G41 is another 4 series chipset like G45/43. + +commit f9c625e1e5ddfff06b38fdd4e596fd8eae5934d5 +Author: Zhenyu Wang +Date: Thu Sep 11 15:35:27 2008 +0800 + + Disable render standby + + Render standby is known to cause possible hang issue on some + mobile chips, so always disable it. + +commit 7e8eb6e20b6b1a2a3c1ef28f694fa23c68a15c48 +Merge: fba9b5a 58a3817 +Author: Eric Anholt +Date: Wed Sep 10 14:10:26 2008 -0700 + + Merge branch 'master' into dri2 + + Conflicts: + + src/i830_batchbuffer.c + src/i830_display.c + +commit 58a3817305ef1455a11be6ead8a8521dfc5875c7 +Author: Eric Anholt +Date: Tue Sep 9 11:02:49 2008 -0700 + + Track move of exec to bufmgr, and restoration of emit/wait funcs for non-drm. + +commit f367334c6392a717f6cd2f4ed02200be1c6d356a +Author: Eric Anholt +Date: Tue Sep 9 11:01:33 2008 -0700 + + Track the move of irq emit/wait to fake bufmgr. + +commit 0b4f7b630312b148ce4e172cb7cd9f673751b2a3 +Author: Eric Anholt +Date: Tue Sep 9 10:57:08 2008 -0700 + + Track move of bufmgr functions to libdrm_intel. + +commit 0f804bfa1e1e972e9b4e3b7c8db61e9877c50f50 +Author: Eric Anholt +Date: Tue Sep 9 19:17:05 2008 -0700 + + Bug #17446: Don't try to manage IRQs in GEM mode. + + The kernel told us that it was already doing so, resulting in failure. + +commit da63b5adec8555cc7b3e71f33933f4c9dd6f714e +Author: Eric Anholt +Date: Sun Aug 31 14:27:29 2008 -0700 + + Add some MCHBAR registers for debugging tile swizzling issues. + +commit c7aaf0118baa34e583df5f1c29c9dab9a6af6eb7 +Author: Dave Airlie +Date: Tue Sep 9 18:13:56 2008 +1000 + + mode: fix missing comma + +commit b9ef0ed7d7b96eca6394cd0d367369ec511d1bcd +Author: Daniel Stone +Date: Fri Sep 5 05:02:08 2008 +0300 + + i830: Fix timer leak + + TimerCancel just cancels the timer: it still leaves the TimerRec intact and + unfreed. + +commit fba9b5aff450d874ef98cafd3ecc0fd85f9597b5 +Author: Eric Anholt +Date: Wed Sep 3 16:49:07 2008 +0100 + + DRI2: Move pixmap pitch alignment for use with depth to pixmap create. + + The previous location for pitch fixup would have only worked when depth was + used with the backbuffer, and no page flipping or other adventures occurred. + +commit 71ec627c3a65cfc7bca7353af43c60b18e73230d +Author: Eric Anholt +Date: Wed Sep 3 16:37:25 2008 +0100 + + DRI2: Emit the MI_FLUSH before flushing batch in swapbuffers. + + Should fix issues with swapbuffers flushing to front buffer on 965. + +commit daaefd173b4c98d0ebabd43352bfa3a030a62e4b +Author: Eric Anholt +Date: Wed Sep 3 16:26:27 2008 +0100 + + UXA: Re-enable non-965 render. + +commit 32bb5fc7db14911d0438aea1504e1551b2c9fc25 +Author: Eric Anholt +Date: Wed Sep 3 16:19:03 2008 +0100 + + Don't set up sarea or drm mappings in DRI2 mode. + +commit 4a5e31138115f435be7f8f5999b1b2329a18d669 +Author: Kristian Høgsberg +Date: Wed Sep 3 16:18:23 2008 +0100 + + Fix broken test for DRI1 in DRI2 conversion. + +commit fca7a4e9a5c73e1c129e94eeccf8fc795f729931 +Author: Stefan Dirsch +Date: Wed Sep 3 15:32:11 2008 +0200 + + Pipe A force quirk for Toshiba Satellite A30. + +commit 57ad9cc689724a2f3583eda862250eab0a6798d5 +Author: Fabio +Date: Mon Sep 1 13:33:50 2008 +0800 + + Man page patch to clarify meaning of VideoRam option with i810/i815 + +commit fd6a9ca5b59a868260eb91272091ea6169091737 +Author: Kristian Høgsberg +Date: Fri Aug 8 15:36:35 2008 -0400 + + Add DRI2 support. + +commit a1c802e4a0324386cf7370594a46354c89e3b646 +Merge: 3733a1b 808b72f +Author: Jesse Barnes +Date: Fri Aug 29 09:23:35 2008 -0700 + + Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 3733a1b54c95aa378f32577f9e996946e8e8e48c +Author: Jesse Barnes +Date: Fri Aug 29 09:12:05 2008 -0700 + + Fix build when using kernel DRM headers + + Unfortunate mismatch between kernel and DRM master headers. + Kernel: + typedef struct _drm_i915_batchbuffer { ... } drm_i915_batchbuffer_t; + DRM master: + typedef struct drm_i915_batchbuffer { ... } drm_i915_batchbuffer_t; + + so use the typedef rather than the morphing structure name. + +commit bd7ee7fcf51138d21da92a3d8cbaff49871d7188 +Author: Zou Nan hai +Date: Fri Aug 29 11:57:46 2008 +0800 + + [965-xvmc] There is some issue with uv half pixel, remove it till fix + +commit 973a5fb25652a97e28af03295d430a79557be756 +Author: Zou Nan hai +Date: Fri Aug 29 10:59:17 2008 +0800 + + [965-xvmc] some shader optimize + +commit e7379d1c48a522f137cf1a06a334748c88471946 +Author: Zou Nan hai +Date: Thu Aug 28 09:49:57 2008 +0800 + + [965-xvmc] half-pixel bug fix + +commit be49ae6bd683ee9eb778f7ea937aaee4d72c51f0 +Author: Zou Nan hai +Date: Wed Aug 27 11:29:15 2008 +0800 + + [965-xvmc] add missing g4a file + +commit e813b139b7c353a0930c3e00408700619d3949e4 +Author: Zou Nan hai +Date: Wed Aug 27 11:11:41 2008 +0800 + + [965-xvmc] support field prediction and dct type, optimize in GPU + +commit 808b72f81454061c815321e51a9b9f925c4bf786 +Author: Eamon Walsh +Date: Tue Aug 26 22:24:36 2008 -0400 + + Change uxa private keys to integer variables. + + Prepares for a devPrivates system that will store an index. + +commit 62ce9e8f9c8cc2014645d58f4249c496aebc36e8 +Author: Eamon Walsh +Date: Tue Aug 26 22:23:06 2008 -0400 + + Remove unused exa_pixmap_key. + +commit 087ade8e66cf7a34b8a96e1efe438099376cd896 +Author: Robert Noland +Date: Tue Aug 26 16:35:07 2008 -0400 + + Fix typo in last commit + +commit 6404ac178bf2c32a715a66e7fd6ab0184a05af36 +Author: Robert Noland +Date: Tue Aug 26 15:09:47 2008 -0400 + + Check for drm before calling modeset ioctl. + +commit c889198ab54336248a03050ad410254912d79bb7 +Author: Zhenyu Wang +Date: Tue Aug 26 10:12:21 2008 +0800 + + Fix X exit crash in NoAccel + + NoAccel should still be needed for performance evaluation, + so don't crash me when exit. + +commit 0929a191ae36473acb0244a818098e4acf26d675 +Author: Zhenyu Wang +Date: Tue Aug 26 10:01:23 2008 +0800 + + Destroy bufmgr after allocation finish + + Fixed X exit crash for me, allocation reset will + unreference bo which still requires bufmgr to be live. + +commit 94a86fa51a931f0059ea17728f857ec92cec5b16 +Author: Jesse Barnes +Date: Mon Aug 25 16:59:03 2008 -0700 + + Fix UXA build for distcheck + + Was missing proper path info in CFLAGS. + +commit 1c224f72d5f8fa8b6c4d9a6e06698f2462bb43b6 +Author: Jesse Barnes +Date: Mon Aug 25 16:59:03 2008 -0700 + + Fix UXA build for distcheck + + Was missing proper path info in CFLAGS. + +commit 09a235af0f216052d3101b153c18be1fa75abf15 +Author: Jesse Barnes +Date: Mon Aug 25 16:38:17 2008 -0700 + + Update version to 2.4.97 for first 2.5 test release + +commit 8e3243b8e5549033aa2f901a3bdd882418f6a69b +Author: Jesse Barnes +Date: Mon Aug 25 16:37:34 2008 -0700 + + Update version to post-2.5 + +commit 7a5b090abc39c380955489bad5e46d1278f38fee +Author: Jesse Barnes +Date: Thu Aug 21 09:40:57 2008 -0700 + + Hide kernel mode setting EXA code behind XF86DRM_MODE + + Prevents compiler warnings in the non-kms case. + +commit 4937b98981923c599786f5007ab0580ad08e1909 +Author: Jesse Barnes +Date: Thu Aug 21 09:39:33 2008 -0700 + + Fix compiler warnings in VBIOS utils + +commit 08326827fdb8abecbff20c7b051537dbad433c40 +Merge: 5af5041 0de8ca3 +Author: Jesse Barnes +Date: Thu Aug 21 09:30:38 2008 -0700 + + Merge branch 'modesetting-gem' + +commit 5af504166f14f4401818f3b7c27ac2ccba7b9ff5 +Author: Jesse Barnes +Date: Wed Aug 20 15:06:36 2008 -0700 + + Don't disable planes in i830_update_dsparb + + We need to program DSPARB with only one plane enabled at most, and that's + guaranteed to be the case when we're called during mode set, so just assert + that case but otherwise leave the planes alone to avoid flicker on active + displays during output detection for example. + + Fixes bug #17050. + +commit 7b6f4d22211d71480caf6335a3eacaacff369371 +Author: Jesse Barnes +Date: Wed Aug 20 14:40:29 2008 -0700 + + Don't allocate a pipe for hotplug detection + + It shouldn't be needed... + +commit ba4a4b7887d5c2da21cadfeeed601eaec8515550 +Author: Jesse Barnes +Date: Wed Aug 20 14:39:34 2008 -0700 + + Add more panel debugging info to register dump & vbios reader + +commit 0de8ca36306c506356e82d500134b4eeb96a6080 +Merge: f26bcb9 5eccb5e +Author: Jesse Barnes +Date: Wed Aug 20 12:11:00 2008 -0700 + + Merge branch 'master' into modesetting-gem + + Conflicts: + + configure.ac + +commit 5eccb5ec7ea78b5800f98decd4216d39b9ebe5ec +Author: Julien Cristau +Date: Wed Aug 20 15:33:59 2008 +0800 + + Don't skip the checks for DRI headers with --enable-dri + +commit 1baebabc3af9f21a5b8084788ecd88dc66ce78de +Author: Jesse Barnes +Date: Tue Aug 19 16:02:55 2008 -0700 + + Add swf_dumper to .gitignore + +commit f26bcb9cb879e2e9ee2b26c95438cf46286c0208 +Merge: 67ab546 7a1cc48 +Author: Jesse Barnes +Date: Tue Aug 19 15:53:18 2008 -0700 + + Merge branch 'master' into modesetting-gem + + Conflicts: + + src/i830_driver.c + +commit 67ab5462527c5ed94ed073421b60e85a213ea267 +Author: Jesse Barnes +Date: Tue Aug 19 15:46:52 2008 -0700 + + Use GTT mapping for EXA PrepareAccess function + + Makes software fallbacks *much* faster. + +commit 547cf774801bea2177d1224204f7de0dbf6baf3c +Author: Jesse Barnes +Date: Tue Aug 19 15:45:26 2008 -0700 + + Don't allocate EXA offscreen space if kernel mode setting is active + + We'll use GEM alloc & free routines in that case. + +commit 2ddd85f8aef5da1aebbfe9fab510858e7a41860d +Author: Jesse Barnes +Date: Tue Aug 19 15:41:41 2008 -0700 + + Bail out if kernel mode setting is active but DRI fails + +commit 646bbdc4b6a7b887ee8f0e51fdff5d07c4586329 +Author: Jesse Barnes +Date: Tue Aug 19 15:05:00 2008 -0700 + + Add quirk for pre-915s with working PFIT regs + + The regs are undocumented, but on some machines they work fine, so add this + quirk to indicate it. + +commit 7a1cc48276f974d04e1c5ef7c92d98fe5ae9d4fa +Author: Jesse Barnes +Date: Tue Aug 19 10:44:04 2008 -0700 + + Add VBIOS software flags dumper program + + Still need to actually print all the flags & test on various platforms, but at + least the bits are documented now. + +commit 385dc85881c56e218e7d17d7e1d022568aa29cfb +Author: Zou Nan hai +Date: Tue Aug 19 16:27:12 2008 +0800 + + Fix from He Shuang(shuang.he@intel.com), + XvMCDestroyContext to check pointer valid + +commit 3147fa775c7e2a933dc74af1372a3318e77d3218 +Author: Zou Nan hai +Date: Tue Aug 19 16:20:16 2008 +0800 + + Fix from He Shuang(shuang.he@intel.com), + XvMCDestroyContext to check pointer valid + +commit 078a59dd48ed00a6512d155883956c18752da9ce +Author: Jesse Barnes +Date: Mon Aug 18 12:53:33 2008 -0700 + + Remove unused VBIOS flag defines + + We just use the structure definitions now. + +commit 7048141254b7c1948fe77b1742b463f8723610d8 +Author: Jesse Barnes +Date: Mon Aug 18 12:51:31 2008 -0700 + + Pack bdb_general_definitions block + + More correct & consistent with other definitions. + +commit 0e6759bb6ad7293b6447bd20e3d7d8fdee46aba7 +Author: Zhenyu Wang +Date: Tue Aug 19 07:30:01 2008 +0800 + + Fix reverted LVDS bios capability dword definition + + Issue found by Peter Clifton. + +commit 76b5a7ff5c943cfaa254d2fd94b6397c91d1f8e6 +Author: Shaohua Li +Date: Mon Aug 18 11:13:20 2008 +0800 + + [PATCH] avoid duplicate mode set in lvds + + xf86SetDesiredModes() already sets lvds to full mode. later when + xf86CrtcScreenInit() initialized randr12, i830_lvds_set_property will + recall xf86CrtcSetMode and set mode to full. This patch is to remove the + duplication. In my test, this can save about 0.2 - 0.4s x startup time. + +commit b8ee31cd80a945d1fbbfc45234ffe34a109b5717 +Author: Jesse Barnes +Date: Sat Aug 16 12:18:01 2008 -0700 + + Remove last TTM bits + + Makes it build again with drm#modesetting-gem. + +commit 6eb3e0f2f4e43e436029fc82e458ac8de1f94745 +Author: Adam Jackson +Date: Fri Aug 15 15:47:35 2008 -0400 + + Don't touch pScrn->monitor->DDC directly. + +commit ed7269e0a377b3135b06cacecc59119f06958feb +Author: Zhenyu Wang +Date: Fri Aug 15 10:10:43 2008 +0800 + + Always check and free driver private in LVDS destroy + +commit f4cb9a135dca9279af8186a9b18bf62ef7351019 +Author: Zhenyu Wang +Date: Fri Aug 15 10:02:44 2008 +0800 + + Make skip_panel_detect clear for its meaning + +commit 22918f62c89a4314fb5d01c58f22fee5b9a15a27 +Author: Jesse Barnes +Date: Thu Aug 14 16:02:37 2008 -0700 + + Fix pipe A force quirk + + Last commit introduced a logic buglet, we went from (foo & BLAH) -> (!foo & + BLAH) rather than !(foo & BLAH), so fix it up to make my laptop work again. + +commit c1687f9ca9ce7b52043272e877e070c810e6599f +Author: Jesse Barnes +Date: Thu Aug 14 15:48:02 2008 -0700 + + Map/unmap render state only when bo is available + + Otherwise just use the GTT address. + +commit 380c80712f78b3673b64ea07746a8e25e15fba8e +Author: Jesse Barnes +Date: Thu Aug 14 15:39:57 2008 -0700 + + Fixup AccelMethod kernel mode setting code + + Allow UXA or EXA in the kernel mode setting case, defaulting to EXA. + +commit 4475dfb541c988ad19b177e60f31f333e2fb3355 +Author: Jesse Barnes +Date: Thu Aug 14 15:38:07 2008 -0700 + + Use pwrite for cursor updates + + Don't open code map/memcpy/unmap, let libdrm do that for us if necessary. + +commit cb217d4bfd941d0fa9ceae3e483dd1ca1d768e86 +Author: Jesse Barnes +Date: Wed Aug 13 16:55:39 2008 -0700 + + Make EXA & UXA share bo getting function + + Needed for proper acceleration & batch buffer handling. + +commit 1ab7239b73a5e298cadaf44e5605cf05855f08e9 +Author: Jesse Barnes +Date: Tue Aug 12 18:16:37 2008 -0700 + + Map gen4 render state buffer before initializing + +commit 603f48e31b021c4dc0bbf7b5efbb2e68aeb421d5 +Author: Jesse Barnes +Date: Tue Aug 12 18:04:08 2008 -0700 + + Don't set tiling (yet) if kernel mode setting is active + +commit f744aa8d4b22374e1de6dda4facb673c3c428d4d +Author: Jesse Barnes +Date: Tue Aug 12 18:02:21 2008 -0700 + + Don't run old accel init code + + Had the wrong logic. Throw in a couple of cleanups while we're there. + +commit 2321c865f3da9fd321910236a92b32e0af1aa458 +Author: Jesse Barnes +Date: Tue Aug 12 17:59:16 2008 -0700 + + Don't wait for ring if kernel mode setting is active + + We won't have the ring mapped. + +commit a1b334a4c8ae090744e802f8d41a36ea631d6c84 +Author: Jesse Barnes +Date: Tue Aug 12 17:58:29 2008 -0700 + + Update DRM based modesetting support + + Just a checkpoint, still needs a lot of work to properly handle resize, rotate + & cursor handling. + +commit 5d78cf7cf0d23f60e6d61a92cbc2065b440027d3 +Author: Jesse Barnes +Date: Tue Aug 12 17:56:59 2008 -0700 + + Add EXA pixmap management functions for kernel mode setting + + Mostly pulled over from the old kernel modesetting code; a few updates were + necessary. + +commit 9ec36e0c8bd8a4bd7c40569412fc1a21219b5af9 +Author: Olivier Fourdan +Date: Mon Aug 11 12:07:32 2008 -0400 + + Fix DPMS off in the presence of the pipe A quirk. + + Still turn off the VGA plane, and also handle the DRI path at the end. + +commit 445c2e9ef8fc1d49bbb03e07bf36e0339be16a80 +Author: Olivier Fourdan +Date: Mon Aug 11 11:30:51 2008 -0400 + + Apply pipe A quirk to 845 as well. + +commit 915c370964d8dbab48ff24ede2c5e78e7b39132d +Author: Zou Nan hai +Date: Mon Aug 11 15:45:35 2008 +0800 + + [965-xvmc] some fixes for earlier 965 chips + +commit 19ebdf1b24184c0a293a698d44c4e0571109d153 +Author: root +Date: Mon Aug 11 15:31:13 2008 +0800 + + [i965-xvmc] bypass copy when put image with xvmc + +commit d592eabc806b752053ade3c18e9dd8e0f39b45a3 +Author: Zhenyu Wang +Date: Mon Aug 11 15:16:44 2008 +0800 + + Fix possible spurious interrupts in hotplug detect on 4 series chip + +commit d0018a96064ee0adfe87c2d50c341bf7d2e45eb0 +Author: Zhenyu Wang +Date: Mon Aug 11 15:16:09 2008 +0800 + + Disable display clock gating for 4 series chips + +commit 173b909a71955997ed6366e70faebf63fe922a8e +Author: Jesse Barnes +Date: Fri Aug 8 18:11:13 2008 -0700 + + Make it actually build the kernel stuff if possible + + Fixup the kernel stuff to have a slightly better chance of working. Still need + to fixup the EXA pixmap functions. + +commit fe90c0522f65f60c4c431787c889b7fb639ab61b +Author: Eric Anholt +Date: Fri Aug 8 16:35:25 2008 -0700 + + Set lvds_ddc_mode before use to avoid a segfault on mac mini. + +commit b1aef6f63c151dcb202fce869e4b80598b4b2052 +Author: Jesse Barnes +Date: Fri Aug 8 11:54:18 2008 -0700 + + Initial port of kernel modesetting from old intel-kernelmode branch + + Thanks airlied! + +commit 91e7b93c12f612e41b04a2d6106ff29b53b22a43 +Author: Eric Anholt +Date: Thu Aug 7 11:02:19 2008 -0700 + + intel_idle: Instead if #if 0, add an ignore flag for unreliable INSTDONE bits. + + This lets us produce a decent total value, and still show the unreliable bits + in case they aren't on your platform. + +commit f9504eff31eb3c9c6c6b33dced9875866ff8307e +Merge: f911347 5c9a62a +Author: Jesse Barnes +Date: Wed Aug 6 12:40:47 2008 -0700 + + Merge branch 'drm-gem' + +commit 5c9a62a29f62a9ecce37fae98cb01f8217eaba15 +Author: Jesse Barnes +Date: Wed Aug 6 12:39:03 2008 -0700 + + Revert "Switch to using a buffer object for the vertex buffer" + + This reverts commit 1abf4d3a7a203ff5d6e5ceda29573e7fd69ddf8e. + + Conflicts: + + src/i965_render.c - flushing was removed, keep it that way + +commit f91134795b545c8baebf218975b261c76a0e5873 +Author: Zhenyu Wang +Date: Wed Aug 6 16:19:29 2008 +0800 + + Fix SDVO HDMI encoding detect (#16920) + + Check return value of get supported encode command and current + encoding mode, which could be DVI or HDMI. + +commit fc3e287e6b6db21b113aa40ec4d397802c067f8b +Author: Keith Packard +Date: Tue Aug 5 22:50:01 2008 -0700 + + [uxa] Remove unused pixmap size limits. + + All size-related rendering limits should be managed by the driver in the + pixmap_is_offscreen call. There's no need for uxa to even know these values. + +commit 68f0872db6ec4d5dc3b524ee08ecad0aa125acd9 +Author: Keith Packard +Date: Tue Aug 5 22:36:03 2008 -0700 + + [uxa] Check xalloc returns and deal with failure + + Failing xalloc in a rendering function means just dropping the drawing on + the floor (that's what we've always done). + +commit 8f10bfb127bfe73d83d58f1f306fb9a4dfd825d6 +Author: Keith Packard +Date: Tue Aug 5 22:34:24 2008 -0700 + + Use EXA by default instead of UXA until we have GTT mapping + +commit b2d058d80ccd08d9e02ef866ee7a95b58686f6a3 +Author: Keith Packard +Date: Mon Aug 4 23:43:13 2008 -0700 + + Rename uxa using _ instead of caps + +commit fc4d9c55a7fa8001786c1e4da10f005406c57ece +Author: Keith Packard +Date: Mon Aug 4 18:17:20 2008 -0700 + + Change PrepareAccess to take access mode rather than index + +commit c155bb3cb17a3bd3b2e90be52cd1fc90147c4e17 +Author: Keith Packard +Date: Mon Aug 4 04:11:13 2008 -0700 + + Add batch flush in i830_uxa_prepare_access + +commit 66706718553cd272eab6f817b5a059df3e0a4347 +Author: Keith Packard +Date: Mon Aug 4 04:10:21 2008 -0700 + + Add throttling + +commit 12df8f40d2fb41f5446db1b49beeb442da18bee2 +Author: Keith Packard +Date: Mon Aug 4 01:43:44 2008 -0700 + + Use dri_bo for all object allocations, including pixmaps under uxa + +commit 4cc20b7f6e25f4be4598f8edbe0077117126b4ee +Author: Keith Packard +Date: Mon Aug 4 01:42:48 2008 -0700 + + Don't call sync on prepare_access -- just let the driver deal with it. + + Let the driver do whatever sync is necessary from the prepare_access hook + rather than forcing a full sync. + +commit b0b0998b5d52d105eb1e631f688aa8f1bd55ef39 +Author: Keith Packard +Date: Wed Jul 30 16:15:37 2008 -0700 + + Make EXA functions work for UXA as well + + EXA and UXA have the same acceleration interface, but UXA doesn't provide + pixmap stride information as it doesn't manage pixmaps. Move all of that + into the driver structure so that the acceleration functions needn't + reference the EXA structure. + +commit 59774e9aca2d743e82d616bb644d20ff6d60d492 +Author: Keith Packard +Date: Tue Jul 29 22:57:09 2008 -0700 + + Add UXA - the unified memory acceleration architecture. + + This eliminates the cost of EXA migration management while providing full + pixmap allocation control to the driver. The goal is to make something + useful for UMA drivers. + +commit a21d4794b6812ce05d08f06dc47b26c4fb1c1fef +Author: Jesse Barnes +Date: Tue Aug 5 13:37:38 2008 -0700 + + Reorganize VBIOS code + + Make VBT parsing happen at driver init time rather than in each output init + function, to save time and better separate VBIOS code into i830_bios.[ch]. The + changes end up touching the output files due to field name changes, and allow + us to reorder & simplify our LFP mode detection code. + +commit c2f0df4dc97c87539b66525a277c7d1e2c421f61 +Merge: 4f1f308 750bd0b +Author: Jesse Barnes +Date: Tue Aug 5 13:03:46 2008 -0700 + + Merge branch 'drm-gem' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel into drm-gem + +commit 4f1f30854260e18b8b9c4103eebbad5dcf729ce6 +Merge: e9e6b47 2aaa207 +Author: Jesse Barnes +Date: Tue Aug 5 13:02:47 2008 -0700 + + Merge branch 'master' into drm-gem + + Conflicts: + + src/i830_driver.c + +commit 1a59cc6b9acf312de1755d67757bf7f1967342e4 +Author: Julien Cristau +Date: Mon Aug 4 12:18:12 2008 +0200 + + Fix up the HP Pavilion ze4944ea quirk + + The chip is 855GM, not GM45. + +commit 27e9506fda86e90fd67de1715fa32d23aaa8a683 +Author: Alan Coopersmith +Date: Thu Jul 31 20:02:21 2008 -0700 + + Man page typo fixes + +commit da2eb83fb9a52291ea98f3285aee7bee2d55e0ca +Author: Jesse Barnes +Date: Thu Jul 31 19:21:36 2008 -0700 + + Update man page + + Add example dual head config, add info on bug reporting. + +commit 2aaa207db2cea03ba05c439b5074807689f2c5be +Merge: 2049ba2 76eb8e6 +Author: Jesse Barnes +Date: Thu Jul 31 13:10:19 2008 -0700 + + Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + + Conflicts: + + src/i830_display.c + +commit 2049ba211e7cdc383976c09f52c2b43acdd59481 +Author: Jesse Barnes +Date: Thu Jul 31 13:07:20 2008 -0700 + + Update DSPARB while planes are still off + + This avoids the flickering people reported in the 2.4.0 release. + +commit 750bd0bde09adf956c17bbb49c5a6020f12e60a4 +Author: Carl Worth +Date: Tue Jul 29 15:22:39 2008 -0700 + + Call DRM_I915_GEM_THROTTLE from I830BlockHandler + + This prevents the CPU from ridiculously outrunning the GPU. + +commit a893f176dda0b64f7dadfda6bf0331240037851e +Author: Carl Worth +Date: Fri Jul 25 15:56:35 2008 -0700 + + Add call to intel_bufmgr_gem_enable_reuse + + This instructs GEM to reuse buffer objects and improves the + performance of my favorite 'x11perf -aa10text' from about + 169k to about 188k glyphs/sec. + +commit b3c1a148679a4d943e556f996ef6b9004f549a41 +Author: Carl Worth +Date: Fri Jul 25 15:18:28 2008 -0700 + + Eliminate unnecessary flush from i965_composite + + This improves 'x11perf -aa10text' performance from ~144k to ~169k + +commit 1abf4d3a7a203ff5d6e5ceda29573e7fd69ddf8e +Author: Carl Worth +Date: Fri Jul 25 14:48:45 2008 -0700 + + Switch to using a buffer object for the vertex buffer + +commit e5fab0b7681be06a5a3be4bbd769ba5c435e2128 +Author: Carl Worth +Date: Fri Jul 25 13:44:29 2008 -0700 + + Add OUT_RELOC macro and backing intel_batch_emit_reloc function + +commit 76eb8e6f1f0c6962b23550564f4273f392567857 +Author: Zhenyu Wang +Date: Thu Jul 31 16:59:43 2008 +0800 + + Fix SDVO reg definition + + Remove wrong set tv resolution command, adding HDMI regs in dump. + +commit 77ed3d7600c1d92bf4a3ef4f54405cde8c232986 +Author: Zhenyu Wang +Date: Thu Jul 31 13:13:45 2008 +0800 + + Don't program dsparb on new Intel chip + + On new chip, DSPARB is controlled by hardware only. + +commit e9e6b4738573ffa3822ae68088bd53a645eedbce +Author: Eric Anholt +Date: Wed Jul 30 14:15:57 2008 -0700 + + intel-gem: Use new getparam to detect kernel GEM support. + +commit 42fb06f3f14fbec070350cf48361be4a0be0af04 +Author: Tomas Carnecky +Date: Sun Jun 15 14:27:16 2008 +0200 + + Reorder visuals reported by the intel driver + + The root window visual can not be changed. Neither at runtime nor + through the configuration file. The xserver simply selects the first one + that matches the class (usually TrueColor). I need a root window visual + with stencil buffer because my compiz plugin uses the it for some + operations. This patch reorders the visuals that the 3D driver reports + and puts the one with stencil (and depth) bits as first. + +commit 1e90c82161789d1fd50b79db50edb7860b934639 +Author: Julien Cristau +Date: Sun Jul 27 12:07:21 2008 +0200 + + Link with -lm for sin/cos + +commit d77d42e543ee82e801a8563a911826521c0ba557 +Author: Eric Anholt +Date: Sat Jul 26 16:10:05 2008 -0700 + + intel-gem: Give a better error message if the kernel rejects the tiling mode. + +commit 6ac352f146bafe3b4bb5832340eb0ccb730565d2 +Author: Zhenyu Wang +Date: Wed Jul 23 15:10:07 2008 +0800 + + shut up gcc warning + +commit 075cf7fce57da4e51acafb3bfd3d61ba1a8096d5 +Author: Zhenyu Wang +Date: Wed Jul 23 15:07:48 2008 +0800 + + Fix distcheck for clean doltcompile + +commit 29d982c6bf873c6685bd0e395a8b0e5e3b1063e0 +Author: Zhenyu Wang +Date: Wed Jul 23 11:16:14 2008 +0800 + + Fix HDMI output number + + Output 33 is confusing. + +commit fd060ce89d86f6e8ff742d5b287abe8ecea32927 +Author: Zhenyu Wang +Date: Tue Jul 22 15:29:34 2008 +0800 + + Bug #16801: fix X crash when NoAccel on 965 + +commit 577c4d1a0c753fb46d43be05a9781d2e204fac45 +Author: Zhenyu Wang +Date: Tue Jul 22 15:14:14 2008 +0800 + + only check pipe underrun if vtSema is true. + +commit 04bbed2248e3e8f86efd64225abf2db8eb552653 +Author: Zhenyu Wang +Date: Tue Jul 22 15:08:57 2008 +0800 + + SSC is LVDS only + + Fix regression on my 855GM for VGA output. + +commit 7defa4f1f0eba82f39e74f96d2ad7ed2481b537e +Author: Zhenyu Wang +Date: Tue Jul 22 10:51:01 2008 +0800 + + Check underrun on enabled pipe + +commit b7765b0837af4cc80f1257ba04495140ef5d536e +Author: Zhenyu Wang +Date: Tue Jul 22 09:51:54 2008 +0800 + + Thinkpad R60e TV quirk via DMI info + +commit 286ff63f83db8ea16514512385e6f8c6875871ef +Author: Eric Anholt +Date: Thu Jul 17 17:06:28 2008 -0700 + + Don't set up the HWS page in GEM mode now that the kernel manages it. + +commit ed0fbd016b8fbcf01eddfd17fd25e745e7af2ba4 +Author: Jesse Barnes +Date: Mon Jul 21 11:48:38 2008 -0700 + + Add no LVDS quirk for Transtec Senyo 610 mini PC + + Fixes FDO #16757. + +commit 62a037b0585d6ecb43daac9d4eb0927a4618a367 +Author: Eric Anholt +Date: Fri Jul 18 14:50:08 2008 -0700 + + Fix distcheck. + +commit 3cbfc6c76bcd2bc9194a944092f6ce0881ff9da2 +Author: Eric Anholt +Date: Fri Jul 18 14:56:18 2008 -0700 + + Fix uninitialized-use warning in i830_debug.c ring dumping. + +commit 1b1c4975768f63ed0f3933ec384d24c324a383b3 +Author: Eric Anholt +Date: Fri Jul 18 14:53:26 2008 -0700 + + Get prototype for i830_bios_get_tv(). + +commit 978abf84e8cf3ba3e915774981fe03610e15efeb +Author: Eric Anholt +Date: Fri Jul 18 14:50:42 2008 -0700 + + Bump version number past the 2.4 stable branch. + +commit f4ab1f6ad47b8f9a33d45b35c1cb2ba9610b96a6 +Author: Carl Worth +Date: Fri Jul 18 14:31:45 2008 -0700 + + Add intel_statuspage to .gitignore + +commit c0dce28892d7a31ebcca615f87ba8d4fa6872204 +Merge: a6ad504 b8ca1c7 +Author: Keith Packard +Date: Fri Jul 18 10:49:50 2008 -0700 + + Merge commit 'origin/master' into drm-gem + +commit b8ca1c747a679c931267363639fc0bc690cae2d6 +Author: Jesse Barnes +Date: Thu Jul 17 14:41:51 2008 -0700 + + Choose a split for DSPARB based on the configured modes for both planes. + + Previously, we were attempting to give both planes equal space in the FIFO + to be fair. However, larger modes require more fifo space, so split it based + on the relative HDisplay of the modes. This should resolve some fifo underrun + issues with differently-sized displays, or single large ones. + + Bug #16169. + +commit b37a2a8ca82279468e3806dcf77d5fa7bdd0e874 +Author: Jesse Barnes +Date: Thu Jul 17 12:30:57 2008 -0700 + + Don't disable pipe A on 855 chips + + It needs to stay enabled or we may see hangs when trying to re-enable it (say + at VT switch time). + + Fixes FDO bug #15168. + +commit a6ad50402cb879b08de95f94959bb1f59701c1ff +Merge: e9916b9 c4565a9 +Author: Carl Worth +Date: Thu Jul 17 00:38:54 2008 -0700 + + Merge branch 'master' into drm-gem + + Conflicts: + + configure.ac + src/reg_dumper/Makefile.am + +commit c4565a9811487402d899d0933cc63e27ffe1ff08 +Author: Zhenyu Wang +Date: Wed Jul 16 10:45:28 2008 +0800 + + Only initialize integrated TV encoder for mobile chips + +commit bca316863b79148b2f51a97d58b94e52ba3eae9f +Author: Zhenyu Wang +Date: Tue Jul 15 13:35:21 2008 +0800 + + xvmc: use vector based structure + + This is more clear to read MV components. + +commit 0c67219d0e6cfc858af2eb375c2f9473d0f6db60 +Author: Zhenyu Wang +Date: Tue Jul 15 13:29:33 2008 +0800 + + move FBC register dump out of display registers + + This makes it easier to read. + +commit a76ae7cab3001ce6639ae23fb0769c4e46b57e71 +Author: lipeng +Date: Tue Jul 15 10:26:33 2008 -0700 + + Fix GPIO pin usage for DDC on second HDMI port. + +commit 5054a86b1b362f3f63310afb9ef2d37c9f1cfca5 +Author: Eric Anholt +Date: Mon Jul 14 13:43:31 2008 -0700 + + Fix DSPARB setting on 845/865, which have only the AEND field and 96 entries. + +commit 8ac00ca97995e36514ff593fec3c0f0d316ed138 +Author: Julien Cristau +Date: Fri Jun 6 13:40:20 2008 +0200 + + Link the driver with -lpciaccess and -ldrm if needed + + This makes sure the driver ends up with a DT_NEEDED reference to + the libraries it's using. + +commit d61182511b1520b04133d28480e1ffaacbaeb753 +Author: Julien Cristau +Date: Sun Jul 6 12:00:52 2008 +0200 + + Fix gen4asm rule to work with a build dir + +commit 757c00927a6f5760135136450b8d02d0f999ac1c +Author: Carl Worth +Date: Mon Jul 7 15:58:27 2008 -0700 + + Use up to 256 separate vertex buffers + + This allows us to only call i830WaitSync once every 128 calls to composite + rather than on every call. However, we do need to also call MI_FLUSH to + avoid the vertex cache getting in our way, (since our "separate" buffers + are all allocated as one contiguous chunk). + +commit 0c548cd040d0c5e1812470ccdf6de86b6a2926d7 +Author: Carl Worth +Date: Mon Jul 7 14:01:15 2008 -0700 + + Allow for multiple vertex buffers (though only use one for now) + + Using more than one (in the future) will allow for doing less frequent calls + to i830WaitSync. + +commit cc2249333cd462b4d99d110a12c454ca141b2be8 +Author: Carl Worth +Date: Mon Jul 7 13:25:42 2008 -0700 + + Move VERTEX_BUFFERS setup from prepare_composite to composite + + This is in preparation for having larger (or multiple) vertex buffers + in the future. + +commit e9916b9d496fd0b4df717892dda33f81a2e2990a +Author: Eric Anholt +Date: Fri Jul 11 18:59:05 2008 -0700 + + Set tiling state for buffers allocated using GEM. + +commit 3c0f2bcc9965155fecab606edae68874427d3423 +Author: Jesse Barnes +Date: Thu Jul 10 12:57:25 2008 -0700 + + Add VBIOS based TV connector detection + + Now that the VBIOS code supports it, we can use the general features block to + detect whether a TV connector is present on a given platform. + + Reviewed by Nanhai Zou. + +commit e00d9435609bcff1afb71aa6638a6b42a64f5178 +Author: Jesse Barnes +Date: Thu Jul 10 12:55:12 2008 -0700 + + Improve VBIOS feature detection, add SSC support + + Improve the VBIOS feature detection and use it to find whether the platform + supports spread spectrum clocking. Use the specified reference clock, but + disable SSC if multiple heads are active, since it can cause problems in cloned + configurations. + + Reviewed by Nanhai Zou. + +commit 7332132a79e5b5c208d43e93dfe0c8b12eb1728d +Author: Jesse Barnes +Date: Mon Jul 7 10:48:56 2008 -0700 + + Improve FBC size checking + + In hindsight, this is obvious, since nowhere do we tell the FBC unit how much + memory it has available. We need to make sure the compressed buffer is big + enough to handle the uncompresed buffer, both in terms of vertical size and + total framebuffer size, or the compressor could overwrite the memory + immediately following the compressed buffer. + +commit f2ec3fd8f2c63b1bc0745802dcf737eda4bb42b6 +Author: Stefan Dirsch +Date: Thu Jul 3 23:12:13 2008 +0200 + + Add pipea force enable quirk for another 855GM machine. + + Fixes Novell Bug #406123, thanks Christoph. + +commit a34a4e3f6420e2b06bbdaa124fe0ccb1bc6a0bd9 +Author: Zhenyu Wang +Date: Thu Jul 3 01:03:14 2008 +0800 + + Fix official name for GM45 chipset + +commit 6506ac7aa008436158db4f4196802cab462f3446 +Author: Zhenyu Wang +Date: Wed Jul 2 11:12:54 2008 +0800 + + Give asus and eeepc backlight method higher priority + + On #16418, Evgeniy Manachkin reported that + last asus and eeepc backlight patch is wrong, as acpi_video0 method + will take priority and doesn't work. + +commit 55678c64bc6e3ed613ea6db14c105c18a0cf28ce +Author: Dave Airlie +Date: Tue Jul 1 18:51:18 2008 +1000 + + intel: fix drm check. + + The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed + with GEM etc. + +commit 0597d94001afe0a9a34104285ce4dffc75b68071 +Author: Roland Test-tools Bär +Date: Mon Jun 30 10:32:42 2008 -0700 + + i810: Remove an effectively unused variable (only used in an incorrect free()) + + Bug #15401. + +commit 37661d916e8384f537d5ed8cbec66a93795c6a05 +Author: Zhenyu Wang +Date: Fri Jun 27 11:21:59 2008 +0800 + + Fix SDVOC typo + +commit 7834a3b118ae4e034f064257762d5c25ada5fe52 +Author: Zhenyu Wang +Date: Fri Jun 27 09:54:35 2008 +0800 + + xvmc: fix motion_type dump for frame/field picture + +commit 989ec9e8a69f909cb64f17e4465982613b4b054d +Author: Zhenyu Wang +Date: Fri Jun 27 09:39:02 2008 +0800 + + xvmc: Don't copy on xvmc surface in PutImage + + As xvmc rendering result has already been in fb, we shouldn't + do extra copy on it. Although special care is required for i915 + xvmc surface pitch alignment, which must be at least 1KB aligned. + So video display function should take it into acount instead of + always setting Y pitch to be double of U/V pitch. + +commit 550082070a3fdb951e3cf08974dc56276c0a739c +Author: Zhenyu Wang +Date: Thu Jun 26 14:22:34 2008 +0800 + + xvmc: enlarge batch buffer size + +commit d50cec6ef9e2178ea663e58d548390f0f3da7692 +Author: Zhenyu Wang +Date: Thu Jun 26 14:20:05 2008 +0800 + + xvmc: only allocate memory requiring physical address on 915G + + Later 945-ish chipset can use graphics address instead. + +commit d1c34d8c0e7ae2a1d952791343e131837fbfda99 +Author: Zhenyu Wang +Date: Thu Jun 26 10:05:21 2008 +0800 + + xvmc: init mc render load indirect command once + +commit 75e38fa8348198ba151afa37e10be3b0b0b468f8 +Author: Zhenyu Wang +Date: Thu Jun 26 09:47:28 2008 +0800 + + xvmc: init dest and reference buffer once + + Init them right after context create, and only update buffer address + info later. + +commit b4d8ca8b38e495b56bb3b4143e5dfe91ee651f15 +Author: Zhenyu Wang +Date: Wed Jun 25 14:27:16 2008 +0800 + + xvmc: init one-time mc context once + + Don't setup one-time mc context everytime, as the content is always + unchanged. And several structs got packed layout inside to ease static + state initialization. + +commit 54f3f528e4804b958936ac773e7a507b2676f815 +Author: Zhenyu Wang +Date: Mon Jun 23 15:51:49 2008 +0800 + + xvmc: environ debug option support + + export INTEL_XVMC_DEBUG=1 + +commit 7a705081788bf957409e17baa5f189241589057c +Author: Zhenyu Wang +Date: Mon Jun 23 15:49:29 2008 +0800 + + xvmc: formalize surface type definition + + We should also carefully select surface type id. + +commit 0283d22f510ba47dfdac2806a58e46649c26580b +Author: Jesse Barnes +Date: Fri Jun 27 13:39:31 2008 -0700 + + Add pipea force enable quirk for HP Pavilion ze4944ea + + Fixes bug #16540, thanks Bryce. + +commit 08903abe4dc0295c7ed7d1ff1a22e0e579540c15 +Author: Jesse Barnes +Date: Fri Jun 27 13:37:10 2008 -0700 + + Add pipe a force enable quirk for Lenovo T60 + + Fixes bug #16494. + +commit 05df8c0b31721a9ccc7215fb1cda1115758367c7 +Author: Hong Liu +Date: Fri Jun 20 10:57:14 2008 +0800 + + Fix SDVO HDMI output. + + While some cards had enough initialized at startup to work already, others + required that the driver actually initialize the required AVI info frame. + +commit 59f39e0ea0ad48c52d9b8f7afb6e04ce95db717e +Author: Jesse Barnes +Date: Tue Jun 24 11:01:46 2008 -0700 + + Remove ErrorF debugging from modeset ioctl + + Oops. + +commit 1056d79809a3765f81113f3988bd948c1f9c673a +Author: Jesse Barnes +Date: Tue Jun 24 10:44:23 2008 -0700 + + Fix back buffer damage handler for 965+ chips + + When page flipping is enabled, we need to make sure any changes to the front + buffer are reflected in the back buffer(s) or corruption might occur at page + flip time. So make the damage handler work on 965 by adding appropriate tiling + flags and pitch adjustments. + +commit 65eee25d7d2ca979205f3776d620dbb36bf68a13 +Author: Jesse Barnes +Date: Tue Jun 24 10:41:46 2008 -0700 + + Add support for keeping vblank counters sane across mode setting + + The DRM supports disabling of vblank interrupts when not in use, but in order + to function properly it must also be aware of mode setting, which will reset + the frame counter to 0. Add code to call into the DRM before and after mode + setting, so that it can account for any lost vblank events. + +commit 277632d8c37cf43c7c1178ae7d5a2e6d5705968c +Author: Zou Nan hai +Date: Tue Jun 24 16:43:40 2008 +0800 + + 965 xvmc, current only frame based DCT_type support + +commit 9d7929436488969ca4fd1fef4d2e92be5e1a93aa +Author: Keith Packard +Date: Fri Jun 20 00:23:45 2008 -0700 + + Flush pending batch in block handler + + Make sure any pending rendering commands are delivered to the hardware + before the server goes to sleep. + +commit 2f8a0aa8cd24ede824aa52102b45a295f1b6b5be +Author: Keith Packard +Date: Tue May 20 20:29:25 2008 -0700 + + Remove some unreliable regs for i915 + +commit 6b6be2b2a7179c1c9fa12989e16076aae105f4e2 +Author: Eric Anholt +Date: Thu Jun 19 15:01:00 2008 -0700 + + Fix a crash in i830_sdvo_init error paths by setting up dev_priv earlier. + +commit 65ad29d78793c7804f133a58de80ffaa0404ca28 +Author: Eric Anholt +Date: Thu Jun 19 14:27:30 2008 -0700 + + Automatically detect the presence of HDMI. + + Now, SDVO is only probed if the SDVO detected bit is set. If the SDVO probe + fails, but the detect bit is set, assume that it's an HDMI output. + +commit ea0d21006ec71bc56acde7291e5f8d28e54b83fe +Author: Eric Anholt +Date: Thu Jun 19 14:10:29 2008 -0700 + + Fix hdmi POSTING_READ to use the register number instead of the register value. + + We won't dwell too long on how this ever worked. + +commit 2fa9240a3b685a0c3d0e2644fc144c927b67b6b3 +Author: Eric Anholt +Date: Thu Mar 20 15:14:46 2008 -0700 + + Get HDMI output working. + + HDMI, despite claiming to have pixel multiply support, actually doesn't + want it, at least in the way that SDVO did. Disable it. + + Also disable the NULL_PACKETS_DURING_VSYNC bit. Despite the docs telling us + to set it, the output doesn't like it when you do that, and the BIOS doesn't + set it. + + Also add a posting read to SDVOx setting. Without it, half the X starts + wouldn't get anything on the screen. (interestingly, it was every other + startup, not just a chance). + +commit dc8ab9d35b261b6105a62949cfb47a3554531d0b +Author: Eric Anholt +Date: Thu Mar 20 13:49:47 2008 -0700 + + Set the sync active bits like we're supposed to, matching the BIOS. + +commit af13826ed063b60a1e4179101e8889b4ab7a9d0b +Author: Eric Anholt +Date: Mon Mar 10 11:51:05 2008 -0700 + + Add pixel multiplier support for HDMI + +commit 9a05662918223477eb1cf6f80ffac08712721c70 +Author: Eric Anholt +Date: Mon Mar 10 11:47:15 2008 -0700 + + The phase shift its are now reserved, and add HDMI clock limits. + +commit beba1dd3561e38573ed9f507328caf7f8fb9f84a +Author: Eric Anholt +Date: Thu Mar 6 16:05:17 2008 -0800 + + Initial HDMI work. Not currently hooked up at startup. + +commit da58dc3b02999f3244d0eaf77180b828d85bd609 +Author: Eric Anholt +Date: Thu Mar 6 14:57:57 2008 -0800 + + Add DisplayPort registers. + +commit 52a414d1158aa7512fb79560dc220e2a78456a2d +Author: Eric Anholt +Date: Thu Mar 6 14:00:18 2008 -0800 + + Remove VGA regs from debug output. + +commit b60bbbfd7b7dcf31726ad615a493f34f17cc6309 +Author: Eric Anholt +Date: Thu Mar 6 13:59:06 2008 -0800 + + Add little hotplug detector app. + +commit 64fa32e2eba21cb94aa0f8d87a6ee6b7c178a7a5 +Author: Zhenyu Wang +Date: Thu Jun 19 11:02:29 2008 +0800 + + Add backlight kernel method support on Asus and Eeepc + + Noted and tested by Evgeniy Manachkin + for asus-laptop support, also add eeepc support. + +commit 1cfe769c74d1a3a392bf1aaaf5c2dcc8273daf66 +Author: Zhenyu Wang +Date: Tue Jun 17 12:39:28 2008 -0700 + + Add support for Intel 4 series chipsets. + +commit 289790c0467d27e96b537598a6589fc6a36da8b8 +Author: Zhenyu Wang +Date: Tue Jun 17 09:46:12 2008 +0800 + + Fix compiling with server master in LVDS backlight patch + +commit 66418cc99cfd360e303efcdf74a9ee31d435ff15 +Author: Zhenyu Wang +Date: Thu Jun 12 14:04:41 2008 +0800 + + Fix compiler warning when disable xvmc config + (cherry picked from commit df0bbdc7cbb6ff357a81ed28d12e56c9c7d643f7) + +commit 078d05865884ca5784b532c0a79c8440632002ac +Author: Shuang He +Date: Mon May 26 09:20:53 2008 +0800 + + Fix typo in xvmc block destroy + (cherry picked from commit 87ace420a34df7425641d089f71830e44fced098) + +commit 4c4ef27779aebf4df90b6233de05be2bb972de4c +Author: Lukas Hejtmanek +Date: Mon Jun 16 02:49:41 2008 +0800 + + Fix maximum backlight issue + +commit d775ddc64dc8349b8ef9e85b0be9e93cb1997fea +Author: Eric Anholt +Date: Fri Jun 13 10:03:24 2008 -0700 + + [gem] Catch -EINTR from blocking GEM ioctl and restart. + +commit 02d7141ac395446613edba0f2e2a951e750e4e9f +Author: Dave Airlie +Date: Fri Jun 13 11:30:58 2008 +1000 + + [gem] remove one more unused bit + +commit f07acbdaac95931d184ea2c557edb632e577eb47 +Author: Eric Anholt +Date: Thu Jun 12 13:47:35 2008 -0700 + + Require libdrm 2.4.0 always since we need the bufmgr code. + + This lets us remove a lot of conditional compile stuff in the DRI case, as + if we're doing DRI and have 2.4.0, we can rely on GEM ioctls existing. + +commit 754df0aa55c4b5f0c3c415ad97d7612504410229 +Author: Eric Anholt +Date: Wed Jun 11 14:43:38 2008 -0700 + + [gem] Chase move of create ioctl from generic to device-specific. + +commit 339f00e340c3a9c8ac8f17147e37906494ef370b +Author: Eric Anholt +Date: Tue Jun 10 16:14:06 2008 -0700 + + [gem] Don't set up the ring in GEM mode, as that'll be handled by the kernel. + +commit e930c0dc5b5f98d256a4167ed70ba813c88924d2 +Author: Eric Anholt +Date: Sat Jun 7 13:57:59 2008 -0700 + + Use bufmgr_gem when available instead of the fake bufmgr. + + This is a bit unstable still sometimes. + +commit ecf19e1cda60a938d41413075ae6e00f24e0ec1a +Author: Eric Anholt +Date: Fri Jun 6 15:27:44 2008 -0700 + + Change most usage of pixmap offsets to using a reloc macro. + + This is based on airlied's RING->BATCH commit. The 965 code still needs to + be fixed up for relocations. + +commit bade7d7d2505a10a8a7d24b084aff9742e2d6d64 +Author: Eric Anholt +Date: Fri Jun 6 14:03:25 2008 -0700 + + Use the DRM for submitting batchbuffers when available. + + There are some concerns with this, as the DRM will be setting the nonsecure + flag on the batchbuffer, and the server may be submitting some secure-only + commands. It appears to work on the 915GM test system currently. + +commit 6e94affcc2240e668bcf1aa41f3c8b19929d144b +Author: Eric Anholt +Date: Fri Jun 6 14:01:05 2008 -0700 + + Avoid needless flush emits in the blockhandler. + + The EmitFlush in i830_dri.c was added as a pageflipping workaround, and was + noted to not even be sufficient then. There's no reason for it to be there, + so it's removed. After that, we just have to not emit an MI_FLUSH if we + already had, and cursor movement no longer bashes memory manager. + +commit b2216e7bc2f1a35f9fc1794bad83208cd5c583d1 +Author: Eric Anholt +Date: Wed Jun 4 16:31:16 2008 -0700 + + Use batchbuffers instead of ring emits for general commands. + + The batchbuffers are managed using libdrm and bufmgr_fake, and dispatched from + the ring from userland. + +commit d0fda9d24c5fe4870cdbd2ba0213091165666a8e +Merge: cc98d41 79f94ee +Author: Eric Anholt +Date: Tue Jun 10 11:32:49 2008 -0700 + + Merge branch 'master' into drm-gem + +commit 79f94ee3c4652019395b9c329d94f7779c558571 +Author: Eric Anholt +Date: Tue Jun 10 11:31:22 2008 -0700 + + Set up/restore PWRCTXA from enter/leavevt not server start/exit. + + This should improve behavior in the presence of VT switching, but also avoids + a crash on X exit from writing the register after unmapping mmio. + +commit 231a302013981cc597ba09ee89b367c8ab56e8ba +Author: Bryce Harrington +Date: Tue Jun 10 14:10:39 2008 +0800 + + Two more Dell quirks + + fd.o #16160 + +commit cc98d41df63f1ee2561440fab3aa471a80a12920 +Author: Eric Anholt +Date: Mon Jun 9 12:00:14 2008 -0700 + + Add a little program to dump out the first 64 dwords of the status page. + +commit 1142be53eb8d2ee8a9b60ace5d49f0ba27332275 +Author: Jesse Barnes +Date: Mon Jun 9 08:52:59 2008 -0700 + + Fix TV programming: add vblank wait after TV_CTL writes + + Fxies FDO bug #14000; we need to wait for vblank after writing TV_CTL or followi + ng "DPMS on" calls may not actually enable the output. + +commit 64a8f2433d7774d06119793b57cec6d3be6389c1 +Author: Robert Lowery +Date: Tue May 20 21:09:23 2008 +1000 + + Fix TV out connection type detection + + Make sure we wait for vblank when using the TV DAC to detect the connection + type. + + Fixes FDO bug #14000. + +commit a993a8f3ce3a2079c5b5ebaca2ec2564047d7d4e +Author: Tomas Carnecky +Date: Fri Jun 6 10:03:23 2008 +0800 + + Fix compile error in LeaveVT + +commit 432d07fb175b385715eb3ccf97a303d2ad7bfe11 +Merge: 3a967b8 bff180e +Author: Eric Anholt +Date: Thu Jun 5 14:57:18 2008 -0700 + + Merge branch 'master' into drm-gem + +commit bff180e6cac4452ef491c81855eb12bfa03d0bf3 +Author: Eric Anholt +Date: Thu Jun 5 14:55:23 2008 -0700 + + Move debug clock printout from ErrorF to X_INFO. + +commit ad459b21b7de4a79552ac155803d5930432fb84b +Author: Eric Anholt +Date: Thu Jun 5 14:37:59 2008 -0700 + + Remove SVG_WORK_CONTROL init. + + The bit set is now reserved -- used to be a workaround for early revisions. + +commit e41dc98a0aeec389b221038753056c725ecee1c5 +Author: Eric Anholt +Date: Thu Jun 5 14:37:26 2008 -0700 + + Initialize clock gating from EnterVT and save/restore it appropriately. + +commit 8061e5ac27a5f61f940bccc940be922999cc1d3f +Author: Eric Anholt +Date: Thu Jun 5 14:09:45 2008 -0700 + + Move BIOS scratch register setup to EnterVT instead of PreInit. + + We want these to always be set when our driver's in control. They are + already appropriately save/restored at leave/entervt. + +commit b61cb9283185eb5211e84eb7d8e68beea607c2eb +Author: Eric Anholt +Date: Thu Jun 5 13:57:54 2008 -0700 + + Remove gratuitous wait_ring_idle after I830Sync. Syncing implies that. + +commit b65f67b74ff99aea1490d52f170ef4fe80cef6c7 +Author: Eric Anholt +Date: Thu Jun 5 13:40:55 2008 -0700 + + Move the remaining two lines of SetHWOperatingState to the caller. + +commit adb4f5a5e826e584ab212d23fc8d474c3e7bb8e8 +Author: Eric Anholt +Date: Thu Jun 5 13:39:08 2008 -0700 + + Remove duplicated i830_stop_ring()/SetHWOperatingState() in EnterVT(). + +commit c2e2fe48113667c683c6e1e9b1237635c41c61c3 +Author: Eric Anholt +Date: Thu Jun 5 13:21:55 2008 -0700 + + Move DSPARB setup into a separate function, and save/restore it at VT switch. + +commit 7e51384c973a96366b02ea646392c43574674111 +Author: Eric Anholt +Date: Thu Jun 5 11:56:42 2008 -0700 + + Replace a couple of wait-for-ring-idles with a single function to do so. + +commit 65306cdd71dad71e4ca7229764f81a0880dd70bf +Author: Eric Anholt +Date: Thu Jun 5 11:26:02 2008 -0700 + + Just remove the mprotect kludge. + + Besides not being #ifdef __linux__ed as requested, some linux kernels break + in exciting new ways when you try to mprotect from PROT_NONE back to + PROT_READ|PROT_WRITE. Yes, there are bugs in the code we're calling in a + bug-exploiting bug workaround. + + If you want this workaround for the original bug exposed when moving to + libpciaccess, it's already in libpciaccess. + +commit beb72ae5aa053303f5cc419e9c9d7c6db964f160 +Author: Hong Liu +Date: Wed Jun 4 16:58:05 2008 +0800 + + Set SDVO sync polarity to default on 965 + + Fix fd.o bug 15766 + +commit c7fee208fd46e143965ea173984d284e1eec2a9b +Author: Hong Liu +Date: Wed Jun 4 16:56:50 2008 +0800 + + Fix DSPARB change on 965G + + From the spec, only 965GM and IGD_GM have 128 FIFO entries. + With DSPARB change introduced by commit bd137a, I've got PIPE B + underrun when dual-headed on G35 platform. + +commit 64ccc8a036a1d80fc918e9b124d24ce0d26bdbbb +Author: Zhenyu Wang +Date: Wed Jun 4 22:30:04 2008 +0800 + + xvmc: add render dump function + +commit 1729a4f29dd52346a9fa997f818d57884047657f +Author: Zhenyu Wang +Date: Wed Jun 4 22:25:39 2008 +0800 + + xvmc: move block size lookup helper to generic + +commit 3cc8876db7ba82fa18e8fab4f267ac6e87964c47 +Author: Zhenyu Wang +Date: Tue Jun 3 16:15:36 2008 +0800 + + xvmc: a little cleanup + + Also safe check context size to not exceed surface max. + +commit 96955003557686469c7ae9f7d42620d2851e6fad +Author: Zhenyu Wang +Date: Tue Jun 3 16:13:52 2008 +0800 + + xvmc: remove unused dri drawable + +commit bd137a19dc29dd466eac030e040f729ed0807e3f +Author: Jesse Barnes +Date: Wed May 28 15:47:47 2008 -0700 + + Fixup DSPARB for 855 & 945 + + It turns out 855 has a different DSPARB layout than 915+. And 945+ have more + FIFO entries, so we have to allocate things differently. So on 855 split the + FIFO evenly again between A & B planes, and do the same on 945, where we have a + larger FIFO. Fixes an issue reported by Daniel Stone with the previous default + value. + +commit 3a967b8359bd6c05a10111076cdb02df15cbf2e8 +Author: Eric Anholt +Date: Mon May 12 13:51:11 2008 -0700 + + [gem] Note if pinning a buffer fails. + +commit 363ccc3dfbf8ab91608d502e0376a43653581856 +Author: Jesse Barnes +Date: Mon May 26 09:43:40 2008 -0700 + + Fixup FIFO comment + + What I originally checked in was a bit misleading. + +commit 2e1425246ccc75216247b0c2fa6fce2635db472b +Author: Jesse Barnes +Date: Mon May 26 09:40:10 2008 -0700 + + Handle display FIFOs better + + Add some debug code to catch FIFO underruns, which are normally bugs (unless + they occur during mode setting) and remove any plane C FIFO allocations, since + we don't use that plane at all. We may eventually need to be a little smarter + about this on platforms that use plane C for the popup. + +commit 89bb53cc7a853d88fc34a0ca65ae2b6227a8dd24 +Author: Jesse Barnes +Date: Mon May 26 09:34:34 2008 -0700 + + Fixup power saving registers + + Update clock gating disable bits to match docs and allocate a power context + memory area so that newer chips can save state and power down the render unit. + +commit ced4b4bb0c44b55feb5e32ddb860f1c1dc3bbde5 +Author: Eric Anholt +Date: Thu May 22 22:10:25 2008 -0700 + + [gem] Reduce console spam from debugging. + +commit 165c0865d849b7d280a3a119fe9ae0ad34637df0 +Author: Alan Coopersmith +Date: Wed May 21 14:56:27 2008 -0700 + + Define DEFFILEMODE for OS'es that don't have it + +commit 71180653825a1b141a08590e4b767d33d9b5d8c1 +Author: Jesse Barnes +Date: Wed May 21 11:51:55 2008 -0700 + + Revert "Disable FBC by default on 965GM" + + This reverts commit 53e3693ef13f31f3fc33bcff7286ab2b03b2d430. + + Conflicts: + + src/i830_driver.c - default FBC on for 965+ + +commit 740a73dad1d9a9b0ebf1cc7d6f2a056abad57aaf +Author: Zhenyu Wang +Date: Tue May 20 08:54:01 2008 +0800 + + Revert "Add FIFO watermark regs to register dumper" + + This reverts commit 0c00a638ef57aa9d6a3047176b0bfad733f781f0. + + Those FIFO watermark regs are 945-ish, and cause problem + on G35. + +commit c81050c0058e32098259b5078515807038beb7d6 +Merge: 9c9a5d0 e9532f3 +Author: Keith Packard +Date: Sat May 17 23:26:14 2008 -0700 + + Merge commit 'origin/master' into drm-gem + +commit 9c9a5d0e48c6e911574695fc417d2dc1a0fd1c20 +Author: Keith Packard +Date: Tue May 13 12:24:50 2008 -0700 + + Add check for GEM, use that to enable driver GEM support + +commit e9532f3abf1e0b62b2569d4aae60a5a63add571f +Author: Rémi Cardona +Date: Wed May 14 14:52:37 2008 +0800 + + Add glproto to DRI dependencies + +commit fe455a38cbac8d47a5c82b3eeb3cc6a59a6e8443 +Author: Eric Anholt +Date: Tue May 13 11:56:10 2008 -0700 + + Formatting fixes for intel_idle. + +commit 5c1720ecbc5528c40bb48084dc68ef233e9bb43b +Author: Eric Anholt +Date: Mon May 12 16:48:05 2008 -0700 + + Add i915 support to intel_idle. + +commit 089011daf3da8db3bd16d50e1d6a6457da82300e +Author: Keith Packard +Date: Mon May 12 12:18:19 2008 -0700 + + Track name changes in GEM ioctls. + + allocate → create + unreference → close + name → flink + +commit 10f1d835b8ac7bf3153ac39d295ad2a72c4aa076 +Author: Keith Packard +Date: Mon May 12 12:15:09 2008 -0700 + + Record alignment requirements in mem structure for use by GEM. + + GEM needs memory alignment requirements sent at pin time, which is a bit + after the allocation itself. Store the required alignment in the memory + object for later use by pin. + +commit 5103e5a39a4869a714b8a59da8bf51ecc8c65e4f +Author: Jesse Barnes +Date: Mon May 12 10:58:24 2008 -0700 + + Panel fitting: fix letterbox modes + + In full_aspect mode, we try to preserve the aspect ratio by adding + either top & bottom or left & right borders. In the letterbox case (top + & bottom borders) we were miscalculating the top border which led to + programming a bad mode. Fix the calculation and bug #15559. + +commit f280c50dd5d29c5717adc6da2368363cb3d0adbb +Author: Zhenyu Wang +Date: Mon May 12 08:57:56 2008 +0800 + + Revert last HP 965GM pipe A quirk + + Seems not resolve the issue (fdo bug #15885). + +commit d91d9e6a2f2ba18b35cb6fd7bc3fe8bc617eb44f +Author: Bryce Harrington +Date: Sat May 10 07:58:59 2008 +0800 + + More Pipe A force quirks + +commit 548d4c0f979a72eac5d0c9c76da12f0bd05e64e1 +Author: Zhenyu Wang +Date: Thu May 8 12:43:30 2008 +0800 + + Fix i965 render getting dest format error + + Depend on value returned by function within assert is wrong. + Fixed weird render corrupt on i965. + +commit 9f324860431ff8199a78d19bbaa74046e1476b89 +Author: Mike Isely +Date: Thu May 8 10:00:17 2008 +0800 + + Implement option to ignore external fixed mode settings + + The Intel xorg driver tries mightily to determine the native fixed + panel mode settings for the LVDS output. It does this through various + means, including scanning video BIOS tables, and noticing if the pipe + in question has already been set up by somebody else (and adopting + those timings). This strategy works well for say a laptop where the + LCD panel is an integral part of the machine. But for other + applications where the display is unrelated to the system's BIOS or + other software, then the BIOS will likely have no clue how to + configure the LVDS output. Worse still, the BIOS can simply "get it + wrong", leaving the pipe misconfigured. Unfortunately the Intel + driver can potentially notice this, adopt the same settings, leaving a + messed up display. + + All of this complexity normally happens independently, behind the + scenes, from the mode timings that might otherwise be specified by the + user. This driver has a concept of fixed, i.e. "native" mode, and + then user-specified mode. If the corresponding resolutions between + those concepts don't match, then the driver in theory will arrange for + scaling to take place while adhering to the actual native mode of the + panel. Said another way, if the user says 800x600 but the driver + mistakenly (see above) thinks the native mode is 640x480, then 640x480 + is the mode set with scaling to an 800x600 frame buffer. If the + driver gets the wrong native mode, then the result is a miserable mess + with no way for the user to override what the driver thinks is right. + + This patch provides a means to override the driver. This implements a + new driver option, "LVDSFixedMode" which defaults to true (the normal, + probe-what-I-need behavior). However when set to false, then all the + guessing is skipped and the driver will assume no fixed, i.e. "native" + mode for the display device. Instead with this option set to false, + the driver will directly set the timings specified by the user, + providing an escape hatch for situations where the driver can't + correctly figure out the right mode. + + Under most scenarios of course, this option should not be needed. But + in situations where the Intel video BIOS is hopelessly fouled up + related to the LVDS output, this option provides the escape hatch for + the user to get a working display in spite of the BIOS situation. + + Signed-off-by: Mike Isely + +commit 33f033cbf346c13a687e469e8879579fcd5bb2fb +Author: Jesse Barnes +Date: Wed May 7 14:46:52 2008 -0700 + + Save/restore cursor registers + + There are lots of good reasons for doing this, one of them is fdo bug #11305. + +commit a7188b1f2dd9a69fa7daefe478d283735226f9f3 +Author: Zhenyu Wang +Date: Wed May 7 14:21:59 2008 +0800 + + Use I830FALLBACK when check pitch for debug + +commit 79fde3ad7a949fb7f0dc9907cb6eea6ca9a910ae +Author: Zhenyu Wang +Date: Sat Apr 19 08:54:38 2008 +0800 + + Check pitch for EXA operation + + 2D pitch limit applys to all chips. Pre-965 chip has + 8KB pitch limit for 3D. 965 supports max pitch by current + exa (128KB). + (cherry picked from commit 8187a5a16f8bd8f0ba5e7f5357f355928b3b8f07) + +commit 36ec93300926084fb2951d69b001e4c67bc6ff79 +Author: Eric Anholt +Date: Tue May 6 18:48:20 2008 -0700 + + Bug #15807: Fix use of the ring while VT-switched, hit by fast user switching. + + The fix for flushing at blockhandler with no DRI on 965 was broken and would + try to flush the chip even when the driver wasn't in control of the VT. + Hilarity ensued. + +commit 0c00a638ef57aa9d6a3047176b0bfad733f781f0 +Author: Jesse Barnes +Date: Tue May 6 14:38:48 2008 -0700 + + Add FIFO watermark regs to register dumper + +commit c81a4687fca80bf7367d7f0e9a00a6a09737c5bb +Author: Zhenyu Wang +Date: Tue May 6 13:52:22 2008 +0800 + + Only check xvmc lib when xvmc is enabled. + + Don't check xvmc lib if user has already wanted to disable it. + Fix fdo bug #15762. + +commit be746a90a87d7a9807fa4243493e7e4d48f7f1c0 +Author: Bryce Harrington +Date: Tue May 6 13:51:46 2008 +0800 + + More quirks from ubuntu/dell + +commit 417f86d80525d2f5038628afba8f70f8c0fecca3 +Author: Keith Packard +Date: Mon May 5 13:36:19 2008 -0700 + + Move a declaration under #ifndef HAVE_FREE_SHADOW + +commit 587dc5bfc4ef32942bd7511f932a3a2e2fcdccb0 +Author: Keith Packard +Date: Mon May 5 13:35:22 2008 -0700 + + Fix up ring dumping code for non-i965 + +commit 65877d32bb2cd71ccc8d6a66244f029fc3577f69 +Merge: b9d12da fff17b9 +Author: Keith Packard +Date: Mon May 5 12:05:00 2008 -0700 + + Merge branch 'master' into drm-gem + +commit b9d12da91eb1afb05bd78a40e15f4333e697093d +Author: Keith Packard +Date: Mon May 5 10:44:09 2008 -0700 + + Use GEM for buffer naming now. + +commit 0741020f3725c32c48ad15535b9c0549e4092c23 +Author: Keith Packard +Date: Mon May 5 10:17:01 2008 -0700 + + Set pin alignment for gem on non-965 + + non-965 tiled frame buffers have fairly strict alignment requirements, 512K + on 8xx and 1MB on 9xx, plus they must be aligned to the size of the + allocation. + +commit 271abfd0ec29851273d8ca5241d963be5c64e43c +Author: Eric Anholt +Date: Fri May 2 10:06:13 2008 -0700 + + Add initial GEM hacks to bring the server up. + +commit a0ced923bb793aa22e6bfbeeec0888d3b42ce176 +Author: Jesse Barnes +Date: Tue Apr 29 13:19:02 2008 -0700 + + Add a new quirk for BIOSes that reprogram regs at lid close/open time + + Dell Latitude D500s seem to have this problem. At lid close/open, the DSPABASE + reg gets reset to 0, so we either need to keep the framebuffer at offset 0 or + make sure we reprogram the CRTCs after the lid opens again. Since we can't + make sure the former is always true (buffer resize, etc.), this patch adds a + quirk to reset the modes at lid open time. + + Fixes FDO bug #14890. + +commit fff17b9d1b58cb53032d153094826dd306836d59 +Author: Keith Packard +Date: Tue Apr 29 10:32:14 2008 -0700 + + Use new xf86RotateFreeShadow function to clean up shadow buffers. + + This simply moves code from the driver up into the X server; use it where + available. + +commit 1d467a8038946a37844795e8860be113d43219ac +Author: Keith Packard +Date: Wed Apr 23 11:08:38 2008 -0700 + + Overlay video doesn't require that the target pixmap be in video memory. + + I830PutImage was checking to make sure the target pixmap resided in video + memory, but this isn't necessary when using the overlay. Test + +commit 40e0a03af57d7b3180d7066bcb15e03dcc9ca295 +Author: Keith Packard +Date: Mon Apr 21 01:03:22 2008 -0700 + + Dump batch buffers found from main ring + +commit c8ae3b781f0d8e325876a74c91cd0a685d34454b +Author: Keith Packard +Date: Sun Apr 20 02:11:15 2008 -0700 + + Add a bunch of 965 ring stuff to the debug dump + +commit 2c135ef8ac40f8e7cd071de7414adfae019f9198 +Author: Eric Anholt +Date: Wed Apr 16 21:39:58 2008 -0700 + + Make the binding table and surface state be arrays to reduce syncing. + +commit c3fb62df4e60b63295f94c99b3c5de70dbf94e1c +Author: Keith Packard +Date: Thu Apr 17 10:04:55 2008 -0700 + + Add a kludge-around to fix cd/wt bits in fb ptes on linux. + + Mmap from /sys/devices/pci* on linux forces the cache-disable and + write-through bits, which turns our write-combining map into an + uncached-map, seriously impacting performance. It turns out that a bug in + mprotect allows us to fix this by disabling access to those pages and then + immediately re-enabling them. + +commit 0ae283582d21776d3317d5fc1c25751d50d562c7 +Author: Hong Liu +Date: Thu Apr 17 10:57:34 2008 +0800 + + fix possible segfault in I830FreeScreen + + pI830 may point to NULL if I830PreInit fails + +commit 7008eac855302fd467e001495483c2dccfddf68f +Author: Eric Anholt +Date: Wed Apr 16 12:09:41 2008 -0700 + + Update dolt from git, fixing fallback to libtool. + +commit 23d1df22d177e54bfc46304053d8115047ff85d4 +Author: Eric Anholt +Date: Mon Apr 14 16:46:17 2008 -0700 + + Abstract surface setup into a separate function. + +commit e27ce4238f748d024635835824c120eb298b84b2 +Author: Eric Anholt +Date: Mon Apr 14 23:30:21 2008 -0700 + + Move the vertex buffer to the state structure as well. + +commit 69709fe36cfdb59c140f5cba233dcb606f8dbc85 +Author: Eric Anholt +Date: Mon Apr 14 18:34:13 2008 -0700 + + Move the binding table for 965 to the state structure. + +commit 049d057dfd73b6c191a8ba5d73eddb77cf7748e7 +Author: Eric Anholt +Date: Mon Apr 14 17:09:22 2008 -0700 + + Move the 965 static variables local to the function they're used in. + +commit 092962c962fdf3e33a8d387221448fe7c8c36376 +Author: Eric Anholt +Date: Mon Apr 14 14:02:58 2008 -0700 + + Make the VS unit state static for 965 render. + +commit 4bbdd7096d4927fe48673006fff7df922972f116 +Author: Eric Anholt +Date: Mon Apr 14 13:53:36 2008 -0700 + + Rename some variables in i965_render.c for clarity. + + The gen4_render_state is now always called "render_state" (i965_render.c + bookkeeping) and gen4_state_t is now always called "card_state" (the buffer + for state used by the chip). + +commit 456bb529335c28cf60f3b6e5900b804efa5c185a +Author: Carl Worth +Date: Fri Nov 9 17:24:21 2007 -0800 + + Associate one sf_state object with each sf_kernel + + (cherry picked from a2b5c23184d19b386fdfd04f578a55566df60132 commit) + +commit 90d6b178473ba32cf66e6e654e608cb4374e4a19 +Author: Zhenyu Wang +Date: Mon Apr 14 16:31:03 2008 +0800 + + Change default panel fitting mode to origin + + i8xx currently only works in FULL mode. + (cherry picked from commit 33ffd781bbca3d0dee8c1b47e7b90be5824b9a4f) + +commit c1ad0a1a344a87a537aa5f93f6c774997a3189e4 +Author: Zhenyu Wang +Date: Mon Apr 14 10:02:00 2008 +0800 + + Remove old sf/wm program from Makefile + + Fix distcheck + (cherry picked from commit 1d8383923bebf38ab8ada6a262cb4fc8c30e074a) + +commit 18ef4158e5574bfc6621b268821532f13e261d13 +Author: Keith Packard +Date: Sun Apr 13 21:37:49 2008 -0700 + + Only use FOURCC_XVMC when INTEL_XVMC is defined + + The XVMC code uses a magic FOURCC code to signal frame updates, but that + code is only defined when the XVMC code is used. + +commit 269809030ee9d08b56ad0178a7a9c0194e25785e +Author: Keith Packard +Date: Sun Apr 13 12:47:02 2008 -0700 + + Move wm_scratch first to meet alignment requirements + +commit 08d3206f3b891e611e3e16c9eb79cfca21ab8a51 +Author: Keith Packard +Date: Sun Apr 13 12:35:14 2008 -0700 + + Kludge to make planar video work - duplicate sampler state + + This patch duplicates all of the surface sampler state needed to read from + the separate YUV surfaces and then has the planar sampler read from samplers + 0, 2, 4 instead of 0, 1, 2. This appears to make things work, instead of + having the samplers break at random. I do not understand why this works. + +commit 6366e4de540c4713cbc8402c89516464bbdc35b9 +Author: Keith Packard +Date: Sat Apr 12 16:39:00 2008 -0700 + + Skip copying on FOURCC_XVMC surfaces + +commit 0fec42b64ee529eb7ec15febdaa5e4986ec1ab17 +Author: Keith Packard +Date: Sat Apr 12 11:01:14 2008 -0700 + + Set some mask bits to try and get yuv conversion working + +commit 91d3e19786e22061f4b617cf39a3cd713139a2d9 +Author: Keith Packard +Date: Sat Apr 12 11:00:51 2008 -0700 + + Use compressed instructions for yuv conversion + +commit 03836067b77606c134c71b30c7078d09d77c95fa +Author: Eric Anholt +Date: Fri Apr 11 12:17:28 2008 -0700 + + Fix the offset to sampler default color, and a compiler warning. + +commit d3138d9ff0f821fb3adbd27684b0c22a8a910c3e +Author: Carl Worth +Date: Tue Nov 13 12:37:13 2007 -0800 + + Enumerate all possible wm_state objects + + We have a collection of wm_state objects for each ps kernel, + (one for each combination of src and mask extend and repeat + values). + + Thanks to Dave Airlie for noticing an errant write through a + wild wm_state pointer in an early version of this commit. + + (cherry picked from 7763706a93d3021907273f9b330750ba110e2fc3 commit) + + This cherry-pick required more reformatting than most, due to the + projective texturing merge. + +commit 2293a3677d1dcf294de6a8712bf0d2f65b50dcc3 +Author: Carl Worth +Date: Mon Nov 12 16:09:00 2007 -0800 + + Enumerate all possible src,mask sampler state pairs + + This will eventually allow for the elimination of sampler state + updates while compositing---and initializing everything in the + initialization function. + + (cherry picked from commit d0874697be8086cd64740c24698df8cd4d31c76f) + +commit da85d1b822dcb31698e9c5ab85a7bb27ad745eee +Author: Keith Packard +Date: Fri Apr 11 11:22:29 2008 -0700 + + Revert "remove '#line NUM ...' in macro process" + + This reverts commit f47486fab3dffcbb03e7ad89f777abba1e887299. + + Sorry for failing to push the #line processing changes to intel-gen4asm; + those are now pushed, so this change should no longer be necessary. Having + correct file name and line numbers in the error messages is awfully nice + though. + +commit f47486fab3dffcbb03e7ad89f777abba1e887299 +Author: Zhenyu Wang +Date: Fri Apr 11 10:12:40 2008 +0800 + + remove '#line NUM ...' in macro process + + intel-gen4asm doesn't allow '#' line + +commit 5c9cde37e769287fb7bf4e08c3600a33c2e92dce +Author: Hong Liu +Date: Fri Apr 11 09:54:34 2008 +0800 + + Bug #14935: Fix i9xx reference clock for spread spectrum. + +commit 152a50703aa5e9ebaa9abbe448518742734a5eb7 +Author: Eric Anholt +Date: Thu Apr 10 16:06:41 2008 -0700 + + Fix compiler warning from 24-bit lvds change. + +commit baa55ffe3b67ca952e4d1ef7087335d76eb2f24b +Author: Carl Worth +Date: Tue Nov 13 12:56:13 2007 -0800 + + Enumerate all possible cc_state objects + + We need one for each possible combination of src and dst + blend_factors. Again, as with recent changes, this eliminates + state updates from prepare_composite and allows that function + to instead simply reference an existing object initialized + within gen4_state_init. + + Thanks to Dave Airlie (and git-bisect) for pointing out that with + gnome-terminal all text was appearing as solid black with an early + version of this commit. As expected the bug was an alignment issue. + + (cherry picked from 0c0ab52c2d100c47f38c7ef826ef585c8b9815e9 commit) + + Performance is approximately equivalent on text tests, but may be + around +2%. + +commit d5a80e1e3ab5724d34b20f9ee6f830efd0f5b076 +Author: Keith Packard +Date: Wed Apr 9 16:27:40 2008 -0500 + + Single memcpy when pitches align on planar image transfer + +commit ac97f2b1487df5574875350a9cded958dae33afa +Author: Keith Packard +Date: Wed Apr 9 16:27:23 2008 -0500 + + Use available symbolic register name + +commit f270456e5612cb88933e6aabcd9a816c5c292229 +Author: Keith Packard +Date: Wed Apr 9 10:00:08 2008 -0500 + + Remove .g4b files on clean + +commit fb6ed8b8b59e9dd18801afef5d7c62042ad176d7 +Author: Keith Packard +Date: Wed Apr 9 09:58:44 2008 -0500 + + Update yuv->rgb conversion programs to write to src_sample regs + + The YUV->RGB code was written to write directly to the dataport registers, + but that didn't work for the compositing functions (cause still unknown). + This change makes that code write RGB values to the src_sample registers as + with the other sample computation fragments. + +commit b01d582e23fc99e32bc47a395e9caa366731372a +Author: Keith Packard +Date: Wed Apr 9 09:30:35 2008 -0500 + + Revert "Compute pixel values directly into data port" + + This reverts commit 346cf57deabb4c336612df4c13650a87b5ef6775. + + Mixing randr transforms and video caused screen corruption for Render + operations. No, I don't understand why. + +commit 3fc3d1a701bae257b70aa7b7654c722f30e71399 +Author: Keith Packard +Date: Wed Apr 9 02:02:56 2008 -0500 + + Remove sync after 965 video put. + + The hardware has been marked as needing a sync, so the next video put will + block waiting for the previous one to complete. Adding a sync here just + stalls the video playback for no good reason. + +commit 825d9e50c59450f07178a54fed2616e551dc0455 +Author: Keith Packard +Date: Wed Apr 9 00:09:34 2008 -0500 + + Add planer video decode kernel + + Support for planar video reduces bus bandwidth by 25% and also reduces CPU + usage during planar->packed conversion. + +commit a03eaaa67b33c57530e92c53d28917e2563b4427 +Author: Keith Packard +Date: Tue Apr 8 16:24:55 2008 -0500 + + Use shared exa_wm code for packed yuv decode + + Eliminate special video sf and ps programs. + +commit 32ef98518394d29cb87405005c660278489396bb +Author: Keith Packard +Date: Tue Apr 8 16:21:55 2008 -0500 + + Compute pixel values directly into data port + + Instead of leaving pixel values in src_sample registers, compute the pixel + values directl to the data port to save 8 moves. This cannot work when no + computation is done as there is both no way to wait for the sampler to + finish and because the sampler returns data in a different order from that + required by the data port (sigh). + +commit b68d9f4245d0ebe3371c179401ff145f1a4d101b +Author: Keith Packard +Date: Tue Apr 8 16:09:00 2008 -0500 + + Use symbolic names for channels in YUV code + +commit 781be9d47289713b0a8fcd95c769a9c6241d62e9 +Author: Keith Packard +Date: Tue Apr 8 16:08:20 2008 -0500 + + Rename src/mask/data registers to indicate channel + +commit 2871ac8eefd0192080bb0569140c3f5d0e1d9b44 +Author: Eric Anholt +Date: Thu Apr 10 13:34:13 2008 -0700 + + Statically allocate the sampler default color, which we never change. + + Performance change is in the noise. Also from Carl Worth. + +commit 80dd784e33847e431403d4659a7b8d8425b2676f +Author: Eric Anholt +Date: Thu Apr 10 13:24:51 2008 -0700 + + Add copyright information for recent editors of this file. + +commit b606278db83ec84b1db562a2d65697c50561b169 +Author: Eric Anholt +Date: Thu Apr 10 13:17:58 2008 -0700 + + Keep static copies of the 965 render programs in video memory. + + This reduces the CPU overhead of memcpying them in every time, for a speedup + in aa24text of around 30%. This is based on work by Carl Worth which is + in the intel-batchbuffer branch. + +commit bd41d2bb858770c109d5013274a4354e8e6ae32d +Author: Eric Anholt +Date: Thu Apr 10 10:24:48 2008 -0700 + + Add dolt to speed up compile time and reduce insanity. + + Hopefully some day we can be rid of libtool entirely. + +commit 96ae9a9f0abc582e45ff4e17dd213c8739c24cb3 +Author: Eric Anholt +Date: Wed Apr 9 14:17:29 2008 -0700 + + SDVO: Rename output_dtd variable to input_dtd, which is its new job. + +commit 72c3995d5158286d20e97296f4552697f32f935f +Author: Eric Anholt +Date: Tue Apr 8 15:00:18 2008 -0700 + + SDVO: Set adjusted_mode in mode_fixup from the preferred input timings for TV. + +commit b61178524bece756dc0fd4f798c6c7743b5725db +Author: Eric Anholt +Date: Tue Apr 8 14:11:42 2008 -0700 + + SDVO: Fix lols TV mode list handling. + +commit 5db73f18d2badec37523850024b9aa824e4e6bd8 +Author: Eric Anholt +Date: Tue Apr 8 13:53:51 2008 -0700 + + SDVO: Use the TV reference clock for SDVO TV outputs. + + Based on a patch by Will Wiseman. + +commit e031cc02e65acfbafb48136dad414751e04425c5 +Author: Mike Isely +Date: Wed Apr 9 14:15:03 2008 +0800 + + Implement support for 24 bit pixel format + + The Intel driver appears to be coded to only work with displays + expecting 18 bit pixels. However I have an application using a LCD + display that expects pixel data in 24 bit format. The difference is + only 2 bits in a single GPU register. This patch implements that + change, controlled by a new driver option, "LVDS24Bit". The default + value is false, which is the previous behavior. When set to true, + then 24 bit panels should work (at least the one I'm testing here + does). + + Fd.o bug #15201 + + Signed-off-by: Mike Isely + +commit 79b18980ac9f60b1978abe421352df965aed1681 +Author: Zhenyu Wang +Date: Wed Apr 9 14:03:45 2008 +0800 + + Include in i810.h for integer types definition + +commit 2b720262e1235f1c9da860ba3e9181f0c377aa5e +Author: Jesse Barnes +Date: Wed Apr 9 17:34:17 2008 +0800 + + Fix LVDS regression + + Disable panel fitting on 855GM, and fix dither setting. + +commit af92f4f885c8eae2211d09080b2289aa5bab9ec1 +Author: David Schleef +Date: Tue Apr 8 12:43:20 2008 -0700 + + Bug #15219: Fix default overlay CSC factors, and use BT709 if available. + + Using the updated factors even when BT709 conversion isn't available + (non-965) should still give us better color reproduction. Tested on a + 945GM, examining the +/-5% of black bars of videotestsrc. + +commit 37bc23660a8c346f1eaa6c93ed2c7a840828f0b0 +Author: Bryce Harrington +Date: Mon Apr 7 17:26:49 2008 +0800 + + Quirks from Ubuntu/Dell + + FD bug #15353. Launchpad bug ID is available for reference. + (cherry picked from commit 24248097988775d62f6c416f2988e74d31c91cd0) + +commit dcbdc901d64d2fab489292ef1c9ca1490bdd1e94 +Merge: 0147c1c 13563bd +Author: Keith Packard +Date: Fri Apr 4 19:19:35 2008 -0700 + + Merge commit 'origin/master' into projective-965 + +commit 0147c1c84872f7a109721a53d88a539932d9be81 +Author: Keith Packard +Date: Fri Apr 4 19:17:55 2008 -0700 + + Forgot to build exa_wm_src_sample_argb.g4b + +commit 13563bd65cbbbb3e697dacd814efa3517e1493dc +Author: Hong Liu +Date: Wed Apr 2 16:05:43 2008 -0700 + + SDVO: Fix DDC bus selection based on output priority list. + +commit 6ad2d6ba86689674876f5f4c473f11e39243ac38 +Author: Eric Anholt +Date: Wed Apr 2 15:16:17 2008 -0700 + + SDVO: Fix mixups with input and output channels. + + The 2-bit input_mask was actually an input count -- in0 is always there, and + in1 is optional. + + The output flags weren't being reported in the log, so I mistakenly took + controlled_output == RGB0 to mean that the device only reported an RGB0, + while it actually reported RGB0|SVID0|YPRPB0|misc|other. Move SVID0 up + in priority and remove the RGB-is-it-really-TV hack I had just come up with. + + Finally, set the input/output mapping at mode set time. We're always + supposed to do this, but haven't had to so far as we've never handled + devices with more than one output. + +commit 3a17400dc67534f0eb474ece080f01061469569c +Author: Eric Anholt +Date: Wed Apr 2 14:21:23 2008 -0700 + + SDVO: Handle RGB outputs that are really TV outputs, and select a TV format. + + Still doesn't light anything up. + +commit 3c1701797b61afaae826a78455079e2115483053 +Author: Eric Anholt +Date: Mon Mar 31 10:04:18 2008 -0700 + + Add WIP SDVO TV-out support. + + Doesn't include properties for selecting TV formats or picture enhancements, + and totally untested. + +commit 9d5ba26fb5c337388920b45eadda85e43bc564fa +Author: Eric Anholt +Date: Fri Mar 28 14:28:28 2008 -0700 + + Add SDVO TV-out registers. + +commit 90886f9a602d58b754e9a8d0f1a9c40803d34fa2 +Author: Keith Packard +Date: Tue Apr 1 00:54:13 2008 -0700 + + Remove extra flushing + +commit 0836373dc6e2f8612f120074980561f7ac11f6f7 +Author: Keith Packard +Date: Tue Apr 1 00:16:05 2008 -0700 + + Add projective versions of the PS kernels + +commit bfd803e085e938866efb45c67a79facef78ec399 +Author: Keith Packard +Date: Tue Apr 1 00:06:08 2008 -0700 + + Shrink WM thread to 32 registers and 1024 scratch space. + + Saving registers means we can run more in parallel. + +commit a6492661ae07310128eb73c3ef037c42ce7ab184 +Author: Keith Packard +Date: Mon Mar 31 23:50:20 2008 -0700 + + Fix composite with mask using new compositing thread code + + Clean up register allocation to never overlap + Always write 4 values for each texture vertex. + +commit f8081178eb6fda0e405967cbacad532561619262 +Author: Keith Packard +Date: Mon Mar 31 12:06:37 2008 -0700 + + remove old shader source files + +commit 879f8717b09f79156b218ee9cc2107700190d586 +Author: Keith Packard +Date: Mon Mar 31 12:05:56 2008 -0700 + + remove old monolithic shaders + +commit 6db8faeb754897b21af045d00f50db9640b080bb +Author: Keith Packard +Date: Mon Mar 31 12:04:00 2008 -0700 + + remove old monolithic shaders + +commit 6bb92213374f278387c539bbe05b773e87e11b90 +Author: Keith Packard +Date: Mon Mar 31 11:59:14 2008 -0700 + + Back to new shaders, fix urb read length + +commit 05710145b6fc4ed2c528128b2e6022591a53d050 +Author: Keith Packard +Date: Mon Mar 31 11:31:31 2008 -0700 + + Dont set the compr bit on 8-unit sends + +commit 08500507284f13ad7084eb231b43e117e9728129 +Author: Keith Packard +Date: Mon Mar 31 02:20:43 2008 -0700 + + Use m4 to clean up gen4 asm progs. Start adding projective transform support. + + Use macros for register names, modularize functions into separate files. + +commit 949d73271d7100c1f028fd60f185f4929461304e +Author: Keith Packard +Date: Sun Mar 30 19:19:46 2008 -0700 + + Remove rotation sf and wm progs + +commit 492ff1494f782240e6ca68919b2d0b9aa400fc53 +Author: Keith Packard +Date: Sun Mar 30 19:14:18 2008 -0700 + + Fix the sf_mask program to compute and pass corrected uvw cooefficients + + sf_mask is the same as sf except that it must compute both src and mask uvw + cooefficients, which are conveniently adjacent in the same registers, and so + need only an extended execution width + +commit 6304b38423f99190a5e54f1a7dcaa75adfad4f2a +Author: Keith Packard +Date: Sun Mar 30 00:54:51 2008 -0700 + + Reimplement wm program for nomask case to handle affine transforms + + This involves correctly computing u/v locations based on x/y vectors and + line constants computed in new sf program. + + Also, use fewer instructions to make this go a bit faster (2X for 500x500 + composite). + +commit 771a56b1ed0df69345c723cb62a73b6842cd8227 +Author: Keith Packard +Date: Sun Mar 30 00:54:07 2008 -0700 + + Clarify comment in exa_sf program + +commit 4f469189fed541549e5d470b2529275a29cc2f20 +Author: Keith Packard +Date: Sat Mar 29 14:28:05 2008 -0700 + + Compute du/dv/dw in no-mask SF prog + +commit 7dcb6e627449c80cea9812462ce6a3e125bd1240 +Author: Keith Packard +Date: Sat Mar 29 14:27:35 2008 -0700 + + Disable cursors while switching modes + +commit d50264fc7c4e0f80d9cc68dfdf322f68520a0f1e +Author: Eric Anholt +Date: Fri Mar 28 15:15:26 2008 -0700 + + Add a "total" field to intel_idle output (set when any unit is busy). + +commit 1450acd046d47e1739a3ffbd146c73ad2974a935 +Author: Jesse Barnes +Date: Fri Mar 28 13:23:02 2008 -0700 + + Use combo backlight control rather than pure legacy + + If the legacy bit is set, use both the BLC_PWM_CTL and LBB regs to control the + backlight, rather than just LBB. Looks like more platforms want that than what + the current code does. Note that kernel provided interfaces will always be + used if available, so this shouldn't affect users with /sys/class/backlight + interfaces at all. + + Fixes #14721. + +commit 49f409fef5e8b04a8595309ba8959ca36b2e41b1 +Author: Matthias Hopf +Date: Wed Jan 9 16:31:41 2008 +0100 + + Include missing stdlib.h for free() + +commit 3414313ac9d0faa95797ee18cc33afa231ec7581 +Author: Matthias Hopf +Date: Wed Jan 9 16:08:57 2008 +0100 + + Fix obviously wrong verification of DRI_SUPPORTS_CLIP_NOTIFY. + +commit c40f195f2dc3467259b4588e087aac9741003ebf +Author: Matthias Hopf +Date: Wed Jan 9 14:40:49 2008 +0100 + + Fix obviously stray '(' in non-I830_USE_EXA case. + +commit 7bba2c13310ed5ac22a355a3cc0ec8b7afaa79cf +Author: Zhenyu Wang +Date: Fri Mar 28 11:41:24 2008 +0800 + + Disable DRI earlier if fb width > 2048 + +commit b1f358ba97473b792ec2b7ed5170152faebe7262 +Author: Zhenyu Wang +Date: Fri Mar 28 11:29:40 2008 +0800 + + Disable overlay on new mobile chipset + + It's gone, really. + +commit 588371ba15afffa9343629f0ea7ce530586eef0b +Merge: 52d6ced c13efdd +Author: Jesse Barnes +Date: Wed Mar 26 14:53:15 2008 -0700 + + Merge branch 'master' into pfit + +commit c13efdd3d6d3846078766814b57306a7519bce18 +Author: Paulo Cesar Pereira de Andrade +Date: Wed Mar 26 10:11:36 2008 +0800 + + More compile warning fixes. + + o Check for RANDR_GET_CRTC_INTERFACE before defining functions that + are used only if it is defined. + o Declare a variable before code, and rename it from ret to xvmc_status + to better describe it. + o if 0 some static functions not used. + o Don't declare some unused variables. + o Declare as static some functions that are used only in the file defining it. + o Add a default/fallback return True to the Bool function + src/xvmc/intel_batchbuffer.c:intelInitBatchBuffer(). + o Ansify src/xvmc/xf86dri.c. + o Add missing prototype to src/xvmc/xf86dri.h and follow pattern of other + headers by adding "extern" before function prototype. + +commit 8cdbd55f8075cd18b563badde35815665d7d053e +Author: Eric Anholt +Date: Tue Mar 25 10:06:14 2008 -0700 + + Fix 965+ rendering issues with DRI disabled. + + The new chips no longer automatically flush the rendering cache, so if we + don't flush the RC at blockhandler, the last rendering done may not + appear on the screen. This was particularly noticable with a bare Xorg with + some missing root weave, and terminals where the last character wouldn't + appear until the cursor blinked. A flush in the DRI blockhandler path had + hidden this issue for most people. + +commit c02ab432dd7058c700c35eecf6215daf5f262c51 +Author: Eric Anholt +Date: Mon Mar 24 13:48:20 2008 -0700 + + Revert "Use mprotect on unbound AGP memory to attempt to catch use while unbound." + + While I still like the idea, the mprotect calls themselves are failing on + Linux and causing more trouble than they're worth. + + This reverts commit a1612b7728d4153499fe86b6713a13c8702cc7d9. + + Conflicts: + + src/i830_driver.c + src/i830_memory.c + +commit 552a1b824db31a234d7c5cb71057ed0e0ce64477 +Author: Eric Anholt +Date: Mon Mar 24 13:25:37 2008 -0700 + + Disable a bunch of clock gating disables on IGD_GM, which doesn't need them. + + Besides our driver having fallen through to the GM965 path for + RENCLK_GATE_D1, the BIOS was turning some of these on. It may be relevant + for previous platforms as well to zero out the fields that should be zero + in the other registers. + +commit c1a2bc357fc122d3718eca771530367ba2915815 +Author: Julien Cristau +Date: Mon Mar 24 13:29:24 2008 +0800 + + Don't try to build XvMC if DRI is disabled + + Instead of failing the build, don't even try unless --enable-xvmc was used. + +commit 5fcc002f77ebb66c1dc0f901a377ccf9bbc1d0bd +Author: Maxim Levitsky +Date: Mon Mar 24 13:24:12 2008 +0800 + + Fix crash triggered by dpms low power mode with hardware overlay running + + When overlay switch crtc, it ignores current crtc dpms mode which + might lead to hang. + +commit 645980596450ed21c3b8927410a6bfe38a0c55d1 +Author: Keith Packard +Date: Fri Mar 21 03:08:24 2008 -0700 + + Transformed coord computed using floats. Don't move bilinear composite dst. + + The homogeneous coordinate computation in the core server cannot be used for + many legal matrices as it overflows. Just use floats in the driver; faster + and avoids troubles. + + When compositing with bilinear filter, don't push the dst coordinates around + as that makes the output blurry when pixels are aligned. + +commit bf725b92cf93d74a6f414f81f319dddbc2c78525 +Author: Zhenyu Wang +Date: Fri Mar 21 11:50:27 2008 +0800 + + xvmc: fix distcheck + + Add i915 headers in Makefile.am + +commit e8da1a5418ab240ae7b1ef95bfea6bee22f1e0c1 +Author: Joerg Sonnenberger +Date: Fri Mar 21 11:41:49 2008 +0800 + + Fix DRI config for NetBSD + + Reported by Joerg. This does a little more clearn up. + +commit 224c36cc14a7552bc5df793ad582f0ea5349eb1e +Merge: 4b9b7b0 03ccffd +Author: Zhenyu Wang +Date: Thu Mar 20 10:31:57 2008 +0800 + + Merge branch 'xvmc' + +commit 52d6ced652059989e6d9780a149488ccd16e3a22 +Author: Jesse Barnes +Date: Wed Mar 19 11:59:15 2008 -0700 + + Fixup backlight control and panel fitting property names + + They should be listed as lower case, since that's what you'd pass to xrandr. + +commit 4b9b7b007d729f94b01b0031d8ae478134b501da +Author: Keith Packard +Date: Tue Mar 18 14:08:19 2008 -0700 + + Handle projective transforms on 9xx for Composite. + + Projective transforms require un-normalized texture coordinates and the use + of the texldp instruction. The coordinates are passed as x/y/z/w (the z is + unused, but there isn't a vertext format for just x/y/w). + +commit f699389818f1f11f3edddcdddcd0a43be21ba4c0 +Author: Keith Packard +Date: Tue Mar 18 14:06:47 2008 -0700 + + Add i830_transform_is_affine and i830_get_transformed_coordinates_3d. + + These are needed to deal with projective transforms in the composite + operation. + +commit a55974b435224fe5726fa44298d051c71e4056a5 +Author: Keith Packard +Date: Tue Mar 18 13:47:20 2008 -0700 + + Add defines for 9xx S3 word in 3D_STATE_LOAD_STATE_IMMEDIATE + + These aren't used at this point, but what the heck. + +commit 4f5500abe209b92b39ae1f2d7a1118362ac95034 +Author: Keith Packard +Date: Tue Mar 18 13:45:46 2008 -0700 + + 8xx/9xx can handle textures to 2kx2k. 965 can do 8kx8k + +commit b1b173d03b3acd300c3b0f0ceffeddf1a8137839 +Author: Julien Cristau +Date: Tue Mar 18 12:02:25 2008 +0100 + + Add i8[13]0_ring.h to _SOURCES to fix distcheck + + Thanks to Bruno . + +commit 03ccffd5b9b8108166ea143884a1a0a6417f3236 +Merge: ac76363 d72e18c +Author: Zhenyu Wang +Date: Tue Mar 18 16:54:15 2008 +0800 + + Merge branch 'master' into xvmc + +commit ac763634069fe070b3afc073ce437959612d39fe +Author: Zhenyu Wang +Date: Tue Mar 18 16:52:29 2008 +0800 + + Disable XvMC if DRI is not enabled. + + Default XvMC to disabled. + +commit d72e18c10995079121eded758a60ed99b5b8ce1a +Author: Paulo Cesar Pereira de Andrade +Date: Mon Mar 17 16:59:12 2008 +0800 + + Compile warning fixes. + + Move some declarations and don't declare an extra variable with the + same name, to fix warnings about mixed declarations and code. + +commit 81df48d8d151907c2e9dd33a729860c39aa78175 +Author: Zhenyu Wang +Date: Mon Mar 17 10:05:57 2008 +0800 + + bug 15060: Dell Latitude X300 needs pipe A quirk + +commit ffb5a115cc62ed63110f77815b7f04976f720065 +Merge: 05cf070 24e6eb2 +Author: Jesse Barnes +Date: Mon Mar 17 15:19:05 2008 -0700 + + Merge branch 'master' into pfit + +commit 24e6eb2ae683ed6614ac79c0d7811ac9fe94209f +Author: Jesse Barnes +Date: Mon Mar 17 14:17:27 2008 -0700 + + Add support for new ->get_crtc output callbacks + + Using the new interface allows the server to avoid some flicker at startup. + +commit 69fbc17441d0f894d17b058e65ae22300cd2a54c +Author: Eric Anholt +Date: Fri Mar 14 10:04:18 2008 -0700 + + Change OUT_RING and similar calls to OUT_BATCH for batchbuffer merge + +commit 65f92cfb7a05c9c028cf73ce1221cc0a651b50b3 +Author: Eric Anholt +Date: Fri Mar 14 10:03:11 2008 -0700 + + Remove h0h0 UploadToScreen implementation that used pattern blits. + + It never worked and was never that hot of an idea. Most of the motivation is + gone with glyph pixmaps anyway. + +commit 05cf07071e25f84dec3476a9bed7235ed50cd249 +Author: Jesse Barnes +Date: Thu Mar 13 18:12:00 2008 -0700 + + Initial panel fitting changes + + Basic support for panel fitting. + +commit 402fbd36221d2ed27913850f6bfcce768b970fe8 +Author: Jesse Barnes +Date: Thu Mar 13 16:12:20 2008 -0700 + + Remove fbc enable/disable messages + + Tired of them filling up my logs. + +commit c20d78a7bc512219fa36dfc9707fe65f66ab80f1 +Author: Eric Anholt +Date: Mon Mar 10 17:27:45 2008 -0700 + + Add workarounds for 830/845's lack of a8/x8r8g8b8/x8b8g8r8 support. + + When we have unset channels (color for a8, or alpha for x8*), force them + to the appropriate value in the texture combiner rather than relying on getting + the desired results from teture mapping. Performance is the same on 865, so + multiple paths aren't necessary and we can use the less friendly texture + formats everywhere. + +commit f425181695b1b3864373e1919cf651229f19fa69 +Merge: f4cfc98 1c0e495 +Author: Zhenyu Wang +Date: Thu Mar 13 23:58:56 2008 +0800 + + Merge branch 'master' into xvmc + +commit f4cfc98ab038af4d5d52af12e4d60ded62cf4a6e +Author: Zhenyu Wang +Date: Thu Mar 13 23:56:48 2008 +0800 + + nuke unneed error_base and event_base + +commit f269c69b4e7be076dc9838d0e0801c940ccdba08 +Author: Zhenyu Wang +Date: Thu Mar 13 23:41:22 2008 +0800 + + remove unused init/fini hooks for xvmc driver + +commit 1c0e4958564588162bc22a980567436dfc9d1e56 +Author: Zhenyu Wang +Date: Thu Mar 13 10:15:55 2008 +0800 + + Always bind memory after agp aperture allocation + + This fixed the crash appearing for Xv buffer memory, which appears + allocation and free happening in stolen memory. We should always + try to bind for stolen memory for correct protect setup, otherwise + we might get fault that stolen memory protect reverted to non-r/w + after previous free and unbind. + + Credit goes to Lukas Hejtmanek to identify the real problem of Xv + crash! + +commit 2e2372912ed9bc0d86e8960653ef0bfce5cf99ab +Author: Eric Anholt +Date: Wed Mar 12 11:38:56 2008 -0700 + + Eliminate local variables defined in i830 BEGIN_LP_RING(). + + This lets us get better sanity asserts, and avoid mysterious braces when you + do two BEGIN_LP_RING()s in a single function. Potential minor performance + loss isn't too exciting, as ring access is about to become a compat path + anyway. This change also removes the requirement for ring emits to be aligned + to dwords. + +commit abf11a274e14535630742fe4c41cc0ae92555293 +Author: Eric Anholt +Date: Wed Mar 12 11:03:26 2008 -0700 + + Separate i810 and i830 ring macros out into separate files. + + I want to hack on i830 for changing it into a compat path for batchbuffer + without having to worry about the i810 stuff getting broken. + +commit e04908853db74dc76718f6bc0dfb23b5ab3c5837 +Author: Jesse Barnes +Date: Wed Mar 12 15:44:58 2008 -0700 + + Add sysfs backlight support for Fujitsu laptops + + Tested by Dan Williams. + +commit 907399660b83b3939aab3dc7d0697197441e4ec8 +Author: Jesse Barnes +Date: Wed Mar 12 12:33:36 2008 -0700 + + Add stdint.h to DVO drivers + + Fixes the build for me (just following the git development guide on a + new machine). + +commit 8563effc96195116c96f89a801c1de6ab982630a +Author: Jesse Barnes +Date: Wed Mar 12 11:14:17 2008 -0700 + + Add stdint.h to i830_bios.h + + Needed for new uint* usage. + +commit c82d8e51c6ff9522ad0deb33399d13f3d6fef19d +Author: Jesse Barnes +Date: Wed Mar 12 11:13:50 2008 -0700 + + Add pipe A force quirk for Thinkpad R31 + + Fixes #15036. + +commit a8f4108bea0966406b0fcae8d062ae1cfb4afbb3 +Author: Hong Liu +Date: Wed Mar 12 21:55:56 2008 +0800 + + Fix rotation mem with kernel memory manager in VT switch + + Unbind and bind a DRM BO may change the buffer offset, thus + crtc may reference a wrong rotated memory after a VT switch cycle. + Destroying it here will cause its reallocation when entering VT. + +commit cd73c6a5a78eac726b14ef242b8452c559c4c003 +Author: Zhenyu Wang +Date: Wed Mar 12 20:37:41 2008 +0800 + + Pass default visual in dri context create + +commit 21580add63307ca68790bf911243b8675f5f7c64 +Author: Zhenyu Wang +Date: Wed Mar 12 20:37:17 2008 +0800 + + disable memory alloc debug + +commit 5f272471878c896038b2c3f2bf704655d908828d +Author: Eric Anholt +Date: Tue Mar 11 12:14:51 2008 -0700 + + Nuke more CARD* types from i810 driver. Untested. + +commit 9a62d3b598cca3c28fa8b6313bba82983cc29ecf +Author: Eric Anholt +Date: Tue Mar 11 12:07:52 2008 -0700 + + Remove i830+ driver's use of CARD*/INT* types for great justice. + + Several uses are actually left, which are determined by the X Server + interfaces we're implementing. + +commit 15f17aa682129c57d3864a355834edff06e91540 +Author: Eric Anholt +Date: Tue Mar 11 11:27:10 2008 -0700 + + Cleanse DVO drivers of CARD* types. + +commit 642ba6278876ec945ad687c2b9624e532cd3f629 +Author: Eric Anholt +Date: Tue Mar 11 09:59:16 2008 -0700 + + Add support for brightness control to i915 textured video output. + +commit ecdb5963ef6873ab82998dca6ca5186644666ec8 +Author: Jesse Barnes +Date: Tue Mar 11 11:08:25 2008 -0700 + + Add pipe A force enable quirk for Toshiba Portege R205-S209 + + Fixes #14944. + +commit 4ea67e9b853e9ed61557780b87bd184fc81fd731 +Author: Kristian Høgsberg +Date: Tue Mar 11 13:54:33 2008 -0400 + + Crack down on warnings. + + Fix printf formatting warnings, wrap a couple of long lines, nuke + unused variables, add missing #include . + +commit 9fd13e6773371c82b9799a5bda7c96ffa5cafe8c +Author: Kristian Høgsberg +Date: Tue Mar 11 13:48:07 2008 -0400 + + Silence warnings about possible uninitialize use of dst_format. + + Whoa, gcc got a lot smarter about warnings. If iXXX_get_dest_format() + doesn't support the picture format passed in it won't initialize the + uint32_t pointed to by dst_format and return FALSE. + + What gcc now can detect is if dst_format is used without checking the + return value, it might be used uninitialized. This patch makes sure + we always check the return value before using dst_format. + +commit 31654f52b084ebb32f69854dfb1c342c9da07928 +Merge: a03aca1 02c0ffb +Author: Zhenyu Wang +Date: Tue Mar 11 14:37:41 2008 +0800 + + Merge branch 'master' into xvmc + + Conflicts: + + man/intel.man + src/i830_driver.c + +commit 02c0ffb1d8112a6fb03f9c8eae9ec1a1fca123ef +Author: Jesse Barnes +Date: Mon Mar 10 11:51:37 2008 -0700 + + Add pipe A force enable quirk for Dell Latitude D500 + + Fixes #14888. + +commit a1cd37f94cb8efbde84ba0a46839fb8735dd3595 +Author: Dave Airlie +Date: Mon Mar 10 14:43:24 2008 +1000 + + quirk: add DVO ivch quirk + +commit f2b9f387af7f618ad083b1ec8bee513ff2157d06 +Author: Matthieu Herrb +Date: Sat Mar 8 23:36:56 2008 +0100 + + Makefile.am: nuke RCS Id + +commit bf6d59ee98127ac6447848c4202c54d861a510d4 +Author: Eric Anholt +Date: Fri Mar 7 14:26:22 2008 -0800 + + Avoid setting reserved bits in SDVOx on everything 965-class. + + This will likely fix SDVO outputs on G35 hardware. + +commit 5915c75422c5277d530e7f8ecbdfe94654706efd +Author: Jesse Barnes +Date: Fri Mar 7 13:18:09 2008 -0800 + + Enable hardware overlay on 965 + + Based on Maxim Levitsky's patch for the same. Many thanks to Maxim for + discovering that this features still works in recent hardware! + +commit 13ae79b415d944891cfdc2cd2d5397fec36a4e8e +Author: Dave Airlie +Date: Fri Mar 7 08:04:37 2008 +1000 + + fixup pciaccess version detect + +commit be08b61540e1edbb7673f0b6add0f1e32b136b3c +Author: Jesse Barnes +Date: Thu Mar 6 13:55:13 2008 -0800 + + Implement new get_property feature for backlight control + + This should keep the backlight value reported by xrandr --prop & xbacklight + consistent with changes by other software in the system (like the hotkey driver + or kernel backlight driver). + +commit 502e41f6dff91393cfeaf08c9ba312781d1b7267 +Author: Zhenyu Wang +Date: Thu Mar 6 19:32:29 2008 +0800 + + remove extra dri checking + + And directRenderingDisabled already has config check result. + +commit ea58d66cf778c0477c30e5bfe3142b64e8b971d5 +Author: Zhenyu Wang +Date: Thu Mar 6 19:31:33 2008 +0800 + + No ring, no sync + +commit c823fb00a20f523f50a2779c36aa1c014ba01535 +Author: Jesse Barnes +Date: Thu Mar 6 19:29:22 2008 +0800 + + Pull chipset detection out of PreInit into its own function + +commit 6b16cee0786b636dc849826193b26e898832a73c +Author: Jesse Barnes +Date: Thu Mar 6 19:27:42 2008 +0800 + + Account for FBC LL cache in memory reservation + + When we reserve memory (memory that won't be managed by the kernel) make + sure to reserve space for the FBC LL cache as well. + +commit 6f04d02471f1cebc76eab637a9a78c4004fd3cc9 +Author: Jesse Barnes +Date: Thu Mar 6 19:27:07 2008 +0800 + + Move MTRR fixup to its own routine + +commit 750beb9232b51223d8e650878ce8dad071f0d0b3 +Author: Jesse Barnes +Date: Thu Mar 6 19:24:47 2008 +0800 + + Refactor memory allocation into a separate function + + This simplifies the memory allocation code and fixes a number of bugs. + Prior to this change, some flags may have been set after memory + allocation occurred, meaning they had no effect. It should also make + the allocation logic clearer. + +commit d466b25d09bbe85abe84d9d7714ffb65fafe7593 +Author: Zhenyu Wang +Date: Wed Mar 5 13:38:58 2008 +0800 + + Really print adjusted_mode for mode debug + +commit d767eabe534be7f7bdcbf00614a8901124ac911f +Author: Hong Liu +Date: Thu Feb 28 13:51:18 2008 +0800 + + Fix DPLL programming in CRTC mode set + + The following patch fixes the display problem on internal development machines. + The code in commit 3c22ed633be2ac96eea7bc533839e956f1f31b84 (Jesse's force pipe + A enable patch) broke DPLL programming. Moving the DPLL set back up in the + function solves the problem. + + Fix for internal bug #309. + +commit 4936e097028b91f4bdc2d9101dc49f6fe586e718 +Author: Jesse Barnes +Date: Tue Mar 4 08:52:40 2008 -0800 + + Change FBC idle mode back to default + + Use the "immediate idle" mode for FBC. Rather than waiting for the current + compression pass to finish before signalling to the CPU that it's idle, this + mode should stop any current compression pass and tell the CPU that the GPU is + idle right away. + + Seems to fix #13326. + +commit 02a3b80ee8341968dbce5b7cb871b187db5ff805 +Author: Zhenyu Wang +Date: Fri Feb 29 11:13:34 2008 +0800 + + Bug 14591: comment out MI_DISPLAY_POWER_DOWN as for 965GM only + +commit ea7c7d088e0a3c3b7ab2bdd0475aa13379764bf4 +Author: Peng Li +Date: Wed Feb 27 11:56:55 2008 +0800 + + HP Compaq 6730s has no TV output + +commit fdc25cb0ca7d479051cee66a032f9ee1b68db98a +Author: Mark Kettenis +Date: Tue Feb 26 17:26:50 2008 -0800 + + Bug #14649: Fix build if pciaccess headers are not with other xorg headers. + + We failed to include the pciaccess header flags in our build. Even if the + server was to include those flags for us, it would leave us broken for the + tools-only case, and it's easier to just put the flags everywhere so we avoid + future copy'n'paste mistakes. + +commit e55d86f654aa9dd4951b441636c8ca4b37786daf +Author: Eric Anholt +Date: Tue Feb 26 12:26:23 2008 -0800 + + Fix SDVO I2C access on Mac Mini in EFI mode. + + The GMBUS was being left in SDVO pin access mode, which blocked our bit-banging + access to those pins. Thanks to Peter Jones for quick debugging turnaround + in getting this fixed. + +commit 6935c732c351585f31e2094c4201a00e3d5529b3 +Author: Julien Cristau +Date: Mon Feb 25 14:47:02 2008 +0100 + + Look for src/{modes,parser} in $srcdir, not in objdir + + This makes the detection work in case configure is run from another directory. + +commit 66cdccb021a4748b2af41e415c36ed58ca808df6 +Author: Zhenyu Wang +Date: Mon Feb 25 14:29:09 2008 +0800 + + Fix overlay rotation + + Track current covered crtc rotation in port's private, + and fix overlay rotation transform to be against crtc mode + coordinate. + +commit 975d7833bc844485c7043538336bddcba7f7f90e +Author: Jesse Barnes +Date: Fri Feb 22 11:41:25 2008 -0800 + + Add quirk for DVO channel selection + + Some machines want DVOA, some DVOB. We can use this quirk to differentiate + them until we come up with a better solution. Patch from Hong Liu. + + Fixes #13722. + +commit 33802b6ee3c298bae4d2b6f464ee5cc730a58506 +Author: Jesse Barnes +Date: Thu Feb 21 08:43:34 2008 -0800 + + Add pipe A force enable quirk for ThinkPad X40 + + ThinkPad X40s need this quirk or they'll crash frequently. + + Fixes #14521. + +commit 444984a578aae92ff55c06da897ea1d23679e706 +Author: Jesse Barnes +Date: Thu Feb 21 08:37:42 2008 -0800 + + Remove side effects from VGA debug code + + The VGA register dumping code was leaving ARX in data mode rather than index + mode, which could cause problems for later software accessing AR* registers. + Fix it to make sure it's in index mode when we're done. + + Fixes #14434. + +commit 28049540d8a9f79401fcfeb90784f5a528e7b34f +Author: Jesse Barnes +Date: Wed Feb 20 13:08:27 2008 -0800 + + Fix DSP*CNTR restoration + + When checking which pipe a given plane was associated with, we weren't properly + masking the pipe selection bits. Fixes #14481 and should allow the driver to + work with vesafb again. + +commit 293120bfc40a5b828567551954d8312639e73578 +Author: Zhenyu Wang +Date: Tue Feb 19 21:13:45 2008 +0800 + + Don't leak memory if no DMI info is provided by kernel + +commit cdc5cb7c3d24f36a30fb931b43ec6df8294709e2 +Author: Zhenyu Wang +Date: Tue Feb 19 08:51:53 2008 +0800 + + Fix last 8XX clock's p2 value commit + + My fault to change Hong's origin patch reversely. + +commit be0591880f20bdcbae159d5ab47113b6cc6fbffe +Author: Zhenyu Wang +Date: Mon Feb 18 14:35:06 2008 +0800 + + Fix Lenovo X60 TV quirk + + Z61 has same subsys ids with X60, but does have one S-video + TV out. Use DMI info instead to quirk TV on X60, X60s. + +commit d5e564c5f24b0d9320bc4908693d37e7e6d68bc6 +Author: Zhenyu Wang +Date: Mon Feb 18 14:32:32 2008 +0800 + + Add DMI info for i830 quirks + + Linux kernel has CONFIG_DMIID to export dmi info + through sysfs. + +commit 4a42b01f5ee5a673716d6959dfe0e693b037eb48 +Author: Keith Packard +Date: Sat Feb 16 18:16:12 2008 -0800 + + Decode DSPCLK_GATE, dump PIPE*STAT, MI_MODE, MI_DISPLAY_POWER_DOWN, MI_ARB_STATE, MI_RDRET_STATE, ECOSKPD + +commit 663313559873208c00c3d3748b99d837949ecdf2 +Author: Zhenyu Wang +Date: Fri Feb 15 13:20:22 2008 +0800 + + Bug #14440: fix stolen mem size mask on i830M + + For i830M stolen mem size mask should always be 0x70. + Use 0xF0 for later chipsets should be ok, so behavior is + identical to kernel agp. + +commit 8c8ca16120927fc2d3cf8bcd5212a4227a280708 +Author: Eric Anholt +Date: Fri Feb 8 11:34:04 2008 -0800 + + Add a little program to output the stepping information for several chipsets. + +commit f5896dcd1f5a964dce024ab8887ac8a79f7093a1 +Author: Jesse Barnes +Date: Thu Feb 7 11:56:28 2008 -0800 + + Add CACHE_MODE_0 register to dump output + +commit d59eaa8b1e6eeb9775c9d21c7a5fd28f25b2bc3a +Author: Jesse Barnes +Date: Wed Feb 6 09:35:43 2008 -0800 + + Only disable FBC if registers are available + + The call to disable FBC should only occur if the FBC feature is actually + present or we may end up hanging on a read from a non-existent register. + +commit 83a071e2c01eb71462273f25d86d77159ac51114 +Author: Jesse Barnes +Date: Tue Feb 5 17:09:19 2008 -0800 + + Fix build warnings on 64 bit + + Use PRIx32 for printing CARD32 types, and PRIx64 for portably printing uint64_t + types. Requires the addition of a new include, inttypes.h, to work. Hope C99 + is ok with everybody... + +commit abf4b0cafa038e97bd7a6e5ba107b822117b9ccc +Author: Jesse Barnes +Date: Tue Feb 5 13:30:51 2008 -0800 + + Only enable FBC if one pipe is active + + Some chips can't support FBC if multiple pipes are active. So if more than one + pipe is on or we're going from one->two pipes enabled, make sure FBC is + disabled. + + Intended to fix 13418, 13326, 13152. + +commit f79a585d57c61fbe9af5684a336918e1fe3e8416 +Author: liuhong +Date: Tue Feb 5 11:04:34 2008 +0800 + + xf86-video-intel: fix ivch using wrong dvo register + + We use the wrong DVO output register for ivch which is used for DVO LVDS. + Vbios enables DVOB and driver never touches it, so everything seems + working correctly now. + +commit cabed67b6a0e4dd408eeb8d2083269100a65933c +Author: Jesse Barnes +Date: Tue Feb 5 11:36:24 2008 -0800 + + Program FBC fence offset register + + Just a partial fix for some of the FBC issues people have been seeing. The + other half is to disable FBC if both pipes are running. + +commit 332587081fb05d284864aabe608dd9988eee3d44 +Author: Zhenyu Wang +Date: Tue Feb 5 10:34:55 2008 +0800 + + Fix last commit on i8xx debug p2 value + +commit 2d18a299cf39f2ecf9bd3ba8407f892566b2edcc +Author: Hong Liu +Date: Tue Feb 5 09:10:48 2008 +0800 + + Fix PLL reference clk debug dump + +commit 9536515d7717969795edc1b80d6e6a36820dd575 +Author: Hong Liu +Date: Tue Feb 5 09:06:14 2008 +0800 + + Allow non-strict free order for bo_list + +commit 11de831cb706025c003e98fef6d666d273192bcd +Author: Hong Liu +Date: Tue Feb 5 08:58:44 2008 +0800 + + Bug 10584: Mac Mini EDID data assigned to TMDS output + + EDID data for TMDS output got from crt should be applied + to TMDS output on mac mini. + +commit 95327571134d8ebb9d936d80b70c2f642393aa9f +Author: Hong Liu +Date: Mon Feb 4 17:14:23 2008 +0800 + + Bug 10773: fix i8xx pll p2 value in i830_crtc_clock_get() + + Also fix debug dump, slightly modified to use macro instead. + +commit be1b568bc2379856c3eaaed365002512bebc218c +Author: Paulo Cesar Pereira de Andrade +Date: Thu Jan 31 22:47:18 2008 -0200 + + Make sure symbols used by other modules are public. + + These symbols must be explicitly exported, otherwise if compiled with + hidden symbols, LoaderSymbol (and dlopen) will fail to find them. + +commit cc1031a834b81aa6f835c282ad86deddabe229a0 +Author: Mark Kettenis +Date: Thu Jan 31 21:02:48 2008 -0800 + + Bug #14246: Fix biuld on OpenBSD. + +commit b1e1c7cd993ab4f1935d750eb8852e74be757e53 +Author: Eric Anholt +Date: Wed Jan 30 23:01:04 2008 -0800 + + Add detail on different units to intel_idle. + +commit aa3ac79759581b5eb05293a8cbcf89eb5b76712c +Author: Zhenyu Wang +Date: Thu Jan 31 18:26:46 2008 +0800 + + Don't crash if SW cursor + + In case of device option or hw cursor allocation fails. + +commit 2e43bec8731ba1b172f7a0bf867bbb5c1adbda2d +Author: Jesse Barnes +Date: Wed Jan 30 18:59:12 2008 +0800 + + Frame buffer compression support on new chipset + +commit bf629466a46c4037ec7b7cc5ee16be947618bd68 +Author: Zhenyu Wang +Date: Wed Jan 30 18:55:20 2008 +0800 + + hardware status page initialization rework + + Order hardware status page setup more reasonable after + all memory bound, in case new chipset requires non-stolen + page and that could be bound then. + + Also clean up drm irq handler install function, and put + first install in starting stage later than status page setup, + so we won't make device cry for uninitialized status page. + +commit 04032dad28baab80131edbe8fe58aade8149bb71 +Author: Zhenyu Wang +Date: Wed Jan 30 18:52:32 2008 +0800 + + Wrap up chipsets which needs graphics address for status page + + Also add support on new chipset. + +commit b9c3fa79d9fd48c34536f92e6c1c70fe3a619410 +Author: Keith Packard +Date: Fri Jan 11 15:51:00 2008 -0800 + + Add intel_idle to measure GPU load ratio. + + Samples GPU idle register to detect when the GPU is busy; prints out the + number of busy samples per 100 total samples once per second. + +commit 5d9e67aec3ce458d22b7febd3819542abb360534 +Author: Erik Andren +Date: Fri Jan 25 11:06:01 2008 +0800 + + Clevo M720R has no TV-out + +commit 6bf53eb48f40ad0c8ea9679ee634447410821b4f +Author: Zhenyu Wang +Date: Fri Jan 25 16:59:13 2008 +0800 + + Set vtSema before EnterVT + + Which was missing in our ScreenInit and initial EnterVT. + This not only causes failure in initial rotation with TTM, + as we won't bind in rotate_mem alloc in this case, and hide + another bug that we call randr12 function in I830LoadPalete + before we call xf86RandR12Init. + +commit 94a18fa1f8141837bdab32e545da7a7aed1cc396 +Author: Julien Cristau +Date: Thu Jan 24 15:24:40 2008 +0100 + + Don't build reg_dumper if we don't have pciaccess 0.10.0 + + The pci_device_map_range() function was added in libpciaccess 0.10.0, and + is used by the reg_dumper tool. Don't try to build it if we have an older + libpciaccess. + Also make sure that util-macros >= 1.1.3 is available when running autoconf, + because it's required for the PACKAGE_VERSION_* macros. + +commit d341e41c863f1212bf2c6b84782a7e472b6612a1 +Author: Zhenyu Wang +Date: Thu Jan 24 10:40:18 2008 +0800 + + Clear shadow memory after allocation + +commit 88a1041c5361964d37107c22d77feaa1b2160656 +Author: Zhenyu Wang +Date: Thu Jan 24 10:36:06 2008 +0800 + + Fix i830 block handler wrap + + which was observed in rotation crash with stack overflow. + +commit db0a7c569e383436a2725e1e74f35fb426da1196 +Author: Andreas Stawinoga +Date: Thu Jan 24 08:51:09 2008 +0800 + + Samsung Q45 has no TV output + +commit f54bba7600647c76fe3bd2d0133edc06dbea6a05 +Author: Zhenyu Wang +Date: Tue Jan 22 00:48:23 2008 +0800 + + Add missing i830M and 845G pci ids info + +commit 633dbd28218fd8a746c1735fd44a14f35bd07faa +Author: Julien Cristau +Date: Thu Jan 17 22:34:21 2008 +0800 + + Bug 14032: i810, set default depth to 16 + + X fails to start without an xorg.conf on i810, because the default depth set by + the server (32) is not supported by the driver. I think the driver should + default to 16 bits (it supports 24, but when I tested it that didn't seem to + work very well, and dri is disabled at 24 bits depth anyway) instead of letting + the server use 32 and failing later on. + +commit 4fec18e07f2b23306e885d63c74661ae0e4b04d9 +Author: Jesse Barnes +Date: Fri Jan 11 10:28:59 2008 -0800 + + Turn on backlight when LVDS panel is powered up + + In some configurations, the LVDS may be off at startup along with the + backlight. So when turning the LVDS on for the first time, we may also need to + set the backlight to a non-zero value. So try to use the saved value if + possible, but if it's zero, make the backlight full brightness when turning on + the LVDS. + + Note that this is slightly sub-optimal for configurations where zero is a valid backlight brightness. + + Fixes fdo bz #13958. + +commit b5cf8faf8102e6313c23de87a680cc327ac95478 +Author: Jesse Barnes +Date: Thu Jan 10 14:25:18 2008 -0800 + + Remove unnecessary quirk code in CRT probing + + Since we return early in the CRTC DPMS code, keeping the pipes & clocks + enabled, this code is no longer necessary. As an added bonus, VGA connections + should be reported correctly even when the pipe A quirk is active. + + Updates fix for fdo bz #11432. + +commit 3c22ed633be2ac96eea7bc533839e956f1f31b84 +Author: Jesse Barnes +Date: Wed Jan 9 09:47:38 2008 -0800 + + Add pipe A force enable quirk + + On some platforms, the firmware may read & write GPU registers on lid close, + suspend/resume time or during various SMM events. If one of the graphics pipes + is disabled at that time, the GPU may hang due to the programming dependencies + of the various registers. + + This patch adds a quirk to force the driver to keep pipe A enabled if + necessary, through user configuration in xorg.conf or via a platform specific + quirk. Leaving the pipe enabled comes at a power cost however, so the quirk + should only be enabled when strictly necessary. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=11432. + +commit d3b41bcf231a6ffd289c128c06aa619f554a776c +Author: Zhenyu Wang +Date: Wed Jan 9 21:28:25 2008 +0800 + + Disable frame buffer compression on new chipset now. + +commit 2f0c0427dc4113bac64cda07c6365df1f0637697 +Author: Zhenyu Wang +Date: Wed Jan 9 21:27:42 2008 +0800 + + Update PIPELINE_SELECT instruction and surface state format for new chipset + +commit 139e9affdd49dcbe08e260a0a2bd001de16566e6 +Author: Zhenyu Wang +Date: Wed Jan 9 21:26:57 2008 +0800 + + GTT access change for new integrated graphics device + +commit 4f288ff2d1e7d28bf49167f073fbce21492a7c32 +Author: Zhenyu Wang +Date: Wed Jan 9 21:25:47 2008 +0800 + + Add new integrated graphics chipset ids + +commit f089942689df622b1af00569eade4883a84eb7a3 +Author: Zhenyu Wang +Date: Thu Jan 3 11:28:18 2008 +0800 + + Change origin i965G_1 to chipset market name G35. + +commit 71143200ed66cb9dcc1f9edf98128be80b05619c +Author: Jesse Barnes +Date: Fri Jan 4 15:01:25 2008 -0800 + + Don't modify low bit of BLC_PWM_CTL when using combo backlight control + + On some platforms, the low bit of BLC_PWM_CTL is wired as a 'max brightness' + flag, rather than a regular part of the backlight duty cycle. So when in the + combo mode, divide the total number of backlight levels available by two + (tossing one bit) and adjust the programming in the set_brightness routine. + + Note that platforms with this behavior may need quirks added so that they work + by default. + +commit b434bf4029d1a405216454629bcea717c779ae5a +Author: hulifox008 +Date: Fri Jan 4 02:46:54 2008 -0800 + + Fix copy'n'paste-o in unused airlied i2c code. + +commit f2ffc0f6e038357dda268363e52c11ada1d0b810 +Author: Jesse Barnes +Date: Thu Jan 3 11:16:15 2008 -0800 + + Fix compilation error when not using DRI + + This patch complements 88f8b688e2316ae4a1f7485f0010ce90de54783a which + added uint64_t typed variables to avoid unsigned long overflows in + 32-bit architectures but didn't include with the required + definition. + + When XF86DRI and _XF86DRI_SERVER_ are defined this header gets + indirectly included through "i830_dri.h", thanks to "i830_common.h" + which masquerades this problem as released in 2.1.0 and that manifests + with : + + In file included from i810_driver.c:88: + i830.h:137: error: expected specifier-qualifier-list before 'uint64_t' + i830.h:240: error: expected specifier-qualifier-list before 'uint64_t' + + Patch from Carlo Marcelo Arenas Belon + +commit a03aca101d4d51ed2279a99d1137ce3b7ef364e2 +Author: Zhenyu Wang +Date: Wed Jan 2 14:11:31 2008 +0800 + + xvmc: setup driver info for XvMCGetDRInfo request + + User don't need to have XvMCConfig file then, if ld.so can + find libIntelXvMC.so in ld path. + +commit 0fd769b5882058e5ebf17ee1c1e35b4a3d46e6b0 +Author: Zhenyu Wang +Date: Wed Jan 2 13:57:23 2008 +0800 + + xvmc: add context id info in debug/trace + +commit 83d304c61ad5fdc58b0a9309dbd1e5a3f6cd9b01 +Author: Nanhai Zou +Date: Wed Jan 2 10:50:44 2008 +0800 + + TV: fix 576p refresh rate + +commit a2bb2afd24c95e056b801c85dc12daeac54b37f0 +Author: Zhenyu Wang +Date: Fri Dec 28 15:52:12 2007 +0800 + + xvmc: move drmOpen earlier + + remove wrong comments + +commit 96246c27cb836bae8ee02c46c68a1f2102efd14b +Author: Joakim +Date: Thu Dec 27 17:09:02 2007 +0800 + + Aopen Minipc 965GM LVDS quirk + +commit 666e01bd426a553f23eeb5040ecbc28b4abb87da +Author: Zhenyu Wang +Date: Wed Dec 26 09:51:09 2007 +0800 + + xvmc: add info in intel.man + +commit e75d0c20e3b02f649b62ac9da7f41bb43d0f3d80 +Author: Zhenyu Wang +Date: Wed Dec 26 09:37:34 2007 +0800 + + xvmc: make XvMC default on + +commit ed9ff6f30fff33fe2d60715f1b503047f8e1ef01 +Author: Zhenyu Wang +Date: Tue Dec 25 08:32:47 2007 +0800 + + xvmc: consolidate put surface interfaces + + Make surface list track like context list, and move + generic PutSurface code out of i915. So MC driver just + needs to fill specific the command params, and we can + get one single type of intel xvmc command to issue, + ddx driver's put_image_size got removed. + + Fix last commit with missing XvMCContext assignment. + + Fix priv_data free with apropriate X11 XFree. + +commit f0ced5edaeec3e7741828eab728417843326d56f +Author: Zhenyu Wang +Date: Mon Dec 24 10:53:57 2007 +0800 + + xvmc: store XvMCContext pointer instead of context_id in internal ctx list + +commit 216ad7398742f2f80b5477e89f827acb351b4d72 +Author: Zhenyu Wang +Date: Thu Dec 20 13:39:32 2007 +0800 + + xvmc: add disable xvmc build support + + Move xvmc source files under XVMC config + +commit a811ca30659e8c477027ea9c91fb9fc516fdabc7 +Author: Zhenyu Wang +Date: Thu Dec 20 13:08:07 2007 +0800 + + xvmc: handle surface create/destory in generic code + +commit 5f961f28310a1cd19967df2034b0452bf4446394 +Author: Zhenyu Wang +Date: Thu Dec 20 12:51:06 2007 +0800 + + xvmc: move dri context handling to generic code + + Use XvMCContext's context_id for dri context handling instead + of driver private id. Remove unnecessary field for i915 private + structs. + +commit 73827e78357ab3f30a21f159ecdfb26dd0ea889b +Merge: 3cf8627 f69b48f +Author: Zhenyu Wang +Date: Wed Dec 19 22:47:02 2007 +0800 + + Merge branch 'master' into xvmc + +commit f69b48fe24ef94dac44b8123884ca71df675be4b +Author: Jesse Barnes +Date: Tue Dec 18 18:10:33 2007 -0800 + + Unconditionally restore pipe configuration + + This is a partial fix for #13196, which covers both leaving pipes disabled at + server exit time and problems with restoring the pipe configuration on certain + chipsets. It restores the pipe configuration unconditionally (previously we + made sure the PLL was running and we weren't in VGA mode) but also adds some + additional PLL settle time to the PLL register write paths. + +commit 4757a218d733af12d04674455fc6e1fad48a1cd0 +Author: Michel Dänzer +Date: Tue Dec 18 19:37:46 2007 +0100 + + Always set pPriv->buf to NULL after freeing the memory it pointed to. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13108 . + +commit 5cbb4110116f6d4187fd27660a78203caa1da46b +Author: Adam Jackson +Date: Thu Dec 13 15:10:43 2007 -0500 + + i830_sdvo_mode_valid: Fix return values to match what we actually check. + +commit e03bc385e924222d3d5f3c9a8d65e1ef63b858dc +Author: Jesse Barnes +Date: Tue Dec 11 13:28:01 2007 -0800 + + Add cscope files to .gitignore + +commit e720ae4476c3f986f623ce0f0ab9775b8b9b7e05 +Author: Jesse Barnes +Date: Mon Dec 10 13:00:14 2007 -0800 + + CRT hotplug detection improvements + + Patch from Hong Liu. + + Fixup CRT detection by making sure the pipe is enabled before CRT + detection actually occurs. Fixes bugs Hong was seeing on G35 and other + machines. + +commit d9df93578b74785c08ba860b4c9aa23b0c89c91c +Author: Dave Airlie +Date: Mon Dec 10 16:41:24 2007 +1000 + + ivch: fails on address mismatch as I seem to get this on my 865 system + +commit cd6f83519c69f72f146fea59afbd6a3542da783a +Author: Zhenyu Wang +Date: Mon Dec 10 05:49:58 2007 +0800 + + Fix tv quirk for Dell Latitude X1 + + which is actually 915GM, reported by + Andreas Schildbach + +commit 13ec9c8141a9f794258869a04a6bab59dac5eefa +Author: Zhenyu Wang +Date: Sun Dec 9 00:52:13 2007 +0800 + + exa: fix rendering issue on some 855GM laptops + + This trys to initialize more 3d states on i830 like mesa + code, which fixes exa rendering failure for some 855GM users. + +commit e2d9fd6425584119f28768d85c4b7d106ecf8742 +Author: Jesse Barnes +Date: Fri Dec 7 16:30:46 2007 -0800 + + Describe output properties in more detail + + Add descriptions for LVDS and TV output properties and also mention the EDID + property a new output configuration section. + +commit 6f92200db39a790c95c1fac64baf0bd41a70e481 +Author: Jesse Barnes +Date: Wed Dec 5 08:10:17 2007 -0800 + + Fix backlight setting save/restore + + We need to save the current backlight value at LVDS init time, as well as when + we change the DPMS setting. Also, since 0 is a valid backlight value, don't + set the backlight value to maximum at startup if the value happens to be zero. + + These fixes should make the backlight user experience much more consistent and + hopefully less frustrating. + +commit 4c1fa5235555c9ef3de1eebd006c4e91283362bf +Author: Jesse Barnes +Date: Tue Dec 4 18:27:24 2007 -0800 + + Add BCM_ to backlight control method enums + + Avoids polluting the global namespace with such generic terms. + +commit 30d74f1b1f30e751d2c47aa63a4a2043e71467dc +Author: Jesse Barnes +Date: Tue Dec 4 18:23:44 2007 -0800 + + Use "LEGACY" backlight method if backlight control is such + + This may regress the user experience a bit (fewer backlight levels) on machines + where both the LBB and native registers work, but it's better that it work for + everyone than work extra well for some and not at all for others. + +commit 0e554e6dd4da56be24d2f971ff4cd4d585936724 +Author: Eric Anholt +Date: Tue Dec 4 10:32:45 2007 -0800 + + Remove extra have_libpciaccess=no that broke tools build with old servers. + +commit 3cf862717688aa679b5e667cd041ddd6f5db0b58 +Author: Zhenyu Wang +Date: Thu Nov 29 23:12:16 2007 +0800 + + xvmc: add "XvMC" option, default is false. + +commit 6da4b7a80cdf730018435fe84485ecdad62bc860 +Author: Zhenyu Wang +Date: Thu Nov 29 22:56:13 2007 +0800 + + xvmc: move batch buffer init/fini code into generic + +commit 75ef3e669dac1259d282dcc8f54b197fc19f22b3 +Author: Zhenyu Wang +Date: Wed Nov 28 22:13:55 2007 +0800 + + Replace ALLOCATE_LOCAL/DEALLOCATE_LOCAL with xalloc/xfree + +commit df47b7ba57f3e7dc8bac1898679186d9d48639ac +Merge: df718a7 7f9ceff +Author: Zhenyu Wang +Date: Tue Nov 27 01:13:43 2007 +0800 + + Merge branch 'master' into xvmc + +commit 7f9cefffbf44a2d07b51cc13aaf2d54fcd8f2f22 +Author: Alan Hourihane +Date: Fri Nov 16 15:56:08 2007 +0000 + + vendor is CARD8 + +commit df718a77c854c9110a81c2bc2a32a9aac85850f2 +Author: Zhenyu Wang +Date: Fri Nov 16 16:08:06 2007 +0800 + + xvmc: add xvmc decoder type string + +commit a03a758db0df615fbb44dae1ab6910bfeaeb54f9 +Author: Zhenyu Wang +Date: Fri Nov 16 15:49:10 2007 +0800 + + xvmc: move some i915 context destroy code to generic function + +commit 7bfbcb4dc7806ae7543f230373e67f35ba30668d +Author: Zhenyu Wang +Date: Fri Nov 16 15:43:04 2007 +0800 + + xvmc: clean batch buffer finish + +commit a6e8f4ef0481c66fda4f22fcc4bb0ef9c000f0cd +Author: Zhenyu Wang +Date: Fri Nov 16 13:51:44 2007 +0800 + + xvmc: remove i915 drm map type + +commit 4a2b0f340357c4ca58dc9586fad1337b83966362 +Author: Jesse Barnes +Date: Thu Nov 15 18:36:54 2007 -0800 + + Fix typo in 1920x1080 resolution entry + +commit 6c68fcc93917565712b6a9386df54d0204e4ea8f +Author: Zhenyu Wang +Date: Fri Nov 16 10:04:46 2007 +0800 + + xvmc: more i915 xvmc cleanups + +commit 04b60b6d3436fb57163c23acf335364f0ea2f79c +Author: Jesse Barnes +Date: Thu Nov 15 11:49:53 2007 -0800 + + Bump version to 2.2.0 + +commit 6eecef4fed8a21dfdabef42eb69fd150b96167b2 +Author: Jesse Barnes +Date: Thu Nov 15 10:10:59 2007 -0800 + + Adjust default TV out paramaters + + According to several users, a default brightness of 0 results in much better TV + output. Improved control of these parameters will be provided by Randr1.3, + which will standardize several output properties across various chips. + +commit 7552d80e367fe38bbc594fe94abd649917fe54d5 +Author: Jesse Barnes +Date: Thu Nov 15 10:07:34 2007 -0800 + + Add 1920x1080 mode to TV out + + Allows users to use 1080p modes on TV out, see bug #13034. + +commit e56c166ceb8c1ceddd5020e8de2d0b9d51f535a4 +Author: Zhenyu Wang +Date: Thu Nov 15 18:34:18 2007 +0800 + + remove unnecessary i830_reg.h includes + + i830_reg.h only contains 3d engine cmds for 8XX chips. + +commit 6f3de19159cd7a2d73ed212add909edb3aedce9c +Author: Zhenyu Wang +Date: Thu Nov 15 18:33:27 2007 +0800 + + Move fb compression reg definition into i810_reg.h + + where we put MMIO control reg in, and shared with intel_reg_dump + program. + +commit 1ff97991a4954d508cc260dda82b7678010d13c9 +Author: Zhenyu Wang +Date: Thu Nov 15 17:01:31 2007 +0800 + + xvmc: intel_xvmc.c cleanups + +commit 1cfdf192882b856bfc93b735cfb9cb813cac3fdb +Author: Zhenyu Wang +Date: Thu Nov 15 16:38:21 2007 +0800 + + xvmc: remove unused SAREAPTR macro + +commit d9ea2fbdcce3c7c91428846eff43b65ac340f38d +Author: Zhenyu Wang +Date: Thu Nov 15 15:25:35 2007 +0800 + + xvmc: i915 rename files + +commit 06c0579df8d45f7f04b96956353d5f86cf59148f +Author: Zhenyu Wang +Date: Thu Nov 15 15:01:56 2007 +0800 + + xvmc: some code clean up + +commit 4983e3401390654098dbf99dcfb45bab060b068c +Author: Zhenyu Wang +Date: Thu Nov 15 13:56:24 2007 +0800 + + xvmc: move locking code into generic place + +commit bcd656c8dfe7309a5cf02ce1da8bc747ccd6e21c +Author: Zhenyu Wang +Date: Thu Nov 15 11:18:38 2007 +0800 + + xvmc: oops, should first map batch buffer before init + +commit 0464af581b0fcfc4d1c7fec8160d812262086177 +Merge: 2256519 e56c166 +Author: Zhenyu Wang +Date: Thu Nov 15 11:05:44 2007 +0800 + + Merge branch 'master' into xvmc + +commit 22565198b360826ba10e7ca05d272c419054dc08 +Merge: 619044b e64f492 +Author: Zhenyu Wang +Date: Thu Nov 15 18:53:22 2007 +0800 + + Merge branch 'master' into xvmc + +commit e64f4929690a57701241334fbca17e95b39ba3d4 +Author: Jesse Barnes +Date: Wed Nov 14 16:44:34 2007 -0800 + + Backlight fixes + + Open the "actual_brightness" file as read only, since we only read from it. + Also set an initial backlight_duty_cycle at init time so we don't set the + brightness to 0 at startup. + +commit 53e3693ef13f31f3fc33bcff7286ab2b03b2d430 +Author: Jesse Barnes +Date: Wed Nov 14 16:24:56 2007 -0800 + + Disable FBC by default on 965GM + + Several people have reported that they see frequent FBC related display + corruption on 965GM, so disable it for now. Users wanting to enable it can use + the driver option "Framebuffercompression" to override the default. + +commit b2726899bc6ebd108aa4a5dd66fe1d881bb778b3 +Author: Jesse Barnes +Date: Wed Nov 14 15:49:41 2007 -0800 + + Add more FBC regs + + Needed for the new debug code + +commit b7bc694c6b98dac17763426d905a22d3ae17a018 +Author: Jesse Barnes +Date: Wed Nov 14 15:46:57 2007 -0800 + + Fix kernel get_brightness function + + We need to look at "actual_brightness" rather than "brightness". The former + contains the brightness value the kernel driver has actually set, while the + latter is merely what the user requested. + +commit 9ee96ed02aacd953ab58288fddf0fa60f60b668e +Author: Jesse Barnes +Date: Wed Nov 14 15:44:56 2007 -0800 + + Correct FBC debug message + + To be consistent, it should say 'plane' rather than 'pipe'. + +commit 675b9471d84059496ca41d427a4f95d419f82be9 +Author: Jesse Barnes +Date: Wed Nov 14 15:17:05 2007 -0800 + + Add FBC registers to register dump output + + Just for completeness. + +commit a2a0821e74a61f53cc7f0c41ce629644ad712114 +Author: Jesse Barnes +Date: Wed Nov 14 11:30:20 2007 -0800 + + Don't stop ring before restoring hw state + + Some of the hw state restoration callbacks may want to use the ring for various + things like stopping video playback, so leave the ring enabled until we get + back from RestoreHWState. Also rename the functions so that their purpose is + clearer and remove a couple of redundant lines. + +commit 619044b242d4abf605b42cfff538b63f445fe709 +Author: Zhenyu Wang +Date: Thu Nov 15 02:23:07 2007 +0800 + + xvmc: move batch buffer init/fini to intel_batchbuffer.c + +commit ae805ac379ccfdae9ee272896665e73f5bc7d2cf +Author: Zhenyu Wang +Date: Thu Nov 15 02:13:07 2007 +0800 + + xvmc: take out batch buffer handling code + +commit ad3bc0158d37e98fcbbe6a8e31413c142a260424 +Author: Zhenyu Wang +Date: Wed Nov 14 22:46:46 2007 +0800 + + Don't enable fbc with XAA or tiling is off. + + This slightly reworks my last fbc patch. We don't + support tiled front buffer with XAA now, so also + disable fbc on it. If tiled alloc failed, disable + fbc too. + +commit 26194e19e1c80615697016e25640d4c8c244353f +Author: Keith Packard +Date: Tue Nov 13 22:26:40 2007 -0800 + + Review PLL spreadsheet and update register ranges. + + The PLL spreadsheet makes the precise register ranges allowed for each mode + quite clear, and shows a few inaccuracies in the b-spec. In particular, the + N register value may range from 1 to 6 instead of 3 to 8. This should close + the gap we've seen in the reachable frequencies. + +commit 581509321e51becb8ee6ddcfaa15a2a713c9ef8e +Author: Zhenyu Wang +Date: Wed Nov 14 22:16:04 2007 +0800 + + Remove one redundant line. + +commit 8cea3c8cfa86600b5f2c3e1f21c19d4b2a320fd4 +Author: Zhenyu Wang +Date: Wed Nov 14 22:13:30 2007 +0800 + + Don't setup fb compression if fb is not tiling + +commit 539b669d6e23833a917a9b0d3a355d4283e0b76a +Author: Jesse Barnes +Date: Tue Nov 13 17:59:54 2007 -0800 + + Remove harmless error message + + This really isn't an error in general. If vblank pipe setup really fails for + some reason, it'll be obvious enough when the user tries to use vblank events + for something. + + Patch from Hong Liu. + +commit e8db8584ae4860aa991c916126335b287a972d5b +Author: Zhenyu Wang +Date: Wed Nov 14 00:11:20 2007 +0800 + + xvmc: attempt to move batch buffer code out of i915 private + +commit 11c0e0dbef42f1ae77a77d534870d3e9821fb017 +Merge: c838f72 43fbc54 +Author: Zhenyu Wang +Date: Tue Nov 13 22:44:06 2007 +0800 + + Merge branch 'master' into xvmc + +commit 43fbc547786cf26514f95bce79fab58a66c291bf +Author: Jesse Barnes +Date: Mon Nov 12 12:23:41 2007 -0800 + + Improve backlight control + + This commit fixes backlight support for several platforms. + + Except on recent machines supporting the IGD OpRegion specification, + backlight control is rather platform specific. In some cases, we can + program the native backlight control regsiters directly without any + trouble. On others, we need to use the legacy backlight control + register. On still others, we need a combination of the two. And on + some platforms, none of the above will work, so we go through the + kernel backlight interface, which provides a platform specific driver + for backlight control. + +commit 10988c5e6ec0f3c40d56bbf209b7976627cca706 +Author: Jesse Barnes +Date: Mon Nov 12 09:19:22 2007 -0800 + + Fix typo in PLL enable check + + Check against DPLL_A instead of DPLL_B before writing PIPEACONF. + + Thanks to Colin Guthrie for his sharp eyes. + +commit ab2055ebb20aa6de121fa377e488ce91913035ae +Author: Jesse Barnes +Date: Fri Nov 9 13:55:46 2007 -0800 + + Add 'ret' variable to i830_allocator_init + + Needed in the XF86DRI_MM case. + +commit 24280edbdf54e9559b26ea27c1b005eea73f51bc +Author: Jesse Barnes +Date: Fri Nov 9 13:53:58 2007 -0800 + + Fixup warnings + + Remove unused 'ret' variable, move pI830 under #ifdef XF86DRI_MM in + i830_allocate_memory. + +commit 4fe507957bf826d81a71cd63af17c5547d1023a1 +Author: Jesse Barnes +Date: Fri Nov 9 13:51:11 2007 -0800 + + Remove unused 'palette_enable' variable + +commit 62404a9c9c0d98efb69ac96209dea17331e0489c +Author: Jesse Barnes +Date: Fri Nov 9 07:55:01 2007 -0800 + + Update man page to reflect EXA by default + +commit c838f7297f675ea9d82678ed37715955cb0a8a78 +Merge: a9449ff 6f53568 +Author: Zhenyu Wang +Date: Fri Nov 9 19:37:07 2007 +0800 + + Merge branch 'xvmc' of git+ssh://zhen@people.freedesktop.org/~zhen/xf86-video-intel into xvmc + +commit a9449fff4be8e6b3cc82914376420e3a66b960f5 +Merge: a470f6b 177924e +Author: Zhenyu Wang +Date: Fri Nov 9 19:36:25 2007 +0800 + + Merge branch 'master' into xvmc + +commit 177924e879564b7e9e70fd607141978bfd053fff +Author: Jesse Barnes +Date: Thu Nov 8 18:16:48 2007 -0800 + + Bump driver version to 2.1.99 in preparation for 2.2 release + +commit cb4e5796f0537ea5e0e646d473930c7b826c85d8 +Author: Jesse Barnes +Date: Thu Nov 8 18:13:47 2007 -0800 + + Default to EXA + + If EXA is compiled into the driver, default to using it for acceleration. + Hopefully we can remove XAA entirely one day. + +commit 43a59ab26b09fcc24de1ed7bd770bb622f899ceb +Author: Jesse Barnes +Date: Thu Nov 8 16:52:41 2007 -0800 + + Clear current video crtc on DPMS off + + When calling the video DPMS off function, make sure we zero out the current + crtc so that it will be properly re-set up next time video is turned on. + + Fix from Peter Clifton with changes by Keith Packard. + +commit e784e152a8e84b6e447b55a5c7019e7b47e17621 +Author: Jesse Barnes +Date: Thu Nov 8 16:37:53 2007 -0800 + + Fix overlay destination clamping + + The overlay width & height scaling clamp check was reversed. Fix that and + update the comment. + +commit b8770f710729d616b3ac72544aa522161a78f819 +Author: Jesse Barnes +Date: Thu Nov 8 16:19:01 2007 -0800 + + Setup 3D state at EnterVT time + + In the absence of full suspend/resume support in the kernel, we have to + save/restore state in Enter/LeaveVT. For 8xx chips, 3D state may be lost + during suspend/resume, so re-emit the basic setup at EnterVT time. + + Patch from Peter Clifton. + +commit 5f92b4c2db9712496b829ee239468e3d14e27d2f +Author: Eric Anholt +Date: Thu Nov 8 13:31:51 2007 -0800 + + Bug #12059: Add ch7019 to the list of supported devices for ch7017. + + While I'm here, fix the chip description to be LVDS instead of TMDS in i2c + device. + +commit eecd3ccedee6c4acf101591f7e60673660379e62 +Author: Jesse Barnes +Date: Thu Nov 8 09:31:08 2007 -0800 + + Check DPLL status before writing PIPEnCONF regs + + If the DPLL isn't enabled or is in VGA mode, writing the PIPEnCONF registers + may cause a hang or crash. So ensure the DPLL is in the proper state before + writing them. + + Another excellent fix from Peter Clifton. + +commit b434c1a437c407de88396b219560649c2dae82b2 +Author: Jesse Barnes +Date: Thu Nov 1 12:06:07 2007 -0700 + + Framebuffer compression fix: front buffer may not be at fence 0 + + Fix a long standing bug in the framebuffer compression code (thanks to + Pierre Willenbrock!) that prevented FBC from working correctly if the front + buffer was anywhere but fence register 0. + +commit 50d3693a6862028e50bc5ba8c788e7ea573c3eb8 +Author: Zhenyu Wang +Date: Thu Nov 1 22:22:27 2007 +0800 + + Fix allocation reset for really not free BO allocator + +commit ecd995d533d28b622afc71a20504d47c33ff5b8d +Author: Alan Coopersmith +Date: Tue Oct 30 18:20:49 2007 -0700 + + Fix builds without DRI + +commit 7c88b58a93fce9fda59b6344acb87af16336e287 +Author: Alan Coopersmith +Date: Tue Oct 30 18:20:15 2007 -0700 + + Clear compiler error: "void functions cannot return values" + +commit a470f6b2ca291e305979dd9223885a50dc0b334b +Author: Zhenyu Wang +Date: Fri Oct 26 22:40:47 2007 +0800 + + try to move some fields to xvmc driver structure + + Still a lot of things to move include batch buffer, lock, context, + surface resource handling, etc. + +commit 6f53568cd2aeeec6bd8c1f1d9f9c5ecadc5c62f9 +Author: Zhenyu Wang +Date: Fri Oct 26 14:58:43 2007 +0800 + + Fix DRI context creation for XvMC + +commit d2c78f82c20f33fc9c22cab8a7ca161e57a34bf8 +Author: Thomas Hellstrom +Date: Wed Oct 24 19:34:12 2007 +0200 + + Adapt to DRM Lockfree and setStatus changes. + +commit 78aaec0ffc711742bf8ad77757ed8c15cc3f7a9f +Author: Eric Anholt +Date: Wed Oct 24 11:50:54 2007 -0700 + + Fix typo in my hand-application of rglowery's patch. + +commit 021265fbec9fd4ee31bdc9767c0c0453479ea22c +Author: Rob +Date: Wed Oct 24 11:06:53 2007 -0700 + + Fix a crash in TV mode handling by initializing the prev field of modes. + +commit ce9802edd25255f6c9c11e512b2ef905384b914d +Author: Zhenyu Wang +Date: Wed Oct 24 00:31:53 2007 +0800 + + fix xvmc return values + + Use values defined by xvmc lib spec + +commit 9c84543eb0fde4643eb7529eb6b08eacf57c12d0 +Author: Zhenyu Wang +Date: Tue Oct 23 22:16:55 2007 +0800 + + add missing license header for new files + +commit 87345e820d20f1a98216c52e156c2e18c15ffa44 +Author: Jesse Barnes +Date: Mon Oct 22 14:22:37 2007 -0700 + + intel_reg_dumper - dump VGA AR registers too + + Add a VGA AR dumping function so we can debug text mode problems too. + +commit 90e4eafdf59edd966ed626107c3909b24737da8d +Author: Zhenyu Wang +Date: Mon Oct 22 17:09:15 2007 +0800 + + revert xvmc memory allocation hacks + +commit 167c56bcf82f0a6d72151b202e6d56f6e0d627f6 +Merge: fc9368c 78e251d +Author: Zhenyu Wang +Date: Tue Oct 23 00:12:22 2007 +0800 + + Merge branch 'master' into xvmc + +commit fc9368ce7dacd52ef222559d20188ddcf2a85df5 +Author: Zhenyu Wang +Date: Tue Oct 23 00:09:06 2007 +0800 + + split xvmc user lib chipset drivers + +commit 78e251db671e21bc859c9b505d391b70babee2dc +Author: Eric Anholt +Date: Fri Oct 19 15:04:10 2007 -0700 + + In the clock graph, draw the VCO as erasures in the lines representing clocks. + + This shows one of the reasons for the gaps: with the other settings, the VCO + is too low inside the gap. However, it also points out another issue: we + aren't using the high end of the VCO range due to some other limits being hit. + +commit 9f9b888525b274036d301d6e06351583d0415f9e +Author: Eric Anholt +Date: Thu Oct 18 11:25:24 2007 -0700 + + Warn in the log if we choose a PLL clock that's way out of line. + +commit 1f8bf110394cc1df66aae9acf5c818145ae19b52 +Author: Eric Anholt +Date: Thu Oct 18 11:17:38 2007 -0700 + + Add some nickle scripts for looking at PLL issues. + + While here, move similar nickle scripts under src/scripts/ + +commit 79636b8c776ae024518103c9fa137c8498c21d48 +Author: Eric Anholt +Date: Wed Oct 17 17:10:24 2007 -0700 + + Bump pciaccess version requirement for new API usage. + +commit c824c45e72908b5b3fa832fec91c7b47f305180c +Author: Dave Airlie +Date: Wed Oct 17 16:35:29 2007 +1000 + + intel: make block handler hook happen no matter what video is in use + + This shouldn't make a difference now, but for upcoming EXA/batch changes it + will be more useful + +commit aa88d23e615e7f154cf850927a0a7bb9fbb0d2f9 +Author: Rob +Date: Wed Oct 17 09:19:19 2007 +0800 + + AOpen 965GM mini pc has no LVDS + +commit 38900f55e2b50ea383f78adb016e3a02c3bd17ad +Author: Kyle McMartin +Date: Tue Oct 16 16:38:28 2007 -0400 + + toshiba satellite u300 has no tv out + +commit 74ac5de14ebb77aeb39d698e9e8d188c9d9abd76 +Author: Michel Dänzer +Date: Tue Oct 16 15:08:26 2007 +0200 + + Adapt to libdrm buffer object API changes. + +commit d66e924680a3504aa1feb9c228145a95d1a16b1e +Author: Eric Anholt +Date: Mon Oct 15 11:31:51 2007 -0700 + + In update_front_offset(), set pScrn->fbOffset even at EnterVT during init. + + Failure to do so led to the memset() at EnterVT being done to an invalid + offset. + +commit cc892d1ba1d87d08bdd04f857efc6b8f64620018 +Merge: b52ce0b fd97edb +Author: Zhenyu Wang +Date: Mon Oct 15 22:09:14 2007 +0800 + + Merge branch 'xvmc' of git+ssh://zhen@people.freedesktop.org/~zhen/xf86-video-intel into xvmc + +commit c94cdfd6ddbc580523737f596e97b96a7ce100b9 +Author: Jesse Barnes +Date: Sat Oct 13 15:57:45 2007 -0700 + + Fix palette save/restore + + When restoring the palette, we weren't checking to make sure the + associated pipe was enabled before writing the registers. In some + configurations, this led to a driver crash. Add new routines to handle + palette save/restore and verify that the pipes are on before we touch + the registers (could easily be changed to enable/disable the pipes + around the save/restore as well). + +commit e04333a6352040bc883655d606923c912d005981 +Author: Eric Anholt +Date: Fri Oct 12 12:42:45 2007 -0700 + + Fix failure in tiling setup on non-power-of-two allocations on pre-965. + +commit a1612b7728d4153499fe86b6713a13c8702cc7d9 +Author: Eric Anholt +Date: Fri Oct 12 12:42:06 2007 -0700 + + Use mprotect on unbound AGP memory to attempt to catch use while unbound. + + This doesn't help with the most common use-while-unbound cases, which are + from the hardware side. + +commit 3af442ba52550a9d183e215d49cc12dac0cb9e4b +Author: Eric Anholt +Date: Thu Oct 11 11:56:06 2007 -0700 + + Don't double-free the memory manager allocation. + +commit 6c485ff5bd25e9aa6a3c1eb669843e6b969d94df +Author: Eric Anholt +Date: Fri Oct 5 15:52:56 2007 -0700 + + Update memory manager sizing for the current set of LIFETIME_FIXED bufffers. + +commit d47cf148776d74f9035863b23eefdc2b5893af08 +Author: Eric Anholt +Date: Fri Oct 5 15:45:51 2007 -0700 + + Move tiling fence register setup to bind time instead of allocate time. + + This allows us to allocate tiled buffers in buffer objects. In the process + I removed the fence division that we had for tiled buffers on pre-965. If we + resurrect that code, it should probably be managed by just dividing all the + objects in roughly half and fencing those halves (to reduce the alignment + requirement), instead of using giant fences until we run out of space and then + trying to deal with scarce space on the last (or not) buffer. Halving + our tiled objects would use 6/8 of our fence registers on that hardware. + +commit a6dc81a0864f9ab2f6fc1aa31002c0191f674ceb +Author: Eric Anholt +Date: Fri Oct 5 12:37:19 2007 -0700 + + Allow front/back/depth to move over the lifetime of the server. + +commit 132dce7565feeea1055899f8c1627766fe84c88c +Author: Eric Anholt +Date: Fri Oct 5 12:12:06 2007 -0700 + + Delay SAREA and mapping setup until EnterVT when using the memory manager. + + Otherwise, we would use uninitialized offsets in the early setup. + +commit 4ca3550fb7d488741f8dc1ba3c8722393277c3b8 +Author: Eric Anholt +Date: Thu Oct 4 17:02:15 2007 -0700 + + Rework DRI buffer mappings and sarea setup to allow for moving buffers. + + While this has been a desired feature for some time, to allow for reallocation + of the front buffer, it was made more necessary by the desire to avoid + requiring a NO_MOVE buffer type in TTM because buffer objects may not be left + pinned over VT switch. This is a step towards making those buffers + movable and resizable. + +commit f393a12d21eed668cf4771f022beded9a4c547c7 +Author: Eric Anholt +Date: Thu Oct 4 13:03:14 2007 -0700 + + Move drmMMLock to after we have unbound our (pinned) buffers. + + There are still issues due to the fact that we're allocating + NEED_LIFETIME_FIXED memory as buffer objects, which we refuse to unpin because + we have no way of pinning it back in the same location. + +commit 8fc4e3078210f726c7c375faa2f2fd8d05017c09 +Author: Eric Anholt +Date: Fri Oct 5 11:51:55 2007 -0700 + + Refuse to allocate LIFETIME_FIXED objects in buffer objects. + + We can't guarantee the offset will stay the same using the current DRM + interface, but the correct solution is fixing our code to allow these objects + to move. Breaks TTM mode of the DRI driver for now. + +commit 0de747f7d219a56434dad49a8a6d1d9d4c251ca7 +Author: Eric Anholt +Date: Thu Oct 11 10:36:01 2007 -0700 + + In i830_allocate_memory_bo, bind if we control the VT, not on lifetime-fixed. + +commit 0040bb95445e800af80ca9fa1b92f5db33f1b4ac +Author: Eric Anholt +Date: Wed Oct 10 16:48:12 2007 -0700 + + Fix potential use-after-free in XV overlay code on video stop. + +commit 56ae767180da4a8bd4b7a4c35b92e019ab67d753 +Author: Zhenyu Wang +Date: Thu Oct 11 10:09:29 2007 +0800 + + Revert "Fix G33 GTT stolen mem range" + + This reverts commit 2a8592f2ebcba86b1127aa889155d58a3dc186ca. + + This causes compat issue between ddx and kernel apggart version. + Revert it as it shouldn't hurt normal people's default GTT size, + but if you change it to 1MB in bios, it's supposed to be broken now. + +commit 5faee02e97b7543b41bb1f8e3751558c48802833 +Author: Zhenyu Wang +Date: Wed Oct 10 13:55:30 2007 +0800 + + EXA: fix tiled dest rendering on i8XX chips + +commit 5bbe9f09fda1238da04e6b584813d40fc646f49d +Author: Keith Packard +Date: Wed Oct 3 00:18:25 2007 -0700 + + Include xf86mm.h if using XF86DRI_MM + + This header file doesn't appear to be getting automatically included for + some reason. + +commit 41dacf97ec1d4ba6f54057f4fcc7bb76033a454e +Author: Keith Packard +Date: Wed Oct 3 00:17:41 2007 -0700 + + Quirk for Samsung Q35 which has no TV output. + +commit b52ce0bd178c268d20334e2be8fad46037e47499 +Author: Zhenyu Wang +Date: Mon Oct 8 22:56:44 2007 +0800 + + use field name to initialize i915 xvmc driver + +commit e0fb228401b10ea4281eee48497bf1d584999705 +Merge: 84d7b2b 9e770bf +Author: Zhenyu Wang +Date: Mon Oct 8 22:45:11 2007 +0800 + + Merge branch 'master' into xvmc + + Conflicts: + + src/i830_driver.c + +commit fd97edb62463e50a1860290d54684a68d5490bdc +Author: Zhenyu Wang +Date: Mon Oct 8 16:13:26 2007 +0800 + + move some definition out of i915 specific header + +commit 3a2b5222341b37322b788e329c2b9006dc14ecfd +Author: Zhenyu Wang +Date: Mon Oct 8 15:46:11 2007 +0800 + + Temp work around ttm allocation for xvmc, which should be fixed later. + +commit 9e770bf69edaa8944048049e11266dbe1ef145e5 +Author: Eric Anholt +Date: Thu Oct 4 14:31:37 2007 -0700 + + Replace setting of LIFETIME_FIXED on cursors with just updating the offsets. + +commit c9d6e90c2523096c45d330552f471e6bf1752704 +Author: Eric Anholt +Date: Thu Oct 4 14:27:07 2007 -0700 + + Don't set overlay registers LIFETIME_FIXED. It always uses the current offset. + +commit 1cc6bec4628a4ca04a68919a84148a1e6312072f +Author: Eric Anholt +Date: Thu Oct 4 14:23:48 2007 -0700 + + Revert setting of exa_965_state as LIFETIME_FIXED. + + The current offset is used every time in render setup. + +commit dfa22df8ce7713b491c4766ce6ce652db91b5f90 +Author: Eric Anholt +Date: Fri Oct 5 12:53:07 2007 -0700 + + Don't leak buffer object allocations in i830_reset_allocations(). + +commit 7db9d706a1bc9da7afc4823cee92b23e96ae55b8 +Author: Eric Anholt +Date: Fri Oct 5 12:40:48 2007 -0700 + + Warning cleanup. + +commit bf33c4e2d91172efd08690fadda7b3743dd3de62 +Author: Eric Anholt +Date: Fri Oct 5 12:40:37 2007 -0700 + + Fix formatting of error message. + +commit 04e936935f0b0045600241424f1d04a6721a2432 +Author: Eric Anholt +Date: Mon Oct 1 17:29:35 2007 -0700 + + Bring the CH7017 driver closer to spec. + + This is also closer to what my hardware is programmed with, except for some + very confusing off-by-one bugs in an unexpected direction. + +commit 263d48ad93a0fb7100729d0c6e0443797c20c80a +Author: Eric Anholt +Date: Mon Oct 1 16:23:30 2007 -0700 + + Fix probing of the sample CH7017 device I found by allowing GPIO overrides. + + It may be that the LVDS chips need to be DVOA and GPIOB only on mobility + devices with them, and DVOC/GPIOE on non-mobility like this 845. But until + more examples are found, just make this one device probe. + +commit 219354af212c7b68c20df689692c55331e36a705 +Author: Eric Anholt +Date: Mon Oct 1 16:09:13 2007 -0700 + + Restore building of pciaccess-based tools even if the server doesn't use it. + +commit 1b83e5e589105d05c1b78032fa47eecee478cb99 +Author: Eric Anholt +Date: Mon Oct 1 14:32:28 2007 -0700 + + Remove more DVO probing noise. + +commit 29d3188ee9676f697f6fcb859c7f680f5df30318 +Author: Eric Anholt +Date: Mon Oct 1 13:45:09 2007 -0700 + + Suppress I2C failure error messages during DVO device detection. + + Otherwise, errors would be printed for every chip probed which wasn't present + on the system. + +commit 6dd8228a386334d05836353672aae9f8c456e435 +Author: Eric Anholt +Date: Mon Oct 1 12:07:22 2007 -0700 + + Enable CH7017/7018 DVO driver by default. + + On hardware containing one of these chips (generally single pipe with an LVDS + connected), it's probably better to try to enable it and fail in some cases + than to not probe the output at all. + +commit 994ee6721d9f1650ad37e21198b86848352b73af +Author: Eric Anholt +Date: Mon Oct 1 12:01:16 2007 -0700 + + Disable TV/VGA output on the CH7017/7018 devices. + + We don't support those outputs on this chip yet, so turn them off if the BIOS + had set them on. + +commit 0e5574e842eeaac75271ccd50027d3e54c57722d +Author: Regis Prevot +Date: Sat Sep 29 16:21:08 2007 +0200 + + Ignore detection of TV output on Panasonic CF-Y7 + +commit 84d7b2b955107264b67526a04028a8b79d8804e3 +Author: Zhenyu Wang +Date: Sat Sep 29 19:41:15 2007 +0800 + + rename xvmc init function names + +commit 1845e7c6e9caf7a9ad7f46a8fbfa321ddec69a1e +Author: Jesse Barnes +Date: Fri Sep 28 10:12:11 2007 -0700 + + Go back to using old drm_i915_flip_t field name + + This field shouldn't have been renamed in the first place. Go back to using + the old name so that the tree is backward and forward compatible again. + +commit f3d92ab474de11babe507b0e3c15aca146b6cb66 +Author: Kyle McMartin +Date: Fri Sep 28 10:17:55 2007 -0400 + + Dell XPS 1330 has no TV out + +commit bbf69c7446aa9748dacecccfe0b63d803f865b00 +Author: Zhenyu Wang +Date: Thu Sep 27 17:37:19 2007 +0800 + + Pin cursor, overlay(no physical) and exa state buffers + + And cursor mem counting for dri mem manager is not relate + to overlay. + +commit 64188246bb25e95a916ebb8a50a09298e56d91d9 +Author: Zhenyu Wang +Date: Wed Sep 26 15:48:19 2007 +0800 + + clean up old i915 xvmc function declare + +commit 320b7f08f457455f1d16b4c36d149bdc3f6ceead +Author: Zhenyu Wang +Date: Wed Sep 26 15:02:33 2007 +0800 + + Revert to origin xvmc setup steps + + We have to grab xvadaptor's PutImage earlier than + xv init, otherwise no chance to do that.. + +commit 1e0ff38f44e3b5a8b4a5d509c7faa266270d522c +Author: Hong Liu +Date: Thu Sep 20 11:28:52 2007 +0800 + + Fix pixmap offset + + Use consistent interface for counting pixmap offset. + +commit 85e4bd109464a4d90856e17bc960872eeaebc2ad +Author: Zhenyu Wang +Date: Wed Sep 26 14:32:46 2007 +0800 + + Log xvmc driver name + +commit e58b76a24a29e0a502650807de81e650e5dc184d +Author: Zhenyu Wang +Date: Wed Sep 26 14:40:04 2007 +0800 + + clean up err report + + Still need to clean up return value for XvMC API + +commit b10a9668dc50d10489b2ae531d89c8ab7c408170 +Author: Zhenyu Wang +Date: Wed Sep 26 14:01:57 2007 +0800 + + fix i915 xvmc devPrivate reference + +commit f12eaaf385e7a0b85524588a5d865d1cc3f1a0cf +Author: Zhenyu Wang +Date: Wed Sep 26 13:49:55 2007 +0800 + + comment out i965_xvmc_driver for now + +commit 513e8a2f8abde1b11b8058e94a650796fd51779b +Author: Zhenyu Wang +Date: Wed Sep 26 13:45:42 2007 +0800 + + Create xvmc driver interface + + convert i915 to new xvmc driver interface + +commit ca67fa767dc762dac369e84b27a7ef15673d527c +Author: Eric Anholt +Date: Mon Sep 24 11:12:22 2007 -0700 + + Remove logic for supporting i915tex_dri.so vs. i915_dri.so. + + There can be only one. + +commit 130f79613bfe6a8cfa7f431c8cce06cbb93cc91a +Merge: b73235f 1260316 +Author: Eric Anholt +Date: Fri Sep 21 17:14:44 2007 -0700 + + Merge branch 'buffer-objects' + + This branch changes i830_memory.c's allocator to use TTM when available to + allocate memory, which also allows TTM to control almost the entire aperture. + As a result, our front/back/depth buffers are created as real buffer objects, + which may be used by the DRI driver instead of the fake buffer type in TTM. + The updated DRM with bo_set_pin ioctl is required, to allow us to pin and + unpin our buffers as needed. + +commit 126031655c3c1db9881ad17d712461533eb59632 +Merge: c343835 bda3c69 +Author: Eric Anholt +Date: Thu Sep 20 08:57:58 2007 -0700 + + Merge remote branch 'origin/master' into buffer-objects + + Conflicts: + + src/i830.h + src/i830_driver.c + +commit b73235f40497cfb10792ba191d4f6eac3a5df009 +Author: Hong Liu +Date: Thu Sep 20 11:28:52 2007 +0800 + + Fix pixmap offset + + Use consistent interface for counting pixmap offset. + +commit 798448e4641acf241b7cbae0d6c243ae383da9f4 +Author: Zhenyu Wang +Date: Wed Sep 19 13:29:31 2007 +0800 + + Add media state definition on i965 + + This adds VFE state and interface descriptor struct define. + +commit 36b81ba20d20e7b235cb701c5135cbf3f3eedb12 +Merge: 02ad9ce bda3c69 +Author: Zhenyu Wang +Date: Wed Sep 19 11:44:41 2007 +0800 + + Merge branch 'master' into xvmc-i915 + + Conflicts: + + src/i830.h + src/i830_memory.c + +commit bda3c69a7a044869ea63514b97f8aa9260d6b5a7 +Author: Dmitry Babrovich +Date: Tue Sep 18 09:34:34 2007 -0700 + + Bug #12457: Let the ch7xxx driver probe the 7301 + + Looking at the 7304, this chipset likely requires slightly different + programming. However, this change allows for at least some functionality. + +commit 445a59d262b93bd9d2c16cee9934ce77a103776b +Author: Jesse Barnes +Date: Wed Sep 12 09:32:41 2007 -0700 + + Remove unused plane->pipe mappings from SAREA private + + Turns out we can get away without this, so remove it, fix a crash, and only + swap planes/pipes if the DRM can support it. + +commit d02336290bea30de3c390b8121046c38fd6b0f62 +Author: Jesse Barnes +Date: Tue Sep 11 04:28:14 2007 -0700 + + Fix plane/pipe mapping compat code + + Move plane->pipe mapping adjustment to ScreenInit so we can check + against the DRM driver version accurately. + +commit d9f2b3c0d2d08a4b7fad865dab7deb6224b57999 +Author: Jesse Barnes +Date: Mon Sep 10 23:49:34 2007 -0700 + + Fix crash in ScreenInit + + Use pScreen directly when getting at the SAREA private, since + pScrn->pScreen may not be initialized yet. + +commit 4c7542ef43a5267e470ca1608a2ae57abf9783ec +Author: Jesse Barnes +Date: Mon Sep 10 23:30:50 2007 -0700 + + Only swap planes and pipes if DRM supports it + + We want to associate plane A with pipe B on pre-965 mobile chips, since that's + the only way to get framebuffer compression on the builtin LVDS on those + platforms. However, if we do this swapping and DRM isn't aware of it, we may + end up requesting vblank events for the wrong pipe, or setting up SAREA buffer + swap state incorrectly. + + This mod checks whether DRM supports the new plane->pipe swapping behavior, and + only enables the swapping if so. This should fix the bugs Lukas found and + debugged. Reviewed by Michel Danzer. + +commit 286f5df0b62f571cbb4dbf120679d3af029b8775 +Author: Keith Packard +Date: Thu Sep 6 14:31:55 2007 -0700 + + Switch to pci_device_map_range/pci_device_unmap_range APIs. + + With the libpciaccess change that added these new APIs, use them + for all mapping. + +commit 2a8592f2ebcba86b1127aa889155d58a3dc186ca +Author: Zhenyu Wang +Date: Wed Sep 5 14:52:56 2007 +0800 + + Fix G33 GTT stolen mem range + + G33 GTT table lives in seperate stolen mem with + graphics data stolen mem. + +commit 7fd9a98178cdebda4213796fdc452a8a265a1197 +Author: Keith Packard +Date: Tue Aug 28 16:00:01 2007 -0700 + + Don't set supported TV formats until after RandR initialized. + + The TV format property cannot be configured until RandR has been + initialized. + +commit c6e637cd683dc60567b3b4f69b7f2b4c338c89ea +Author: Keith Packard +Date: Tue Aug 28 12:17:15 2007 -0700 + + Limit TV formats to those supported by current connection + +commit ddd6053987b9ca9bd3722ddbdfd412a3d8d252cf +Author: Keith Packard +Date: Tue Aug 28 12:30:46 2007 -0700 + + Add register defines for hw binning + +commit 3fbbd0afde49c53a5a8661f75c8c8c4be3020c30 +Author: Michel Dänzer +Date: Tue Aug 28 17:48:20 2007 +0200 + + Fix build against pre-pci-rework xserver. + +commit 0fdbf64b34e4114c2b89d696b268b9c7464f1efd +Author: Zhenyu Wang +Date: Tue Aug 28 21:56:21 2007 +0800 + + Fix i915 a8 color buffer blending + + From spec, i915 engine uses green channel when reading from 8bit + color buffer for blending, and also writes back green channel. + Fix blend factor in dest alpha case by using dest color instead. + Now rendercheck can pass a8 tests. + +commit 3411eb0dbae470b910af3116a4ab960c821b9b20 +Author: Keith Packard +Date: Sun Aug 26 23:09:01 2007 -0700 + + i830_driver.c changes for libpciaccess. + + Change to use libpciaccess APIs, including computing and using BAR indices + for various mapping activities. + +commit 387fed6daa7426e4a85d30ba7cf608b5f41d24bb +Author: Keith Packard +Date: Sun Aug 26 23:06:57 2007 -0700 + + i810_driver.c changes for libpciaccess. + + This includes new probe code (intel_pci_probe) and changes for i810 to + use BAR indices to refer to suitable portions of the device mappings. + +commit 2c794192052ca55c3263e27e13d16aafe8caa92c +Author: Keith Packard +Date: Sun Aug 26 22:46:19 2007 -0700 + + Mechanical API conversions for libpciaccess. + + Uncomplicated API transistions for libpciaccess usage: + + Legacy xf86 API libpciaccess API + --------------- ---------------- + xf86ReadPciBIOS pci_device_read_rom + pciReadWord pci_device_cfg_read_u16 + pciWriteByte pci_device_cfg_write_u8 + + And, more use of the API-independent DEVICE_ID/SUBVENDOR_ID/SUBSYS_ID macros + to pull PCI identification data from the underlying structure. + +commit 70e8e5957200401474967a467663ae049e9080f2 +Author: Keith Packard +Date: Sun Aug 26 22:40:25 2007 -0700 + + Change DRI interface to fill in PCI data from new libpciaccess structure. + + The DRI interface requires bus identification for each DRI object; pull that + data from the libpciaccess structures as necessary. + +commit 5516cc781bd488c936af225123812a61ed5874b8 +Author: Keith Packard +Date: Sun Aug 26 22:37:38 2007 -0700 + + Add libpciaccess declarations to I810Rec and I830Rec. + + Using libpciaccess requires a different type for PciInfo (struct pci_device + instead of pciVideoPtr) and it requires knowing which BAR each memory region + needs to be mapped from. Add these definitions to the driver private record + along with the includes necessary to use libpciaccess. + +commit daada59b5f8c2294b524a4b5920dc6b1c213642f +Author: Keith Packard +Date: Sun Aug 26 22:32:39 2007 -0700 + + Change IS_Ixxx tests to work with or without libpciaccess. + + libpciaccess has a new structure that holds the PCI identifier data; borrow + macros from the mga driver to work with either the old xf86-specific + structure or the new libpciaccess structure. + +commit 3d3bf493a3973f4067433d27a4d7ddfecaa18f1c +Author: Keith Packard +Date: Sun Aug 26 22:27:34 2007 -0700 + + Intel driver configuration (only) changes for X server libpciaccess usage. + + Detect whether the target X server uses libpciaccess, using it in the driver + compilation as necessary. This change means that utilities that used to use + libpciaccess will not do so unless the driver itself uses libpciaccess. Yes, + that could be fixed, but it doesn't seem that important. + + This patch does not include any code changes necessary to actually have the + driver build against an X server using libpciaccess. + +commit 5faf9cc6afe1c30fa88bc6446088a6fa47fc5d0b +Author: Keith Packard +Date: Sun Aug 26 09:34:06 2007 -0700 + + Sort quirk table, add Dell Latitude X1 + +commit a9e1d42a47cef79d8bbde2afd89d26aed964e344 +Author: Keith Packard +Date: Sat Aug 25 12:54:11 2007 -0700 + + Lenovo 201a is x60s, not x61s + +commit ffc2907f7f2eb039004eff0014c5563a01463fb0 +Author: Keith Packard +Date: Sat Aug 25 12:31:21 2007 -0700 + + Thinkpad X61s has no TV out + +commit 0c20fbabd18c19b2753cb60280f89e240ce5645f +Author: Keith Packard +Date: Fri Aug 17 22:21:47 2007 -0700 + + Make sure XV_PIPE is used whenever possible. + + The code was not consistently using XV_PIPE when the desired crtc contained + any portion of the video output. + +commit e443f83dd6f110156743c93f7d793cdddb8195a1 +Author: Eric Anholt +Date: Fri Aug 17 18:13:49 2007 -0700 + + Tune acceleration architecture allocator sizes down. + +commit bd874b11bbfe582aebd3115771f90807e75afc31 +Author: Eric Anholt +Date: Fri Aug 17 17:49:21 2007 -0700 + + Replace AA allocator usage with i830_memory.c for RandR rotation. + + This requires EXA 2.2 (server 1.3) for rotated performance with EXA, because + the i830_memory.c allocation may not fall within what EXA considers the + offscreen area, so the PixmapIsOffscreen hook is needed. + +commit 9ad33dd65a79277ef75a6e95373614852725f5a9 +Author: Eric Anholt +Date: Fri Aug 17 16:46:48 2007 -0700 + + Use i830_memory.c instead of the AA's allocator for XV buffers. + + This should fix issues with XV being allocated into XAA's tiled pixmap + cache and resulting bad rendering. Its also brings us closer to being able + to shrink the size of the pixmap cache on XAA, which is of limited utility. + +commit 3655a1ecb62f6c387a16fa87cf6f00bf7835dce4 +Merge: e5c336e 2231cdc +Author: Jesse Barnes +Date: Thu Aug 16 12:04:20 2007 -0700 + + Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit e5c336eaa32be8f9379a2c1dd51006b85bc8b270 +Author: Jesse Barnes +Date: Thu Aug 16 12:04:02 2007 -0700 + + Disambiguate plane and pipe mapping, use plane A on pipe B on pre-965 LVDS + + Add a new 'plane' field to the intel_crtc private structure for tracking + planes separate from pipes. This allows pre-965 chips to use plane A + on pipe B, enabling framebuffer compression for builtin LVDS displays. + +commit c3438356d6b7b63ad9d0086efb084be8e048980e +Author: Eric Anholt +Date: Thu Aug 16 11:34:02 2007 -0700 + + Add tiling information to BO layout description. + +commit 0c9e4aeea84e20a18e3b76d8cf8e802af004df57 +Merge: 79d9a30 2231cdc +Author: Eric Anholt +Date: Thu Aug 16 11:30:16 2007 -0700 + + Merge branch 'master' into buffer-objects + + Conflicts: + + src/i830_dri.c + src/i830_memory.c + +commit 2231cdcd8f1ee81b3e59cc5e3a325c22ee0f40e4 +Author: Dave Airlie +Date: Thu Aug 16 17:15:54 2007 +1000 + + i915: add support for render to a8 + +commit a69db6f7fe1703b473e5c1d1e0088ccc203f4d5a +Author: Dave Airlie +Date: Wed Aug 15 18:28:50 2007 +1000 + + intel: don't setup texOffsetStart unless using EXA + +commit 5126a71f82767b9e23cd590453718f3364789740 +Author: Zhenyu Wang +Date: Tue Aug 14 13:54:55 2007 +0800 + + Fix seg fault introduced in tiling patch when TV detect + + When TV does load detect, fb hasn't been setup, so we should check + that in i830_display_tiled(). Caught by Nanhai. + +commit d9f89a1af7e7ff4056727060cdf2e35c15a4dcdd +Author: Keith Packard +Date: Fri Aug 10 17:59:33 2007 -0700 + + Save/restore tile-mode offset registers DSPATILEOFF and DSPBTILEOFF + + Now that the driver sets these registers, they must be saved and restored. + +commit 5bc194d3d3c87bb0128d9ac10f090f031345eb37 +Author: Keith Packard +Date: Fri Aug 10 17:54:32 2007 -0700 + + Set DSPATILEOFF/DSPBTILEOFF to handle 965 tiled frame buffers. + + DSPATILEOFF and DSPBTILEOFF replace DSPASURF and DSPBSURF when the frame + buffer is in tiled mode. + +commit 64b943c79cf957a4c54482720195d7f27b7f0c0d +Author: Eric Anholt +Date: Fri Aug 10 15:48:05 2007 -0700 + + Add #if 0-ed fence debugging code. It's noisy, and of little use to most. + +commit ba9a503ba2099025e393f3382bb453985ef23497 +Author: Eric Anholt +Date: Fri Aug 10 15:06:58 2007 -0700 + + Don't force tiling on if it is disabled in configuration but fbc is possible. + +commit b7751c7d1d6bcf310824295c3bab4ff36760c791 +Author: Eric Anholt +Date: Fri Aug 10 17:42:09 2007 -0700 + + Fix stack-smashing in the last commit. + +commit cb36635a053d4ac3971fea05060d31dbd3d382d2 +Author: Eric Anholt +Date: Fri Aug 10 14:16:59 2007 -0700 + + Attempt to fix several front buffer tiling failure cases. + + Front buffer tiling is now disabled with G965 and XAA. Some of the acceleration + that i830_xaa.c does can't be supported on tiled buffers. + + Adds a tiling field to struct i830_memory, and uses it instead of separate + variables for each potential tiled buffer. + +commit ed1b106fabf3a18489bdb3083326f27387a9cb72 +Author: Keith Packard +Date: Fri Aug 10 14:31:16 2007 -0700 + + Clean up tv mode name allocation and copy. + + TV mode names used to contain the signalling standard along with the pixel + size. The signalling has been moved to the TV_FORMAT property, but the + allocation and initialization of the mode name was left a bit messy as a + result. + +commit f71b9358b4157a8cfdc694ddef8ca3f98926ca91 +Author: Jesse Barnes +Date: Fri Aug 10 15:53:04 2007 -0400 + + Cleanup tiling and FBC driver output. + + Remove an extra "FBC enabled" message from i830_memory.c (only report errors + if they occur), and don't print the "forcing FBC on" message if tiling was + already enabled, as it's redundant and confusing. + +commit e6746d0f286ef9d9a87f748d40e5421c268f2f7d +Author: Jesse Barnes +Date: Fri Aug 10 15:48:15 2007 -0400 + + Enable tiling by default on 965. + +commit e0fcf645a228094620b8f7fdd580963611bdd6ef +Author: Jesse Barnes +Date: Fri Aug 10 15:43:06 2007 -0400 + + Tiling fixes for 965 + + This should be close to the last set of tiling fixes for 965 chipsets. + Prior to this commit, the 965 composite hook didn't take tiling into + account, nor did 965 textured video, which caused display corruption. + However, there seems to be at least one last bug to squash--on occasion, + a configuration with tiling enabled won't properly display text. This + is likely another tiling related problem with the composite hook. + +commit 02ad9cee330fb5fb0008ad6f74e74e8d8a1fc36e +Merge: 105f8a1 7b143e5 +Author: Zhenyu Wang +Date: Fri Aug 10 16:45:56 2007 +0800 + + Merge branch 'master' into xvmc-i915 + +commit 105f8a183eb64623d9a9e2833dbe27156a551f69 +Author: Zhenyu Wang +Date: Fri Aug 10 16:44:46 2007 +0800 + + disable subpicture initial + + until we really implement it, OSD can't work for now. + +commit 7b143e5c8397da077c0e02455c21c5a99cf50942 +Author: Dave Airlie +Date: Thu Aug 9 12:14:44 2007 +1000 + + i965: increase composite vertex buffer size and alignment to be safe + +commit 14691b24da5aa29d8c41ac7b7c61828e3cd9eab7 +Author: Dave Airlie +Date: Thu Aug 9 09:41:32 2007 +1000 + + i965: fix memcpy of the sf_kernel when a mask is needed + +commit 5e18c6af9051da654d2a6a97553ef4fe777bb61e +Author: Carl Worth +Date: Wed Aug 8 11:13:37 2007 -0700 + + Allow 965 composite acceleration to A8 destinations. + + Note that this is a slowdown in text rendering due to the high overhead of our + compositing setup, but appears to be correct according to rendercheck. + +commit b0ec670cdb0b6ca6fc0f4f165fa3ee5a20d7c985 +Author: Eric Anholt +Date: Wed Aug 8 11:03:51 2007 -0700 + + Bug #11593: Remove dead struct vch_bdb_20 which was angering the sun compiler. + +commit 87cc72ef509b85635bf0e84c47dfed6b7242170b +Author: Zhenyu Wang +Date: Wed Aug 8 09:39:55 2007 +0800 + + check early if we have slot left for new context or surface + +commit fec6744b763f2b85b4e592c51326b9ee979bef5d +Author: Zhenyu Wang +Date: Wed Aug 8 09:26:10 2007 +0800 + + I missed to remove port attributes wrapper + +commit 76c084d41999f13497b80d4ac6799cb974adaa03 +Author: Zhenyu Wang +Date: Wed Aug 8 09:22:42 2007 +0800 + + explicit say "unsigned int" + +commit cfc614b1f9143ed1407733aaa81c4a980c613a63 +Author: Zhenyu Wang +Date: Wed Aug 8 09:06:47 2007 +0800 + + remove xvmc attributes + + We don't have extra attributes than Xv port. + +commit 92af2f4bbcb395cbde097776718449d99843ad67 +Merge: da82a47 e0be352 +Author: Eric Anholt +Date: Tue Aug 7 15:18:17 2007 -0700 + + Merge branch 'origin' + + Conflicts: + + src/i830_exa.c + +commit da82a47a558597f3653e2b33bc6adbab18574b57 +Author: Eric Anholt +Date: Mon Aug 6 17:01:37 2007 -0700 + + Fix EXA rendering with tiled front buffer on pre-965. + + The 915 and earlier appear to respect the fence registers, while only the 965 + requires the per-operation tiling setting and pitch shifting. This will also + fix issues with rendering on the 965 involving multiple cliprects, where the + pitch would get divided repeatedly. + + This removes the offset < 4096 fallback, which essentially resulted in no + acceleration to tiled buffers, hiding the issues. + +commit e0be352f5017f0e645a4ff8a40961d9c2b98863a +Author: Jesse Barnes +Date: Tue Aug 7 12:37:25 2007 -0700 + + Fixup pitch in Prepare* functions, since actual hooks may + be called many times for the same pixmap, and we don't want + to keep dividing the pitch by 4. + +commit b29a932bec2a3cc5a38e9c09c012cfdc1b6209c1 +Author: Zhenyu Wang +Date: Tue Aug 7 16:47:13 2007 +0800 + + code cleanups + + and put wrap function in driver xvmc priv instead of per xv port priv + +commit 7431abee5fb971d1f8bc7ac4bea137f6ece9418b +Author: Brice Goglin +Date: Tue Aug 7 09:13:00 2007 +0200 + + Define INTEL_VERSION_MAJOR/MINOR/PATCH using PACKAGE_VERSION_* + +commit 9e1914270a0978ec4dfae757d3dd57ca7ffe17e5 +Author: Jesse Barnes +Date: Mon Aug 6 17:55:00 2007 -0700 + + Remove 4k offset checks from Copy & Solid hooks. + Reading the docs too literally can cause you to hide bugs with false fixes... + +commit 3510d5728fa972b36d022b4f9189d46ff98d7b16 +Author: Eric Anholt +Date: Mon Aug 6 16:44:39 2007 -0700 + + Fix accumulated whitespace nits in i830_exa.c + +commit 5ff05dffe229e35da7619762628fdd0f125585e8 +Author: Jesse Barnes +Date: Mon Aug 6 16:01:10 2007 -0700 + + More tiled rendering fixes: - check for tiling, not just offset in PrepareSolid - combine pI830->tiling and frontbuffer checks into new exaPixmapTiled function for readability + +commit ba90d944329dd8c79a757c38128964fbbe4ab898 +Author: Eric Anholt +Date: Fri Aug 3 16:46:09 2007 -0700 + + Add the file mode for bios_dumper output so it doesn't have 000 permissions. + +commit 322a163cfbda885adc6bb09c1f976d36617ea83b +Author: Eric Anholt +Date: Fri Aug 3 10:46:39 2007 -0700 + + Quirk away the nonexistent TV connector on the Panasonic CF-Y4. + +commit ffbab2ee5dc227b2a8a5ffd1717ae00e8e37f956 +Author: Jesse Barnes +Date: Fri Aug 3 21:27:52 2007 -0700 + + Limit Solid & Copy offsets to 4k when rendering to tiled targets + +commit 019dbfda294aaafb28d8bea0fe2f5dadc2ea3e0b +Merge: 3d3c0e8 15f71ed +Author: Jesse Barnes +Date: Fri Aug 3 20:45:14 2007 -0700 + + Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 3d3c0e8c55f639a501c0756948b518abd903d7d0 +Author: Jesse Barnes +Date: Fri Aug 3 20:40:45 2007 -0700 + + Tiled rendering & fbc fixes: + - actually enable tiling in DSP(A|B)CNTR if needed + - add logic to EXA routines for tiled case (still needs work) + - enable/disable fbc on DPMS events (meant moving functions higher in file) + - fix fence register pitch programming (use correct pitch instead of kludged value) + +commit 79d9a309b19e22561e000a47b732c67479c2e6d4 +Author: Eric Anholt +Date: Thu Aug 2 15:50:42 2007 -0700 + + Mark DRI buffers as shareable, and pass their buffer handles through the SAREA. + +commit 0da4f2b0cd7203377ad10407928a367b8c6d310e +Author: Jesse Barnes +Date: Tue Jul 31 16:22:36 2007 -0700 + + Legacy backlight changes: + - add support for 965GM + - make sure legacy enabled systems don't reduce the range of backlight values we can present to the user + +commit 15f71edba37738f8ba279fa07452fda10cc65298 +Author: Zhenyu Wang +Date: Sat Jul 28 17:43:29 2007 +0800 + + Update Lenovo TV quirk info + +commit 857b4a7bcb69ca43b866b4283fe075abbafb1d22 +Author: Eric Anholt +Date: Fri Jul 27 18:03:12 2007 -0700 + + Pin some buffer objects at creation time, which can't be moved yet. + + A number of other interfaces of ours don't allow buffer offsets to be updated + after screeninit. This attempts to catalog why for each one, so that they + can be fixed one by one. + + This happens to restore the EXA offscreen allocator for now, as a fixed-offset + object. + +commit d7b5b595ad29ae0ac3adbd3a176be3fe7ffa6474 +Author: Eric Anholt +Date: Fri Jul 27 12:48:08 2007 -0700 + + Delay the first screen pixmap update to CreateScreenResources. + + The return value of GetScreenPixmap before CreateScreenResources is not, in + fact, a pixmap. + +commit 2b1ec0f51479c1d7e5e62803c68feca29375519d +Author: Eric Anholt +Date: Fri Jul 27 10:00:35 2007 -0700 + + Use the dontMapFramebuffer option available with DRIINFO 5.4. + + If not available, AIGLX init will fail. While here, simplify DRIINFO tests + since we refuse to init with a version queried less than the version we + compiled against, anyway. + +commit f403a50afbcef1e54f554481c72037338bd5357c +Author: Wang Zhenyu +Date: Fri Jul 27 09:24:24 2007 +0800 + + Add another Lenovo TV output quirk + + From issue report http://lists.freedesktop.org/archives/xorg/2007-July/026644.html + +commit 34c82ad7ce83394db47588693b578cf91991bf1c +Author: Wang Zhenyu +Date: Fri Jul 27 09:14:13 2007 +0800 + + Add quirk support + + This one trys to use a flag for possible quirks. It adds a quirk + for my Lenovo T61 TV output, and ports some origin LVDS quirks to it. + +commit 1a585d03972394cb97dec2462937b0104bdf4de2 +Author: Eric Anholt +Date: Thu Jul 26 10:46:35 2007 -0700 + + Use new drmBOSetPin interface instead of NO_EVICT/NO_MOVE buffers. + + To do this, we have to deal with buffer offsets being set at EnterVT time + instead of screen init time. We've wanted to move this direction for a long + time, but there are repercussions. The EXA offscreen memory manager has to + be disabled, because it can't be moved. That will be replaced by BO-backed + pixmaps soon. Also unresolved is whether our moving + front/back/depth/texture buffers will break the classic-mode DRI driver. + + This code doesn't actually work yet. + +commit 0fd3ba0518b3cde9ca0e4e2fc1854c00d8a43d5c +Author: Brice Goglin +Date: Wed Jul 25 20:11:32 2007 +0200 + + Fix typo in intel.man + + Reported by A. Costa" in + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432061 + +commit 18c707a8c13ac5fffdd30d55e6f5926a68b367df +Author: Eric Anholt +Date: Wed Jul 25 10:11:16 2007 -0700 + + When TTM is available, use it instead of manual AGP allocations when possible. + + This is a step towards being able to expose buffer objects through the screen + private to DRI clients, instead of having them have to use the fake buffer + object type. + + This fails in two ways. First, the kernel memory manager is not currently + suitable for doing the physical allocations we need, so we still use AGP for + those. Additionally, the DRI lock can't be initialized early enough for us, so + these buffer object allocations fail. This will be fixed by improving the + DRM interface. + +commit c4deefa80a6349db968e25bd6778cdf7a514ca7f +Author: Xiang, Haihao +Date: Mon Jul 23 10:35:32 2007 +0800 + + only enable xvmc for 915/945/G33 + +commit 45962eed51120ff77326c29d72cf8b6cd8a934b5 +Author: Zhenyu Wang +Date: Mon Jul 23 09:50:17 2007 +0800 + + Fix a typo in i915 render + + Fence setting is in mapstate actually. This fixes rotation in + tiled fb case, thanks Keith to report this. + +commit a52c53b8603495ab05e07e3da5092fe122fcb6f2 +Author: Xiang, Haihao +Date: Fri Jul 20 17:10:27 2007 +0800 + + don't initialize XvMC if xv is disabled. + +commit b1af2c0e01c54ef1d40fd0ca1ede29a1dd7ed97b +Author: Zhenyu Wang +Date: Fri Jul 20 15:18:48 2007 +0800 + + Fix device id info for 945GME, 965GME + + which do have new host bridge ids + +commit 6b4d43dbf4bbb86d479d8fca480c8bec39e2714b +Author: Xiang, Haihao +Date: Fri Jul 20 09:59:40 2007 +0800 + + lock display when creating context + +commit 42e91c7092f9cf7f5c0b98e9ae3d92a5b30821bf +Author: Xiang, Haihao +Date: Thu Jul 19 17:30:54 2007 +0800 + + move i830_allocate_xvmc_buffer out of #if/#endif + +commit 36ea26f2779d951fa173da785aca100564e5ecf8 +Author: Xiang, Haihao +Date: Thu Jul 19 17:21:05 2007 +0800 + + add copyright + +commit 9d03873423c0968b2d6700b7d8d44c7e23b8d7f3 +Author: Xiang, Haihao +Date: Thu Jul 19 10:03:19 2007 +0800 + + block some signals within critical section to avoid + + dead lock. + +commit 25658f838bd1bcd7559d7a032d127c626833fb7c +Author: Xiang, Haihao +Date: Mon Jul 16 13:03:58 2007 +0800 + + 1. The pitches for y/u/v surfaces are 1024bytes aligned. + + 2. clean code + +commit 8f316a4584d0676e5dae051698bde0831f018cc4 +Author: root +Date: Thu Jul 12 16:24:03 2007 +0800 + + 1. clean code + + 2. fix an error in map_state + +commit 4844254431695158287167e3b0fad25d9efb7a6c +Author: root +Date: Tue Jun 26 16:32:30 2007 +0800 + + a fix for 945G/945GM + +commit 8c249765ce788f8adb0325a8e3016a0eae74b13b +Author: root +Date: Mon Jun 25 14:07:01 2007 +0800 + + 1. using batch buffer + + 2. implement macroblock_ipicture instruction + 3. 16bit INTRA block + +commit 2b20b395541f786e4009211e4c56042257b8d114 +Author: Xiang, Haihao +Date: Mon Jun 25 10:43:49 2007 +0800 + + fix a bug related to display surface + +commit 6e47601ac7427390fa4cb6e228dfb566ff95db09 +Author: Xiang, Haihao +Date: Mon Jun 25 10:40:08 2007 +0800 + + fix some bugs + +commit d038ffdfffb846e22f360faac5d469c8e59795ad +Author: Xiang, Haihao +Date: Mon Jun 25 10:37:12 2007 +0800 + + Release resource allocated for surface/subpicture + +commit a9bf7e28b91692c7c7a4915cdf9603cd2ef025ea +Author: Xiang, Haihao +Date: Mon Jun 25 10:33:35 2007 +0800 + + fix some bugs + +commit ccac60bf035bb54661c13f306031def81e105a32 +Author: Xiang, Haihao +Date: Mon Jun 25 10:23:28 2007 +0800 + + fix some bugs + +commit 934da9f2b83716bb37d0719a61b8e6b179fff2cd +Author: Xiang, Haihao +Date: Mon Jun 25 10:17:08 2007 +0800 + + enable XvMC for i915 + +commit c7920a0e819308762fca3d6fc7ab194bd565b06a +Author: Dave Airlie +Date: Thu Jul 19 15:09:54 2007 +1000 + + strip out remainder of drmmm code in driver + +commit 37652b68880f1881b90bd22218cfe86eca7e5974 +Author: Dave Airlie +Date: Tue Jul 17 14:03:21 2007 +1000 + + intel: oops I commited pixman local workaround - undo it + +commit e40f6a4923d1323702406266e90eae3218a8a44e +Author: Dave Airlie +Date: Tue Jul 17 09:20:07 2007 +1000 + + intel: actually 2.3.1 should be good enough + +commit 1e169be25b2e4ab34afd4b8ae8ae0041f6069125 +Author: Dave Airlie +Date: Tue Jul 17 09:17:31 2007 +1000 + + intel: don't try and use TTM memory manager with old libdrm interface + + I probably need to release a libdrm with this interface in it now.. + +commit ff2be3995d33f9e4b7f63b380f166b6168c9b9c6 +Author: Keith Packard +Date: Fri Jul 13 12:47:18 2007 -0700 + + Remove hard-coded CRT blanking frobbing for load detection. + + CRT blanking needn't be adjusted to perform load detection on 9xx chips, and + the 8xx load detection path now adjusts blanking just during load detection. + Adjusting the blanking interval turned out to cause many monitors to fail to + sync. + +commit 00f4587025a3879626623135b0a153fcdb906719 +Author: Keith Packard +Date: Fri Jul 13 10:58:06 2007 -0700 + + Ensure pipe/output active before doing load detection. + + If the pipe or output have been set to DPMSOff, then load detection will not + work correctly. Also, share the load detection configuration code between + crt and tv outputs. + +commit 6f18300aed1340348c6d395f326061b5315be643 +Author: Keith Packard +Date: Mon Jul 9 21:29:55 2007 -0700 + + Eliminate bogus (and harmful) blanking adjustment for load detect. + + Instead of always adding blanking to mode lines, use the FORCE_BORDER option + on i9xx hardware where it works, and dynamically add a bit of border if + necessary on i8xx hardware to make load detection work. This may cause + flashing when a usable crtc is not otherwise idle when load detection is + requested. + +commit 04130ac6b705aa49161fb6dae83ad0bdd76e89d9 +Author: Wang Zhenyu +Date: Wed Jul 11 11:42:56 2007 +0800 + + Fix i915 rendering for tiled buffer + + Make it to check fence register for dest buffer. + +commit 88f8b688e2316ae4a1f7485f0010ce90de54783a +Author: Eric Anholt +Date: Mon Jul 9 12:56:13 2007 -0700 + + Fix some physical address handling for >4GB addresses. + + The upper bits would have been inappropriately dropped on G33-class hardware, + and on G965-class hardware in a 32-bit environment. The only use of physical + addresses on these should be for FBC, though, and FBC requires addresses + below 4GB. This is unresolved. + +commit bf831117b4659cc4f2774098dee938505f780a9b +Author: Jesse Barnes +Date: Sat Jul 7 10:15:32 2007 -0700 + + FBC fixes: + - allow FBC and Tiling to be forced off if configured to do so + - only touch FBC registers if pI830->fb_compression is true + +commit b426866fe1be2ad3861559beff69186379a6afad +Author: Jesse Barnes +Date: Fri Jul 6 20:48:40 2007 -0700 + + Fix manpage to reflect default behavior. + +commit 377c58373daa6bef5d37ead2b6f9a769a905b6fa +Author: Jesse Barnes +Date: Fri Jul 6 20:39:19 2007 -0700 + + Fix naming of FBC plane enable bits (mistakenly called them pipes earlier). + +commit 9c0388dc8d4c6495fae21af6da644b34e20173d1 +Author: Jesse Barnes +Date: Fri Jul 6 20:38:41 2007 -0700 + + Update man page with current behavior. + +commit cecbc71fdc9af832cef23427696f6f654f7d6104 +Author: Jesse Barnes +Date: Fri Jul 6 16:36:34 2007 -0700 + + Fix debug output in fbc enable/disable routines. Add logic to make sure fbc + isn't enabled twice on two different pipes. + +commit 4359df9419d2d02a2f9d9adc7f5a49ecf07ddd30 +Author: Jesse Barnes +Date: Fri Jul 6 16:17:45 2007 -0700 + + Fix tiling and fb compression defaults for 965 (not yet fully supported). + +commit ca593a5219549df94a6d234ebbcf9e7c44723c9b +Author: Jesse Barnes +Date: Fri Jul 6 16:10:52 2007 -0700 + + FBC and tiling changes + - change framebuffer option name to "FramebufferCompression" + - add new "Tiling" option (controls all tiling, not just front buffer) + - add debug message to fb compression enable/disable routines + - update man page with new options + +commit 8798ef11321ee6957919279076758d47ad956cf3 +Merge: 8919b22 3c552af +Author: Jesse Barnes +Date: Thu Jul 5 12:21:31 2007 -0700 + + Merge branch 'master' into fbc + +commit 8919b2292147add41a1c1c6e5e673257cb6c6c6e +Author: Jesse Barnes +Date: Thu Jul 5 12:21:06 2007 -0700 + + Re-add tiling kludge, but only for 965. + +commit 407b124af8f7bb42abe4eecc87476c4c3e555cd0 +Author: Jesse Barnes +Date: Thu Jul 5 11:31:34 2007 -0700 + + Remove tiling kludge. May need more fixes for 965. + +commit 7a87b9d2a2eb4d281dce67586756ff5653b2805a +Author: Jesse Barnes +Date: Thu Jul 5 11:23:06 2007 -0700 + + Revert discard alpha change, requires other fixes to work. + +commit fecf964534f5ba6d40480cb13adc89094946a51e +Author: Jesse Barnes +Date: Thu Jul 5 10:59:23 2007 -0700 + + FBC fixes: + - properly check several FBC enablement constraints + - don't use alpha discard if FBC is in use + +commit 60ee7b6a91b2b8c447130c60cd8b19eb68119777 +Author: Jesse Barnes +Date: Tue Jul 3 14:20:34 2007 -0700 + + Fixup line length buffer padding, add kludge for front buffer tile + pitch. + +commit 3c552af65d28fafec1d09484a8914b690b961349 +Author: Eric Anholt +Date: Mon Jul 2 18:33:47 2007 -0700 + + Update documentation and bump driver version to 2.1.0. + +commit f02036aedcd7866c567a6adc070eda3dad872105 +Author: Jesse Barnes +Date: Mon Jul 2 15:42:02 2007 -0700 + + Framebuffer compression changes: + - move FBC register definitions to i830_reg.h + - add fix from Arjan for 965 depth buffer tiling + - add VT switch and clear-at-server-start code for FBC registers + +commit 2b9961eb9ce8734565ecdb01cb11610714d7f610 +Author: Eric Anholt +Date: Mon Jul 2 15:16:33 2007 -0700 + + Fix reversed LVDS dither enabling logic on GM965. + +commit 3d9ee8b2991ec0da8cc21b8455ff7f00fd0335b5 +Author: Eric Anholt +Date: Mon Jul 2 14:38:28 2007 -0700 + + Bug #11365: Disable the panel fitter unless it's needed for the chosen mode. + + The automatic panel scaling appears to choose bad sampling on some GM965 + hardware for 1:1 mapping modes, and there's no real sense in having it on + if we just want 1:1. + +commit b384c608978dcd3d2ea6c0018179673cb4735f4c +Author: Jesse Barnes +Date: Mon Jul 2 09:32:28 2007 -0700 + + Enable framebuffer compression (use Option "FrameBufferCompression" + "true" in your xorg.conf). Should save ~0.5W during typical 2D usage. + +commit 1e2e301348b4168aeed38b3fdc6b0e43d5678a86 +Author: Keith Packard +Date: Sat Jun 30 12:45:24 2007 -0700 + + Fix load detection to use border region instead of blanking. + + Make sure there is some border area to use by changing how the pipe is + configured, then pick a scanline in the middle of the border for load + detection. This lets the load detect code use an active pipe instead of + requiring an idle one. + +commit 11862c2e1f23b77b56d7bd8b384579b5e3ae377b +Author: Alan Coopersmith +Date: Thu Jun 28 23:31:28 2007 -0700 + + Add *~ to .gitignore to skip emacs & patch backup files + +commit 6503eb45023d0db9a94cb9d1e14a26af07a6628d +Author: Alan Coopersmith +Date: Thu Jun 28 23:30:35 2007 -0700 + + Add AM_PROG_CC_C_O to configure.ac + + Clears automake-1.10 warning: src/bios_reader/Makefile.am:8: compiling + `bios_dumper.c' with per-target flags requires `AM_PROG_CC_C_O' in + `configure.ac' + +commit 5257e36f502676fd6a44bbb8e747d9138ed3bc5c +Author: Keith Packard +Date: Thu Jun 28 15:29:52 2007 -0700 + + Handle dual-channel LVDS on i855. + + Just as with i9xx LVDS, the i855 LVDS can operate in dual-channel mode with + a modified P2 divisor value (7 instead of 14). Just using the existing 9xx + code for 855 appears to work fine. + +commit 16bfcb8042519f24b4494fd621814f39949ceeb6 +Author: Keith Packard +Date: Thu Jun 28 15:27:56 2007 -0700 + + Decode PLL registers in LVDS mode a bit better in debug code. + + LVDS mode changes how the PLL works in fairly dramatic ways; the debug code + wasn't properly accounting for those differences resulting in fairly bogus + debug output. + +commit 9675ccb30818bf831ac4c634751ab4bfe35f7bfe +Author: Wang Zhenyu +Date: Wed Jun 27 09:23:33 2007 +0800 + + EXA: fallback mask transform on i965 + + It needs to fix shader programs which hasn't been done yet. + +commit 7a2300c88ae59f5b7c3ce89d33147e3f0ca23c18 +Author: Wang Zhenyu +Date: Wed Jun 27 09:19:22 2007 +0800 + + EXA: don't have to check offscreen size + + DDX will check it for EXA_OFFSCREEN_PIXMAPS flag + +commit fff4a3b58fa18ee2ad91f998d190e90b77c051ab +Author: Carl Worth +Date: Mon Jun 25 23:15:58 2007 -0700 + + Use local structures for vs_state, sf_state, and wm_state + +commit 0a8a4afd3c59011d6b1f5b39aedfb9bce0e55c48 +Author: Carl Worth +Date: Mon Jun 25 23:12:23 2007 -0700 + + Use local structure for src_sampler_state and mask_sampler_state + +commit 499166a60fcbf16021bd9ec233790ba55803aa44 +Author: Carl Worth +Date: Mon Jun 25 23:09:17 2007 -0700 + + Use local structure for mask_surf_state + +commit a418ef7316808b239884a90c3fe890220bcc0242 +Author: Carl Worth +Date: Mon Jun 25 23:07:19 2007 -0700 + + Use local structure for src_surf_state + +commit 0e3c0b17826b7b5a21ee2c1d789b084fc167f1ed +Author: Carl Worth +Date: Mon Jun 25 23:05:50 2007 -0700 + + Use local structure for dest_surf_state + +commit 41a2c0f15446d59678461648f476fa71d40d44e0 +Author: Carl Worth +Date: Mon Jun 25 23:03:47 2007 -0700 + + Use local structure for cc_state + +commit 59f2150caca7eb374a2db43a472ba85f50d23274 +Author: Carl Worth +Date: Mon Jun 25 11:28:57 2007 -0700 + + Remove redundant i830WaitSync from i965_prepare_composite + + There were two calls to i830WaitSync, and between them no state was + being changed---just offsets were being computed. + +commit 66aa0e61e1e8d2216a9c0555be5be004ed0a3192 +Author: Dave Mueller +Date: Fri Jun 22 16:45:27 2007 -0700 + + Bug #11171: Add support for the Ti TFP410 DVO TMDS transmitter. + +commit f8d7cbc6e1322acad3351591336cefcfba7d9aaf +Author: Eric Anholt +Date: Fri Jun 22 16:29:21 2007 -0700 + + Move the ivch's fixed panel mode support to i830_dvo.c for other LVDS drivers. + + This also results in removal of the setup hook, which was being called + unconditionally and breaking non-ivch dvo drivers. + +commit ec236c76b93aea5f2ee1e8b8509cde4625974fcb +Author: Keith Packard +Date: Fri Jun 22 16:32:46 2007 +0100 + + I830 needs to have plane/pipe/pll started in mode_set. + + The patch for the i855 to stop enabling plane/pipe/pll in mode_set broke the + i830. Revert that just for the i830, leaving it enabled for the i855. + +commit d957c6b8e1dde8e11c1db3431e0ff58c5d984880 +Author: Keith Packard +Date: Fri Jun 22 01:32:02 2007 +0100 + + Increase vblank wait timeout from 20ms to 30ms. 49.6Hz < 20ms. + + The x40 LVDS mode has a 49.6Hz vertical refresh. Waiting for only 20ms can + sometimes cause the driver to start programming the hardware before the + vblank has occurred, which will lock up the i855 chipset. Extend this to + 30ms (the maximum timeout used by the BIOS) to ensure this doesn't happen. + + Detecting actual vblank occurance using the various status registers should + also be possible but isn't yet working. + +commit a67c2965385001bcb8987265f698ff0f5809cd11 +Author: Keith Packard +Date: Thu Jun 21 23:59:38 2007 +0100 + + Follow BIOS configuration for Legacy Backlight Brightness. + + The backlight control in the LVDS controller can either operate in 'normal' + mode or 'legacy' mode. In legacy mode, it uses the PCI config space register + 0xf4 which can range from 0 to 0xff. In normal mode, it reads the range and + current value from the BLC_PWM_CTL register. + +commit d6e46f67ab3af1ad3bfa72acb0efd9fe79dbf1dc +Author: Keith Packard +Date: Thu Jun 21 20:16:36 2007 +0100 + + Eliminate some uninitialized variable warnings + +commit 9d104634cf03bea82d1467f01e577cb8d2e4b554 +Author: Keith Packard +Date: Thu Jun 21 01:15:39 2007 +0100 + + Add 3DSTATE_CLEAR_PARAMETERS bits + +commit 3bbf313ba541526a893915f8b6c64b1eccf325e0 +Author: Wang Zhenyu +Date: Tue Jun 19 09:33:50 2007 +0800 + + Fix left G33 issues + + Be sure to check G33 chip type in: + - sdvo output + - Y-major tile + - crt detect + - and xaa composite + Sorry for that I should have fixed them very earlier... + +commit acef342c870f3b5b781e48c8bf44739aa5ee8ffa +Author: Eric Anholt +Date: Mon Jun 18 11:57:48 2007 -0700 + + Bug #11295: Disable textured video on i915 with framebuffer width too large. + +commit fbbb41bc5e03478cb46ee8f64ef68b23ff3fc14b +Author: Keith Packard +Date: Sun Jun 17 14:59:24 2007 +0100 + + Let DPMS functions enable plane/pipe/output on 8xx hardware. + + On 855, letting crtc_mode_set enable the plane and pipe will occasionally + hang the chip. Instead, wait for crtc_enable to light things up. For 9xx, + leave things alone. + +commit d5ca000ece145a35fd6df0dcf3fb3460bd2d64e3 +Author: Rémi Cardona +Date: Sat Jun 16 13:17:54 2007 +0100 + + Include stdint.h to get uint64_t + +commit 6b2ae93506d6795f87d6993bebfcb4e6632508ee +Author: Dave Airlie +Date: Fri Jun 15 23:30:04 2007 +1000 + + sdvo: add support for RGB outputs on SDVO + + This lights up my monitor VGA-1 - it doesn't look the best though + +commit 671ba03befebfdd7256855858987aabc28b2e8cd +Author: Eric Anholt +Date: Wed Jun 13 16:30:26 2007 -0700 + + Fix and enable the 915-class planar textured video path. + +commit 6c29e0bae5f1e7cee02b678418394abb971594eb +Author: Eric Anholt +Date: Wed Jun 13 13:40:39 2007 -0700 + + Improve the drm_i915_flip_t check. + +commit 420e41e7921d3cc07c784fd17936ec8a675f3b20 +Author: Eric Anholt +Date: Wed Jun 13 13:34:26 2007 -0700 + + Revert "Replace failure-prone configure test for fresh libdrm with a simple ifndef." + + This reverts commit c2b130354aecffbeb2a2d23c7371461feaf5766a. + + Sadly, a non-working DRM_IOCTL_I915_FLIP already existed. + +commit 51612e5ac3ddfb2bb172c58f2dfff9631093b69c +Author: Eric Anholt +Date: Tue Jun 12 16:09:54 2007 -0700 + + On hang, dump up to the head pointer, not just up to the tail. + +commit ceb6dd72443c094212b0281c42cbe92e9a29f682 +Author: Eric Anholt +Date: Mon Jun 4 16:37:53 2007 -0700 + + Fix context switching between DRI and X. + + Now, all 3D pipeline consumers in the driver just call + IntelEmitInvariantState(), which handles basic state setup, the caching of that + state setup, and notifying DRI clients. This also removes a mistaken idle + wait in the Render code which was papering over the brokenness in the context + switching. + +commit c2b130354aecffbeb2a2d23c7371461feaf5766a +Author: Eric Anholt +Date: Tue Jun 12 08:49:21 2007 -0700 + + Replace failure-prone configure test for fresh libdrm with a simple ifndef. + +commit 0e1deb607f94e4aa3ec4b9df8ff7a07a1c95e31d +Author: Eric Anholt +Date: Mon Jun 11 17:33:33 2007 -0700 + + Fix a typo in _3DSTATE_DEPTH_SUBRECT_DISABLE definition. + + This is already fixed in the definition in the 3d driver. + +commit 8d7a0ccd4f674659eb781def2cfdc3a6e5a219ce +Author: Eric Anholt +Date: Mon Jun 11 17:33:07 2007 -0700 + + Clean up some nits in i915_video.c setup. + + - The screen dimensions were used for the clipping despite drawing being done + to any pixmap, not necessarily the screen. + - One piece of state setup was not documented anywhere, and isn't used in other + 3d hardware paths that also work. + - A 3DSTATE_MODES_1 command (830-class only) was issued even though it no + longer exists. + +commit 15caa64a497dcc0eacb0f91166d9b70206a8db35 +Author: Keith Packard +Date: Fri Jun 8 18:44:28 2007 -0700 + + Add description for how to use the frame and pixel counter registers. + + The 24-bit frame and pixel counters were not described in detail and + will be useful for DRM. + +commit 404fd47573f855b0442d49a383542fc093825ad0 +Author: Wang Zhenyu +Date: Wed Jun 6 11:01:48 2007 +0800 + + Enable overlay on G33 class chipsets + + Which have to use gfx vm offset fot setup overlay regs. + +commit f4c05973d391bdb0a9b0eadb155548310baa98fd +Author: Wang Zhenyu +Date: Tue Jun 5 11:07:41 2007 -0700 + + Add support for the G33, Q33, and Q35 chipsets. + + These chipsets require that the hardware status page be referenced by an offset + in the GTT rather than a physical memory address, so the X Server allocates it + rather than the DRM. + +commit 36fcaeb2ef94db5399071540bba106dec3db81d5 +Author: Eric Anholt +Date: Mon Jun 4 15:58:31 2007 -0700 + + Fix misplaced merge of 1280x768 panel fixup. + +commit 8a19e7d57bc23dd163b45e0ab7deca4f074c934d +Author: Keith Packard +Date: Tue Jun 5 00:09:57 2007 -0700 + + Always ensure the pipe A is lit when activating overlay on pipe B. + + Ok, so moving video from pipe A to pipe B still requires that pipe A be + active during the transition. Instead of trying to be fancy, just ensure + that pipe A is running on each transition to pipe B. + +commit e986f6cb62f8644c5fa835bd7dfb7b014c2677c5 +Author: Keith Packard +Date: Mon Jun 4 23:52:23 2007 -0700 + + Automatically switch overlay when crtcs are reconfigured. + + As crtcs are disabled and enabled, make sure the automatic crtc selection + mechanism drives overlay configuration at each request to display an image. + +commit 0984c1fc0963f1ebab31f5b8fce5ad4c387fbd2c +Author: Wang Zhenyu +Date: Thu May 31 10:17:26 2007 +0800 + + Add pci ids for 945GME + +commit 88ee25ebad78e54d243d728b775a69365359b5fb +Author: Wang Zhenyu +Date: Thu May 31 10:13:30 2007 +0800 + + Add pci ids for 965GME/GLE chip + +commit 92e4deb50e049cc83cbde4995ba0b901feceb15a +Author: Keith Packard +Date: Wed May 30 11:49:07 2007 -0600 + + Extend XV_PIPE range to include new -1 value + +commit 888a4a5f469bf955e3ee3e184b628808ae8a4498 +Author: Wang Zhenyu +Date: Wed May 30 14:42:35 2007 +0800 + + Fix i965 render's draw clip rectangle + + Use scrn's virtual size is not correct in rotation rendering. + This fixes initial rotation problem on i965. + +commit 516fb73ffee0aea7cf892e6703d37f8ecf52b812 +Author: Eric Anholt +Date: Tue May 29 10:22:25 2007 -0700 + + Remove README statement that 830M panels are unsupported. + +commit 72462568da589054828b72ace83232a71636ee73 +Author: Eric Anholt +Date: Tue May 29 10:21:12 2007 -0700 + + Expand manpage description of outputs supported. + +commit 906b974bfeeed18d79c244ad3db4f5d30e13e4c8 +Author: Eric Anholt +Date: Tue May 29 09:49:08 2007 -0700 + + Add a fixup to LVDS panel mode detection for 1280x768 panel from text mode. + + Apparently some BIOSes will program a small mode with large blanking instead of + using the pannel fitter. + +commit 4b2781291844b61b397e257a0fdb43e964e5f603 +Author: Keith Packard +Date: Sat May 26 10:09:11 2007 -0700 + + Mark IVCH as connected when detected + +commit 2a365eab0178c28782fba97bdd22365f30ce8963 +Author: Keith Packard +Date: Sun May 27 12:35:55 2007 -0700 + + On i830, Pipe B cannot be lit the first time unless Pipe A is running. + + I don't understand it, but just like the video overlay, if Pipe A is not + running, Pipe B will not turn the first time it is activated. This + patch restructures the code used for the video overlay to share it + with the crtc commit function. + +commit ff8c8cb869a3c780dbd826f7c94f06e4f3fda6af +Author: Keith Packard +Date: Fri May 25 20:29:59 2007 -0700 + + Compute and clip to crtc before call to xf86XVClipVideoHelper. + + By clipping to the crtc ahead of time, xf86XVClipVideoHelper will + correctly clip to the bounds of the crtc, eliminating the need for any + custom crtc clipping. + + Also, replace the broken xf86XVFillKeyHelper with a private version that + doesn't end up stuck with the wrong clip list when the root window changes + size. + +commit 33f635d79fe891079558fd909d564f3cf424c482 +Author: Keith Packard +Date: Fri May 25 17:32:06 2007 -0700 + + Ensure Pipe A is active when enabling overlay the first time. + + The overlay on the i830 appears to be clocked by Pipe A when being enabled. + If pipe A is not running, it will freeze the overlay and blank the screen. + Setting a random mode on the Pipe and turning it on fixes this problem + nicely. + +commit ff0ac8ea63dd6e55573652c5826c482881da0d62 +Author: Keith Packard +Date: Fri May 25 17:26:15 2007 -0700 + + Xv does not require directRendering + +commit 109e5d597b76f7414601cb39c07b133ebf1b0e61 +Author: Keith Packard +Date: Thu May 24 11:40:50 2007 -0700 + + Clean up CRTC selection. Remove more overlay blocking. + + Create separate CRTC selection function, use ints instead of floats for + coverage measurement. Remove pipe stalls waiting for overlay update. + +commit dfb1ec9a07f74125cb1724d41ed4342c4714e12b +Author: Keith Packard +Date: Thu May 24 11:23:44 2007 -0700 + + Eliminate blocking for video overlay. + + No need to block for the overlay; just use the idle buffer. This will + always work because the buffer switch occurs at vblank time, so there is + always plenty of time to get the next buffer contents in place before it + starts getting scanned to the screen. + +commit d172344599585e11388e59659dc9aaa86d7a31c1 +Author: Keith Packard +Date: Wed May 23 20:00:16 2007 -0700 + + Reformat i830_video.c to four-space indents. + + Yes, I can't stand it anymore. it's a huge patch, but + git-diff -w shows no changes. + +commit 02935ced3fba598a01d908ae49ccc30cbcc765a8 +Author: Keith Packard +Date: Wed May 23 19:24:25 2007 -0700 + + Clean up overlay management. + + Create separate on/continue/off functions for overlay. + Manage overlayOn boolean within those functions. + Eliminate redundant management code in other routines. + +commit 08753f9b79f3f09879a18b552d90d88dbf52d4be +Author: Keith Packard +Date: Wed May 23 18:59:10 2007 -0700 + + Use FLIP_CONTINUE with ~OVERLAY_ENABLE to turn overlay off. + + This makes the overlay work on i830 with the modesetting driver. I don't + know why the pre-modesetting driver worked without this, but it did. + A more 'correct' fix would be welcome, but this does seem to do the trick. + +commit aa187186dc4f2d770a642060fe54f547ea8952b3 +Author: Keith Packard +Date: Mon May 21 10:49:08 2007 -0700 + + Automatically select crtc based on coverage. + + By default, select crtc based on which one covers more of the video output. + pipe property can be used to override selection when both have partial + coverage. + +commit f5017a06a271bba0ace3c5415b78e78bc0c96f22 +Author: Keith Packard +Date: Sun May 20 17:25:33 2007 -0700 + + Use CRTCs instead of pipe indices for video pipe selection. + + Replace pipe indices with crtc indices and store references to the xf86Crtc + objects in the video private structure. + +commit 2df87256df755e972eb884bc742832038a020b2c +Author: Keith Packard +Date: Sun May 20 17:23:26 2007 -0700 + + Dump pending ring on crash. + + When the hardware locks up, dump the pending commands in the ring for + analysis. + +commit 9971fac87622c93503540196e1756fded3d4869e +Author: Michel Dänzer +Date: Tue May 22 10:46:39 2007 +0200 + + i830: Provide new DRI texOffsetStart hook when available with EXA. + +commit 5390a2e2611950d3f48cc735df4a0c37bc5377a5 +Author: Michel Dänzer +Date: Fri May 18 17:51:36 2007 +0200 + + Update vblank pipes when a pipe gets disabled. + +commit 4120a20626998272424225261f2cf7960b7ec0ca +Author: Wang Zhenyu +Date: Fri May 18 10:10:34 2007 +0800 + + EXA: add render enter helper function + + That notify mesa rendering is smashing the state, and check last 3d + operation to do sync after we're swapped in or others. + +commit 8db28aeaa6e908017b40bd9180f144a2972f6278 +Author: Wang Zhenyu +Date: Fri May 18 09:54:34 2007 +0800 + + Fix ring debug code + + Use proper unsigned type for timer variables, and try to dump 965G state. + +commit 16e50a91dd8b3676e8ce06052c549ab27e6843b7 +Author: Wang Zhenyu +Date: Fri May 18 09:53:36 2007 +0800 + + EXA: remove a flush cmd in i915 render code + +commit 12a9fcfe1b25cee850380d8ce11ef11cde9aaacb +Merge: b930bb9 e89d5f2 +Author: Keith Packard +Date: Thu May 17 15:11:29 2007 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit e89d5f275442915cc7777e75d3fcf7e7ed0f2084 +Author: Keith Packard +Date: Thu May 17 15:00:12 2007 -0700 + + Make each output control clones/crtcs. Split DVO into LVDS, TMDS, TV. + + Move clone/crtc config into each output where it's easier to understand (no + need for a switch statement in I830PrepareOutputs. Also, split DVO into + three sub-types (TMDS, LVDS, TVOUT) as those have different cloning + abilities. + +commit a441954630c6cdabbf463bfc3404160f97a04b4f +Author: Keith Packard +Date: Thu May 17 14:11:49 2007 -0700 + + Enable panel fitter on ivch DVO. + + Using BIOS source code as a guide, set up the panel fitter on the ivch. This + involves setting the pipe to the panel fixed mode, the DVO to the source + size and assigning vertical and horizontal scaling factors in the ivch + itself. + +commit c0daa0a982e7074af4b50653b4a45b0a6352b43d +Author: Keith Packard +Date: Wed May 16 14:02:00 2007 -0700 + + Change DVO module interface to pass more state across. Fix IVCH display. + + The DVO module interface reflected most of the xf86Output API to the + underlying functions; finish that work given the changes that have since + occurred in the xf86Output API. + + Move the LVDS-specific code into the IVCH module and make that work on the + Thinkpad X30 (an i830-based laptop). Panel scaling does not work yet. + +commit b28817a87a1608e849e4a9a736dda43533a84b0c +Author: Keith Packard +Date: Wed May 16 13:59:36 2007 -0700 + + Add i830_bios_get_aim_data_block to read AIM data from BIOS + + Add-in modules have per-module data in the BIOS which contains configuration + information which cannot be entirely discovered. + +commit b31bef1a8effa9acb6de7edd206b9d8c48d88144 +Author: Keith Packard +Date: Sat May 12 20:04:31 2007 -0700 + + Deal with i830 CRT load detection which cannot use FORCE_BORDER. + + Chips newer than the i830 can force the border color for the active period + of the screen, allowing the load detection to easily see the right data. In + addition, newer chips appear to have more sensible load detection hardware + which either ignores inactive periods on the screen or performs some + longer-term averaging. The i830 appears to provide unfiltered samples of the + detected load. + + For the i830, then, emit a border at the bottom of the screen and, for load + detection, simply turn it purple and wait for the current line to be within + the border. Sample an entire scanline, counting the number of times the load + detection sees a monitor. In my testing, the presence of a monitor will + cause the detection to succeed every time, while the absense will cause it + to fail about 75% of the time. The code here, checks for presence at least + 75% of the time, which should be adequate. + + Also, as the new mode configuration code has already taken care to enable + the CRT output, eliminate much of the load detection code which is simply + duplicating functionality from the general mode setting code. This should + result in faster load detection as this code will now run in no more than + one frame time. It does burn the CPU the whole time though, polling the + displayed scanline register. + +commit b930bb9d6da8c24dbe0949afb7bb2aa4bcb24687 +Author: Eric Anholt +Date: Thu May 3 13:44:12 2007 -0700 + + Disable vblank interrupts when no DRI clients are running. + (cherry picked from commit 6621dd71ada839f4c1742e9e5b272e924cee21d9) + +commit 3b769af53e0ef6ef9b56afd679446c73a0e63ea5 +Author: Eric Anholt +Date: Thu May 3 13:44:12 2007 -0700 + + Disable vblank interrupts when no DRI clients are running. + +commit 775fc125aa7ecd0f054959ef210be2df4dc54345 +Author: Dave Airlie +Date: Thu May 3 20:58:50 2007 +1000 + + i810: be a bit more verbose about disabling DRI + +commit 34f362d099d255f8f0bb34e9de30f953ee770163 +Author: Eric Anholt +Date: Wed May 2 15:40:49 2007 -0700 + + Fix typo s/i/index/ in LoadPalette for depth 16. + + Reported by: Haihao Xiang + +commit f850d4727a2ad55c2116d0788f6684b2a0192d24 +Author: Eric Anholt +Date: Wed May 2 14:16:21 2007 -0700 + + Make up a fixed panel timing for DVO LVDS, and use DVOA for DVO LVDS. + + The fixed panel timing will only be available when the LVDS is already on + at X startup. + + So far, our only mostly-working LVDS driver is for the i830, and on i830 the + LVDS is always on DVOA, so use that for all LVDS chips. This may need to + change if we support the ch7017 I've seen used on embedded i845, for example. + +commit f3168e3b0c5664a322ca6bb1c81fc94844cb30ab +Author: Eric Anholt +Date: Wed May 2 14:08:30 2007 -0700 + + Disable non-working GTT decoding on i830, and fix map/unmap of GTT. + +commit 1fc630f24f8ad9e304cb0761f9cacca2224203c4 +Author: Eric Anholt +Date: Wed May 2 13:29:21 2007 -0700 + + Add DVO[ABC] register debugging. + +commit d0ec37e9c0ceab1080700cd7be4a7cc58552d465 +Author: Eric Anholt +Date: Tue May 1 15:56:37 2007 -0700 + + Make the DVO output name LVDS if it's an LVDS chip. + +commit 490d05f99d2b62dd612d514d9ae0badbac9285ce +Author: Eric Anholt +Date: Tue May 1 15:47:01 2007 -0700 + + Fix typo in previous commit with s/XF86_DRI/XF86DRI/ + +commit c7bb34e83d7c459d932d01070cfeffbbf6c703ac +Author: Dave Airlie +Date: Wed May 2 14:25:39 2007 +1000 + + disable all outputs on EnterVT + + This disables all outputs on EnterVT as the SDVO output can confuse + the VGA output if the BIOS has enabled it on the same pipe but X + isn't going to use the SDVO. + + Worked out on irc with keithp + +commit cae0ae237b79fa7d3a82dfc8d3fb595ccb6c63e1 +Author: Samuel Thibault +Date: Tue May 1 12:41:18 2007 -0700 + + Bug #10714: Fix build without DRI. + +commit 6748d620fbf39dd98982856c09256bdec0fc82a1 +Author: Eric Anholt +Date: Mon Apr 30 17:27:23 2007 -0700 + + Ignore VideoRam now that its original purpose is obsolete. + + It had been necessary to allow more than a small amount of memory to be + allocated, but now those old small allocations people had configured are + getting in the way. + +commit a4f1a7872f6f959bb4bc6568face710bee3589de +Author: Eric Anholt +Date: Mon Apr 30 17:13:09 2007 -0700 + + Allow physical-memory allocations within stolen memory. + + Because stolen memory happens to be a contiguous block of high system memory, + we can just read the GTT entries for it to get physical addresses for our + allocations there if needed. This reduces fragmentation of the aperture space, + and will often reclaim up to 7 MB of memory that had been left unused since the + simplified aperture manager was put in place, but without reintroducing the + complexities of the old aperture manager. + +commit 7d0d34cfdcc67d07e7667e13a9413743853134f8 +Author: Eric Anholt +Date: Mon Apr 30 10:39:54 2007 -0700 + + Disable some clock gating functions documented to work incorrectly. + +commit 138ac8f36cb4e4b3776f313955372522646acbb2 +Author: Wang Zhenyu +Date: Sun Apr 29 14:43:19 2007 +0800 + + Alloc state mem buffer on 965G for xaa rotation + + 965G needs state mem buffer to setup render pipeline. + Thanks Barry Scrott for report this. + +commit 0cd524e5411e35c8483c02ecc5062625809e6fc6 +Author: Kristian Høgsberg +Date: Wed Apr 25 18:09:10 2007 -0400 + + Implement the custom I2C protocol used by the ivch DVO. + + The ihch DVO uses a modified I2C addressing scheme as described + in section 5.2 of the data sheet. Implement this by over-riding + the I2C read and write word routines. + +commit 880314aabe6326ed56517034940f0e10fb16e866 +Author: Keith Packard +Date: Tue Apr 24 11:37:08 2007 -0700 + + CRTC Rotation under XAA wasn't hitting accelerated path. + + The server rotation code is now using the root window in IncludeInferiors + mode rather than using the screen pixmap. Change the XAA Composite code + to check for this case now. + +commit b23eae55c8cdd73e0aba1bf7ced283d402ee6470 +Merge: 31bf269 cebdb8b +Author: Keith Packard +Date: Thu Apr 19 20:38:18 2007 -0700 + + Merge branch 'origin' + +commit 31bf269afed0a830e79cbbd9d4b1ee9843af326c +Author: Keith Packard +Date: Thu Apr 19 20:03:41 2007 -0700 + + Update version to 2.0.0 + +commit cebdb8bfc6170a0fb441039f4422917fd0c77e70 +Author: Wang Zhenyu +Date: Fri Apr 20 10:54:34 2007 +0800 + + EXA: set enabling bits properly for i830 + + This was found when debug exa on a 865GV, we should set + pipeline state bits properly, otherwise the engine will hang. + +commit 60e891915af7d0f522c9c3f966599fa07779f7aa +Author: Keith Packard +Date: Thu Apr 19 14:02:23 2007 -0700 + + Eliminate LinearAlloc option and code. + + With the fixes to the 2D frame buffer allocation that allows up to 65536 + lines of 2D frame buffer in XAA mode, the old linear allocation hacks are no + longer necessary. + +commit cca389769001c657435f056e1f1c26b0f52a48bd +Author: Keith Packard +Date: Thu Apr 19 13:15:23 2007 -0700 + + Clean up 1.2 xserver build support. + + Convert relative X server source path to absolute. Check for local copies + of needed header files before building, rather than requiring server source. + Remove extra duplicate -I elements in AM_CFLAGS in sub directories. + +commit 07797fee88d6be0dfb30394a419dd86f8a3c9095 +Author: Keith Packard +Date: Thu Apr 19 13:01:37 2007 -0700 + + Fix mismatching braces when XF86DRI_MM is not defined. + + A closing brace was left inside #ifdef XF86DRI_MM while the matching + open brace was outside. + +commit 163c565527e8cda1f5a47c7fd63f04c80feaf3c7 +Author: Keith Packard +Date: Thu Apr 19 13:00:03 2007 -0700 + + Use I2C delay function instead of usleep. + + usleep isn't always available, and we have an existing delay mechanism + available to use. + +commit 378ceea3d9ddbec7a08ac2f07f9a8cd9cf3cef36 +Author: Wang Zhenyu +Date: Thu Apr 19 17:30:28 2007 +0800 + + Fix mem list order and remove extra unbind call when free memory + +commit db4b9e18810990e8900bdf54aa3091b876ea2658 +Author: Alan Hourihane +Date: Wed Apr 18 13:52:08 2007 +0100 + + Fix return status + +commit 3f5111940e35989d334aa99cd1b0eb26293ebf1b +Author: Alan Hourihane +Date: Wed Apr 18 13:27:59 2007 +0100 + + Update read_response to include the try on PENDING status + + and remove it from get attached displays call. + +commit 902388fa06f85486fe8010807ab53e4926cc979a +Author: Eric Anholt +Date: Tue Apr 17 14:21:25 2007 -0700 + + Don't try to init the XAA linear region unless we allocated memory for it. + + Reported by JM Ibanez + +commit 8abecae202b609375b6754dbd5ecce3d59036daf +Author: Eric Anholt +Date: Tue Apr 17 12:28:43 2007 -0700 + + Fix i852 EXA Composite acceleration setup. + + Reported by JM Ibanez. + +commit 2dbe8d678b02b724c4f06255383f49bb4c2708b0 +Author: Timo Aaltonen +Date: Mon Apr 16 14:14:19 2007 -0700 + + Fix build against xserver 1.2. + +commit a089ac11beb4c801928c17780401e913bc0d5257 +Author: Eric Anholt +Date: Tue Apr 17 11:01:05 2007 -0700 + + Add all the possible ivch slave addresses (still commented out). + +commit 37ee68a95ca8c86ebe9abafaaf55b060dd2a2f73 +Author: Eric Anholt +Date: Tue Apr 17 10:50:02 2007 -0700 + + Bug #10438: Fix 965 XV when sourcing from less than the full image. + + Bob deinterlacing in MythTV, and the zoom options in totem would result in + attempting to source from outside the video instead of scaling appropriately. + +commit ac9181c014638dbeb334b40b4029d0ccb2b7a0fc +Author: Alan Hourihane +Date: Tue Apr 17 16:30:17 2007 +0100 + + Check for the PENDING message when reading the attached + displays. Ensures the command has completed before continuing. + + (probably need to check PENDING in other SDVO calls too) + +commit ab5bdee8a62c842ae32aaef57eb841ebcb644d2b +Author: Wang Zhenyu +Date: Tue Apr 17 16:23:46 2007 +0800 + + EXA: fix i830 render + + Fix tex blend pipeline in case that src/mask pict has no + alpha. Unmask color buffer write disable bits. These make + rendercheck run fine on 855GM. + +commit 1a29750b8dba1371d7d0802744cdf2f3bfa83c13 +Author: Wang Zhenyu +Date: Mon Apr 16 16:21:39 2007 +0800 + + EXA: fix 830/845G pict format + + Fallback in 830/845G when pict format is a8, x8r8g8b8 or + x8b8g8r8. The hw doesn't support them. + +commit 3a634bbd198650c1597dec4306d99928374c30f3 +Author: Wang Zhenyu +Date: Mon Apr 16 15:14:49 2007 +0800 + + EXA: Add i830 supported pict format XRGB8888, XBGR8888 + +commit 3bcb9a0b4ba7f3df346b5708617a7aafcbe2490a +Author: Wang Zhenyu +Date: Mon Apr 16 14:27:49 2007 +0800 + + EXA: i830 render misc fix and cleanups + + Try to map texture stream when setup texture map, and use + correct order in load_immediate_1 cmd, which fixed crash on + 845GV. Also remove some flush cmds. + +commit 64c30cf896f8bde3ee74c92b970132ab91b418cd +Author: Wang Zhenyu +Date: Mon Apr 16 13:58:50 2007 +0800 + + Update intel.man with 965GM chipset support + +commit b67adb6de34cede0e31f02f26cd5ec7b1adfa586 +Author: Wang Zhenyu +Date: Fri Apr 13 22:34:52 2007 +0800 + + Fix crash on G965 XAA with LinearAlloc option + + We should alloc xaa_linear mem in LinearAlloc case, otherwise + we get crash when initializing xf86 fb manager. + +commit b5b243e4120d6a048fb6bbe8814fe3184271e9d9 +Author: Eric Anholt +Date: Thu Apr 12 12:34:23 2007 -0700 + + Add license headers to 965 programs. + +commit 08cd5f9b0f086e51112008d50de48556372899f9 +Author: Eric Anholt +Date: Tue Apr 10 11:26:46 2007 -0700 + + Bug #10520: i810 manpage not installed despite users expecting it to be there. + + Install it as an alias to intel.4x, since we're letting people load the driver + as "i810" still. + +commit bf9771e9711361632afe3abeeedca7ce03497005 +Author: Eric Anholt +Date: Mon Apr 9 15:26:05 2007 -0700 + + Don't use extended regexps in sed when not necessary. + + Some seds require a flag to enable extended regexps. + +commit 656fbd952542ba5ddc9b018071008ceb38b1bd19 +Author: Brice Goglin +Date: Mon Apr 9 13:06:46 2007 -0700 + + Bug #10515: Fix module version number with more than one digit per field. + +commit aa850d3c633a510d787ee59e538e26e5c3acbf4a +Author: Eric Anholt +Date: Mon Apr 9 11:44:25 2007 -0700 + + Turn off ALWAYS_SYNC in EXA. + + This slipped in as a debugging aid, and never got turned off. The driver + appears to work fine without it on an i915 system, and for the non-default EXA + option, we'd rather see issues found than continue running with debugging aids + and hiding them behind bad performance. + +commit d2e75d8acde2541b85a0050d9e47182c1db7fc2c +Author: Eric Anholt +Date: Mon Apr 9 11:34:57 2007 -0700 + + Avoid a magic number and correct a (currently harmless) ifdef in ResetState(). + +commit 9ed446e12bd21b7c8222c6e63a03a8e2ec6b97e2 +Author: Eric Anholt +Date: Tue Apr 3 11:39:48 2007 -0700 + + It's 2007 now. Didn't I get the memo? + +commit d9d05b553ca1f98efc230ef13f34576122311ac1 +Author: Eric Anholt +Date: Tue Apr 3 00:15:02 2007 -0700 + + Bump version to 1.9.94 for 2.0 RC4. + +commit eb45315b07624cb0506d539f523728a651efb798 +Author: Eric Anholt +Date: Mon Apr 2 18:20:33 2007 -0700 + + Move README to being a plain old text file. + +commit 9b78208f1ef1a8ee98f2aa139956659169e234ab +Author: Eric Anholt +Date: Mon Apr 2 18:20:15 2007 -0700 + + Move a bunch of debugging verbosity under Option "ModeDebug". + +commit 9ea83d440d6b9e30d4627e34168226a6b4b2a841 +Author: Eric Anholt +Date: Mon Apr 2 11:39:27 2007 -0700 + + Update README source for new release notes. + +commit c6d0bf9fb6033339159d98dc2b9fe44759ad9de5 +Author: Eric Anholt +Date: Mon Apr 2 10:09:43 2007 -0700 + + Remove long-stale TODO file. + +commit c59e5895a0ea1f219c8f63a02b429a024bd1ed66 +Author: Dave Airlie +Date: Mon Apr 2 07:18:04 2007 +1000 + + make warning info only so ppl don't go reporting stupid bugs + +commit e119eaabb2ad1ffc1d83f18199f49c52ec71b0fe +Author: Eric Anholt +Date: Fri Mar 30 17:09:18 2007 -0700 + + Warnings cleanup in ch7xxx. + +commit fd98e88d1a6e0e8d35bda868e7afcb78d2d11524 +Author: Eric Anholt +Date: Fri Mar 30 17:07:29 2007 -0700 + + Finish off some function renaming that was missed before. + + Thanks to alanc for catching this. + +commit 274b99e5e750228eba9a67773725a40ebaa9bf56 +Author: Eric Anholt +Date: Fri Mar 30 17:06:43 2007 -0700 + + Don't forget the warnings CFLAGS in subdirectories. + +commit aa6a9abb34e93780c07563ab5b21d8c064ea0a1c +Merge: 670c852 107ac12 +Author: Keith Packard +Date: Fri Mar 30 12:10:17 2007 -0700 + + Merge branch 'crestline-qa' + +commit 670c8521f18f01b9ea899ceb68d2a3dbb884b199 +Author: Eric Anholt +Date: Thu Mar 29 13:43:31 2007 -0700 + + Add missing file for old server compatibility build. + +commit 89c84f939f2dbed1d03a5f0e1daae23a229e47bc +Author: Eric Anholt +Date: Thu Mar 29 13:40:52 2007 -0700 + + Whitespace cleanup in Makefile. + +commit 6cd3b2c2de4596886aab85988b16cf63e8887add +Author: Wang Zhenyu +Date: Tue Mar 27 15:34:32 2007 +0800 + + EXA: i830 fix blend action + + i830_get_blend_cntl() has already added S8 offset. + +commit 35b3dd881a333569ce20ddf36b915b095757a1ba +Author: Wang Zhenyu +Date: Tue Mar 27 15:33:43 2007 +0800 + + EXA: fix i830 componentAlpha support + + Pick fix from i915 render, change tex blend pipeline for CA. + +commit df96d9a11d038ad64673022ce14c24223b3bd34c +Author: Wang Zhenyu +Date: Tue Mar 27 15:32:53 2007 +0800 + + EXA: fix i830 texture setup + + Use LOAD_IMM_2 helper cmd for tex setup. Enable RepeatNormal + support. Fix A8 format, i830 can support it now. + +commit aa78e67553ffe8ca986330f0ee49b5414c71a71f +Merge: 768821b 2191634 +Author: Eric Anholt +Date: Mon Mar 26 22:00:36 2007 -0700 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 107ac12867eda6b86212159db15c640d3490f2da +Merge: 6548817 2191634 +Author: Nian Wu +Date: Tue Mar 27 12:51:45 2007 +0800 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 768821bd3832aad01e44856199e60c6b7726a83b +Author: Eric Anholt +Date: Mon Mar 26 21:27:54 2007 -0700 + + Bump version to 1.9.93 for 2.0RC3. + +commit 2191634dd67b3219bb88f365bcf951d5a58140e8 +Author: Alan Coopersmith +Date: Mon Mar 26 14:58:41 2007 -0700 + + Add Solaris to list of OS'es with agpgart in man page + +commit 1c809f92467f97b098bcc89d66e60f6f88d9bade +Author: Eric Anholt +Date: Mon Mar 26 13:03:28 2007 -0700 + + Update .gitignore. + +commit f7befe50af4c13554d1f7aee6b05848ac312411b +Author: Eric Anholt +Date: Mon Mar 26 13:01:11 2007 -0700 + + Power on the LVDS B-channel pairs only when we've chosen dual-channel mode. + + It was basing off of the clock rate, but we have an override to use the + existing dual channel state when we can detect it, so the two settings were + conflicting. + +commit 827dc457a4fd0b97c95ec696ec9c3cd2f4a4becb +Author: Eric Anholt +Date: Mon Mar 26 12:45:23 2007 -0700 + + Update manpage to remove Rotate option and point at xorg.conf instead. + + While here, update a few other bits as well. + +commit 654881794ae1ad7214e85091b9015ae0fbdc5ddc +Merge: 6de3edc d572771 +Author: Nian Wu +Date: Mon Mar 26 17:00:11 2007 +0800 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit d5727717c9141be28a69b1154ccd23c23207f8f6 +Author: Keith Packard +Date: Sun Mar 25 23:44:59 2007 -0700 + + Switch TV_FORMAT property to format XA_ATOM + + This allows the driver to report the set of valid formats in the property + data. + +commit 6de3edcb52e6258f1af75e4f4bef73de1698445d +Merge: d874aa3 1e6e675 +Author: Nian Wu +Date: Sat Mar 24 17:00:13 2007 +0800 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 1e6e675524461ef0eb1983de89e2877426571a55 +Author: Keith Packard +Date: Fri Mar 23 23:42:52 2007 -0700 + + Eliminate calls to RRPostPendingProperty. + + RRPostPendingProperty has been removed in favor of RRPostPendingProperties, + and that call is now managed outside of the driver. + +commit 28da6f4e307880326dd553f50fe3fff3b9be9f4f +Author: Keith Packard +Date: Fri Mar 23 14:36:42 2007 -0700 + + Record 3D state loss at EnterVT in last_3d value. + + last_3d set to LAST_3D_OTHER indicates that the 3D hardware has unknown + state. + +commit ab19439cf4592e4607dc0bfc602aba3d56645a42 +Author: Keith Packard +Date: Fri Mar 23 14:34:27 2007 -0700 + + Don't call AdjustFrame on EnterVT. + + AdjustFrame is strictly for legacy compatibility; calling it on EnterVT + wrecks crtc positions. + +commit d874aa31599da4777438cc51469afe9b66601f55 +Merge: 94dbc37 26f32ef +Author: Nian Wu +Date: Fri Mar 23 17:00:12 2007 +0800 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 26f32ef680a19e63af4b7c8c84141fe32263f298 +Author: Keith Packard +Date: Fri Mar 23 01:17:58 2007 -0700 + + Property size is in units, not bytes. + + Several places were using byte lengths instead of unit lengths for + properties. + +commit f48dc501fbf74e0ac348f0b77750016597849ef4 +Author: Keith Packard +Date: Fri Mar 23 01:08:08 2007 -0700 + + TV output properties: TV_FORMAT, LEFT, TOP, RIGHT, BOTTOM. + + Remove TV format from mode name, instead use an explicit output property and + split the input resolution from the tv format. Add properties to set the + blank area on all four sides of the image. + +commit 94dbc3725358d63fe0ac8e6749489c993d24ede2 +Merge: 28af380 20b2685 +Author: Nian Wu +Date: Thu Mar 22 17:00:15 2007 +0800 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 20b26854abdacb6dc45cba2d81d515b2e47e25f1 +Author: Wang Zhenyu +Date: Thu Mar 22 10:33:15 2007 +0800 + + EXA: don't smash vertex header in G965 + + Originally we smashed vertex header to store texture + coordinates, this is working as we only use sf/wm kernel + and disable all other stages on pipeline. But better to + not do this. This also cleans up vertex elements state + and makes vertex buffer order looks "normal". + +commit 28af380ab133eb14d21dc650c77bdbab66576255 +Merge: 300e893 e06c5f7 +Author: Nian Wu +Date: Wed Mar 21 17:00:04 2007 +0800 + + Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline + +commit e06c5f727fb2e2de111ac9e691a877c56d2ca1b4 +Merge: 0202399 3025fa0 +Author: Wang Zhenyu +Date: Wed Mar 21 15:04:21 2007 +0800 + + Merge branch 'master' into crestline + +commit 02023998663cc7f0735fadfb1719d93dc2e5a112 +Author: Eric Anholt +Date: Wed Mar 21 00:00:56 2007 -0700 + + Whitespace and symbolic reg names cleanup in i830_panel_fitter_pipe(). + +commit 3e9ec78b4f54defb9986e11e6f2ac3475755849d +Author: Eric Anholt +Date: Tue Mar 20 23:58:48 2007 -0700 + + Set the panel fitter to the right pipe on Crestline. + +commit 3025fa0fb2bf5ace7076796e45e2560fe8410e8d +Author: Wang Zhenyu +Date: Wed Mar 21 14:50:45 2007 +0800 + + EXA: try to enable rotation for G965 + + The new sf/wm should handle the texture sampling only in + rotated case. Also fix possible hole in VUE slot. + +commit a50009604152bf9237c40bd098b3b1da3d018929 +Merge: 0a612e7 2239448 +Author: Eric Anholt +Date: Tue Mar 20 23:32:19 2007 -0700 + + Merge branch 'master' into crestline + + Conflicts: + + src/i810_reg.h + src/i830_display.c + +commit 300e893cec19dca48e00ee25014b8714dc13b278 +Merge: 96e8699 0202399 +Author: Nian Wu +Date: Wed Mar 21 08:55:50 2007 +0800 + + Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline + +commit 223944878cf38f86580df5a7d3102d86cfc061b9 +Author: Eric Anholt +Date: Tue Mar 20 14:33:53 2007 -0700 + + Attempt to fix single/dual-channel issues on i9xx LVDS panels. + + - Use the existing single/dual-channel state when available, as changing it + doesn't appear to work out. + - Set the power state of the CLKB and B0-B3 pairs according to whether + choose to go dual-channel or not. + - Restore the LVDS register at the appropriate point (before DPLLs are + re-programmed. + +commit 96e86994f3d1b4938e99a751454ee99bebfe40d3 +Merge: f465c23 0a612e7 +Author: Nian Wu +Date: Tue Mar 20 13:11:09 2007 +0800 + + Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline + +commit 0a612e7115ff993bb8e9a00df13c0b0d20122fd6 +Merge: 8bb6778 4c4faf2 +Author: Wang Zhenyu +Date: Tue Mar 20 11:34:40 2007 +0800 + + Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + + Conflicts: + + src/i830_display.c + + Change LVDS output and postread like upstream. This might + need to be retested on 965GM LVDS. + +commit 4c4faf260eb4dad1b1919c6168fa9ef477b98a39 +Author: Eric Anholt +Date: Mon Mar 19 13:36:37 2007 -0700 + + Set the CURSOR_SIZE register when present. + + Failure to do so gets you a lot of pretty colors. + +commit 64c14204453bea3f98d19861c450612e718e6c69 +Author: Eric Anholt +Date: Mon Mar 19 13:35:43 2007 -0700 + + Print the mode actually being set per pipe. + +commit 3ce802414a20ca8af128a00e6925a099dd90ceb4 +Author: Eric Anholt +Date: Mon Mar 19 11:35:11 2007 -0700 + + Add debug output for ADPA. + +commit c21b88d838fda1f00f6f6bcfe7855d32543c6f3f +Author: Michel Dänzer +Date: Mon Mar 19 10:45:58 2007 +0100 + + Fix build when DAMAGE is not defined. + +commit 991719c21a6cc1b5d9b7cbe30d4b333718b3e686 +Author: Keith Packard +Date: Sun Mar 18 23:05:33 2007 -0700 + + Make i830_sdvo_write_sdvox write everything twice. + + For some reason, certain chips don't correctly enable the SDVO hardware when + this register is written only once. We're following what the BIOS code does + and writing it twice now, but with extra posting reads to boot. Yes, this is + cult-and-paste, but it fixes problems found on deployed hardware. + +commit 9118122a232d4cf7760bcb0874fe970c25251378 +Author: Keith Packard +Date: Sat Mar 17 21:34:03 2007 -0700 + + Allocate 4 separate buffers for HW Cursors on Linux. + + Linux cannot allocate a large fixed buffer for the HW cursors as needed for + FreeBSD; instead, allocate four separate buffers. The code now prefers to + allocate one buffer (less overhead) and falls back to separate buffers only + when necessary. + +commit 62a5399d70ac3f8579441d617f8d80c94942a32a +Author: Keith Packard +Date: Sat Mar 17 21:32:36 2007 -0700 + + Elide I830DRIClipNotify for older DRI versions. + + I830DRIClipNotify is passed to newer versions of DRI; don't include it in + the server when building against older versions. + +commit 05e0021147a89254182c277007236448f315231c +Author: Keith Packard +Date: Sat Mar 17 21:31:04 2007 -0700 + + Cast ARGB cursor address to CARD32 * to eliminate warning. + + While we're just doing a memcpy, it's nice for the two argument types to + match. + +commit d05bb5362e986c9d27bc03c7e1a939ba28824810 +Author: Keith Packard +Date: Sat Mar 17 20:21:59 2007 -0700 + + Increase DDC I2C RiseFallTime to handle older monitors + + Changing this value slows the entire I2C bus down, making it far more + reliable on older monitors. Note the same change has been made in the core X + server code; this change is included here to ensure that older X servers + work reliably with this driver. + +commit 44d1b544cec2e75735d2e27d66a9240317b962c2 +Author: Keith Packard +Date: Sat Mar 17 17:15:43 2007 -0700 + + Build fix for pre-XF86DRI_MM environments. + + Misplaced brace broke builds with older DRM libraries. + +commit a58befe9d243bd562cb4b2f08ec5c9f754148c20 +Author: Keith Packard +Date: Sat Mar 17 17:12:37 2007 -0700 + + Remove extra (and incorrect) I2C ByteTimeout setting. + + Setting the value correctly and then immediately breaking it caused many I2C + transactions to timeout with slow monitors. Oops. + +commit 9d6d9ace4bd3180a4484321c3b96a83bc4adaf84 +Author: Eric Anholt +Date: Fri Mar 16 19:41:54 2007 -0700 + + Move vendor ID check in the utils to after pci_device_probe. + + Even current libpciaccess seems to require this. + +commit a117bc9e3eb824f2056ee6416859ea3ab1fdcc30 +Author: Eric Anholt +Date: Fri Mar 16 19:39:34 2007 -0700 + + Add the (afaict) correct ch7017 I2C slave address. + +commit 29446cdb4f72e12c5249b0d4b79ea56d9fe19934 +Author: Eric Anholt +Date: Fri Mar 16 19:18:37 2007 -0700 + + Fix compile failure due to needed types being in inttypes.h on Linux. + +commit 213394fbaaf353404cbb3aaa4c20860f48ee1079 +Author: Eric Anholt +Date: Thu Mar 15 19:13:28 2007 -0700 + + Fix crashes and other failures when a cursor allocation fails. + + Now, we allocate one single block of memory for cursors, and either succeed or + fail once, rather than trying to support partial fallback modes that generally + resulted in pain due to being untested. In particular, this fixes cursors on + FreeBSD, which only allowed one large physically-contiguous allocation. + +commit 316ee682d342556b65cbd60409201591e916aac5 +Author: Eric Anholt +Date: Thu Mar 15 18:53:55 2007 -0700 + + Don't reload the cursors if we haven't set up the screen yet. + + This avoids a crash during preinit if we set a mode for load detecting. + +commit 8b06ab50bbd79dfaf4c90a6f76116ace64b85b77 +Author: Eric Anholt +Date: Thu Mar 15 10:12:14 2007 -0700 + + Fix sparse warnings about using 0 for NULL. + +commit 8ae6ad93329e2842c6f2d5b20ffeb0c14d10c0de +Author: Keith Packard +Date: Thu Mar 15 00:00:51 2007 -0700 + + Use new driver-independent CRTC-based cursor layer. + + This eliminates all of the cursor rotation code and other cursor management + infrastructure, leaving a fairly simple hardware layer in its place. + +commit 9fbef2de9edbbed9c2f6a80c4074b9b245547c45 +Author: Eric Anholt +Date: Wed Mar 14 12:34:34 2007 -0700 + + Bump to 1.9.92 for RC2. + +commit 555b801a75cafa082808bc9bb683e700fc97d79a +Author: Michel Dänzer +Date: Wed Mar 14 11:41:50 2007 +0100 + + Make sure the legacy texture area is there when needed. + + This currently only matters when the DRM memory manager is not available and + Option "Legacy3D" "off" is specified, but that hasn't always been the case and + might change again in the future. + +commit 66fdb08c83d353fbe4e917900c54b555c869eb80 +Author: Eric Anholt +Date: Tue Mar 13 17:07:10 2007 -0700 + + Refine the i855 LVDS clock code. In particular, p2 is always 14. + + This gets correct clocks detected on most harware. The SSC is always assumed + to be 66Mhz, which may not be true, but we'll fix that when we find example + hardware. + +commit 44708bdd9ebfef0328302c9a964b80deb46e57c6 +Author: Eric Anholt +Date: Tue Mar 13 16:55:38 2007 -0700 + + Get SDVO DPMS working on the Mac Mini by writing SDVOB and SDVOC together. + + Also, add code for setting the encoder power state like the BIOS does, but this + doesn't appear to work. We do much more than the BIOS does in powering things + down, so perhaps that's interfering somehow. + +commit 5135b3a79f9c30ebce78c84c49846bba83607fed +Author: Eric Anholt +Date: Tue Mar 13 10:21:06 2007 -0700 + + Use a POSTING_READ(reg) macro instead of using the (void)INREG(reg) pattern. + +commit 578da7ca705c5a58c0bd397b0831e2f95140f8ae +Author: Eric Anholt +Date: Tue Mar 13 10:11:29 2007 -0700 + + Add PCI write posting protection to i2c putbits. + +commit cf33abe43bd95c9437fad8e6201a24084ff96cb8 +Author: Eric Anholt +Date: Tue Mar 13 10:08:57 2007 -0700 + + Add write posting protection for the SDVO DPMS-on path. + +commit 9d30f0007203157e6b82fa0ffc57324490eb2ca0 +Author: Eric Anholt +Date: Tue Mar 13 10:04:06 2007 -0700 + + Replace #if 0ed LVDS register setting with updated comment. + +commit 9c17c6e9c63563cad5edff837519a73fe0afe313 +Author: Eric Anholt +Date: Tue Mar 13 09:55:49 2007 -0700 + + Add write posting protections to relevant register writes in the mode-set path. + +commit 2824ec7ccbf44ba413a6133f735f4a548c73b3cd +Author: Eric Anholt +Date: Tue Mar 13 09:53:35 2007 -0700 + + Fix uninitialized string use in SDVO non-TMDS case. + +commit f465c23750adf908c0ea874f95aad98ebd2f1015 +Merge: d33e8da 1ed3843 +Author: Nian Wu +Date: Tue Mar 13 17:00:44 2007 +0800 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 1ed3843f73a0d8efa405daff3483ebe70bf6134f +Author: Eric Anholt +Date: Mon Mar 12 17:47:32 2007 -0700 + + Make the 965 use Y-major tiling for the depth buffer, as required by the spec. + + An example of the failure can be seen with the reflect demo when set to + depth buffer mode. + + Reported by: Haihao Xiang + +commit 7aa257154685bd2520649ce87a3a84e55644d02c +Author: Michel Dänzer +Date: Mon Mar 12 19:00:14 2007 +0100 + + Fix build against released libdrm. + +commit 7c561956a28e90667fef140bc3cfa0edca464f15 +Author: Michel Dänzer +Date: Mon Mar 12 18:55:27 2007 +0100 + + Defer flipping pages back to normal until the end of the DRI block handler. + + Doing it earlier can result in the wrong page being visible, giving the + appearance of a frozen X server. + +commit fe59ab9f562fd10118563d80eb3351a4d3b48b3f +Author: Michel Dänzer +Date: Mon Mar 12 13:03:47 2007 +0100 + + Disable page flipping if the DRM is older than 1.9. + + Older versions don't support the functionality we need. + +commit ba55ff15df974197bebd871e28bb96d817ae41c7 +Author: Michel Dänzer +Date: Mon Mar 12 13:01:00 2007 +0100 + + Fix attempt to flip pages back to normal when the last 3D window disappears. + + When this succeeds, 2D rendering does not have to be synchronized to back + buffers until the next 3D window appears. + +commit c4a23c5ef8ce56ee0fe547fbc7c6623c021f801b +Author: Michel Dänzer +Date: Sat Mar 10 16:15:33 2007 +0100 + + Remove unused have3DWindows from pI830. + +commit d33e8daa6874ced978d2a1f687c48922555f2524 +Merge: 58aeb87 797aa6f +Author: Nian Wu +Date: Mon Mar 12 09:03:52 2007 +0800 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 797aa6fcb1231587bde1efb47bc8430c4c8d8110 +Author: Dave Airlie +Date: Sun Mar 11 12:58:50 2007 +1100 + + fixup missing assert includes + +commit 43a80ef9094efcb49027c83f0e726f907fecfbb2 +Author: Dave Airlie +Date: Sun Mar 11 12:58:26 2007 +1100 + + fixup brace alignment for older X.org + +commit 0d33fd3d03cef3a7e63d88ae441354390b37a937 +Author: Dave Airlie +Date: Sun Mar 11 12:58:02 2007 +1100 + + add XMODES flags to the i2c drivers + +commit 3c2d6e07bdf8daef6486b594aef0d22460eb2585 +Author: Michel Dänzer +Date: Fri Mar 9 23:49:46 2007 +0100 + + Don't crash when the SAREA pointer is NULL. + +commit 7518b8959ee7598f3526365a83ea7e143a5d6a4e +Author: Michel Dänzer +Date: Fri Mar 9 19:50:03 2007 +0100 + + Revert change accidentally included in previous commit. + +commit 1991a90ae90b388c914985d20d6f8c3637856e9a +Author: Michel Dänzer +Date: Fri Mar 9 19:47:13 2007 +0100 + + Update SAREA pipe sizes in i830_crtc_dpms instead of i830PipeSetBase. + + This allows setting the size to 0 when a pipe gets disabled. + +commit aef161853033907c6916337cebe88c8f111dd542 +Merge: 1b54ee4 14ee919 +Author: Michel Dänzer +Date: Fri Mar 9 15:14:48 2007 +0100 + + Merge remote branch 'origin/master' into i830-pageflip + +commit 1b54ee493fb96f944aa81e56fa6f00a8067f87fc +Merge: e972265 81722a2 +Author: Michel Dänzer +Date: Fri Mar 9 15:13:50 2007 +0100 + + Merge remote branch 'origin/master' into i830-pageflip + + Conflicts: + + src/i830_dri.c + +commit 14ee9195d203192d3f613919f230b20b900ffdba +Author: Eric Anholt +Date: Wed Mar 7 13:00:03 2007 -0800 + + Bug #10157: Fix cursor corruption on server regen. + +commit 58aeb87f2e335d15eba73ce9dd1982e867c52403 +Merge: a4e7e81 81722a2 +Author: Nian Wu +Date: Wed Mar 7 16:02:03 2007 -0500 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit a5f0522b1d34236278861fe15bac2df099f0a2c7 +Author: Alan Hourihane +Date: Wed Mar 7 15:49:47 2007 +0000 + + Add some additional checks when XAA is enabled. + +commit 81722a21d232fa6cfb11fbe3d984abab50e89bcc +Author: Keith Packard +Date: Tue Mar 6 23:16:53 2007 -0800 + + Remove usage of 'shadow' module. Use xf86CrtcScreenInit. + + With the new mode setting code, rotation is handled outside of the driver, + so the old usage of the 'shadow' module is no longer needed. Code to + initialize the crtc structures has been moved out of the driver and into the + modes code. + +commit 04f50961e2f1610c39e7e4b45811f2a6b517cad6 +Author: Eric Anholt +Date: Tue Mar 6 14:23:06 2007 -0800 + + Bug #9898: Fix a crash with NoAccel set. + +commit b07dfbba5df7728232b38211c623185116dcea5c +Author: Eric Anholt +Date: Tue Mar 6 13:59:14 2007 -0800 + + Remove leftover code that was disabling tiling after we set it up. + +commit 94c37f35872487c04136fb659526bffefd9c46ad +Author: Eric Anholt +Date: Tue Mar 6 13:57:04 2007 -0800 + + Make the depth buffer X tiled instead of Y, and fix a Y tiling nit on 945. + + The previous code claimed to set the depth buffer up as Y tiled, but due to + lack of implementation in SetFence, it ended up being X tiled. Actually + setting the Y tiling flag in the new version broke the depth buffer, so just + switch the depth buffer to X tiling, which appears to work fine. + +commit a4e7e814a24dbe30a33e6ad45baeb41d190a2724 +Merge: 862088b 4042b27 +Author: Nian Wu +Date: Tue Mar 6 16:01:40 2007 -0500 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 30bb719ca0abc2599ffb89e59f297fa9a0a00c3c +Author: Eric Anholt +Date: Tue Mar 6 12:23:43 2007 -0800 + + Continue to allocate the legacy texture pool by default. + + This is a partial revert of 7358642e64ab6d13bc1dc1a44703ee66d715ff61 + + If we don't allocate it now, when the DRM version is too low there won't be any + memory allocated and DRI will fail. Instead, waste the memory in the i915tex + case for now, and leave fixing it right (check DRM version up front and decide + which memory manager to set up) to later. + +commit e972265261c421268e4fb806e587378d0adec577 +Author: Michel Dänzer +Date: Tue Mar 6 16:54:16 2007 +0100 + + Fix build failure. + + Not sure how I missed this before... Thanks to Todd Merrill for reporting. + +commit 862088ba6a91d3e7cf8d37126b1d9f4ee03a1f73 +Merge: 11e9158 d717d9d +Author: Nian Wu +Date: Tue Mar 6 07:43:16 2007 -0500 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 1e1b45fa6ed1683cba4ae73ac98933e74c3ab9d6 +Author: Michel Dänzer +Date: Tue Mar 6 10:28:41 2007 +0100 + + Fix reduced DRI memory manager size. + + pI830->mmSize is in kB. + +commit 3c08bc7d6974a1a6cf5f9cb81898617032966c52 +Author: Michel Dänzer +Date: Tue Mar 6 10:14:47 2007 +0100 + + Fix some conditionals related to triple buffering. + + Guard code that dereferences pI830->third_buffer with tests for that instead of + pI830->TripleBuffer. It could happen that we want to enable triple buffering + but (temporarily) can't because the third buffer couldn't be allocated. + +commit c25cfafbe1eb380b58b5fc16e94f5cc6f422f0cd +Author: Michel Dänzer +Date: Tue Mar 6 10:00:12 2007 +0100 + + Unify allocation of back buffers. + +commit e787d7b698d320a7c45df35d58c5113413561fe2 +Author: Michel Dänzer +Date: Tue Mar 6 09:35:42 2007 +0100 + + Remove warnings about potential artifacts with page flipping and mixed 2D/3D. + + The artifacts only seemed to occur when EXA was falling back to software for + the front buffer. + +commit 6c299aea8e87e72c68c96c03594706c976601ede +Merge: 3308152 4042b27 +Author: Michel Dänzer +Date: Tue Mar 6 09:28:52 2007 +0100 + + Merge remote branch 'origin/master' into i830-pageflip + + Conflicts: + + src/i830_display.c + src/i830_driver.c + +commit 4042b27f01fdb94e7fc0d4e991e054fff88479ea +Author: Keith Packard +Date: Mon Mar 5 22:32:52 2007 -0800 + + Move EnterVT mode setting code to xf86SetDesiredModes. + + Make the application of crtc desiredModes generic code instead of + per-driver by creating xf86SetDesiredModes from the code that was in EnterVT + and calling it. + + Also, move the frame buffer clear until just before mode setting to make + sure things are mapped correctly. + +commit 55ee46aebbf1ec1a8ce914fbd0c8894fc857db8f +Merge: 5c72014 50aa094 +Author: Wang Zhenyu +Date: Tue Mar 6 12:45:08 2007 +0800 + + Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel + +commit 5c720147e2b86ca4046b7c3812c1ca6b0fb78c9d +Author: Wang Zhenyu +Date: Tue Mar 6 12:44:04 2007 +0800 + + EXA: try to always alloc exa i965 state buffer in stolen mem + + I think this is a safe way to work around any possible chip + error. + +commit 11e91586169b4f4bf2b41c0e0e620a69670c2f07 +Merge: a24962a 0150270 +Author: Nian Wu +Date: Mon Mar 5 16:00:20 2007 -0500 + + Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit a24962af9ed39fabca0152cae1265a29fe6237d3 +Merge: 35e9310 8bb6778 +Author: Nian Wu +Date: Mon Mar 5 16:00:11 2007 -0500 + + Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline + +commit 50aa09425f54c4eeca7f8b0fae9579209b10b9c4 +Merge: d717d9d c2c6255 +Author: Keith Packard +Date: Mon Mar 5 11:28:46 2007 -0800 + + Merge branch 'modesetting' + +commit c2c62559e702e7de1fa2ef309fa647ab13564dc3 +Author: Keith Packard +Date: Sat Mar 3 23:12:54 2007 -0800 + + Move single mode setting code to X server. + + Code to drive the global configuration from a single mode setting operation + (from RandR 1.1, XFree86-VidModeExtension or XFree86-DGA) has been included + in the X server now, so remove it from this driver. + +commit 35e9310ef59873877422dcaf9a65b38789fc8ad6 +Merge: c8e6f0b b27fa2c +Author: Nian Wu +Date: Mon Mar 5 09:01:55 2007 -0500 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 8bb677889d3f71cde671f17a3589939acad2c3b3 +Author: Eric Anholt +Date: Mon Mar 5 05:08:51 2007 -0800 + + Fix 965GM SDVO by not setting fields in SDVO[BC] which have new meanings. + +commit 330815251dee808754b328cd2fd60db39f2460eb +Merge: 50ba1ff 0150270 +Author: Michel Dänzer +Date: Mon Mar 5 13:05:20 2007 +0100 + + Merge remote branch 'origin/master' into i830-pageflip + + Conflicts: + + src/i830.h + src/i830_dri.c + src/i830_dri.h + src/i830_driver.c + src/i830_memory.c + src/i830_xaa.c + +commit d717d9d566fe3c0866b06840114e1c1990bd7be0 +Author: Michel Dänzer +Date: Mon Mar 5 12:57:21 2007 +0100 + + Fix DRM memory manager initialization. + + It takes the offset and size in pages, not bytes. + +commit a0c83af3430b6705ab2ecae59085d1c74e890c19 +Merge: c0f99b4 bc20b54 +Author: Eric Anholt +Date: Mon Mar 5 03:37:53 2007 -0800 + + Merge branch 'modesetting' into crestline + +commit 7358642e64ab6d13bc1dc1a44703ee66d715ff61 +Author: Michel Dänzer +Date: Mon Mar 5 11:53:09 2007 +0100 + + Fix handling of new vs. old texture pools. + + Only one of them can be active. + +commit 50ba1fff886a7f51b178ac6d3a1ba79a3014b214 +Author: Michel Dänzer +Date: Mon Mar 5 10:22:07 2007 +0100 + + Be more verbose when page flipping can't be enabled for various reasons. + +commit 015027034e970f1e3bb6ab239f7e0119235e404f +Merge: 9a51064 bc20b54 +Author: Eric Anholt +Date: Sun Mar 4 21:49:00 2007 -0800 + + Merge branch 'modesetting' + + Conflicts: + + configure.ac + src/i830_driver.c + src/i830_modes.c + src/i830_video.c + +commit af565872a49a1a464ee4154c27136660b184c4c1 +Author: Keith Packard +Date: Sun Mar 4 21:20:33 2007 -0800 + + Set version number to 2.0 RC1 (1.9.91). + +commit bc20b54c34088356a277beaebcc90bb4a7063e19 +Author: Keith Packard +Date: Sun Mar 4 19:35:44 2007 -0800 + + Support new CRTC/Output prepare/commit hooks. + + New hooks replace explicit invocation of DPMS functions to manage mode + setting sequencing. + +commit b27fa2c257ccc49c6f29a20a3e672ebaaf58e7aa +Author: Eric Anholt +Date: Sun Mar 4 17:15:45 2007 -0800 + + Fix a crash with XAA and DRI disabled after the allocation rework. + +commit fc7d43c2b6b98be597152fbd88024273edd931d0 +Author: Eric Anholt +Date: Sun Mar 4 17:14:30 2007 -0800 + + Use -f for ln of server source. Otherwise, changing paths didn't take effect. + +commit b7b6063e62927dd135e118c433f48b4d0b5fe246 +Author: Eric Anholt +Date: Sun Mar 4 15:53:50 2007 -0800 + + Add a little BIOS dumper program. + + This isn't actually tested yet as libpciaccess doesn't do rom access on + non-linux yet. + +commit 6aeb855b9d4e03d458773240a9c0c9c1edd3e403 +Author: Keith Packard +Date: Sun Mar 4 17:11:40 2007 -0800 + + Shadow pixmaps use fixed offset of 0. + + Shadow pixmap contents are copied from the main frame buffer and contain + only the bits displayed by the crtc, not the whole frame buffer. The crtc + origin is always interpreted by the shadow copying code, the frame buffer + itself doesn't move. + +commit c8e6f0bac13e0e407f9771b1bbf126f023c1511b +Merge: 0ed5a2f c0f99b4 +Author: Nian Wu +Date: Sun Mar 4 09:00:12 2007 -0500 + + Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline + +commit 7d08f720a95499e8d00dcd7174f06731de420017 +Merge: dd24d2a 435d355 +Author: Keith Packard +Date: Sat Mar 3 23:13:03 2007 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 435d35558d8135a2c1724dfd813fb4a9a4e14178 +Author: Keith Packard +Date: Sat Mar 3 22:46:31 2007 -0800 + + Update for Aaron's xserver changes. + + Add xf86CrtcConfigFuncs to xf86CrtcConfigInit + Add canGrow option to xf86InitialConfiguration + +commit c0f99b4962553e560a5cb882a5060d95db5477a4 +Author: Keith Packard +Date: Sat Mar 3 22:36:46 2007 -0800 + + LVDS dither control moved from PFIT to LVDS register for Crestline + + The LVDS register now contains lots of new controls for dual-channel LVDS control + along with dither enabling. The PFIT register has a lot fewer controls as a result. + +commit 0fa3d4f51b5ee0dba3882fd74b6ac4e7da708f8f +Merge: 10655c4 fd52d63 +Author: Keith Packard +Date: Sat Mar 3 21:02:17 2007 -0800 + + Merge branch 'modesetting' into crestline + +commit 0ed5a2fdcfe9674175aa9af155c20695ef41cadc +Merge: 7ba80cc fd52d63 +Author: Nian Wu +Date: Sat Mar 3 09:00:20 2007 -0500 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit fd52d635603b7093c5a2b7fa9c987cf59f9be27c +Author: Eric Anholt +Date: Fri Mar 2 13:44:57 2007 -0800 + + Add a WIP UploadToScreen implementation. This almost displays right. + +commit ca0fa875e8bb5cb778d4db7d8053ec0a5ae34ef4 +Author: Eric Anholt +Date: Fri Mar 2 11:46:45 2007 -0800 + + Move EXA offscreen memory back after framebuffer to avoid fallbacks. + + Without this, the EXA code decides that the framebuffer is not in video + memory because it's not located between the start of video memory and the end + of EXA allocator memory. We should either have EXA let the driver decide if a + pointer is in video memory, or add a new field for "end of video memory" (not + just end of EXA offscreen allocation), but this fixes things for now. + +commit 5a73624b9bcce0004e5b72c74667c9dd504b9c3e +Author: Eric Anholt +Date: Fri Mar 2 11:03:16 2007 -0800 + + Fix a crash when an ARGB cursor allocation had failed. + +commit 7ba80cc3a5e0f469e3ee55c7537fdc952cd85911 +Merge: 9796cb7 d5df52b +Author: Nian Wu +Date: Fri Mar 2 09:01:46 2007 -0500 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit d5df52be59a7dd950e73336ce5698e73480108b0 +Author: Eric Anholt +Date: Thu Mar 1 08:35:13 2007 -0800 + + Actually add the files for reg_dumper. + +commit 9796cb7ac4bd74d5336986bb194ff5875b028121 +Merge: 42deb1e 1f5d166 +Author: Nian Wu +Date: Thu Mar 1 09:02:22 2007 -0500 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 1f5d1666c8386ca4597c6f2c1ec239f9d821da4c +Author: Eric Anholt +Date: Wed Feb 28 16:27:55 2007 -0800 + + Add a non-installed command line tool using libpciaccess to dump registers. + + This reuses the i830_debug.c code, so we can run that from the console or from + the BIOS-based X server to debug some remaining issues. + +commit cd1d4b398ec91d551bdaaa26c769e5e6a9442df1 +Author: Eric Anholt +Date: Wed Feb 28 09:47:38 2007 -0800 + + Many fixes to mode_get, mode_set, clock limits, and register dumps on i855. + + This should fix a number of issues with i855s, particularly with integrated + LVDS panels. + +commit 36cad3fcb65e3dcd88e58e301cd60adb121cb96b +Author: Michel Dänzer +Date: Wed Feb 28 17:52:42 2007 +0100 + + Update vblank pipe setup when setting a mode. + +commit b5316fb2623e9630cbd58020e0a7c95bf354c587 +Author: Michel Dänzer +Date: Wed Feb 28 17:50:56 2007 +0100 + + I830DRIClipNotify: Fix initialization of crtcBox[1].[xy]2. + +commit 42deb1e10fc445d152b74e2b225daeaee2abb3d1 +Merge: 76aac38 3e8e75e +Author: Nian Wu +Date: Wed Feb 28 09:00:24 2007 -0500 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 76aac382659bc1dab7dca078f703b9cf48b4ad74 +Merge: 42fc06c 1ac83f5 +Author: Nian Wu +Date: Tue Feb 27 14:42:42 2007 -0500 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 3e8e75e5d83a2fa7e9fc6e9a3fbb07dac548ea5a +Author: Wang Zhenyu +Date: Tue Feb 27 16:48:48 2007 +0800 + + Revert "EXA: enlarge 965 exa state buffer size" + + This reverts commit 1ac83f51ee46d65237eae1b5c767e106ac9e29bc. + oops, current exa state + kernel program size + scratch space + is actually ~36KB. + +commit 1ac83f51ee46d65237eae1b5c767e106ac9e29bc +Author: Wang Zhenyu +Date: Tue Feb 27 13:58:47 2007 +0800 + + EXA: enlarge 965 exa state buffer size + + Origin size seems break all render, be sure to assign enough + mem. 80k works fine for me. + +commit acd9f3e28fcf5e91e09d8bdca4cc58681b1fc92a +Author: Wang Zhenyu +Date: Tue Feb 27 13:56:31 2007 +0800 + + Fix typo when assign overlay reg mem pointer + +commit 5b765065c0bdf671b60d8a2fe512f6307f753eab +Author: Eric Anholt +Date: Mon Feb 26 17:25:57 2007 -0800 + + Consolidate shared structure allocation to the start of ScreenInit. + + Previously, the structures would get allocated unnecessarily once, and + wouldn't get reallocated in time at server regen. + +commit 6ed28c5aa34ff1d8b99a8d4721ddac7b9cac41ed +Author: Eric Anholt +Date: Mon Feb 26 17:12:44 2007 -0800 + + Fix XV issues on 965 after the allocation rework + +commit 36bfeb890aeb17a8ee058790dd69b4e9aba644a1 +Author: Eric Anholt +Date: Mon Feb 26 16:58:33 2007 -0800 + + Move the initial EnterVT to after we've set up acceleration. + + This fixes a crash with initial rotation and EXA due to EXA not being + initialized in time for the shadow pixmap setup. + +commit 732885c08daaf17034da8f4855d0b957ec3df9d7 +Author: Eric Anholt +Date: Mon Feb 26 15:04:56 2007 -0800 + + Bug #9604: Align the sizes of allocations to page increments as well. + + Without this, the 965 DRI driver fell over when pitch * height wasn't + page-size aligned. Since the allocator only allocates at page-aligned offsets + anyway this shouldn't hurt us at all. + +commit 0bfaeaab2838184827236c5c0fcc17f06d9e1372 +Author: Eric Anholt +Date: Mon Feb 26 11:11:56 2007 -0800 + + Fix physical memory allocations, including description in log. + +commit 5732dd7221b7bb24bf21e16066f014a0c7cb6b2a +Author: Eric Anholt +Date: Mon Feb 26 09:54:04 2007 -0800 + + Fix some texture memory allocation issues. + +commit aeeae1b40fc012bcc01fcd2243d4993de819b7cf +Author: Eric Anholt +Date: Mon Feb 26 09:13:17 2007 -0800 + + Fix a crash in startup monitor detect. + +commit 10655c4674cdac8a231c50dd9afc5d43fe43b4bd +Author: Zou Nan hai +Date: Mon Feb 26 09:23:14 2007 +0800 + + for merge with external tree + +commit 9417af8630fce0476273b693ebac12129415e0cf +Author: Zou Nan hai +Date: Mon Feb 26 08:02:50 2007 +0800 + + fix conflict with external branch + +commit 42fc06c85a0c487cfa26b9d4aa396402dbc4c2fe +Merge: 10655c4 3bce8bf +Author: Nian Wu +Date: Sun Feb 25 12:53:47 2007 -0800 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 84a7429730ddd29072d696accb9fdd8fea40731a +Author: Eric Anholt +Date: Fri Feb 23 14:59:24 2007 -0800 + + Always allocate logical_context, since we use it in emitting invariants. + +commit 7bb725dee9ef0ccdc478ed4931dc267bcb80203f +Author: Eric Anholt +Date: Fri Feb 23 14:56:58 2007 -0800 + + Improve logging of memory allocation passes, and clean the code up a bit. + +commit 54198b26e87baa180208932b97f10b27d9c0fddc +Author: Eric Anholt +Date: Fri Feb 23 14:17:07 2007 -0800 + + Move memory allocation to ScreenInit rather than PreInit. + + This lets us do memory allocation just once rather than having several passes + (as long as things succeed), avoids trouble with zaphod mode, and will let us + do better automatic sizing of allocations soon. + +commit 828deff6453872ef0f9fa35c08c9f95f464b1785 +Author: Eric Anholt +Date: Fri Feb 23 13:16:02 2007 -0800 + + Fix fence allocations on 965. + +commit d3ac440e127c8a7716062852cd3b5e7943e289e4 +Author: Eric Anholt +Date: Thu Feb 22 10:41:09 2007 -0800 + + Rework the video memory allocation. + + The previous allocator worked in multiple passes, with (at least) one of + setting up allocations, another to attempt to adjust those for tiling, and + then a pass to set up the offsets and fix them in memory. + + The new allocator is simpler, allocating memory immediately if possible, + setting up tiling up front, and choosing offsets immediately. AGP memory + is only allocated to back actual memory used, saving some memory that would + have been allocated for padding previous. It will also allow dynamic freeing + and reallocation of memory, which will be useful for framebuffer resizing. + +commit a61a6b1db610a07060d0dcca54b66a4b2b3686cc +Author: Eric Anholt +Date: Wed Feb 21 09:43:24 2007 -0800 + + Reformat to 4-space indents, no trailing whitespace, and 80 columns. + + I'm in the process of rewriting this file, and wanted to separate my whitespace + changes. + +commit dd24d2a082b41abc466391c37a9b3d066586dc55 +Author: Keith Packard +Date: Thu Feb 22 11:46:44 2007 -0800 + + Remove copied X server headers from driver. + + These two headers were copied during mode setting development; as that code + is now inside the server, these files are no longer needed here. + +commit 681966ce6548c6f47b087eb7e369674b7ddbaade +Author: Keith Packard +Date: Thu Feb 22 11:45:43 2007 -0800 + + Disable unused functions after configuring the remaining resources. + + This eliminates an unsightly flash of the hardware cursor during X server + startup. + +commit f5ab9e0ad3a65c972861dd53be6e33e1aac13191 +Author: Michel Dänzer +Date: Thu Feb 22 18:57:23 2007 +0100 + + I830DRISwapContext: Some cleanups. + + Also call I830EmitFlush() when entering/leaving the server context. Doesn't + seem to help for artifacts with page flipping and mixed 2D/3D unfortunately. + +commit 8cce74f195e5ef6ce5599ecd52f35bcfcb0d7913 +Author: Michel Dänzer +Date: Thu Feb 22 18:27:59 2007 +0100 + + Do not sync DRI windows between pages when possible. + +commit f346549183a407a4bff6521ec2450dacb97442e9 +Author: Michel Dänzer +Date: Wed Feb 21 09:19:54 2007 +0100 + + intel.man: Fix typo. + +commit 3bce8bf0e95e5842399959a5d6f6413e96f03adb +Author: Keith Packard +Date: Tue Feb 20 23:10:17 2007 -0800 + + Pre-965 hardware had fixed pipe 1 for panel fitter. + + The pipe mode setting code needs to disable the panel fitter when using the + pipe for things other than LVDS output. The driver was checking for panel + fitter conflicts using bits that the 965 chipset defines for selecting which + pipe the panel fitter is connected to. However, on pre-965 hardware, the + panel fitter works only with pipe 1 and those bits returned 0. + + The result was that when pipe 1 was using the panel fitter, configuring pipe + 0 would disable the panel fitter. + + The fix provided uses a model-specific test for the panel fitter pipe. + +commit 0bee64f4bc7581de7ab28ca438581d215e85c610 +Author: Michel Dänzer +Date: Tue Feb 20 19:09:37 2007 +0100 + + Add support for triple buffering using a third static buffer. + + Need to bump the DRI DDX version minor for the added SAREA fields. + +commit 2212baa8454abb4c7948c3f2e20e337f831d1b86 +Author: Michel Dänzer +Date: Tue Feb 20 18:39:13 2007 +0100 + + Don't mark page flipping as active when it really isn't. + +commit fac8f2eb49de22abd853ca75f3c985d4d94e3633 +Author: Michel Dänzer +Date: Tue Feb 20 18:38:40 2007 +0100 + + Document Option "PageFlip". + +commit 5a1a04649c62aa4b1c0617560b813642ce0c67b5 +Author: Keith Packard +Date: Sat Feb 17 17:01:04 2007 -0800 + + Make distcheck fixes. Distribute all sources needed even for older servers. + + Always allow (but do not require) link to server sources so that needed + files can be included in the generated tar files. + + Add remaining .g4a files and assembly output to distributed file lists. + +commit 0ca926e63c7fa9122a8cba1424ce4cdee1c7b215 +Author: Keith Packard +Date: Fri Feb 16 02:19:10 2007 -0800 + + Check for presence of xf86Modes.h file. + + xf86Modes.h file signals the availability of the new modes API in the + server; use that instead of counting on X server version numbers. + Also, finish eliminating use of local copies of those header files. + +commit 972f1109d23c0a3f821fa573e2aa40cd17ce2795 +Author: Keith Packard +Date: Fri Feb 16 01:07:20 2007 -0800 + + Remove common code that has moved to xserver/hw/xfree86/modes + +commit 20e146a09e3b4907a6800588ebfa787bfc5b0d89 +Author: Keith Packard +Date: Fri Feb 16 00:57:44 2007 -0800 + + Change rotation pixmap creation API to permit start-time rotation. + + Start time rotation requires that the pixmap be created after the server has + initialized the screens. Delay the pixmap creation until the first block + handler invocation. + +commit 17e38e39a49b2a96e31cca4a0b922631c5f7879e +Author: Keith Packard +Date: Thu Feb 15 23:09:43 2007 -0800 + + Enable mode setting function renames from shared code. + +commit 8e7bc4b1f95f5d62ff18cd94f14f5e3949ef6a29 +Author: Keith Packard +Date: Thu Feb 15 11:17:53 2007 -0800 + + Use server sources for crtc/output generic code. + + As sources for these have been merged to the server, use them from the + server source code instead of keeping copies in this driver. + +commit 6e33c4c44030e05d6d07ca9274cfe4d6df2c0387 +Author: Eric Anholt +Date: Thu Feb 15 09:54:43 2007 -0800 + + Print the correct meaning of bit 30 of pipeconf for 965 in debug output. + +commit 4541150cdce3f2f83b8530d0863aecf28c6610a9 +Author: Eric Anholt +Date: Thu Feb 15 09:51:04 2007 -0800 + + Detect core clock frequencies, to avoid double-wide mode when possible. + + Additionally, don't attempt to set double-wide on the 965, where there is + no such thing any more (not that we'd ever see modes high enough to trigger + it). + +commit d1be0dc4e9d443dcbd218a083cfb21a0b5d634ee +Author: Wang Zhenyu +Date: Thu Feb 15 11:03:12 2007 +0800 + + EXA: fix i965 default color (0,0,0,1.0) -> (0,0,0,0) + + (0,0,0,1.0) is actually black... + +commit c010d28f0a91a9831d366ea490878ef3d958021f +Author: Wang Zhenyu +Date: Thu Feb 15 11:00:06 2007 +0800 + + EXA: mask componentAlpha support + + we're getting load of multiple sf/wm programs for i965, might + need to be cleanup in future. + +commit ec55dd16c4c5f7612d33ae22a6249b3b1c60e2b6 +Author: Keith Packard +Date: Wed Feb 14 14:37:02 2007 -0800 + + Global namespace cleanups, filename fixes. + + Ensure all xf86 symbols created here are protected with XF86NAME. + Remove accidentally exported symbols from namespace. + Make all to-be-DI files prefixed with i830_xf86. + +commit 22a271555a46267c40448fa926d45692498ef7c6 +Author: Keith Packard +Date: Wed Feb 14 14:17:14 2007 -0800 + + Create driver-independent DGA hooks, remove i830 DGA code. + + As RandR needs to poke at DGA code, and we want the RandR code to be + driver-independent, it seemed easier to just make the DGA code + driver-independent as well. + +commit a7c64d5e28f608d54c94fa7a5c92bd5b471179c7 +Author: root +Date: Wed Feb 14 10:20:28 2007 -0800 + + WIP DGA generic support. + +commit 55c7b017ed718107b9b11467030addf225728b84 +Author: Michel Dänzer +Date: Wed Feb 14 16:45:22 2007 +0100 + + Use new DRI ClipNotify hook to track page flipping per CRTC when available. + +commit 3bd8edb95fcbbb49e97a1a2bdd5c8eae4f83d3a8 +Author: Michel Dänzer +Date: Fri Feb 2 17:41:18 2007 +0100 + + Revive i830 page flipping support. + + Use the damage layer directly instead of via shadowfb. + +commit 1d22bad33b634aaf61976907cb2ceeec8a9ebe4d +Author: Michel Dänzer +Date: Wed Feb 14 12:57:12 2007 +0100 + + Update SAREA pipe fields in i830PipeSetBase. + +commit 0df490938af10d3a748221e2fb5467b0f244f9eb +Author: Michel Dänzer +Date: Thu Dec 21 11:27:28 2006 +0100 + + If the DRM can handle it, enable vertical blank interrupts for both pipes. + +commit 1623b47c4863f5362587cdac855e3e11c109b007 +Author: Eric Anholt +Date: Tue Feb 13 17:37:56 2007 -0800 + + Switch the RECTLIST vertex order to (x2, y2), (x1, y2), (x1, y1). + + This is the documented correct ordering, and while the previous ordering + (reversed) worked on some hardware, it failed on others. + + Reported by: Wang Zhenyu + +commit 4bd4058dfdca84d6ebab82a1dfba99adf3852c9c +Author: Eric Anholt +Date: Tue Feb 13 14:29:52 2007 -0800 + + Bug #9941: ViewSonic VX2025wm sync polarity quirk to fix mode distortion. + +commit 0ec4ffcb4e8e5e707e68bef1b13a324677f19f8f +Author: Eric Anholt +Date: Tue Feb 13 13:18:15 2007 -0800 + + Fix double free in the case of LVDS disabled through quirks. + +commit 699fa88d2570de6173e2d866e11b7437f4842d74 +Merge: 681b919 6641aec +Author: Eric Anholt +Date: Tue Feb 13 13:10:08 2007 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 6641aec0a1cbc869fba1956c556cdd204631545a +Author: Eric Anholt +Date: Tue Feb 13 10:21:12 2007 -0800 + + Attempt to detect panel fixed mode from EDID or current programmed mode. + + These two sources are placed in higher priority to the BIOS data when + available, since the BIOS data has proven unreliable. The BIOS data is still + read, and warnings printed if it doesn't match what we probe. The BIOS data + remains useful for the situation where we want to turn on LVDS but there is no + EDID available and no current mode programmed (i.e. booting with VGA or TV + connected). + +commit 991439d4c78cf5b2a8f6bb8f5b36fffbfcc4e4fc +Author: Eric Anholt +Date: Tue Feb 13 10:07:47 2007 -0800 + + Remove dead #if 0-ed structure. + +commit c3aed56d46baba057d83dc6ea12c6b4e705e54ba +Author: Eric Anholt +Date: Fri Feb 9 13:16:37 2007 -0800 + + Fix comments on 965 pitch alignment restrictions. + +commit 98318dfcc99264fb7b7ef34568712812aa6300b6 +Author: Daniel Stone +Date: Fri Feb 9 16:20:57 2007 +0200 + + add missing files to fix distcheck + A bunch of files were missing from _SOURCES, and the build was also broken + for missing files (from EXTRA_DIST) when building without gen4asm. + +commit fce4390c4f1a76c65423114bb479814787612cd7 +Author: Zou Nan hai +Date: Fri Feb 9 11:32:22 2007 +0800 + + TV Enable + +commit 00dadaa115951c36de9caf2a9d78909811ef34bc +Author: Zou Nan hai +Date: Fri Feb 9 11:14:50 2007 +0800 + + set DPLL before detect + +commit 10712c7a781e50475ee7e8ccd5bfd2d820f863e2 +Author: Wang Zhenyu +Date: Thu Feb 8 08:56:42 2007 +0800 + + EXA: i965 pixmap pitch align + + This seems like a typo, which causes screen artifacts. + +commit 44eacf2323454e26b535cc5a4f0789cb0ff0e7fb +Author: Wang Zhenyu +Date: Wed Feb 7 17:30:51 2007 +0800 + + EXA: fix render issue with i965 + + Fix SF kernel with corrent coeffient work, and correct + VUE storage in multi texture case. + +commit 920aeaf8478f706ab3b1de4f20f5d351e64a0197 +Author: Zou Nan hai +Date: Wed Feb 7 13:15:52 2007 +0800 + + Make TV code same with external tree. + Fallback to old filter table. + 4 spaces indent reformat. + Auto scaling seem to not work well on some low res interlace mode when input width > 1024, filter those modes. + Fix some subcarriar number + +commit 6d9757e466863594300c83f3806fd4376bea0504 +Author: Zou Nanhai +Date: Mon Feb 5 14:59:53 2007 +0800 + + Fix hang when TV is not connect. + +commit 681b91924c364a1c00732f548539f2767929ba0e +Author: Eric Anholt +Date: Fri Feb 2 17:40:34 2007 -0800 + + Add subpixel offsets to fix accelerated rotated rendering on i915. + + This fixes the rendercheck "transformed src/mask coords 2" tests. Previously, + the source pixels chosen would be off by one in some cases. + + The particular values were taken from Mesa, which uses .125 offsets (except + apparently broken for y), but the signs are changed. I would be happier if + I had better justification for why this worked. + +commit 76a4f2eea826036e2ac16b7e8c61ab946038c120 +Author: Eric Anholt +Date: Fri Feb 2 17:34:41 2007 -0800 + + Fix bad offsets in "right" rotation of the CRTC in cursor and update handling. + +commit 785a59ead0e8d1d681b2cb6827ee58ad2c51f8c6 +Author: Keith Packard +Date: Thu Feb 1 22:48:44 2007 -0800 + + Rename driver from i810 to intel. Permit old name for compatibility. + + Driver installs as intel_drv.so with symlink to i810_drv.so to ensure + existing configurations continue to work. Updated manual page to reflect + name change and add attributions for recent work. + +commit 1dde7a15a3a42b881c57ece95feceffadf412cff +Merge: 16f30b2 1ba45a3 +Author: Keith Packard +Date: Thu Feb 1 21:31:27 2007 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 16f30b2e6c72e228c66946ff9efadd7278379745 +Author: Keith Packard +Date: Thu Feb 1 21:30:19 2007 -0800 + + Add "Ignore" option to per-output monitor, removes output from server. + + Setting option "Ignore" "Yes" will cause the server to pretend as if the + specified output does not exist at all. It will not be listed by the + RandR1.2 extension, and the server will not attempt to detect monitors at + startup time. + +commit b3633506dcd4fd58f0f9519cd67f6e75d6fb2042 +Author: Wang Zhenyu +Date: Fri Feb 2 11:35:44 2007 +0800 + + Add Intel 965GM chipset support + +commit 380129a17c61c783d77a87685ad5333e8b1c253c +Author: Wang Zhenyu +Date: Fri Feb 2 11:33:46 2007 +0800 + + Revert original crestline pci id patch + +commit f7489bbec150349bf03bea8d9d55451dbc92bfc2 +Merge: f1285ec ae6d358 +Author: Wang Zhenyu +Date: Fri Feb 2 11:26:57 2007 +0800 + + Merge branch 'modesetting' into crestline + + Conflicts: + + src/i830_display.c + src/i830_tv.c + src/i830_xf86Crtc.c + +commit ae6d3585a4d96aa4dc05ca8563cebfa7796324ef +Merge: 6d549ed 1ba45a3 +Author: Wang Zhenyu +Date: Fri Feb 2 11:21:59 2007 +0800 + + Merge branch 'modesetting' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel into modesetting + +commit 9f0acf1eb01ad8320f4da4cc5e498af25c0ecc5e +Author: Keith Packard +Date: Thu Feb 1 15:44:18 2007 -0800 + + Check for rotation change in xf86RandR12CrtcSet. + + xf86RandRCrtcSet was ignoring changes to only rotation, so the screen would + be left incorrectly rotated. + +commit 1ba45a3fcd40aaf4d373447fb9f252ca053f9105 +Author: Eric Anholt +Date: Thu Feb 1 13:26:38 2007 -0800 + + Improve register debugging output. + + This includes not reporting some fields on hardware where those bits are + reserved, correcting one of the hardware error bit numbers, and reducing + the severity of the debugging output warnings. + +commit 9bfeadbd5b37acb56cb646009239a94727ec52bc +Author: Eric Anholt +Date: Thu Feb 1 12:04:58 2007 -0800 + + Remove some more dead options. + +commit d6bc03c379c46842676f640b8edb13ea828bf20c +Author: Eric Anholt +Date: Thu Feb 1 11:28:34 2007 -0800 + + Bug #9819: Add two headers that are apparently necessary on older X Servers. + +commit 351866b0328b1d7afdc6b414c77d9ab4da4bd085 +Author: Eric Anholt +Date: Wed Jan 31 15:48:52 2007 -0800 + + Sync before overwriting Render acceleration state on the 965. + +commit 96783a458957ca280ebb6275fa692dd415df6931 +Author: Eric Anholt +Date: Wed Jan 31 15:48:02 2007 -0800 + + Fix copy-and-paste-o in the render code cleanup that broke XAA. + +commit 5238ff9c80718f9f8baa06123aa1bb6e3193fce6 +Author: Eric Anholt +Date: Wed Jan 31 14:01:41 2007 -0800 + + Naming and formatting cleanup in Render acceleration code. + +commit c47210d94ed17ad9e8e489a1e1886732e6dc7220 +Author: Eric Anholt +Date: Wed Jan 31 12:50:31 2007 -0800 + + Move the render code to non-EXA-specific filenames. + +commit 72ea0e514dcbebd009833c21f40e9bfb84074628 +Author: Eric Anholt +Date: Wed Jan 31 12:43:38 2007 -0800 + + Remove custom accelerated rotation code now that it's all done through Render. + +commit e62751db8b1a631c22ba0f77c932be4ab39ba741 +Author: Eric Anholt +Date: Wed Jan 31 12:15:38 2007 -0800 + + Add an accelerated path for rotation Render operations in XAA. + + The now-generic (kind of) EXA code will be cleaned up and moved to generic + files in a later commit. + +commit f1285ecb72e807ac10db398fa983bf69d4154d97 +Author: Zou Nan hai +Date: Wed Jan 31 14:58:08 2007 +0800 + + tune + +commit 0620a7650f758652d05a0c25d159587f641aaf3e +Author: Zou Nan hai +Date: Wed Jan 31 11:21:11 2007 +0800 + + fix + +commit 12441e217a1968dea3a6b0646b6c5d0e2ede0e7e +Author: Zou Nan hai +Date: Wed Jan 31 11:20:23 2007 +0800 + + add 720p@50Hz, + however 720p in this freq seems to not support src width, + hactive > 800, so skip those inputs. + +commit 726c7dd89627409820ee5cf9bf657d5a926b3648 +Author: Zou Nan hai +Date: Wed Jan 31 10:34:39 2007 +0800 + + TV fixes. + +commit 4cd552e8f4851e029e43bf778cd8340f6c2c4881 +Author: Eric Anholt +Date: Tue Jan 30 16:34:50 2007 -0800 + + Fix accelerated Render transformations. + + Previously, we tried to use 2 points instead of 3 to describe the source + rectangles, which mostly just worked for scaling. + +commit 6a628ae12b0568d656059891c5bca4415d8a735f +Author: Eric Anholt +Date: Tue Jan 30 14:19:05 2007 -0800 + + Simplify EXA acceleration transform handling. + +commit c8581254cb811f76aa6eae49d74489b543b3eb05 +Merge: 9da1791 d329fa1 +Author: Keith Packard +Date: Mon Jan 29 21:25:13 2007 -0800 + + Merge branch 'modesetting-rotation' into modesetting + + This adds reasonably driver-independent rotation support to the common + layer. The piece required in the driver is to allocate and redirect the crtc + to a shadow frame buffer. The driver uses Render to perform the actual + rotation operation (which leaves us free to do fun projective transforms at + some point in the future :-). + +commit 9da1791eeca446cd59e2e7d0803e8a7920dbbea5 +Author: Eric Anholt +Date: Mon Jan 29 17:10:14 2007 -0800 + + Restore a few important lines from 89ace3e81fe72075b1709b073c05532f13b7f0d1 + + Typical results were failure to sync, and a black screen. + +commit 67c6a490e63f6997f8198bc3ab180a1af097fe86 +Author: Eric Anholt +Date: Mon Jan 29 09:53:58 2007 -0800 + + Remove dead code to undo the damage of xf86SetModeCrtc() blank limiting. + +commit 89ace3e81fe72075b1709b073c05532f13b7f0d1 +Author: Eric Anholt +Date: Mon Jan 29 09:43:35 2007 -0800 + + Bug #9680: Remove bogus blank length limiting in xf86SetModeCrtc(). + + Our modes typically come from EDID or default modes, and when the monitor + asks for a specific mode, deciding to tweak it usually results in incorrect + display. And if the user is specifying a mode by hand, tweaking it then is + still pretty rude. + + Reviewed by: ajax + +commit 6eb69e737864d06dc6d4fbb4cd85a027cbb7643a +Author: Dave Airlie +Date: Sun Jan 28 19:40:12 2007 +1100 + + ch7xxx: actually power up the chip around connection detection + +commit d329fa121b2401cadb991c2854e077cfa68e15e8 +Author: Keith Packard +Date: Sat Jan 27 18:36:15 2007 -0800 + + Fetch from root window instead of screen pixmap during rotation. + + The XAA Composite wrapper doesn't check for sourcing from the root pixmap + when deciding whether to sync the hardware drawing. Fix the rotation code to + reference the root window in IncludeInferiors mode to avoid reading without + correct synchronization. + +commit 20419d664c77e9a1a2de82987838b45f44774b47 +Author: Keith Packard +Date: Sat Jan 27 18:34:12 2007 -0800 + + Paint ARGB cursor data to ARGB cursor memory space in frame buffer. + + When converting from global cursor to per-crtc cursor, the ARGB cursor data + was accidentally painted to the wrong location, overwriting some critical + data and causing the hardware to lock up. (along with generating a garbage + cursor image from uninitialized data). + +commit 00decd3b6cea0de22c88b9504dbe26d680e8ab16 +Author: Krzysztof Halasa +Date: Sat Jan 27 12:29:31 2007 -0800 + + Don't zero out mode structure after setting name field. + + Instead of using memset to zero the structure (at the wrong time, no less), + use xcalloc to gather pre-initialized memory. + +commit 7a5f17087bda2833e84fa7e7ff0cb168943b89b6 +Author: Keith Packard +Date: Sat Jan 27 00:11:21 2007 -0800 + + Mark crtc region as damaged when rotation is set. + + When shadow frame buffer is allocated for rotation, it needs to be + initialized by copying from the frame buffer. Do this by simply marking the + entire screen as damaged which will force an update. + +commit 2d95cb6f041653f7e530b1f32cf007929c23ef3b +Author: Keith Packard +Date: Sat Jan 27 00:04:13 2007 -0800 + + Make rotated pixmap size of mode, not rotated mode. Update only damage. + + Rotated pixmap should match size of displayed mode, not the rotated version + of that size. + + Take damaged region, rotate each box and display them instead of displaying + the whole screen after each damage update. This exposes a bug where the + screen is not correctly damaged after rotation. + +commit 5c1e27cdd243dc24dd2bfdeb46d757bbef6ba6af +Author: Eric Anholt +Date: Thu Jan 25 15:31:22 2007 -0800 + + Make rotated shadow buffer allocation dynamic. + + For EXA, this requires version 2.1 of EXA to do rotation, as the VT switching + issues were too complicated otherwise. + +commit 5a67f3d3690903a181ca854d060cfa8b4c2aca26 +Merge: 3cc583e 9811059 +Author: Nian Wu +Date: Thu Jan 25 13:40:50 2007 -0800 + + Merge branch 'crestline' of /git/xorg/driver/xf86-video-intel into crestline + +commit 3cc583ec8e79ec65103308220dd6047a4a7acddf +Merge: 566e1d3 effe579 +Author: Nian Wu +Date: Thu Jan 25 13:37:05 2007 -0800 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline + +commit 6d549ed280d3fcf3fe611b095d9f8adc0196bfb6 +Merge: 75f4df2 effe579 +Author: Nian Wu +Date: Thu Jan 25 13:36:33 2007 -0800 + + Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into modesetting + + Conflicts: + + src/i830_driver.c + +commit 83cc4601b27d871484a2408f31154e9387064b9e +Author: Eric Anholt +Date: Wed Jan 24 16:52:22 2007 +0800 + + Fix a possible failure to misalign video allocation in XAA. + +commit e21332419581eff1d7651741bae0b640c84d0ecd +Author: Eric Anholt +Date: Wed Jan 24 12:32:38 2007 +0800 + + Warning fix. + +commit effe579e691b044e3ce59b41b5c0eaaac4368dda +Author: Dave Airlie +Date: Sun Jan 21 20:23:13 2007 +1100 + + ch7xxx: fix output detection as per datasheet, have no DVI to test this. + +commit c68dae2705d6e5b05dba7d40b6da112b98b926b4 +Author: Dave Airlie +Date: Sun Jan 21 20:22:39 2007 +1100 + + fix building with 7.1 server by hiding stuff inside RANDR_12_INTERFACE + +commit 8eb861fb61fda78e6c142ffa66c586357aaa2e44 +Author: Eric Anholt +Date: Mon Jan 22 15:50:14 2007 +0800 + + Replace the custom SaveScreen function with a generic function calling DPMS. + + With this, additional power saving occurs with the core screensaver, for + example by turning off LVDS backlight. + +commit 7161e824e89a6a69f1277e510f2344ad31721f62 +Author: Wang Zhenyu +Date: Fri Jan 19 15:15:19 2007 +0800 + + Fix DRI issue when EXA enabled + + tell DRI we are smashing the context state. + +commit 74ebff6732b9bfcf8c865b52cbebfd9bf6b73eb2 +Author: Eric Anholt +Date: Thu Jan 18 14:26:21 2007 -0800 + + Allocate separate cursor memory per CRTC and rotate cursors appropriately. + + Also, add bind/unbind of the shadow rotate buffers, which was missed in a + previous commit. + +commit 8759f4d89a141f7d69f1894ec3059ba6bd1cf86b +Author: Eric Anholt +Date: Thu Jan 18 13:13:25 2007 -0800 + + Partially deal with cursor rotation. + + The remaining issue is having a cursor image per CRTC so that the cursors can + be rotated on the independently rotated CRTCs. + +commit b296cd9b8f63ab80e8fe46fcfcdba2e9af846468 +Author: Eric Anholt +Date: Thu Jan 18 13:02:26 2007 -0800 + + Fix transformation matrices for rotation at 90 and 270 degrees. + +commit d2ae2e2ccc3a8e7dc84745c235836cba150754d8 +Author: Eric Anholt +Date: Thu Jan 18 11:37:14 2007 -0800 + + Update CRTC values first so they can be used by the driver in mode setting. + + With this, the screen now gets rotated, though there are major issues. + +commit 92b0f3d2013c32d94fe57fe674da1b195288f347 +Author: Eric Anholt +Date: Thu Jan 18 11:23:22 2007 -0800 + + Disable the clipping for now, since it won't work. + +commit 14d265a02312e9cda7a21614d77525c7140c0ca8 +Author: Eric Anholt +Date: Thu Jan 18 11:21:58 2007 -0800 + + Store fixed values, not integers, in the transformation matrix. + + Also, add a bit more error checking. + +commit cc09dc3efe7279bf67512babb0f6cdaeba654772 +Merge: 53e765d 3094100 +Author: Eric Anholt +Date: Thu Jan 18 10:20:36 2007 -0800 + + Merge branch 'modesetting' into modesetting-rotation + +commit 53e765d1cf5016961c25a798a27f0fe09bd1f237 +Author: Eric Anholt +Date: Wed Jan 17 16:56:06 2007 -0800 + + Fix broken last-minute change in determining whether we're rotated or not. + +commit f256243fff195f73bc8aa72e8dd2c6f7b33446cf +Author: Eric Anholt +Date: Wed Jan 17 16:01:18 2007 -0800 + + Allocate per-crtc rotation buffers and hook up RandR 1.2 per-CRTC rotation. + + It currently displays garbage. + +commit d17c386aee55bd223297adf78cf0fc1db43baf2d +Author: Eric Anholt +Date: Wed Jan 17 15:49:08 2007 -0800 + + Fix some segfaults: crtc->rotatedPixmap not set and dangling damage pointer. + +commit 67a152c43cb7231695b99030c952c52d4edd1e65 +Author: Eric Anholt +Date: Wed Jan 17 14:35:31 2007 -0800 + + Set all CRTCs' allowable rotations when xf86RandR12SetRotations() is called. + +commit 98110591001dfaf2b8b5ac440bea0c38456da718 +Author: Zou Nan hai +Date: Wed Jan 17 10:45:59 2007 +0800 + + enable all TV modes + +commit 3094100cdd04560af1b098bbe8024ae5270a10f4 +Author: Gary Wong +Date: Tue Jan 16 13:25:24 2007 -0800 + + Bug #9550: Add a quirk for too-high clock from EDID on the EN-7100e. + +commit 66c6427cc83e5e381932b0c10743cba4cb9ac883 +Author: Eric Anholt +Date: Tue Jan 16 12:54:29 2007 -0800 + + Add a settable backlight property for LVDS. + + This extends the output funcs to have a callback for when it's time to + configure properties, and another for when the server has changed a property + whose value isn't pending a mode set. (Pending properties are to be picked up + by the driver at mode_set time). + +commit a52df90ffcb19e7c0a3b8018db3cd1391a3ec343 +Merge: 37946c9 45696aa +Author: Keith Packard +Date: Tue Jan 16 12:20:26 2007 +1100 + + Merge branch 'modesetting' into modesetting-rotation + + Conflicts: + + src/i830_driver.c + src/i830_randr.c + + Just a few sync changes. + +commit 37946c9c8a4afa4a4fc1fe9864a8eec1c4571d2c +Author: Keith Packard +Date: Tue Jan 16 12:14:55 2007 +1100 + + Interim work on rotation support with new xf86 code. + + Yes, there are lots of bits tied together here, and we should split this + patch apart. + + Move I830 mode setting to xf86 mode setting. + + Make mode setting function also set the base address. This should fix + problems where the base gets set incorrectly at times. + + Add driver-independent rotation support, requires driver-specific hooks for + shadow pixmap allocation, otherwise it uses Render for painting. + +commit 9a5106401a65c90df32cb71987fca7126dc22e81 +Author: Emilio Scalise +Date: Mon Jan 15 17:22:27 2007 +0000 + + patch to control mergedfb options, bug #9664 + +commit bfeda3bfc59d309772398f688d29452ba97f3973 +Author: Keith Packard +Date: Mon Jan 15 08:05:32 2007 +1100 + + Convert I830PipeSetMode to xf86CrtcSetMode. Add rotation structures. + + Makes the mode setting logic device independent. + Magic rename hooks allow multiple drivers to provide the + generic code without name conflicts. + Rotation code requires special pixmap creation hook, and uses + Render to perform the actual rotation. + +commit 319be199ba657d2b82ba034edf3581aea6dcc3f0 +Author: root +Date: Sat Jan 13 21:34:00 2007 +0000 + + Tweak to bug #9639 + +commit 85de57947570de6b3dc9197647be3e9237480880 +Author: Alan Hourihane +Date: Sat Jan 13 19:18:24 2007 +0000 + + Fix bug #9639, i810 XvMC needs linking against libdrm. + +commit 45696aa29124e2852f94880642e70bb2e0cee827 +Author: Eric Anholt +Date: Thu Jan 4 12:34:47 2007 -0800 + + EXA: Use PRIM3D_RECTLIST instead of TRIFAN so we don't get diagonal tearing. + + A side effect is the reduction in vertex dispatch, which is nice. + +commit 6874a6f25ac87783d3770f77b9192e2d36d083a3 +Author: Eric Anholt +Date: Thu Jan 11 12:34:38 2007 -0800 + + Restore legacy overlay size limits, due to card hangs at larger sizes. + +commit c288aea40775a9cf561fda9912187c3cb5baa419 +Author: Eric Anholt +Date: Thu Jan 11 10:39:00 2007 -0800 + + Bug #8845: Unify all our XV ports to 1920x1088 maximum size. + + This increases the "legacy" size, but that was checked against the 845 + documentation which claims support for 2048x2048 as well. It decreases the + textured video size, which was running into the limits of the bigrequests + extension. The new limits should fit within bigrequests while still supporting + HD videos. + +commit f5d528f8ea27de31054e7f1843e34d8379f811ea +Author: Eric Anholt +Date: Thu Jan 11 10:36:33 2007 -0800 + + Don't limit cachelines to a vertical of 2048, and increase default allocation. + + The cachelines are used for two things: XAA pixmap cache and XV memory. + Only XAA pixmap cache is referred to using an offset pointing at the + beginning of the front buffer in rendering, and XAA only uses the 2d BLT + engine, which actually has a vertical limit of 65536. So, pixmap cache is now + limited to that much vertical. + + Additionally, the previous cachelines allocation was too small for our + advertised XV limits, so video at the limits would fail with BadAlloc. Now, + XAA allocates the same approximate amount of offscreen memory as EXA: + 3 times the screen size, plus one packed HD video. + +commit d13bc016c0723f1df633ddaf5610ad73003b7c96 +Author: Eric Anholt +Date: Wed Jan 10 15:06:56 2007 -0800 + + Correct x/y/pitch limitations in several cases, and detail them in i830_exa.c. + + This reduces max framebuffer width and increases max framebuffer height on + 965, reduces max X/Y on pre-965 EXA (could have caused mis-rendering), and + increases max X/Y on 965 EXA (would have prevented acceleration). + +commit fa383289ac8a6dd1cb359e6f1991cc42beb6ff02 +Author: Eric Anholt +Date: Thu Jan 4 14:12:45 2007 -0800 + + EXA: Wait for sync before we set up new state in our static state buffers. + +commit 5857b4a1693085b8b42dd9560a7c4f5c3c82f862 +Author: Wang Zhenyu +Date: Wed Jan 10 15:09:47 2007 +0800 + + Formalize sync interface + + We should just call i830MarkSync/i830WaitSync in places we need, + which care for both XAA and EXA. + +commit efb75f56053ee06f1dbd4edfaea9986b27162afb +Author: Alan Hourihane +Date: Tue Jan 9 14:05:43 2007 +0000 + + Bump to 1.7.4 + +commit 33c0fac6d63d9a509a24c7a5e5a46a0d6ee4dc5d +Author: Alan Hourihane +Date: Tue Jan 9 14:02:47 2007 +0000 + + Fix bug #8536, i915 BIOS fails when restarting Xserver. + +commit ee52c0ec4e95fa6e5f35c9cd75005a0c0003fd97 +Author: Eric Anholt +Date: Mon Jan 8 16:53:07 2007 -0800 + + Correct typo resulting in a crash with ivch. = != ==. + +commit 566e1d397744d0b477de4da6a206919906176f49 +Merge: b13d638 da6a00f +Author: Keith Packard +Date: Mon Jan 8 12:37:49 2007 -0800 + + Merge branch 'modesetting' into crestline + +commit da6a00f787e4d13e6b75768c1976f1c44ae5bf72 +Author: Keith Packard +Date: Mon Jan 8 12:36:54 2007 -0800 + + Move EXA function declarations from source to header. + + Several new global functions were not put into the header file leading to + potential mismatches between declaration and definition. + +commit 66546d8a8006e1c828e18ccab850214fd8d56b63 +Merge: 0fd2752 40af0ee +Author: Keith Packard +Date: Mon Jan 8 10:14:24 2007 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit b13d6386dfb3a00bd9d21ac0695cdce9f812d1f3 +Author: Keith Packard +Date: Sun Jan 7 22:56:37 2007 -0800 + + Back out rotation changes for RandR 1.2 which won't work. + + RandR 1.2 requires a new rotation structure for per-CRTC rotation. + +commit 7473e7d5297f94164e0f35822166713fb21a11bd +Merge: cdde9e7 a87801f +Author: Keith Packard +Date: Sun Jan 7 22:50:27 2007 -0800 + + Merge branch 'crestline-otc' into crestline + +commit cdde9e7f4a0645ab1ee3e124de54433c1a250097 +Merge: 3110630 0fd2752 +Author: Keith Packard +Date: Sun Jan 7 22:50:12 2007 -0800 + + Merge branch 'modesetting' into crestline + +commit 0fd2752f199928f846fe03c9087f7b6d48cc28d9 +Author: Wang Zhenyu +Date: Thu Jan 4 14:35:55 2007 +0800 + + minor fix on last exa mem binding commit + +commit 3110630e04f37e184609c91494fa7f9f4d59b93f +Merge: be9b635 736d82a +Author: Keith Packard +Date: Sun Jan 7 22:44:36 2007 -0800 + + Merge branch 'modesetting' into crestline + + Conflicts: + + src/i830_rotate.c + + Pull in upstream changes to crestline branch leaving only + the PCI-IDs as local changes. + +commit 40af0ee6ba4ab7596fbc7fcc3ad04d109746ca6f +Author: Keith Packard +Date: Sat Jan 6 18:19:34 2007 -0800 + + Numerous symbol scope issues. + + I830EntityIndex is shared between 810 and newer driver. + Move most EXA rendering state into I830 structure. + Declare shared variables in shared header files rather than .c. + +commit 736d82a6b43f174cb95b425faacd4b0b889916fa +Merge: 53b42f5 4c790f6 +Author: Wang Zhenyu +Date: Mon Dec 4 15:48:04 2006 +0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 53b42f5bc7a58d02106436486e5bb56e56dbbfa1 +Author: Zou Nan hai +Date: Sat Jan 6 14:59:14 2007 -0800 + + support NTSC 480i M-J, PAL 576i for 640x480-1280x1024 sizes + + I still have problem with non-interlace mode and Hi Res mode. + also I don't know how to pickup those mode in xorg.conf + +commit 71946bcdc3c68c220996afac944698eea1974a36 +Author: Wang Zhenyu +Date: Wed Jan 3 22:37:32 2007 -0800 + + [PATCH] Add rotation support for 965. + +commit 35cebed70827999812f8343ac97ad0dffda20786 +Author: Eric Anholt +Date: Thu Nov 16 15:12:43 2006 -0800 + + [PATCH] Replace broken PCI resource size detection with pciGetBaseSize() call. + + Signed-off-by: Keith Packard + +commit 33e912aca08fa11ef588eb386e16ba5f9ea13727 +Author: Wang Zhenyu +Date: Thu Jan 4 11:25:31 2007 +0800 + + [PATCH] Fix EXA mem binding + + We should check if EXA is really enabled. + + Signed-off-by: Keith Packard + +commit fa54a3c08301e59558ab0493b3d22324f4162496 +Author: Wang Zhenyu +Date: Wed Dec 6 13:24:44 2006 +0800 + + [PATCH] fix Makefile.am + + Signed-off-by: Keith Packard + +commit 2f2c443e971faa54ffcf751b6acb444e8e7875ce +Author: Wang Zhenyu +Date: Wed Dec 6 10:43:29 2006 +0800 + + [PATCH] Formats fixes + + We should use card_fmt for src/mask picture, and use dest color + buffer format helper. Also fix wrong name for G965 texture formats, + and pict_x1r5g5b5 isn't supported by sampler engine. + + Signed-off-by: Keith Packard + +commit 0bf04fe78a8a915310ef8a90f5c7872be7476e2e +Author: Wang Zhenyu +Date: Mon Dec 4 15:48:04 2006 +0800 + + [PATCH] set correct default border color + + Signed-off-by: Keith Packard + +commit 5c461063cde68092e778c44ac6abd9129cd8019e +Author: Wang Zhenyu +Date: Mon Dec 4 15:47:31 2006 +0800 + + [PATCH] fix typo in ps kernel + + fix corrupt in some subspans + + Signed-off-by: Keith Packard + +commit 89a42d489bd370b89e5ff4e01f026b4d64723cd8 +Author: Wang Zhenyu +Date: Wed Nov 29 17:16:46 2006 +0800 + + [PATCH] shut up warning + + Signed-off-by: Keith Packard + +commit 01bfa4fa6fc0ceec8581676e5d72c68dd71efa96 +Author: Wang Zhenyu +Date: Wed Nov 29 17:14:55 2006 +0800 + + [PATCH] fix alpha blending state + + Signed-off-by: Keith Packard + +commit 79018bb47c43510d59c592592f06204189bd12dc +Author: Wang Zhenyu +Date: Wed Nov 29 17:05:32 2006 +0800 + + [PATCH] Add in sf/wm program for mask picture without CA + + Signed-off-by: Keith Packard + +commit a5b9b438469f171b002fa0b99d8cab83e51ec968 +Author: Wang Zhenyu +Date: Wed Nov 29 16:52:44 2006 +0800 + + [PATCH] misc cleanup for G965 vs/sf/wm states + + Signed-off-by: Keith Packard + +commit b7c1e1656f45e43ea2f9a47f1a487050c0884c22 +Author: Wang Zhenyu +Date: Wed Nov 29 16:40:15 2006 +0800 + + [PATCH] WM kernel needs scratch space + + Signed-off-by: Keith Packard + +commit db9cfaa35adaf79ea57bc06b27c7e37935d3e1a7 +Author: Wang Zhenyu +Date: Wed Nov 29 16:37:06 2006 +0800 + + [PATCH] Setup default border color for our samplers + + Signed-off-by: Keith Packard + +commit 70276e4e9a8a5026ec436d2be5bf5eab868aa178 +Author: Wang Zhenyu +Date: Wed Nov 29 16:30:53 2006 +0800 + + [PATCH] fix vertex buffer size + + Signed-off-by: Keith Packard + +commit e8a4cbdeff4125e28d807d0a563efc0606d21a75 +Author: Wang Zhenyu +Date: Wed Nov 29 16:24:24 2006 +0800 + + [PATCH] clean up issue cmd to ring buffer + + Make it easy to track different part of ring state, and + use rectlist primitive instead. + + Signed-off-by: Keith Packard + +commit 42534474fd2556e5987205626cca8f30e25855a8 +Author: Wang Zhenyu +Date: Wed Nov 29 16:04:16 2006 +0800 + + [PATCH] remove wrong scale_units + + Signed-off-by: Keith Packard + +commit 05e8a7989db1b8b9dfa7b688629af65d9910cc53 +Author: Wang Zhenyu +Date: Wed Nov 29 16:02:16 2006 +0800 + + [PATCH] Rename exa sf/wm program files + + Also fix some minors in wm program. + + Signed-off-by: Keith Packard + +commit 1329c86f2a4b3664920ded970a984a745a530da4 +Author: Wang Zhenyu +Date: Wed Nov 29 15:47:19 2006 +0800 + + [PATCH] EXA state mem for G965 + + Not split offscreen mem for exa, but alloc a dedicated one + for G965 states. + + Signed-off-by: Keith Packard + +commit 4c790f614ecba1f6468e51779cfaf0e36b6b17ad +Author: Jesse Barnes +Date: Sat Jan 6 08:21:36 2007 -0800 + + More sparse cleanups: + NULL vs. 0 + make some variables static + remove redundant variables + + There are only a few sparse warnings left now: some bitfield warnings + and a few 'mixing code and declarations' warnings from the ring macros. + +commit a87801f73a73e53524237be7835b8cd8b3eb282c +Author: Wang Zhenyu +Date: Thu Jan 4 14:47:48 2007 +0800 + + Fix TV load detect + + Actually load TV, otherwise we don't have expected + reg state to probe. + +commit 9cf759a2cb2580c4ac5f8cdc983389642f3cfce0 +Author: Wang Zhenyu +Date: Thu Jan 4 14:35:55 2007 +0800 + + minor fix on last exa mem binding commit + +commit f9c3ef40100acb85fca6e49c5c0e98f5c9ac97ca +Author: Wang Zhenyu +Date: Tue Oct 10 15:50:10 2006 +0800 + + [PATCH] Mark current ps kernel is experimential with little test. + + + Signed-off-by: Keith Packard + +commit ef2f25e5c6ce04c202698c5122bc8627130073c0 +Author: Wang Zhenyu +Date: Tue Oct 10 14:11:35 2006 +0800 + + [PATCH] Use sf_prog.h instead + + + Signed-off-by: Keith Packard + +commit ca608028c5301700444d39a1c631cc0d5648e1a2 +Author: Wang Zhenyu +Date: Thu Sep 28 13:55:52 2006 +0800 + + [PATCH] Fix picture's transform checking + + + Signed-off-by: Keith Packard + +commit 848368d5d0b90e03d3ec447cb5bd39fc87aea8df +Author: Wang Zhenyu +Date: Thu Sep 28 11:15:33 2006 +0800 + + [PATCH] Fallback in mask picture for now + + Do it later after finish wm kernel program. + + Signed-off-by: Keith Packard + +commit df23624eebe938fa444c80cbedcd61919ec1aeda +Author: Wang Zhenyu +Date: Thu Sep 28 11:09:52 2006 +0800 + + [PATCH] Fix compile, add wm header file. + + + Signed-off-by: Keith Packard + +commit fc944859b1b9605c748162bad1c93a6303c84aae +Author: Wang Zhenyu +Date: Thu Sep 28 10:36:00 2006 +0800 + + [PATCH] Add simplest wm kernel program for no mask picture composite + + This is a try to use new gen4asm language, and will finish + composite program for mask picture with or without CA case later. + + Signed-off-by: Keith Packard + +commit acdc2da77b445e9347a4c6e53e35c81763cbb0b8 +Author: Wang Zhenyu +Date: Wed Sep 27 16:48:43 2006 +0800 + + [PATCH] Add mask sampler state + + + Signed-off-by: Keith Packard + +commit 926d7fb09aaaabf050949ce7c6127c68441c8801 +Author: Wang Zhenyu +Date: Wed Sep 27 13:54:14 2006 +0800 + + [PATCH] change some src sampler states + + sampler for mask should also be set up, and fix + default border texel. + + Signed-off-by: Keith Packard + +commit ed73bbaf5c2e9d555c884037a249cf03e7f60fa0 +Author: Wang Zhenyu +Date: Mon Sep 25 14:35:51 2006 +0800 + + [PATCH] Add file for i965 exa composite + + This does not include ps program, which will be added + in g4a form. + + Signed-off-by: Keith Packard + +commit be9b635b82c0c77ccc0555f178f94de6e5338e27 +Merge: 9e48808 5a793b0 +Author: Keith Packard +Date: Wed Jan 3 22:15:53 2007 -0800 + + Merge branch 'modesetting' into crestline + +commit 5a793b0dcf2d5de408b55073858fcfba6d99f994 +Merge: f188525 394124c +Author: Keith Packard +Date: Wed Jan 3 21:54:05 2007 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit f188525030a8fac59e41520449b1aec9b123e4ea +Author: Keith Packard +Date: Wed Jan 3 21:53:07 2007 -0800 + + Add interlace defines for pipeconf regs + +commit 9e48808fccf5b153c2fb4027f9a09944574fdace +Author: Wang Zhenyu +Date: Thu Jan 4 11:25:31 2007 +0800 + + Fix EXA mem binding + + We should check if EXA is really enabled. + +commit ebd636dbd62cb69ed7defbd86f297c6bc7dac5dd +Merge: 75f0033 3d9ea6f +Author: Wang Zhenyu +Date: Thu Jan 4 10:13:55 2007 +0800 + + Merge branch 'modesetting' into crestline + + Conflicts: + + src/i830.h + src/i830_randr.c + +commit 3d9ea6f3c8a274f930d286fc15d3665dfaa8327a +Merge: 75f4df2 394124c +Author: Wang Zhenyu +Date: Thu Jan 4 10:12:50 2007 +0800 + + Merge branch 'modesetting' of git+ssh://zhen@git.freedesktop.org/git/xorg/driver/xf86-video-intel into modesetting + + Conflicts: + + src/i830_driver.c + +commit 394124ceaadb46d976ad5c3bdeb1b77d351c57f6 +Author: Eric Anholt +Date: Tue Jan 2 16:57:33 2007 -0800 + + Add per-CRTC gamma control support for RandR. + + This makes the CRTCs now always run in gamma-enabled mode, rather than having + flaky logic for switching modes. Also, it should clear up issues with the LUTs + being uninitialized when outputs are first brought up. + +commit 69f250af60220a875f4a04c6d682bffa352281e4 +Merge: 232e209 d960dea +Author: Keith Packard +Date: Wed Jan 3 00:39:15 2007 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 232e2094321dbcdd6a67ef230eb50494a1c7d6df +Author: Keith Packard +Date: Wed Jan 3 00:38:34 2007 -0800 + + Allow initial position to be set in config file. Increase 965 max size. + + Add relative and absolute position configuration code, using per-output + monitor sections. Options include: + + PreferredMode selects a preferred mode for this output by name + Position absolute position, x and y in a single string. + + Below relative positions; argument names other monitor. + RightOf + Above + LeftOf + + Enable force the monitor to be disabled by setting + Disable enable to no or disable to yes. + + MinClock Set valid clock ranges + MaxClock + + Monitor sections can also include sync ranges, physical size and mode lines + as documented in xorg.conf(5). + + Monitors are associated with outputs through options in the Device section: + + Option "monitor-VGA" "My VGA Monitor" + + Output named 'VGA' will use monitor section "My VGA Monitor". + +commit 58e797b2caa6effa5455fc1f13dc4c58d0658744 +Author: Keith Packard +Date: Wed Jan 3 00:04:58 2007 -0800 + + Sync dspbase/dspsurf registers by re-reading them. + + This seems to eliminate base/surf value confusion during EnterVT. + +commit d960deab39eef91fb82b9f23118323aeb4c9c63e +Author: Jesse Barnes +Date: Tue Jan 2 20:23:37 2007 -0800 + + Various sparse cleanups: + NULL vs. 0 + remove redundant pScrn in I830DRISwapContext + make I830DRISwapContext static + +commit 5057769d3a7c1b3a94f49bbff47b9697f368d975 +Author: Dave Airlie +Date: Tue Jan 2 19:25:08 2007 -0800 + + Use correct variable to initialize DVO I2C bus. + + intel_output->pI2CBus isn't initialized until the output is all happy and + running, so using it before that is rather unlikely to do much good. + +commit 2bb9bb951e664d704bdf7a808edbe8b2f50c4366 +Author: Keith Packard +Date: Tue Jan 2 14:04:10 2007 -0800 + + Typo disabled new DRI MM on all chips. + + Detection for new DRI MM wasn't converted to #define correctly because of a + typo. + +commit 5080307230d534b84090bfefc13ac437d53f915d +Author: Keith Packard +Date: Tue Jan 2 00:16:41 2007 -0800 + + Fix driver to build on RandR 1.2 systems again. + + Changes to move initial config code to RandR 1.1/1.2 common path broke + code required only for RandR 1.2. + +commit 237847007afb5a429a50b6aa0b1acc239326571b +Author: Keith Packard +Date: Tue Jan 2 00:09:35 2007 -0800 + + Make driver build and run on Xorg 7.1. Delay DSP*BASE setting until last. + + Autodetect libdrm version, disable new memory manager on older libraries. + Move new M_T_ defines from i830.h to i830_xf86Crtc.h. Add many system + headers to define functions. Use i830PipeSetBase at end of mode setting + code to set DSP*BASE and flush changes. Don't duplicate PipeSetBase call + from screen init function. Make initial RandR configuration code usable on + older versions of extension so the server doesn't start in a panning mode. + Use xfree instead of free in i830_tv.c. + +commit 25d5a892319b02dc6eb81390dea29cd88a1e7da4 +Author: Keith Packard +Date: Sun Dec 31 15:39:20 2006 -0800 + + Elide identical modes from reported list. + + Where two modes would produce precisely the same crtc settings and have the + same name, remove the latter mode from the mode list. + +commit feeefc92e450e9de58da51147325300ffabd2059 +Author: Keith Packard +Date: Sun Dec 31 14:22:53 2006 -0800 + + Replace author-specific license with generic license. + + This file retained the old MIT license with the embedded author name. + Replace that with the version that uses generic 'copyright holders' instead. + +commit 5e456251f0d6c8bef3241267f6c1b3bca4670c0d +Author: Keith Packard +Date: Sun Dec 31 14:21:12 2006 -0800 + + Replace author-specific license with generic license. + + This file retained the old MIT license with the embedded author name. + Replace that with the version that uses generic 'copyright holders' instead. + +commit 75f0033ec41a34bbe695cfd4a9bc9aa60e919c99 +Author: Wang Zhenyu +Date: Sun Dec 31 15:16:59 2006 +0800 + + Issue current virtual size to mode valid. + + Revert change in rotation patch. + +commit 2330b341c925e60bc2c991b4ca8450badbc459a4 +Author: Keith Packard +Date: Sat Dec 30 22:47:58 2006 -0800 + + Prune default modes to EDID clock limit. + + Pick out the EDID max clock value and use that to elide default modes which + are too fast. + +commit c70e7bc701cba3092acfdd66ed4d63487ac8ff9f +Merge: 8b6c456 4ed79a2 +Author: Keith Packard +Date: Sat Dec 30 21:58:36 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 8b6c456e16c81f719bb68178e3e4d26f4108a9c2 +Author: Keith Packard +Date: Sat Dec 30 21:57:42 2006 -0800 + + Detect in ProbeModes. Let get_modes set edid. Prune interlace/dblscan. + + Move output connection status detection from RandR code up to ProbeModes so + it is done before mode sets are built. Otherwise, the mode building code + will elide all modes the first time through as it ignores outputs that are + disconnected. + + Most get_modes functions fetch EDID data; make sure that any + EDID changes are used in the ProbeModes filtering of default modes. + Otherwise, stale EDID data will be used. + + Allow outputs to advertise support for interlaced and double scan modes; + prune such modes from the default mode list when outputs do not support them. + +commit 4ed79a2ba6250354ffc24fa1f7a21ca914ad157e +Author: Eric Anholt +Date: Fri Dec 29 12:19:41 2006 -0800 + + Relax tiling requirements on G965. + + For the 965, we can tile with the pitch at any integer multiple of a tile size + (128 or 512B), up to 128KB. + +commit b8692e646227e56c9ae4f72b9aaa75457b4c0f5f +Author: Keith Packard +Date: Thu Dec 28 22:23:16 2006 -0800 + + Lack of configured monitor implies no configured modes. + + Missing check for missing monitor configuration would result in segfault. + +commit 973da654219ea43916b0b44acfa09a415bed3d7a +Author: Keith Packard +Date: Thu Dec 28 22:22:22 2006 -0800 + + Sync ranges from EDID/default should not limit configured modelines. + + Limit the effect of sync ranges so that sync ranges found via EDID will not + eliminate modes explicitly added by the user. Limit default sync range to + eliminating only default modes, not configured or EDID modes. + +commit f7b1d4c1f7d17a811e17c6a17861ff70be9fbdd7 +Author: Keith Packard +Date: Thu Dec 28 22:18:57 2006 -0800 + + Belinea 10 15 55 monitor quirk - override preferred mode with largest @60Hz + + Belinea 10 15 55 model monitor reports a preferred mode of 640x350, when in + fact it wants a 1024x768 mode @ 60Hz. Add an edid quirk that selects the + largest size mode, preferring those closer to 60hz among equal sized modes. + +commit fbd3f588f0d412c20cc3f86dfad73700734a9a76 +Author: Wang Zhenyu +Date: Fri Dec 29 10:47:52 2006 +0800 + + rotation support for randr-1.2 + + This patch trys to resolve rotation regression with randr-1.2. + Tested with Crestline VGA output. See bug 83. + +commit a1796bfb51d90fd545973909404e1a77ad27c9cc +Merge: 84915ac fabfccd +Author: Wang Zhenyu +Date: Fri Dec 29 10:10:26 2006 +0800 + + Merge branch 'crestline' of git+ssh://zhen@otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline + +commit bedab1654e2dfcf7800bd0101e6991800a544019 +Author: Eric Anholt +Date: Thu Dec 28 16:34:40 2006 -0800 + + Remove 8MB/32MB default VideoRam limits. + + With modern monitors and increased XV and EXA memory requirements, these small + limits were resulting in DRI and other initialization failures because we + wouldn't allow them enough memory. Instead, allow each piece of the system + (DRI, EXA, XAA, etc) to request as much memory as it wants, and choose the + actual videoRam to be used for laying out the memory afterwards. + + With this change, in the absence of a VideoRam option, 32MB will be allocated + for textures. + +commit 4cc5dcf6d7423239f0181f246638366edcb8be87 +Author: Keith Packard +Date: Thu Dec 28 16:43:39 2006 -0800 + + Oops, dont use symlinks for stolen xf86 header files + +commit 86da0d05e4e338e7f4c841577002eb1ba9f6b2ac +Author: Keith Packard +Date: Thu Dec 28 16:40:54 2006 -0800 + + Add stolen xf86 header files to driver source + +commit 2b0a997e5b4b51267fa4f6725f8a965093392434 +Merge: bb238a8 9cfbf1c +Author: Keith Packard +Date: Thu Dec 28 16:34:38 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit bb238a8fc234a8e5e86cd2f42c58c9816a15732c +Author: Keith Packard +Date: Thu Dec 28 16:27:22 2006 -0800 + + Configuration support: per-output mode lines, preferred mode. + + Add the modelines specified in the per-output monitor and all of the default + modes to the list to each output. Prune the resulting list to specified sync + limits and virtual sizes. Sort the resulting mode list on + preferred/size/refresh. + +commit 9cfbf1ceda8f153438df1ba4b1712c55cc872017 +Author: Eric Anholt +Date: Thu Dec 28 12:59:23 2006 -0800 + + In EXA mode, force backing pixmaps into memory when doing XV to them. + +commit e889bde13dcc2438181a03319e204ae7b9235a78 +Author: Eric Anholt +Date: Thu Dec 28 12:49:24 2006 -0800 + + Draw textured video to the backing pixmap in the composited case. + + Currently, when the backing pixmap is not in framebuffer, we just BadAlloc + rather than drawing garbage to the front buffer. This can be fixed with EXA. + +commit c7083a6f30fdf1859f60beba4c352bd790af4773 +Author: Eric Anholt +Date: Thu Dec 28 11:53:33 2006 -0800 + + Add WIP CH7017 LVDS driver. This is disconnected because it's untested. + +commit 778db49616b233f5a2f4f007ceb62a1a878a6e25 +Author: Eric Anholt +Date: Thu Dec 28 11:36:15 2006 -0800 + + Add WIP IVCH (i82807aa) driver. + + It is not currently hooked up as it hasn't been tested. The hardware that this + was written for decided to stop working. + +commit 5806f670eb3a5171ffb0b75701640d5311b34c80 +Author: Eric Anholt +Date: Thu Dec 21 16:22:14 2006 -0800 + + Reformat the DVO drivers table to be a bit more normal style. + +commit b928cef9cd5b3f88dc0880f406300d246a59e0fe +Author: Eric Anholt +Date: Thu Dec 21 16:21:28 2006 -0800 + + Move dvo driver detection into i830_dvo_init(), and use GPIOB for LVDS drivers. + + The documentation states that GPIOB is (generally) used for devices on DVOA + on the motherboard, which appears to be the case on the laptop we have with + LVDS on the motherboard. + + This patch is probably not entirely accurate, as there was apparently an LVDS + DVO card sold that could be put in desktop machines, which would likely be on + GPIOE like other ADD cards. Given that we couldn't find one of these cards for + purchase, I'm not worrying about it. + +commit fabfccd3d8a55a83138d361f66c53cb7e6d371a8 +Author: Zou Nan hai +Date: Thu Dec 28 14:48:54 2006 +0800 + + Fix + +commit ddefce4f02eb3272ad37e890350f73f03eff73c9 +Author: Zou Nan hai +Date: Thu Dec 28 14:45:53 2006 +0800 + + support NTSC 480i M-J 1280x1024 1024x768 800x600 640x480 + PAL 576i 1280x1024 1024x768 800x600 640x480 + + I still have problem with non-interlace mode and Hi Res mode. + also I don't know how to pickup those mode in xorg.conf + +commit c87462ded20904dbc6c6cbdb9547523b75fe5471 +Author: Eric Anholt +Date: Wed Dec 27 19:14:14 2006 -0800 + + Remove the nasty #define away of ErrorF in i830_video.c. + + Every new person touching this file hits this trap, so it's now removed. + +commit 6dc3387219b2b31e0c7dbaa88b568fbd54d72878 +Author: Eric Anholt +Date: Wed Dec 27 18:58:40 2006 -0800 + + Fix operator precedence issue that stuck 965 t-v state into the front buffer. + +commit 210f30bd75529d0064bc46af15464a2a47f9d4c6 +Author: Eric Anholt +Date: Wed Dec 27 18:57:50 2006 -0800 + + debugging for location of various 965 textured-video state. + +commit 82738e60769a4798d7425ffc67882d1f74043b76 +Author: Eric Anholt +Date: Wed Dec 27 18:35:35 2006 -0800 + + Fix discrepancy between XAA/EXA linear allocations that broke EXA XV. + + The XAA allocator returned an offset from the beginning of the frontbuffer + allocation (where the linear allocations come from), while EXA returned one + from the start of framebuffer. Now, both of them use the start of framebuffer + as the reference. + +commit 8165e043670f6a7fee5e7e8f33644adda5757591 +Author: Eric Anholt +Date: Wed Dec 27 18:17:37 2006 -0800 + + Bump the size of the extra space for 965 so it actually fits. + +commit f830c55e5f4efc97451240f8f18b49f46e8bce0f +Author: Eric Anholt +Date: Wed Dec 27 18:14:59 2006 -0800 + + Make the assert() in i965_video.c actually work and expose an error. + +commit a75b416c91085df1db4027a25eafcd04fef1e57c +Author: Eric Anholt +Date: Wed Dec 27 17:58:57 2006 -0800 + + Replace XAA mark/waitsyncs with the XAA/EXA wrappers. + +commit 150010d2f20f4a57f8507eba8762e36966b0f426 +Author: Eric Anholt +Date: Wed Dec 27 17:57:34 2006 -0800 + + reformat i965_video.c to 4-space indents, 80 columns, no trailing whitespace. + +commit 05066632b068ae91d7be77e3a199ea0d337d975b +Author: Eric Anholt +Date: Wed Dec 27 17:41:45 2006 -0800 + + Move 965 textured-video out to a separate file. + +commit 46df75ccd4647ea033583130253a2a2218b34a20 +Author: Eric Anholt +Date: Wed Dec 27 13:45:06 2006 -0800 + + Bug #7524: Major improvements to EXA/XAA static memory allocation. + + With this, we no longer allocate XV through the XF86 linear allocator in the + EXA case. We also no longer allocate extra space for the XF86 2D allocator + that we don't use in EXA mode, or space for the EXA allocator in XAA mode. + The EXA offscreen allocator now gets enough space for several screenfuls of + pixmaps plus one 1920x1088 movie. + + A large duplicated section of code for allocating each framebuffer in the old + dual-screen mode was also factored out. + +commit 84915ac8afeb4bbc03df8f94ab3ba351788d6501 +Author: Keith Packard +Date: Thu Dec 21 23:42:53 2006 -0800 + + If DDC detailed modes are missing physical size, pull from features. + + Monitors without detailed modes, or those which do not bother to set a + physical size in their detailed modes may still have physical size in the + global data. + +commit 1e9105395a7900521206b28bae4bb4f85669a0cd +Merge: df9ecf8 c237e93 +Author: Keith Packard +Date: Thu Dec 21 23:34:30 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit df9ecf8ab93f0aeffde11d438513d41220ba75cb +Author: Keith Packard +Date: Thu Dec 21 23:32:35 2006 -0800 + + Change belinea edid quirk to cover the 10 20 30W model as well. + + This larger model reported different (but still incorrect) + sync polarities, so instead of flipping them, just set them to the right + value. + +commit c237e930615f1b048895efe988d28503f5d67c37 +Author: Keith Packard +Date: Thu Dec 21 23:30:37 2006 -0800 + + Use Vesa DDC timeouts for all I2C busses. + + The default I2C timeouts are very short, and while most + modern monitors have no trouble responding at that rate, + some older ones cannot manage. + +commit d8c5dba4d797fc50d7b2b5855f34e2d2e2ad3e4f +Author: Keith Packard +Date: Thu Dec 21 21:20:43 2006 -0800 + + When cleaning duplicate modes, make sure ->Last is reset correctly. + + When removing the very last mode for a monitor, move the ->Last pointer to + the previous list element. + +commit fab9a6b6210daea423b609208ef57fa26571f5d3 +Author: Keith Packard +Date: Thu Dec 21 21:19:32 2006 -0800 + + Add EDID quirk support for broken EDID data. + + For EDID with known errors, add a quirk mechanism to automatically + compensate. The first quirk is for a Belinea 1440x900 monitor which + incorrectly specifies sync polarities in the detailed mode. + +commit d9b27667e6cc6c7e171b0f513d40be7658cf4574 +Author: Keith Packard +Date: Thu Dec 21 21:17:03 2006 -0800 + + PLL computations missed one possible 'm2' value. + + m2 was ranging from min <= m2 < max instead of <= max resulting in + inaccurate PLL frequencies for some modes. + +commit c5205595f2abacc9f736e1f53666302ec551cbc4 +Merge: b8f3ec7 4c0c1aa +Author: Keith Packard +Date: Thu Dec 21 02:51:33 2006 -0800 + + Merge branch 'modesetting' into crestline + +commit 4c0c1aa882cfec77b2183baec93cbc4cfaf4abe0 +Author: Keith Packard +Date: Thu Dec 21 02:33:39 2006 -0800 + + Computed corred color conversion values. + + Extract correct color conversion values for all video formats from + documentation. Use those, with appropriate conversions, for the color + conversion register values. + +commit 98fd44d681220aa31200e4262f1a7ec952a09530 +Author: Keith Packard +Date: Thu Dec 21 01:24:24 2006 -0800 + + TV subcarrier was computed from wrong clock value. + + The constants provided in the documentation for the subcarrier DDA values + assumed the clock was programmed to precisely 108MHz, but the PLL can't hit + that value exactly (or our PLL computation can't, in any case). The + result was an incorrect subcarrier frequency which resulted in synthetic + subcarrier phase shift and a lovely rainbow effect on the screen. + + Unfortunately, the documentation didn't exactly describe the function + performed by the subcarrier clock hardware, so a bit of detective work was + needed. New constants were computed using the code in tv.5c and those, along + with lots of other values from the documentation were inserted into the + necessary tables. + + The result appears to generate stable NTSC video on the svideo connector. + +commit b8f3ec77104882fc755ddc88f2583cd5d15387a4 +Author: Zou Nan hai +Date: Thu Dec 21 10:46:17 2006 +0800 + + This fix should be better, I830SetMode will call i830_sdvo_dump, + if the sdvo is not initialized, X will crash. So any application which + SetMode will crash X if there is no SDVO output. + +commit b83cbec34a8d1ff39bd303fcd27fc03dcdb1d6c3 +Author: Zou Nan hai +Date: Wed Dec 20 17:32:05 2006 +0800 + + fix null pointer reference, + I hit this when running doom3-demo + +commit 4ba72fc408e7fab7c384aff5e73f0cfb8fd86cf3 +Author: Keith Packard +Date: Tue Dec 19 22:39:57 2006 -0800 + + Reinitialize DGA mode list whenever we update the global list. + + DGA has a copy of the current mode list (yes, this is broken). + Regenerate it whenever the ddx mode list changes. + +commit 07d3f141712e2abf704cb68a59cd5d5c3390e2ca +Merge: 0cd1a11 c28075e +Author: Keith Packard +Date: Tue Dec 19 22:01:02 2006 -0800 + + Merge branch 'modesetting' into crestline + +commit c28075e1d70c98b39fc9829a6a01da171a9b9426 +Author: Keith Packard +Date: Tue Dec 19 21:53:10 2006 -0800 + + TV output I830OutputPrivate had wrong type (crashed in SetMode). + + TV output private type field was set to I830_OUTPUT_SDVO instead of + I830_OUTPUT_TVOUT. When DGA mode setting occurred, the sdvo output debug + code would be invoked and attempt to dereference sdvo-specific bits of the + private structure leading to a segfault. + +commit 2ef4c5e8f6444aad192304e5a2f7a0c77bfb917d +Author: Keith Packard +Date: Tue Dec 19 16:45:39 2006 -0800 + + Re-initialize physical screen size only if -dpi was passed. + + Physical screen size from the config file or DDC will already + be set correctly in the screen structure, unless it was computed from the + virtual size using the -dpi command line option. Recompute physical size as + we reset the screen size if the -dpi option was used. + +commit b00951a5c87ca8c596ee9cc73d96d598eec60751 +Merge: 05cd921 c0a0ddc +Author: Keith Packard +Date: Tue Dec 19 16:22:04 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 05cd921140fae2746c3421715d7f18248a66735a +Author: Keith Packard +Date: Tue Dec 19 16:21:46 2006 -0800 + + Align textured video dither matrix to window + +commit c0a0ddc0ce69b60ac3a58d45cb32ccd0e0bfb0c9 +Author: Eric Anholt +Date: Tue Dec 19 16:06:13 2006 -0800 + + Bug #9382: Save the CRTC's desired mode in the old RandR 1.0 mode set path. + +commit 3c86fdda1d09fd22d4c15a8e412611db4cea7dcf +Author: Keith Packard +Date: Tue Dec 19 15:53:07 2006 -0800 + + Turn on dithering for 915 textured video + +commit 293ad158ece941eeb9894f5af4d663464b9954e5 +Author: Eric Anholt +Date: Tue Dec 19 14:35:51 2006 -0800 + + Remove 8k framebuffer stride restriction on 965. + + Also, clean up the message if the limitation is hit. + +commit ff1223142aedcf888665de6e4d7d5d03a55b2688 +Author: Eric Anholt +Date: Tue Dec 19 12:49:55 2006 -0800 + + Only erase curMode in i830DisableUnusedFunctions when the CRTC is disabled. + + This bug resulted in broken xinerama, among other issues. + +commit 3b5703c7fa08e63f2a31be7496ded9c70015946d +Author: Daniel Stone +Date: Tue Dec 19 09:49:49 2006 -0800 + + Respect the srcdir. + +commit d89e211b12ff715d7475421af69157b102accaca +Author: Eric Anholt +Date: Fri Dec 15 14:39:14 2006 -0800 + + Disable configure-disabled outputs before mode setting. + + We're not supposed to turn off pipes/planes/dplls with outputs attached, which + we could have done before this. + +commit 3fc9feec7b29e0b908e3b90e0f6634117d66ba6d +Author: Eric Anholt +Date: Fri Dec 15 14:38:23 2006 -0800 + + Simplify i830DisableUnusedFunctions() by using the CRTC dpms routines. + +commit 7b8056e3e347b15b37be0116315d7d3a23aef99f +Author: Keith Packard +Date: Tue Dec 19 01:32:54 2006 -0800 + + Writing 1 to I2C line means to tristate the bus so others can manipulate it. + + We were forcing bus lines to 1 which was breaking DDC for some monitors. + Instead, make the PutBits function just tristate when writing 1 bits. + +commit 0cd1a11d4493ef4a2d05ccf8aadec743504dba5f +Author: Zou Nan hai +Date: Tue Dec 19 14:03:19 2006 +0800 + + fix for bug #108 + +commit eedef7adc53dd8337d27c02551c5778fb43bae05 +Author: Eric Anholt +Date: Mon Dec 18 15:57:44 2006 -0800 + + Add a detect() function for DVO chips, and implement it on sil164. + +commit 8983845f91cacf8110c70121e0f5f293fe443e6d +Author: Eric Anholt +Date: Mon Dec 18 15:57:08 2006 -0800 + + Fix crash in xf86SetScrnInfoModes when pScrn->modes ends up empty. + +commit fa4642048b183134544fc5ee47558446d27f6194 +Author: Eric Anholt +Date: Mon Dec 18 15:32:35 2006 -0800 + + Clean up i2c_vid interface, including de-StudlyCapsing and removing dead code. + + The old Init() function is removed and the previous Detect() function is now + init(). This leaves us room in the namespace for a detect() like other + outputs have ("is the monitor connected?"). Also, Power() became dpms(), + taking a DPMSMode*. In general, the mode setting path now matches the intel + internal path, except for the lack of mode_fixup(). + +commit dcb069a1da6b3300b0772843dd9b67efdf319637 +Author: Dave Airlie +Date: Tue Dec 19 10:29:56 2006 +1100 + + ch7xxx: add lookup table for name + + Don't load if we don't match name + +commit 0305298405bd7018e5c520bdd5ea46a75be09f37 +Author: Eric Anholt +Date: Mon Dec 18 14:49:01 2006 -0800 + + Limit modes to 165Mhz on CH7009, according to spec. + +commit 23114fbccad849249b4b7200e3d085a9ac0e2e99 +Author: Eric Anholt +Date: Mon Dec 18 14:47:44 2006 -0800 + + Align the driver to the CH7009[AB] spec. + + With this, the driver works at 640x480 and 1280x1024 on my panel. + +commit 633d718f6fb019844304228a81c84a8605da004f +Author: Eric Anholt +Date: Mon Dec 18 13:59:17 2006 -0800 + + Clean up a bunch of log noise from ch7xxx startup. + +commit 3167bc6b24bd74c50ca4c4d361b14aa24d77cfa3 +Author: Eric Anholt +Date: Mon Dec 18 13:45:55 2006 -0800 + + Fix DVO mode valid function to not throw out all modes. + +commit 4ca92da5b93b07f0bff51843f8fb5d04a2a29443 +Author: Eric Anholt +Date: Mon Dec 18 13:45:34 2006 -0800 + + Add save/restore to ch7xxx to avoid segfaults on server start. + +commit 31849edb3b503ade659981dfa36babf5ad8757c5 +Author: Eric Anholt +Date: Mon Dec 18 13:32:21 2006 -0800 + + Move the ch7xxx code to the style I've been settling on for output code. + +commit 1975fa5b010100196af201e40f43b30a149b7750 +Author: Eamon Walsh +Date: Mon Dec 18 14:08:55 2006 -0500 + + Revert "Convert callers of LookupWindow() to dixLookupWindow()." + + This reverts commit 08575331ac75783c9910cfb6e78db701a29983ac. + +commit 2d0ca2202cb0d780bb4387bbe04e5caa6512e3b1 +Author: Eric Anholt +Date: Mon Dec 18 10:37:33 2006 -0800 + + Bug #8786: Treat pictures with no color data as non-component alpha. + + This is an un(der?)-documented part of the render protocol: If the mask is + alpha only, then the component alpha flag is ignored on it. + +commit 65cd18b97bc533b24031d6eb882fd3074779ceba +Merge: bf43f8c 6823ca8 +Author: Keith Packard +Date: Sun Dec 17 17:32:24 2006 -0800 + + Merge branch 'modesetting' into crestline + +commit 6823ca87f3b1ef3b28ed167254dcfce2a80467df +Author: Keith Packard +Date: Sat Dec 16 21:12:47 2006 -0800 + + Follow mode setting order in RestoreHWState. + + Add delays after output and CRTC disable. Restore panel fit register before + PLLs are restarted. Move all VGA restore code last. Shuffle various register + writes around and add delays to match PipeSetMode code. + +commit 86558cc622b516b568cc26efdf9b64d4b660f50f +Author: Keith Packard +Date: Sat Dec 16 21:09:31 2006 -0800 + + Prefer earliest CRTC when mapping to outputs. + + For some reason, the code was preferring the last possible output when + mapping outputs to crtcs. Use the earlier CRTC instead to make the i830 + driver consistent with BIOS usage. + +commit 8e6ab99b3195325f9fe5432725fe328591c0c7e2 +Author: Keith Packard +Date: Sat Dec 16 21:06:36 2006 -0800 + + Not restoring active outputs. Wait for input sync before enabling outputs. + + Oops--looks like a typo to me; the code was callint set_target_output + instead of set_active_outputs. + + BIOS loops waiting for the SDVO input to sync before enabling outputs, this + makes sense to me. + +commit bffd611b0a1cb05868e0f93e6ff9357a3116eaa6 +Author: Keith Packard +Date: Sat Dec 16 21:03:15 2006 -0800 + + Follow BIOS order in writing DPLL/DPLL_MD registers. + + 965 BIOS writes DPLL and then DPLL_MD. + 945 BIOS writes DPLL twice. + +commit 9b1a1b170befae2e705c23ce295837d0d13b60c0 +Author: Keith Packard +Date: Sat Dec 16 16:53:49 2006 -0800 + + reorder restore writes for 965 VGA + +commit 08575331ac75783c9910cfb6e78db701a29983ac +Author: Eamon Walsh +Date: Fri Dec 15 17:44:44 2006 -0500 + + Convert callers of LookupWindow() to dixLookupWindow(). + +commit 60411bc4d0b3c53850c73b7246d5f7ed5c2d4084 +Author: Keith Packard +Date: Thu Dec 14 18:36:44 2006 -0800 + + Follow BIOS PLL write protocol (disable,enable,enable). + + This gets VGA output and text restore working, but SDVO is still not working. + +commit 082519f34b468d0c5aa08db74ff2b51cf411d743 +Author: Keith Packard +Date: Thu Dec 14 16:51:48 2006 -0800 + + Turn pll/pipe/plane on in crtc_set_mode + + Instead of delaying pll/pipe/plane enables to the dpms function, turn them + on right away in the crtc_set_mode function. To avoid rewriting these + registers in the subsequent dpms function, check each register written there + to see if the enable bit is already on and don't rewrite. + +commit 55e7a32096a58f7bb2380b04df6b3dd9dc8e5b6a +Author: Keith Packard +Date: Thu Dec 14 16:50:26 2006 -0800 + + Respect Virtual in xorg.conf + + Instead of growing virtual to fit our desired sizes, if it is set in the + config file, use the value as the virtual size and make the default + configuration fit within that size (if possible). + +commit d4142abc68888178a8f6c54fdcece91e898bc9f5 +Author: Keith Packard +Date: Thu Dec 14 13:49:08 2006 -0800 + + Set frame buffer size ranges in xf86_config. + + Initialization and default configuration code needs to know the range of + legitimate sizes for the frame buffer. + +commit 2b5a5542ad7d1c558d1684a0a69b66bab6e9d001 +Author: Keith Packard +Date: Thu Dec 14 13:43:50 2006 -0800 + + Change TV modes from Preferred to Driver. + + This avoids having the artificial TV mode size drive overall screen size. + +commit 3fe802453a85183a69c36a098639895f49b17df1 +Author: Keith Packard +Date: Wed Dec 13 13:15:14 2006 -0800 + + Move xf86CrtcConfig to ScrnInfo private. + + Pull xf86CrtcConfig out of the driver private structure and allocate a + ScrnInfo private index for it. Also, make the arrays of outputs and crtcs + dynamic instead of fixed. + +commit 0f6addc8a6aeb9bd041d0f8e8e5850e76764ba51 +Merge: 001e272 3fa5b39 +Author: Keith Packard +Date: Wed Dec 13 12:10:31 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 001e272437a0247ffbc4b9ff8a3f2b437cf4c533 +Author: Keith Packard +Date: Wed Dec 13 12:08:58 2006 -0800 + + Auto-detect working TV output by checking TV regs functionality. + + We can't figure out which chips are supposed to have TV out, so instead we + prod the TV_DAC register to see if it will hold the value written to it, if + not, we assume the chip doesn't have TV out. + +commit 3fa5b3998353518c40e2fb0c28b425ee22c8d625 +Author: Eric Anholt +Date: Wed Dec 13 11:54:36 2006 -0800 + + Add magic double-write of the dpll register to fix mac mini cold boot. + +commit e27372e85a007d8a7e31678dbdb62755c22918bf +Author: Eric Anholt +Date: Wed Dec 13 00:26:27 2006 -0800 + + Add some caution with PCI write posting and DPLL delays to i830_crtc_dpms. + + While it doesn't specifically help/hurt my test case, we've seen enough + mysterious behavior that caution is probably warranted. + +commit df0a5a25aa72563a33731f8063602dd7faad8459 +Author: Keith Packard +Date: Wed Dec 13 11:38:18 2006 -0800 + + Rename outputs to TMDS-1/TMDS-2, LVDS, TV and VGA. + + These names are reasonably short and describe the connector rather than the + target media, but we don't appear to have any way to determine what is on + the other end of the wire. More importantly, they're all unique now. + +commit e3604fc63243ab0f31673a923d20e23131b607f6 +Author: Alan Hourihane +Date: Wed Dec 13 15:42:53 2006 +0000 + + Delete ChangeLog + +commit 4cdcaac26b3f425ec8fcc2fd3eaa9bfb7a137422 +Author: Keith Packard +Date: Tue Dec 12 23:26:00 2006 -0800 + + Write dpll_md register while updating dpll as that appears to be required. + + SDVO multiplier on 965 is in the dpll_md register; for some reason, that + needs to be written along with the dpll value or the multiplier doesn't get + set correctly. + +commit 9dd1520421dcb8c7f36a684f3d2ffb6b42a6671a +Merge: d57a258 63bf484 +Author: Keith Packard +Date: Tue Dec 12 22:52:59 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit d57a25815398ae83eae8bdcb3a1b607760aa30b6 +Author: Keith Packard +Date: Tue Dec 12 22:48:21 2006 -0800 + + Elide duplicate modes in pScrn->monitor. + + xf86DDCMonitorSet dumps all of the DDC-discovered modes + into the monitor mode list without checking to see if they + are already present. This provides an ever-changing list of + modes for outputs which have no DDC and which simply duplicate the monitor + mode list. + +commit 63bf48481d4e5e285fdfe7037ea4150283163a54 +Author: Eric Anholt +Date: Tue Dec 12 22:42:41 2006 -0800 + + Correct typo in mac mini hack, and return modes when the hack is unnecessary. + +commit 41444183b59ed84c09749ca89afbef036d42ec5f +Author: Eric Anholt +Date: Tue Dec 12 18:08:57 2006 -0800 + + Replace custom, partially broken DPMS implementation with a generic one. + +commit 7ed1b05922c07ff45a5794a992fd3d59ab55aa73 +Author: Eric Anholt +Date: Tue Dec 12 16:03:52 2006 -0800 + + Fix mac mini SDVO output: write the SDVO[BC] enabled register state twice. + +commit 9776f6c68b3cdd5585e58e677c1b1318d9aedaf4 +Author: Eric Anholt +Date: Tue Dec 12 16:02:47 2006 -0800 + + Flush the plane changes in i830_crtc_dpms() + + Otherwise, the changes may not have taken effect. + +commit 54823ac39ce9666099d69196694643f04123cb4d +Author: Eric Anholt +Date: Tue Dec 12 14:38:08 2006 -0800 + + Move the SDVO sync detection to after we've turned the port on. + +commit ec45d7274333cccd20ad080facc8e995ad7b26b0 +Author: Eric Anholt +Date: Tue Dec 12 13:54:49 2006 -0800 + + Extend the error state reporting to cover ESR and decode PGTBL_ERR for 945. + +commit 838af10b85ee8c085c6d2c4fbe18fd90b2be9d3f +Author: Eric Anholt +Date: Tue Dec 12 13:45:41 2006 -0800 + + Move PrintErrorState and CheckInheritedErrors code to i830_debug.c. + +commit 668ae6ce3c3c4b93a58749fd44ef32451adb6f9c +Author: Eric Anholt +Date: Tue Dec 12 11:39:40 2006 -0800 + + Set the SDVO port to on before sending the SDVO output on command. + +commit 91a538beadc17155be395ea2c8109a0958a969bd +Author: Eric Anholt +Date: Sat Dec 9 15:58:47 2006 -0800 + + More debugging output for SDVO. + +commit ce54538b905eb329f45c1b9b15e95ddce4a7927f +Author: Eric Anholt +Date: Fri Dec 8 08:26:30 2006 -0800 + + Add a hack for DDC on my Mac Mini. + +commit c8c1fb64ccecfb88f9923ad65c9898aa44692260 +Author: Eric Anholt +Date: Mon Dec 11 16:02:29 2006 -0800 + + Move the overlay mode switch status updates to when we enable/disable crtcs. + + This should help if we mode switch with randr during video playback, and also + simplifies the code by moving the protection all to one place. + +commit 3f3791ba2ece8e8a7aa3a5676f5f6361862a292c +Author: Eric Anholt +Date: Mon Dec 11 15:20:15 2006 -0800 + + Remove remnants of old savedCurrentMode hack. Man, that was gross. + +commit c21baa5a3044eb66f2518b018dae07eadb989aa1 +Author: Eric Anholt +Date: Mon Dec 11 15:15:01 2006 -0800 + + Remove dead remnants of old clone mode support. + +commit b3865f34669319f449f2da8f87a4eef6ec8e7804 +Author: Joshua J. Berry +Date: Mon Dec 11 14:46:20 2006 -0800 + + Include i830.h to get M_T_* compat defines for older X Servers. + + Not duplicating the defines ensures that we won't let the compat bits slip + into the X Server when we move this code over there. + +commit 24d9521c7ae72e146025f10ea85b07ebd7041716 +Author: Eric Anholt +Date: Mon Dec 11 09:34:50 2006 -0800 + + Add error messages for previous silent DRI initialization failures. + +commit bf43f8ce736d91659c2757fb39b13e63bc5891a4 +Merge: 684ea26 9452321 +Author: Wang Zhenyu +Date: Fri Dec 8 14:17:43 2006 +0800 + + Merge branch 'modesetting' into crestline + +commit 94523215127a3458a28d0f1217224a27c8870884 +Merge: 75f4df2 fde52de +Author: Wang Zhenyu +Date: Fri Dec 8 14:15:06 2006 +0800 + + Merge branch 'modesetting' of git+ssh://zhen@git.freedesktop.org/git/xorg/driver/xf86-video-intel into modesetting + +commit 684ea26b740d07ec8f6b0d223c1171e70c073bfa +Merge: 64269de 6b977f0 +Author: Wang Zhenyu +Date: Fri Dec 8 14:03:10 2006 +0800 + + Merge branch 'exa-i965' of git+ssh://zhen@git.freedesktop.org/git/xorg/driver/xf86-video-intel into crestline + +commit 99f6f84076b25af69dc226e6d4704c74d207e657 +Author: Alan Hourihane +Date: Thu Dec 7 09:47:34 2006 +0000 + + Bump to 1.7.3 + +commit fde52de870c84821ab457e17634c334a10cf71ab +Merge: 7dbe6c3 85de8a0 +Author: Keith Packard +Date: Wed Dec 6 23:40:13 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 7dbe6c378d1bc0c06ed6be4c1f9ca38ac31a5571 +Author: Keith Packard +Date: Wed Dec 6 23:39:14 2006 -0800 + + Move vga restore to end of RestoreHWState. + + I was having consistent system lockups when the vga restore + was first. Moving it to the end has reduced them to an infrequent + occurrence (but, alas, it has happened once since). This does not + make me happy. + +commit 28c7002b1cf81e286a083384575d53021d3ce906 +Author: Keith Packard +Date: Wed Dec 6 23:35:15 2006 -0800 + + Use DOUBLE_WIDE mode on all hardware. + + DOUBLE_WIDE mode is needed when the pixel clock is > 90% of the core + clock rate. The code guesses what the core clock rate is based on + the bus (AGP -> 133MHz, PCI-E -> 200MHz). + +commit 85de8a05804eaebcd61430793ef5406f196f9a95 +Author: Eric Anholt +Date: Wed Dec 6 20:26:53 2006 -0800 + + Include render.h to get SubPixelUnknown define. + +commit 64269de3c34db047e78b788dc5681abdc009f8aa +Merge: 8ddbc26 182d2f5 +Author: Keith Packard +Date: Wed Dec 6 18:09:28 2006 -0800 + + Merge branch 'modesetting' into crestline + +commit 182d2f503a7a1be90d93a4a15059585a564fd3ce +Merge: 677c454 6777d80 +Author: Keith Packard +Date: Wed Dec 6 17:18:58 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 6777d8044d5cc063698e05afb7a93a58a7a3b64a +Author: Eric Anholt +Date: Wed Dec 6 17:10:06 2006 -0800 + + Harmless warning fix. + +commit c6ce8a3c3355e8a56e86856caa56baf1cd3c0231 +Author: Eric Anholt +Date: Wed Dec 6 17:07:48 2006 -0800 + + Reduce dumpregs to X startup, after a mode set, and LeaveVT. + + While here, remove some other register dumping that is better done by + i830DumpRegs(). + +commit b23dec37b28a76433ad5d537ab508294e843cabe +Author: Eric Anholt +Date: Wed Dec 6 16:58:24 2006 -0800 + + Save/restore registers around calls in PreInit with register side-effects. + +commit d3c21c09e3904b3d32aca7563044194b061ac2fa +Author: Eric Anholt +Date: Wed Dec 6 16:50:52 2006 -0800 + + Remove stale i830_tv_pre_set_mode. Replaced by generic dpms hook call. + + Also replaced by not spamming unrelated ADPA register. At least, it had sure + better not be related. + +commit 9c3e733aaa2068fcb0164577237ed70d177e9b5a +Author: Eric Anholt +Date: Wed Dec 6 16:36:42 2006 -0800 + + Save/restore more TV registers. + +commit d5ec9d2160f47f21a6015c1cc05b57274cbb0471 +Author: Keith Packard +Date: Wed Dec 6 14:44:40 2006 -0800 + + Cannot modify DPLL register in output mode_set function. + + DPLL register contains clock setup, so it cannot be written + from the output mode_set function or 'bad things' happen. + +commit 5d345c13a949caef384a63769d7185885de6d26d +Author: Keith Packard +Date: Wed Dec 6 13:19:58 2006 -0800 + + Clean up SDVO multiplier debug output + +commit 6ee63364f5fabbc5578bcc9ded38c778595f5a6d +Merge: 56f7119 b75ecdb +Author: Keith Packard +Date: Wed Dec 6 12:53:22 2006 -0800 + + Merge branch 'modesetting' into nonrandr-setup + + Also, fix buffer overflow in i830_debug.c + +commit b75ecdb48309a15eb7c52b279c7f8523a95bcd48 +Merge: 1cb6311 b3bb10e +Author: Eric Anholt +Date: Wed Dec 6 11:59:33 2006 -0800 + + Merge branch 'generic-mode-set' into modesetting + +commit b3bb10e33e44c78f132d239e30931f97065a9fd6 +Author: Eric Anholt +Date: Wed Dec 6 11:53:40 2006 -0800 + + Fix LVDS: Don't change bits in LVDS other than port enable/pipe select. + + This behavior matches what we did before when LVDS worked. + +commit 47d07b1073c162ec00a8b173b8b6389dc4adbe88 +Author: Eric Anholt +Date: Wed Dec 6 10:56:38 2006 -0800 + + More LVDS fixed mode fixing: use the EDID DTD's blank length. + +commit 727bf1cbf72362edcbdd68001a3558fd2b2b4eca +Author: Eric Anholt +Date: Wed Dec 6 10:12:49 2006 -0800 + + Add missing newlines to new debug output. + +commit 236c53be5d94798d55219651a6885fee32ce175b +Author: Eric Anholt +Date: Wed Dec 6 10:10:27 2006 -0800 + + Fix LVDS fixed mode code after generic-mode-set. + +commit 1cb6311c1182fe98d2b8d237cef42509c3178f9a +Author: Wang Zhenyu +Date: Wed Dec 6 16:31:00 2006 +0800 + + fix typo in checking xf86CrtcScreenInit return + +commit 56f71194157ef929b62fe34a89c840bd59e56301 +Author: Keith Packard +Date: Wed Dec 6 00:13:57 2006 -0800 + + Use xf86 structures for default config instead of RandR. + + To avoid requiring RandR 1.2 in the X server, use the + xf86 Crtc and Output structures as the basis for the default configuration + computation (and, eventually, the config-file based configuration as well). + +commit 6b977f0eca388a295ca7348f5960bd8e0192cf1d +Author: Wang Zhenyu +Date: Wed Dec 6 13:24:44 2006 +0800 + + fix Makefile.am + +commit ffd8aacbe7c72b696ff7257609e3c1d45c057609 +Author: Keith Packard +Date: Tue Dec 5 19:48:39 2006 -0800 + + new server APIs are not in server-1.2 (version 7.1.99.2) + +commit a73649611414cb92697575efa90addfc3cf91cf9 +Author: Keith Packard +Date: Tue Dec 5 19:47:04 2006 -0800 + + Capture VGA registers sooner so checks are more informative + +commit 62fba80d3ea9c185ec8ae1e06c099c02bf844d8b +Author: Keith Packard +Date: Tue Dec 5 19:43:41 2006 -0800 + + fix up misleading comment in i830_crt.c about border register + +commit 041f0029c78620ca1b50e7e5d11f5d022e189641 +Author: Wang Zhenyu +Date: Wed Dec 6 10:43:29 2006 +0800 + + Formats fixes + + We should use card_fmt for src/mask picture, and use dest color + buffer format helper. Also fix wrong name for G965 texture formats, + and pict_x1r5g5b5 isn't supported by sampler engine. + +commit 1d94ec7de3387b70815679977cfc5d88200efa99 +Author: Eric Anholt +Date: Tue Dec 5 18:22:59 2006 -0800 + + Fix ordering of PIPE[AB]SRC debug output to be (x, y). + +commit eee23fdd0dadd38a2b80525ec886120150f91077 +Author: Eric Anholt +Date: Tue Dec 5 18:19:49 2006 -0800 + + Fix copy'n'paste-o of the ordering of h/v fields in DSP[AB]SIZE. + +commit 58c247c6de56508b00eadf77b4c145c94134270d +Merge: 0b4c3e7 2e8c927 +Author: Eric Anholt +Date: Tue Dec 5 15:28:21 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + + Conflicts: + + src/i830_display.c + +commit 0b4c3e7bff790e1e99ace5036a41e96046335b04 +Author: Eric Anholt +Date: Tue Dec 5 14:39:47 2006 -0800 + + Add a bunch of per-register debug code to i830DumpRegs(). + +commit 7844e576e71c004ed495bbc31f7bbe890d18b8d9 +Author: Eric Anholt +Date: Tue Dec 5 14:39:09 2006 -0800 + + Move reg dump from i830PipeSetMode to after we set up the modes with RandR. + +commit e777d38ce98d7220621b049b09df1deca5a5df42 +Author: Eric Anholt +Date: Tue Dec 5 10:01:31 2006 -0800 + + WIP code to move mode set sequencing to XFree86 handlers. + + It compiles. It definitely doesn't run. + +commit 2e8c927f9308069a82f25b65bb0c62bc5a156832 +Author: Keith Packard +Date: Mon Dec 4 14:02:30 2006 -0800 + + Re-create RandR Crtc/output structures on server regen. + + RandR structures must be re-created when the server reinitializes, + but the driver PreInit function is not re-invoked. Recreate them + manually in this case during ScreenInit. + +commit 583619cdb2b6a469299dd5bf658bf5b51ee999fe +Author: Wang Zhenyu +Date: Mon Dec 4 15:48:04 2006 +0800 + + set correct default border color + +commit f28d5fc30ccf60d72d5832bb6542522dc7f1c463 +Author: Wang Zhenyu +Date: Mon Dec 4 15:47:31 2006 +0800 + + fix typo in ps kernel + + fix corrupt in some subspans + +commit 677c454469a6223460778033758e384e989cea47 +Merge: 16f9a56 8fcf9a8 +Author: Keith Packard +Date: Sat Dec 2 23:28:38 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 8fcf9a81179ee8577ddab5e904c58fbfd14cf59c +Author: Keith Packard +Date: Sat Dec 2 22:58:31 2006 -0800 + + DOUBLE_WIDE mode for high pixel clock 8xx. Rewrite PLL search. + + High pixel clock modes on pipe A of an 8xx chip require + DOUBLE_WIDE mode. It's supposed to be modes > 180MHz or so, + but the board I have requires DOUBLE_WIDE mode for clocks > 108MHz + or so. The limit is related to the core clock speed of the chip, which + can be found indirectly through PCI config space. None of the possible + values explain why this board needs this mode for these relatively low + clock rates though. + + Also, create tables of data for the PLL computation and use them + instead of code. I think it's cleaner looking. It is also untested on + 9xx. It'll work. Really. + +commit 81dde11d419c8f9198ab3502d9813d66d0bc6d6d +Author: Eric Anholt +Date: Fri Dec 1 10:37:19 2006 -0800 + + Fix copy'n'paste-o from restructure-outputs that resulted in crashes. + + Our driver private is stored in the bus that we set up, not the DDC device + that xf86 code does. + +commit a504e31f0fefdec802ae403573f52fac3d577b65 +Author: Eric Anholt +Date: Fri Dec 1 12:49:43 2006 -0800 + + Don't try to write the read-only PP_STATUS register. + + Also, don't bother reading the PP_CONTROL register to try to get LVDS status -- + that's what PP_STATUS is for. + +commit f21230d3e1cc5470e8f88404b5d9f1702bec44bb +Author: Eric Anholt +Date: Fri Dec 1 12:48:57 2006 -0800 + + Add the [ax]4r4g4b4 source picture formats. + +commit 8ddbc26b276016b922487f7b1e8997998b655a7d +Merge: 93975a5 16f9a56 +Author: Keith Packard +Date: Fri Dec 1 10:57:16 2006 -0800 + + Merge branch 'modesetting' into crestline + + Use new TV output condition (all 9xx except 915g) + +commit 16f9a56070a01c7ada8e566d9b73fcf7900136e0 +Author: Keith Packard +Date: Fri Dec 1 10:50:27 2006 -0800 + + TV output exists on all 9xx chips except for 915G + +commit 93975a526086432cdeb8d7ead721a862d632c1e7 +Merge: 08b6569 e603cd0 +Author: Keith Packard +Date: Fri Dec 1 10:28:58 2006 -0800 + + Merge branch 'modesetting' into crestline + +commit e603cd0c73344ef137d3276b5cfcbcf4df340778 +Author: Keith Packard +Date: Fri Dec 1 10:08:36 2006 -0800 + + Leave detected TV status alone when no free CRTC is available. + + Yes, this means not detecting TV hotplug when two outputs are + already running. An alternative would be to turn off one of the other + outputs temporarily, but that would cause flashing. Something to consider. + +commit ec30356d950199903978265076b8a4e3960cf84f +Author: Keith Packard +Date: Fri Dec 1 10:06:29 2006 -0800 + + Do output detection before any crtc allocation. + + Some output detection requires a crtc for load detection, perform all of the + output detection before allocating any crtcs so that there will be a free + crtc for any load detection. Avoids losing TV detection when two monitors + are connected. + +commit 7642da82781826cb3b45078750cc54d8f592893a +Author: Keith Packard +Date: Thu Nov 30 23:21:39 2006 -0800 + + When CRTC is disable through RandR, the mode is NULL. Don't dereference it. + + Correctly interpret mode == NULL as CRTC disable, make sure the CRTC is + disabled in this case. + +commit de50ca9ed9e78c17be1badec62e35ed5e4d62b05 +Author: Eric Anholt +Date: Thu Nov 30 17:56:47 2006 -0800 + + Tristate the clock/data pins during GPIO when released while getting values. + + While the register is laid out suggesting that you can read a low value while + driving the output high, and the I2C spec seems to indicate that you should be + able to as well, and on some hardware this works successfully, on the i865 and + perhaps some other chips it doesn't. So, if we're not holding the clock or + data pin low during GetBits, tristate the pin so that we can successfully read. + + This fixes i865 analog (VGA) DDC so it successfully sees slave acks. + + Also, improve the I2C bit-banging debugging. + +commit 8c44556408601db2be799b5ac5c4da1d92886d31 +Author: Eric Anholt +Date: Thu Nov 30 15:56:52 2006 -0800 + + Preserve some GPIO bits that the docs tell us to. + +commit 28401b25cc5c1afb272e506cef196ba3a1258bd3 +Author: Eric Anholt +Date: Thu Nov 30 15:45:13 2006 -0800 + + Add debug code for the bit-banging I2C implementation. + +commit ff64bc7397cafbec94e388e1625b3a1999f1aca7 +Merge: b94b7c4 16e01b1 +Author: Keith Packard +Date: Thu Nov 30 14:09:31 2006 -0800 + + Merge branch 'restructure-outputs' into modesetting. + + Outputs and Crtcs now have a driver-independent representation which should + permit generic code to control RandR 1.2 and startup configuration. + +commit 16e01b117bb7ae90b150dd4f25a887dd895cf473 +Author: Keith Packard +Date: Thu Nov 30 11:55:29 2006 -0800 + + Oops. Don't try to use xf86RandR names, use xf86RandR12 instead. + + Attempts to override functions in core server fail, so use + new names instead. + +commit bcf206ff17c6eca8212db72dd86fcd8fdc0162da +Merge: 27ca1c1 2c8c310 +Author: Keith Packard +Date: Thu Nov 30 11:39:56 2006 -0800 + + Merge branch 'restructure-outputs-origin' into restructure-outputs + +commit 27ca1c17aab30670dd1d07e0809fd58cdecfc3b6 +Author: Keith Packard +Date: Thu Nov 30 11:39:37 2006 -0800 + + Rename I830 randr functions to xf86 as they are becoming generic. + + Change function names, create separate i830_randr.h header file + to contain definitions. + +commit b94b7c4bcfdb7ba59ed818f72309b5060a2ab7ee +Merge: b6fc8df 25e6e49 +Author: Eric Anholt +Date: Thu Nov 30 09:15:30 2006 -0800 + + Merge branch 'exa' of ../xf86-video-intel into modesetting + + Conflicts: + + man/i810.man + src/Makefile.am + src/i830.h + src/i830_driver.c + src/i830_rotate.c + src/i830_video.c + +commit b6fc8df9a52f5fe1b4d26ae06bc4d48235b44a67 +Author: Eric Anholt +Date: Wed Nov 29 15:06:32 2006 -0800 + + Properly detect the GTT size on the G965. + + In the past, the GTT has always been sized just large enough to map the whole + graphics aperture. However, apparently on the G965 that isn't the case, and + it is actually 512KB on hardware with a 256MB aperture. This resulted in X + not bothering to allocate memory for 256KB that it thought was already mapped + into stolen memory, and thus garbage rendering (particularly visible in large + video modes that displayed this unallocated memory). The kernel happens to + get the right answer by hardwiring a 512KB GTT size already, but that may not + be true on future hardware. + + Instead, we use a convenient field in PGETBL_CTL that's specifically for the + GTT size rather than the aperture size, which gets us the answer we want. + +commit 359dc81c07901665da0f86c573c096fa1661cdd2 +Author: Eric Anholt +Date: Wed Nov 29 15:01:39 2006 -0800 + + Revert "Don't allocate stuff in the first 256K of video memory (GATT?)" + + This reverts commit 997e8c9bb4235cab1fff4738387df9afcbea0a03. + + The GTT is definitely located at the end of stolen memory. This commit + apparently worked around mis-estimation of the GTT size. + +commit db391e8e4c4d87bfe3ccad0de14dd5b47b69b8fe +Author: Wang Zhenyu +Date: Wed Nov 29 17:16:46 2006 +0800 + + shut up warning + +commit 290f15cd4cda97727ebcaadacbbbf7650278934b +Author: Wang Zhenyu +Date: Wed Nov 29 17:14:55 2006 +0800 + + fix alpha blending state + +commit 3d4edd325f3859c749ee42df102bb4239eac5287 +Author: Wang Zhenyu +Date: Wed Nov 29 17:05:32 2006 +0800 + + Add in sf/wm program for mask picture without CA + +commit a704120b15efae47344a90d972e7f3da64a202a6 +Author: Wang Zhenyu +Date: Wed Nov 29 16:52:44 2006 +0800 + + misc cleanup for G965 vs/sf/wm states + +commit e3c70c68e39183226e498271c44e98ef1b96a681 +Author: Wang Zhenyu +Date: Wed Nov 29 16:40:15 2006 +0800 + + WM kernel needs scratch space + +commit aa515c54f0cfd9025fc38dc4b7938ff17a8a13fb +Author: Wang Zhenyu +Date: Wed Nov 29 16:37:06 2006 +0800 + + Setup default border color for our samplers + +commit b6eba96584bcd2c024f6443d9f3728eb65b234fb +Author: Wang Zhenyu +Date: Wed Nov 29 16:30:53 2006 +0800 + + fix vertex buffer size + +commit 453842c9ff733af45fa665d9db6a35164f45c60a +Author: Wang Zhenyu +Date: Wed Nov 29 16:24:24 2006 +0800 + + clean up issue cmd to ring buffer + + Make it easy to track different part of ring state, and + use rectlist primitive instead. + +commit 18ad7d5cf04081d89a9f978ccc7794116f7c498b +Author: Wang Zhenyu +Date: Wed Nov 29 16:04:16 2006 +0800 + + remove wrong scale_units + +commit 3d5bd0c14eea7951540f7a12eee257428f78e2d1 +Author: Wang Zhenyu +Date: Wed Nov 29 16:02:16 2006 +0800 + + Rename exa sf/wm program files + + Also fix some minors in wm program. + +commit a06beb5f80f097fac3b718e742742bb32f1c1194 +Author: Wang Zhenyu +Date: Wed Nov 29 15:47:19 2006 +0800 + + EXA state mem for G965 + + Not split offscreen mem for exa, but alloc a dedicated one + for G965 states. + +commit 9e4e7d4fa25a64a2494e7531967599142e60e716 +Author: Eric Anholt +Date: Tue Nov 28 16:36:09 2006 -0800 + + Conditionally compile old-server compatibility code in. + + This also replaces calls to compat code with the real names of the functions, + and slips #defines to an i830-namespaced version in when doing compat. + The current server version (7.1.99.2) is still left as requiring compat code, + since the version hasn't been bumped yet. + + This also fixes some failures to call the compat code, and some failures to + actually compile the compat code. Oops. + +commit 8d9ba2405d1f1e58a0cfb570e83e9206af8525b5 +Author: Eric Anholt +Date: Tue Nov 28 15:44:06 2006 -0800 + + sparse cleanups (use NULL instead of 0 for pointers) + +commit dbb8135e10e943a4d4e65f95853eeccc764ccf24 +Author: Eric Anholt +Date: Tue Nov 28 13:21:31 2006 -0800 + + Remove printing of the XFree86 screen mode list, and some other detritus. + +commit e8fb40ab1063b18372be2b5996257eb69d3f15c4 +Author: Eric Anholt +Date: Tue Nov 28 11:17:21 2006 -0800 + + Replace custom DDC mode list code with a copy of the X Server's. + + The X Server now has most of the mode helper functions we want, and we can + start removing compilation of our copies when the server is new enough. + +commit 2c8c310bd8a105dbeda5c989dca31cc766eb6bb8 +Author: Keith Packard +Date: Mon Nov 27 22:18:59 2006 -0800 + + Driver-independent code tracks num_crtc itself, don't do it in driver. + + Now that driver-independent code manages array of crtcs, let it track + the count and just have the driver compute how many there are in + a separate variable. + +commit c421724d8151d1d4578468abdbe8fe1120e373ca +Author: Keith Packard +Date: Mon Nov 27 22:15:40 2006 -0800 + + Move #include "randrstr.h" from i830.h to i830_xf86Crtc.h + + As part of the separation of driver-dependent from driver-independent code, + the interactions with RandR are moving entirely out of the driver, which + means the driver shouldn't even know about RandR, while the + driver-independent code does. + +commit e8d1db326388c9a112f2b8e2eff5a81210b8d6e4 +Author: Keith Packard +Date: Mon Nov 27 12:01:47 2006 -0800 + + Move crtc/output config to sub-structure. + + Place crtc/output in separate structure at head + of driver private structure. Use this from the config code + to make it driver-independent. Still lots of effectively driver + independent code that continues to use driver dependent stuff, + but that will change. + +commit 72692ba2e0254460c4f5a8cd476f5748383390ae +Author: Eric Anholt +Date: Mon Nov 27 11:23:55 2006 -0800 + + Postpone SDVO DDC bus creation until we've detected the SDVO device. + + This reduces log noise for those of us with no SDVO devices. + +commit 5f38bc3e2a685da5c03efa8103a353f79c842aa7 +Author: Eric Anholt +Date: Mon Nov 27 11:06:50 2006 -0800 + + Reduce the severity of many informational log messages. + +commit 85f404bc67d5ab54175c19e75aad406abfcf2133 +Author: Eric Anholt +Date: Mon Nov 20 09:32:26 2006 -0800 + + Re-indent ch7xxx driver. + +commit a0518f5a440630365b1d935b7c2d0725f326ad51 +Author: Keith Packard +Date: Sun Nov 26 19:44:38 2006 -0800 + + Remove mode setting from load detect CRTC allocation. + + To share load-detect CRTC allocation with TV driver, + move it to the output driver + +commit a47c549df036990e29f05bc3df80e1a2ab9f3b3c +Author: Keith Packard +Date: Sun Nov 26 18:26:26 2006 -0800 + + Clean up reworked data structure code so the server actually starts. + + Use i830GeLoadDetectPipe again (instead of missing xf86AllocCrtc). Actually + create new Crtc structures. Fix a few other NULL pointer dereferences. + +commit 2529863a1ade782819d76be2d0dc16e89028c1e3 +Author: Keith Packard +Date: Sun Nov 26 16:44:17 2006 -0800 + + Start output/crtc restructuring work. It compiles. + + Outputs and Crtcs are now split between 'generic' + and 'driver specific' pieces in the hope that more code + will be able to migrate to the xf86-generic layer. + + Right now, the code remains tangled together, significant + work remains to tease the pieces apart. First the code + needs to be made to actually work as-is though. + +commit 9aca4e207440119f4280b78199a221f85d50c511 +Author: Keith Packard +Date: Wed Nov 22 15:52:32 2006 -0800 + + Remove custom configuration code (which was #ifdef'd out). + + Multi-screen configuration is moving to generic code. + +commit 850e3652f4d5bb57f3c4ccb9cf29e2c75fecba9d +Author: Keith Packard +Date: Wed Nov 22 15:36:43 2006 -0800 + + Note which pipe has failed to be configured for VBlank interrupt + +commit 659e3db925de91954421f7f33c072576dfefcc4a +Author: Keith Packard +Date: Wed Nov 22 15:35:59 2006 -0800 + + Set up maximum screen size for clone instead of panorama. + + This avoids heading past the 8Kbyte stride limit of DRI so + that 3D will be available by default. + +commit 03c12f866529230df7a1503de61954cd5ade242e +Author: Keith Packard +Date: Wed Nov 22 15:34:03 2006 -0800 + + Limit DRI use to cases when pitch < 8Kbytes, not 4096 pixels. + + 3D rendering pipeline is limited to pitch of 8Kbytes and not 4096 + pixels, which rather makes a difference at 32bpp. + +commit 6781575f734f05547d7d5ceef4116fc157bba44d +Author: Alan Hourihane +Date: Wed Nov 22 16:49:57 2006 +0000 + + Be a little more verbose when rejecting modes. + +commit e065324661ad08b3b359136f48090232f6138959 +Author: Alan Hourihane +Date: Wed Nov 22 16:49:36 2006 +0000 + + update port attributes immediately when overlay is on. + +commit a0a9d1ea2ac9a0c665e5a1de5b8b8358dee3b9b4 +Author: Keith Packard +Date: Mon Nov 20 17:25:00 2006 -0800 + + Set configured values for screen virtual size and initial frame. + + Computation for virtual size and initial frame origin is quite + broken in xf86 common code. + +commit d6a0f917e601ea36643c6ad857756e19d24ecd73 +Author: Keith Packard +Date: Mon Nov 20 15:17:32 2006 -0800 + + Enable second SDVO channel. + + Rework SDVO support so that it can deal with two channels correctly, + also save/restore all connected output timings. + +commit 08b6569dc663ddf38cb36a6875de6d4ab55acac9 +Author: Eric Anholt +Date: Sun Nov 19 16:15:45 2006 -0800 + + Enable TV output on Crestline (untested). + +commit 05202cabbd23f15330b811ae6b8d708ad042bc40 +Merge: ee502dd b945a65 +Author: Eric Anholt +Date: Sun Nov 19 16:14:18 2006 -0800 + + Merge branch 'modesetting-origin' into crestline + +commit b945a650e952f98c2d101b71bd3ec0f390478da5 +Author: Keith Packard +Date: Sun Nov 19 00:54:30 2006 -0800 + + Fix TV color key. + + Subcarrier defines were incorrect in header file leaving one of the + DDA phases disabled. + +commit 28224af3d90a1a08d54a865dfaf20184330fe8a4 +Author: Keith Packard +Date: Sun Nov 19 00:40:46 2006 -0800 + + Preliminary 945 TV output. Color key is broken. Fixed mode. + + TV output is generating video with this patch, but the color burst + signal is incorrect somehow. + +commit ee502dd92a3dfccdc2efcfb76fc652694bc89e3b +Merge: 15ff17c 2fe6107 +Author: Eric Anholt +Date: Fri Nov 17 14:57:41 2006 -0800 + + Merge branch 'crestline-origin' into crestline + +commit 15ff17c756e42f392306820e3f7ffbdcc56b9892 +Merge: 9cc2f33 816fc1a +Author: Eric Anholt +Date: Fri Nov 17 11:48:53 2006 -0800 + + Merge branch 'modesetting' into crestline + + This works for analog, but SDVO output appears to not work yet. + + Conflicts: + + src/i830_driver.c + +commit 816fc1a76a5ac738e41b172ba8f43137c1521328 +Merge: 9948d83 7a7bb33 +Author: Eric Anholt +Date: Fri Nov 17 00:05:53 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + +commit 7a7bb331e10498e5b8ccec58130bb23334d36562 +Author: Keith Packard +Date: Thu Nov 16 21:19:20 2006 -0800 + + Don't dereference null DisplayModePtr on disabled output. + + During initial configuration, outputs which are disabled have null + modes. + +commit 2fe6107ac68e86ed183d8602436633348340678d +Author: Wang Zhenyu +Date: Fri Nov 17 13:11:36 2006 +0800 + + Rotation support for 965GM + +commit c4508c1cadf323e9ef1d0e69dd77d5e841a6a978 +Author: Keith Packard +Date: Thu Nov 16 21:09:23 2006 -0800 + + RandR-based initial output configuration. + + Using pre-init computed RandR information, make reasonable + default choices for the output configuration at startup time. + Either some preferred size or a size which yields 96dpi is chosen, + from which other monitors are set to a similar size. The largest + size sets the screen size. + + This needs to be extended to respect config file settings, but + those have not been defined yet. + +commit 9948d8377d70e898260c12210151b952b3fb8bf1 +Merge: 45a27f8 b649f95 +Author: Eric Anholt +Date: Thu Nov 16 19:47:24 2006 -0800 + + Merge branch 'master' into modesetting + + Conflicts: + + src/i830.h + src/i830_cursor.c + src/i830_dri.c + src/i830_driver.c + src/i830_video.c + +commit 9cc2f3313d77487dea372e6ab32d6d9c06617ae3 +Author: Eric Anholt +Date: Thu Nov 16 15:12:43 2006 -0800 + + Replace broken PCI resource size detection with pciGetBaseSize() call. + +commit 45a27f80e1c783627f570c309e7a853dcc9af0c1 +Author: Keith Packard +Date: Thu Nov 16 13:38:35 2006 -0800 + + Remove output options. Let outputs be connected to other crtcs. + + Output options will be replaced by properties. + Permits outputs to be connected to arbitrary CRTCs (within hardware limits). + No cloning yet. + +commit 9aea79d1e954fe4fb5c101edcb7c2d0f706a5c4c +Author: Keith Packard +Date: Thu Nov 16 11:40:26 2006 -0800 + + Inverted boolean sense when selecting pipe for CRT detection. + + Pipes are available when they are not in use. + +commit 4889b9f33336c92f07aac86d75f50316db6ef81a +Author: Eric Anholt +Date: Wed Nov 15 15:26:31 2006 -0800 + + Enable the LVDS if we find it and assign it to a pipe (oops). + +commit 854ff826c0031a44e874239c0b0a3533f4d9e14b +Author: Eric Anholt +Date: Tue Nov 14 09:14:24 2006 -0800 + + Disable setup of the second SDVO device until we fix it. + +commit d51555fba4e57c059fd184c1e54822d7e5b62a2f +Author: Eric Anholt +Date: Fri Nov 10 14:40:40 2006 -0800 + + Fix clock range for single-channel LVDS. + +commit dd1dcfab0ab0f2d0c25077fa663209e2762f26e8 +Author: Eric Anholt +Date: Fri Nov 10 11:08:02 2006 -0800 + + Fill in some of the high bits of mode timings for SDVO. + +commit 3955f044cfe1d592bcb36c43c539fb4a75840b8d +Author: Eric Anholt +Date: Thu Nov 9 20:28:46 2006 -0800 + + Expose the DDC-probed EDID data as the EDID_DATA output property. + +commit 0f5886689d7ef7dbbef6425d5c855ac6b67d3350 +Author: Keith Packard +Date: Wed Nov 8 23:19:59 2006 -0800 + + Create RandR 1.2 objects in I830PreInit. + + Creating the objects early will allow the driver to use + randr structures to select a reasonable configuration. + That part has not been done yet. + +commit 679c7bd82639a09cdce133becb8a08629ce3a4e9 +Author: Keith Packard +Date: Wed Nov 8 21:39:28 2006 -0800 + + ignore edited man page + +commit 81b7b489afa2cab4d8614c64f4906be627f1d07e +Author: Keith Packard +Date: Wed Nov 8 21:38:00 2006 -0800 + + Adapt to RandR updates that split object creation from screen association. + + RandR DIX code is preparing for xf86 drivers that want to allocate RandR + objects at PreInit time. This patch adapts to that change without taking + advantage of it. + +commit 81bace0c316c3ed80201a34eca533254d12cd193 +Merge: 713c5b0 beb8916 +Author: Keith Packard +Date: Wed Nov 8 20:23:20 2006 -0800 + + Merge branch 'modesetting-keithp' into modesetting + + Conflicts in PipeSetMode were resolved to use the keithp changes + that pushed more modesetting stuff into the per-pipe function. + + Switched availablePipes to num_pipes. + + Used modesetting default output configuration. + +commit 713c5b0899428edfea7cea0780244488115dbe1d +Author: Eric Anholt +Date: Wed Nov 8 19:55:31 2006 -0800 + + Change the output and pipe "is it on/off" field name to "enabled". + +commit ff77e9d84f2037b99a8e4ac55da0b0ac92ed6b9b +Author: Eric Anholt +Date: Wed Nov 8 19:53:31 2006 -0800 + + Clean up i830_crt_detect_load() a bit more. + + ADPA might not have been set right in some cases (DPMS-off monitor, for + example), and a wait for vsync that the bios does was missing. + +commit 9b267014b55f49d9362c1d432d6ba19ddd0ad95d +Author: Eric Anholt +Date: Wed Nov 8 19:39:18 2006 -0800 + + Go back to only setting up outputs that have a display connected. + +commit 35ab689bbde5f74752598cd743d735640486b639 +Author: Eric Anholt +Date: Wed Nov 8 19:35:49 2006 -0800 + + Fix i830DisableUnusedFunctions after pipe structure change. + + Using "pipe" instead of the index "i" meant pipe(3) got referenced instead of + a nice small integer. Oops. + +commit b649f95ea6fd3555d073fdbf8f2f035dfe1afd33 +Author: Alan Hourihane +Date: Wed Nov 8 19:01:25 2006 +0000 + + Disable some debug message + +commit 75f4df278e9db360967d77cdba4756cbde622d56 +Author: root +Date: Wed Nov 8 13:56:32 2006 +0800 + + 855 fix + +commit f1ff01e31eb8e9dc05190bf1a8b318d4f587f64a +Author: Keith Packard +Date: Sat Nov 4 00:46:18 2006 -0800 + + Eliminate operatingDevices member and PIPE_* values. + + operatingDevices and MonType1/MonType2 duplicate information already stored + in the device structures. Eliminate them and replace uses with direct + references to the appropriate other data. + (cherry picked from 3ab7f9693217d8fe993bdc94c376b219b0082961 commit) + +commit 0b2d36d4f038c4e8fa08632b6f1368627f010392 +Author: Keith Packard +Date: Fri Nov 3 23:29:12 2006 -0800 + + Use pI830->availablePipes instead of MAX_DISPLAY_PIPES everywhere + (cherry picked from e4bcec796e80e9fd66ab0c36394f5946915531f1 commit) + +commit d0ef9e99acb9e999e1b6d3eb76edc6355555043b +Author: Eric Anholt +Date: Mon Nov 6 18:30:46 2006 -0800 + + Restore PFIT_CONTROL before turning the LVDS back on in the restore method. + +commit 94a3731c2b4f2ea2e696a8c87dccc0d214d41e8e +Author: Eric Anholt +Date: Mon Nov 6 18:26:48 2006 -0800 + + Move PFIT_CONTROL disable for G965 up before post_set_mode. + + Also, remove setting of some other random registers that appears to have + been spammed in at the same time, and don't try to disable on the I830, before + this register existed. + +commit beb89163d73376e70870e6e2a6b19863f3a058b1 +Author: Keith Packard +Date: Sun Nov 5 19:06:45 2006 -0800 + + DSPSURF must be page aligned. Place intra-screen offset in DSPBASE. + + DSPASURF/DSPBSURF can only take page aligned values, ignoring + the lower order bits. So, place the offset for the output + within the frame buffer in the DSPABASE/DSPBBASE registers instead. + +commit 997e8c9bb4235cab1fff4738387df9afcbea0a03 +Author: Keith Packard +Date: Sun Nov 5 18:56:33 2006 -0800 + + Don't allocate stuff in the first 256K of video memory (GATT?) + + Letting the ring buffer or other objects be allocated within the lowest + portion of memory appears to trash some memory mapping data; I'm assuming + this is the GATT table on the 965. Just marking this out of bounds for + allocation fixes this problem. + +commit 5a355c72614ed77f2000e5ede45f3ff5990c79d9 +Author: Keith Packard +Date: Sun Nov 5 18:51:28 2006 -0800 + + Fix CRT output on 965 chipset. + + A few more register settings are needed to get CRT output working on the + 965 chipset, in particular the the SDVO/UDI clock multiplier register + needed to get set to the default value (3). No, I really don't know what + this does, but it does get the CRT running at a wide range of sizes. + +commit 49a6bea7d969dbfd1dd542c0c3e02abc330d6850 +Merge: 64447c7 fbb376b +Author: Wang Zhenyu +Date: Mon Nov 6 10:25:23 2006 +0800 + + Merge branch 'master' into crestline + +commit 68c3185046b27ab936ca6c92b924b443b3cd6fce +Author: Keith Packard +Date: Sun Nov 5 13:30:32 2006 -0800 + + Avoid crashing when disabling sdvo output. XXX + +commit 15ef08046bcc3e746453301379f7c5d1bf929ee1 +Author: Keith Packard +Date: Sun Nov 5 13:29:56 2006 -0800 + + Move remaining pipe mode setting logic to i830PipeSetMode + +commit 7fcb555735a58e19ccc10875b211402983170a87 +Author: Keith Packard +Date: Sat Nov 4 00:52:21 2006 -0800 + + Rename availablePipes to num_pipes + +commit 3ab7f9693217d8fe993bdc94c376b219b0082961 +Author: Keith Packard +Date: Sat Nov 4 00:46:18 2006 -0800 + + Eliminate operatingDevices member and PIPE_* values. + + operatingDevices and MonType1/MonType2 duplicate information already stored + in the device structures. Eliminate them and replace uses with direct + references to the appropriate other data. + +commit e4bcec796e80e9fd66ab0c36394f5946915531f1 +Author: Keith Packard +Date: Fri Nov 3 23:29:12 2006 -0800 + + Use pI830->availablePipes instead of MAX_DISPLAY_PIPES everywhere + +commit b7262a9a9110dac66e1a92c39dcb3ab59d95d081 +Author: Keith Packard +Date: Fri Nov 3 23:24:07 2006 -0800 + + Finish removing persistant vbe data + +commit 4625073244d4f521a07e12adcf0609e85658acbe +Author: Keith Packard +Date: Fri Nov 3 23:23:38 2006 -0800 + + Oops, martian memset of randr modes pointer + +commit 719ad68515be9b996a6314de5448843de1146b88 +Author: Keith Packard +Date: Fri Nov 3 19:41:41 2006 -0800 + + Use VBE only temporarily to fetch BIOS rom image + (cherry picked from 6a9386651785afc70a29e355255e8295b321f28e commit) + +commit 27df2ff7908ea7ea2943a5f3445e12dbc24d97c9 +Author: Eric Anholt +Date: Fri Nov 3 15:55:10 2006 -0800 + + Report pipe status (and status mismatches) in i830DescribeOutputConfiguration() + +commit ecbe73b940b2d642115de4b73c2f757eb46ff956 +Merge: 561af00 9681602 +Author: Eric Anholt +Date: Fri Nov 3 15:59:59 2006 -0800 + + Merge branch 'modesetting-origin' into modesetting + + Conflicts: + + src/i830_display.c + +commit 561af007974b8cdad1eea907fb73ed9d430c21ac +Author: Eric Anholt +Date: Fri Nov 3 15:26:14 2006 -0800 + + Add support for load-based CRT detection. + +commit e416b426d83de031441ada7a77b6bd66cec8b5c9 +Author: Eric Anholt +Date: Fri Nov 3 15:25:41 2006 -0800 + + Print out modelines as info, not error (which had been used for debugging). + +commit 282a9e073ea985cbf0d0f3f296d593af1426bad5 +Author: Eric Anholt +Date: Fri Nov 3 13:46:09 2006 -0800 + + Don't memset the modes pointer on init, which was dereferencing NULL. + +commit 9681602177124e84a817a1e1d428f1779f2a45c9 +Author: Keith Packard +Date: Fri Nov 3 12:55:25 2006 -0800 + + Create I830PipeRec to hold pipe-specific data. Remove unused I830 members. + + I830 contained six parallel arrays for pipe-specific data; these + have been moved to a I830PipeRec structure instead. + + I830 also contained several unused members: + + unsigned int bios_version; + Bool newPipeSwitch; + Bool fakeSwitch; + int fixedPipe; + + These have been removed, along with the code that set them. + +commit 0510671a6c5233468ac20f0ec8096e084df03ce6 +Author: Eric Anholt +Date: Fri Nov 3 10:58:23 2006 -0800 + + Fix a pasteo in I965 register restore. + +commit 2c9ab6e0594769274f2dbcdf7c00fe297fc385d5 +Author: Keith Packard +Date: Thu Nov 2 13:44:55 2006 -0800 + + set the v_sync_off_high to zero. XXX should check docs + +commit 56f6d4f1bb67f447500af3f4f7fa557c3e887baa +Author: Keith Packard +Date: Thu Nov 2 13:42:17 2006 -0800 + + Disable the panel fitter when not using it. Cleans up SDVO DVI output. + + The panel fitter appears to exist on the 965 hardware (at least) and + causes troubles with DVI output over SDVO when enabled. This patch + checks to see if the panel fitter is pointing at the pipe being configured + and disables it unconditionally in that case. The LVDS driver will configure + it correctly if necessary afterwards. + +commit f22d9bcc25aea19ba38d35282367b591fd1b7ca0 +Author: Keith Packard +Date: Thu Nov 2 13:34:45 2006 -0800 + + Add another couple of new registers + +commit a9eac38bcdb49df2ce1122b49bd8b1eb19e8cae5 +Author: Eric Anholt +Date: Thu Nov 2 13:24:54 2006 -0800 + + Remove duplicated register defs that were just added. + +commit 7887c76062b7c79e14fb8e4f13486aa592dcbce8 +Author: Eric Anholt +Date: Thu Nov 2 12:27:21 2006 -0800 + + Add airlied's I2C code, ifdeffed out. + + I've gone back to compare our behavior to it several times, so I'll just keep + the code in tree for now. + +commit 87b15cfbf762468d4b8728b3e7a39c76654017de +Author: Eric Anholt +Date: Thu Nov 2 11:30:21 2006 -0800 + + Remove dead specifiedMonitor field. + +commit 2636d68663a02f6d9eaf36971706b67036ebf56c +Author: Keith Packard +Date: Thu Nov 2 11:57:11 2006 -0800 + + Dump more registers for debug purposes + +commit 786ec54c4c1540f4aced63ef21d567c3b9f3282e +Author: Keith Packard +Date: Thu Nov 2 11:56:50 2006 -0800 + + Add a few more registers from the 965 spec + +commit 85e32ad2dadcce1134fcadb14ece8ff30f3925f2 +Author: Keith Packard +Date: Thu Nov 2 11:56:12 2006 -0800 + + ch7xxxSaveRegs receives real type instead of void * + +commit ffbd6ca09bc2300bf967d7c248a559d85b8706e0 +Author: Eric Anholt +Date: Wed Nov 1 13:05:44 2006 -0800 + + Remove dead VESARec struct. + +commit 97c3a1b2421031e41f0b2b1630fde1dc4262d264 +Author: Eric Anholt +Date: Wed Nov 1 13:04:08 2006 -0800 + + Remove the refresh rate appended to some mode names. + + This gets the SDVO and CRT outputs I have to have at least 1 common mode + according to RandR. + +commit 7971c401554c218c84a8c45335c9b31bbccfece7 +Author: Eric Anholt +Date: Wed Nov 1 12:42:56 2006 -0800 + + Attempt to pull monitor physical size information out of DDC EDID data. + +commit fb94c1210966f7875e5f034f10ea31c06c502c3a +Author: Eric Anholt +Date: Wed Nov 1 12:23:50 2006 -0800 + + Move mode lists from per-pipe to per-output. + + This should let RandR do the right thing in exposing the modes to userland. + + As a side effect of getting this working, the SDVO pixel clock range code + was fixed and the mode valid tests for various outputs got extended. Also, + LVDS grew a get_modes for the fixed panel mode. + + Note that we now no longer do automatic enabling of outputs at xrandr -s 0, + hotkey, or VT switch. That will be left to generic RandR code later. Also, + generic modes and user-defined modes are once again not validated into the + lists, so this is a regression there. + +commit f30d7f912f36b110c3af7dc795e35456593781ab +Author: Eric Anholt +Date: Wed Nov 1 11:50:51 2006 -0800 + + Update for the move of RandR phyiscal size information. + +commit 64447c7a059775e7ea8649f4714df7565e932c60 +Author: Zou Nanhai +Date: Wed Nov 1 14:36:20 2006 +0800 + + walk around to VBIOS bug in Crestline B0 + +commit 7195dfabd56239f08cdd8175a2ef3a66ef9600de +Author: Eric Anholt +Date: Tue Oct 31 17:10:08 2006 -0800 + + Give each output a get_modes function and expose those modes through RandR. + + The get_modes should return the probed modes only. The driver should then + append to the list (for example, compatible modes listed in other outputs, + or standard VESA modes) to create the list to expose through RandR. That + isn't done yet. + +commit cc3728be2481637dda321d3bc2e4e89a220699cd +Author: Eric Anholt +Date: Tue Oct 31 15:00:36 2006 -0800 + + Add compat definitions for M_T_PREFERRED and M_T_DRIVER for older X Servers. + +commit a71f283650e8cb7b760e5a53c4db79202c4cc5c4 +Author: Eric Anholt +Date: Tue Oct 31 14:46:23 2006 -0800 + + Connect output detection up to RandR. + +commit 68cef9f4e028755bbf3e1862da2ef47d46ddaa6a +Author: Eric Anholt +Date: Tue Oct 31 14:32:00 2006 -0800 + + Move output connection detection to a per-output method. + + This will be used by RandR, and should let us clean up some of the initial + display configuration, hopefully. + + Also, analog hotplug-based detection is now enabled on G965. + +commit 9fd719fce27f916ab5120f6e1234affa14eaed9d +Author: Eric Anholt +Date: Tue Oct 31 14:29:44 2006 -0800 + + Move SDVOB_PRESERVE_MASK next to SDVOC_PRESERVE_MASK. + +commit 4f5d4d8870fc2784192f95a561163cf4fc8737ac +Author: Eric Anholt +Date: Tue Oct 31 13:37:23 2006 -0800 + + i830SetLVDSPanelPower is now a static function in i830_lvds.c, so remove it. + +commit 49bbdf16c02107c08169f8d2b6e9c6dbd7d8cd95 +Author: Eric Anholt +Date: Tue Oct 31 10:44:45 2006 -0800 + + Fix many inconsistencies in the SDVO code compared to the spec. + + Also, fix some struct padding so that the right bits are sent out. + +commit e7d546cac06767ec58325396a3bb5780b2257c53 +Author: Eric Anholt +Date: Mon Oct 30 11:24:43 2006 -0800 + + Remove some dead code from BIOS modesetting. + +commit 2ca57040b0cd24ad3dbe693789091e28be4e69f8 +Author: Eric Anholt +Date: Mon Oct 30 11:19:19 2006 -0800 + + Remove GetBIOSVersion(). + + This info hardly useful now that we don't use the BIOS for mode setting. + +commit 837b2f632062bc29268f109895a577bd90cabd6d +Author: Eric Anholt +Date: Mon Oct 30 11:17:55 2006 -0800 + + Warning fix. + +commit bca9e6ccbd14eb8f2f103e8e64b28a623113d494 +Author: Eric Anholt +Date: Mon Oct 30 11:17:27 2006 -0800 + + Remove SetPipeAccess and now-unnecessary VBE reinit. + +commit 819a47b27cd4728feb269a08be32403304993ffa +Author: Eric Anholt +Date: Mon Oct 30 09:50:33 2006 -0800 + + Use the new fields for SDVO pixel multiply on the G965. + + This should fix display at resolutions/refresh rates in a different multiplier + class than the console display (generally, high resolution modes). + +commit 71545db4614cfc4650acc4325912474e777c3b36 +Author: Eric Anholt +Date: Mon Oct 30 09:46:10 2006 -0800 + + Return and use valid status bits for i830_sdvo_get_trained_inputs(). + +commit c357eca10ca1c535d305e1f3028471a912ae4102 +Author: Eric Anholt +Date: Mon Oct 30 09:44:55 2006 -0800 + + Clean up whitespace in i830_randr.c. + +commit fbb376bd1a4daad4c86e349df98438989ce173f1 +Author: Wang Zhenyu +Date: Mon Oct 30 14:15:12 2006 +0800 + + Bug 8594: Fix Xv hang with G965 + +commit c0ee50c4ee5ff2c594fdf60c9cb8b952e25644de +Author: Thomas Hellstrom +Date: Fri Oct 27 19:13:33 2006 +0200 + + Add support for the new DRM memory manager. + Some code are duplicated with the new libdrm. + Once this code has been released with xserver, + it can be removed. + + See the man page for new options and backwards + 3D driver compatibility. + +commit 25e6e497824a23eb231fc6fd6e483f601d612cee +Author: Eric Anholt +Date: Thu Oct 26 15:47:49 2006 -0700 + + Major cleanup of 3D invariant state, fixing hangs with rotation and render. + + Now, the generic invariant state is always set while the X Server is active, + and happens automatically when the X Server grabs the DRI lock. More 3D state + is moved to the generic code. + + Then, the 3D consumers (video, rotation, render) set last_3d to their enum + entry, and can update their own invariant state when another consumer was + active. + +commit 0bdcce2e4541c6e441c44aad49254ad3093cedb2 +Author: Eric Anholt +Date: Thu Oct 26 14:30:46 2006 -0700 + + Note alignment requirement for i915 3D (texturing). + +commit c3666a968b1cfac61b7867874d5fbe2acd894720 +Author: Eric Anholt +Date: Thu Oct 26 14:30:25 2006 -0700 + + Don't write unused values beyond the end of scale_units array. + +commit 3ab9f5a4a8cd62c8a8c2a09d3d105adbe815a83d +Author: Eric Anholt +Date: Tue Oct 24 00:26:09 2006 -0700 + + Move vbeInfo out of the driver struct to the one place it's used. + +commit df14838eb5d0a056f663d9f12bd8b5c25cf97330 +Author: Eric Anholt +Date: Tue Oct 24 00:18:33 2006 -0700 + + Remove dead memsize reporting. + + The calculation no longer made sense, as we don't use the BIOS for mode + selection. + +commit 3a6104ab89b159241845314ccf88fa62da14cf7d +Author: Eric Anholt +Date: Mon Oct 23 19:15:30 2006 -0700 + + Remove disabled I830DetectMonitorChange(). + + This used to be called when switching back in to X. It might make some sense + to detect monitors at this time (it happens to occur at resume time, when + monitors are likely to have changed), but it should probably live in either + userland policy with RandR 1.2 or RandR 1.2 XFree86-DDX generic code. + +commit 88c12f577f80fa132ec45cdf456d8060f2ece4fd +Author: Eric Anholt +Date: Mon Oct 23 18:57:57 2006 -0700 + + Move LVDS initialization and blacklisting damage to the LVDS support file. + +commit 2631014e9d5b2e64908ea413729eb5fd819b17fc +Author: Eric Anholt +Date: Wed Oct 25 12:21:44 2006 -0700 + + Clean up the SDVO code. + + The main change is to send SDVO commands using data passed into the send + command function, and receive responses into memory passed into the read + response function, rather than stuff things in/out through dev_priv->sdvo_regs. + This lets us use structures to represent some arguments, which results in a + nice cleanup (and 100% fewer arguments named magicN as a side effect). + + Also, the mode set path is changed to not do any preferred input timing + work. We weren't doing anything legitimate with the results, since we didn't + modify the CRTC timing appropriately, so now we just stuff the CRTC timing into + both and hope for the best. This should probably be revisited later. + +commit ddb986e54f5320359abac06f512f2d3f446872db +Author: Eric Anholt +Date: Tue Oct 24 17:47:58 2006 -0700 + + Nuke trailing whitespace in SDVO code not already cleaned up. + +commit cd2f0d948a6cae61b0d77d2c7184ed8d695be8c3 +Author: Eric Anholt +Date: Tue Oct 24 17:47:47 2006 -0700 + + Clean up SDVO code, moving the private structure internal and cleaning up caps. + + All the SDVO code should now be in lower case rather than StudlyCaps. + + This also adjusts the I2C setup to create a bus per SDVO output we set up. + The previous setup with shared buses was failing in some circumstances, which + is probably due to the lack of refcounting in xf86i2c.c. + +commit cd9c6e29146e1debaba4b0b9ad0d241f07bdbc14 +Merge: c5cca4c eec5580 +Author: Keith Packard +Date: Tue Oct 24 16:53:46 2006 -0700 + + Merge branch 'modesetting-origin' into modesetting + +commit eec5580cefffc293bf547372ab63b2fedaef4a83 +Merge: 53c28b3 a91c0cb +Author: Eric Anholt +Date: Mon Oct 23 14:52:55 2006 -0700 + + Merge branch 'overhaul' into modesetting + +commit a91c0cbab5de51885bfce7c7dce76f82c1b19553 +Author: Eric Anholt +Date: Mon Oct 23 14:30:38 2006 -0700 + + Add work-in-progress integrated TV-out support. + + This is the TV connector on board for the 915GM and 945GM. + + It is currently not hooked up to output initialization as it's entirely + untested. However, I think this is a reasonable starting point for getting + TV-out actually working. + +commit 7d67324fa3a5b5cf0227550316c366752fe4abfb +Author: Alan Hourihane +Date: Mon Oct 23 17:29:17 2006 +0100 + + Add some MergedFB checks for accelerator limitations + +commit 20d263805a365be548279758bc39d027d6e56d63 +Merge: 8548fa5 5ac927d +Author: Alan Hourihane +Date: Mon Oct 23 14:24:41 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 8548fa53746c9886eccfb67d022136471d8f3316 +Author: Alan Hourihane +Date: Mon Oct 23 14:23:29 2006 +0100 + + Fix manpage to report 8160 instead of 6144 for LinearAlloc. + +commit 5ac927d6f05ba6f9608d7e758cbac66e8b3a9db1 +Author: Michel Dänzer +Date: Tue Oct 17 13:27:40 2006 +0200 + + Don't crash if SetCursorPosition is called with pScrn->currentMode == NULL. + + This allows the driver to work with servers that don't have the fix for this + that was only recently pushed to git. + +commit 8149681f2eac0af3b70a9457c5204e17da56142b +Author: Eric Anholt +Date: Mon Oct 16 16:51:04 2006 -0700 + + Add a per-output mode-valid method. + + This is currently disconnected, but will be used in more overhaul work. + This should be where any output limitations, such as clocks, resolution, + scaling limits, or other options, are validated. Other limitations, such as + chipset resolution limits, CRTC clock limits, etc. should be elsewhere. + +commit c5cca4c20ae6b519e3b021a9d90809c1b3d1facb +Author: Keith Packard +Date: Fri Oct 13 15:31:43 2006 -0700 + + Advertise textured video adapter first + +commit adae75ef2f8a655a699e982ca8f26b934dbe950a +Author: Alan Hourihane +Date: Fri Oct 13 17:10:27 2006 +0100 + + Make VIDEO_DEBUG into a configure option + +commit 1d4cfaa391ac41099de11b8f3b21e5eb56543909 +Author: Alan Hourihane +Date: Fri Oct 13 13:55:10 2006 +0100 + + Bump to 1.7.2 + +commit cd9e51cd3ab0b36d2f97dfc6d8850dafe169c221 +Author: Alan Hourihane +Date: Fri Oct 13 13:54:31 2006 +0100 + + Ugh. Turn off debugging. + +commit 334aa062c333f2c59bc40e1b9239d3ea71c88a8f +Author: Alan Hourihane +Date: Fri Oct 13 12:59:30 2006 +0100 + + Bump to 1.7.1 + +commit 8045a7a0af1b276cd7f46ce99d034fd5d503e67c +Author: Alan Hourihane +Date: Fri Oct 13 12:53:53 2006 +0100 + + Fix bug #8553 & #8542 - suspend/resume regression from 1.5 driver + +commit 6596333b077a692c669f8cb4ae32e145f8da6731 +Author: Alan Hourihane +Date: Fri Oct 13 12:48:16 2006 +0100 + + Fix some warnings + +commit 1838671476875e9f5b3dde235eacf9fb43afb66c +Author: Eric Anholt +Date: Tue Oct 10 12:41:01 2006 -0700 + + Only disable the output when marked disabled. + + Also, remove a couple of dead variables. + +commit 4198f1216eb13b30d1e92d4395e98861f4324c38 +Author: Wang Zhenyu +Date: Tue Oct 10 15:50:10 2006 +0800 + + Mark current ps kernel is experimential with little test. + +commit d485c1f2de11db92b515690fbe38b6aeb6207605 +Author: Wang Zhenyu +Date: Tue Oct 10 14:11:35 2006 +0800 + + Use sf_prog.h instead + +commit 2591c1fcf15608d96031be4760cf08534461ca34 +Author: Eric Anholt +Date: Mon Oct 9 14:20:49 2006 -0700 + + Fix LVDS restore path, and move pipe assignment for outputs to the right place. + +commit 09e3d10b0ff69d180467fa9099d12da08e4f681b +Author: Eric Anholt +Date: Mon Oct 9 13:09:18 2006 -0700 + + Add a function for describing the output connection configuration. + +commit 317cc119c575650c1aa8bf992a0f42bdfffcd7ba +Author: Eric Anholt +Date: Mon Oct 9 11:49:18 2006 -0700 + + Move per-output mode setting code to per-output methods. + + This is not a very clean interface, as a number of outputs require tweaks to + the DPLL registers. When possible, the DPLLs are just adjusted in the + per-output post_set_mode, which happens just after the DPLL is enabled. + However, this seems better than the previous method of having all outputs + programmed in the same function. + +commit 53c28b3980d2682de830e8f86553ccad71527ac1 +Author: Adam Jackson +Date: Sat Oct 7 11:18:26 2006 -0400 + + Expand the check for AOpen Mini-PC. + + Just match on subsystem vendor, don't bother inspecting the subsystem device + ID, since apparently they're all busted. + +commit bf3820f1f505649ac0730add23d97d6de3f6d22c +Author: Keith Packard +Date: Fri Oct 6 21:57:26 2006 -0700 + + Compute LVDS resolution from server DPI and native panel size. + + I was unable to find the native LVDS panel physical size in the BDB + information. I would prefer to report accurate information through RandR if + possible though. + +commit c7a23908a0ef45b14b438f656a5f15582bfcbc1c +Author: Alan Hourihane +Date: Fri Oct 6 13:35:39 2006 +0100 + + Fix server regeneration problem mapping the aperture + +commit d649fb0d964a9b40b8e04314b5fc14bbbfd41bc3 +Author: Keith Packard +Date: Thu Oct 5 22:46:07 2006 -0700 + + Don't require MonitorLayout when two monitors are plugged in. + + With randr12 working, we can just leave the second monitor off for now. + +commit 9bb7736ab36f172db58703c4664bb1b0cd7f80c3 +Author: Eric Anholt +Date: Thu Oct 5 16:02:02 2006 -0700 + + Remove checks for output privates in various bits of code. + + Now, the output is only set up if it fully initializes, so it will never exist + if the private it requires doesn't. + +commit ada8f62da263d1e93e22df4e0b1149bf1dbe24d4 +Author: Eric Anholt +Date: Thu Oct 5 15:55:07 2006 -0700 + + Give each output type an init method in its file, making other methods static. + +commit 0a5504e59f90abecedd81a8435b88a60fe098f29 +Author: Keith Packard +Date: Thu Oct 5 09:11:29 2006 -0700 + + Fix DPI at startup in RandR 1.2 code. + + Use requested monitor resolution to compute the appropriate screen size when + resizing the screen during RandR initialization. + +commit 4ac81d58b7e0fbffbb4981deffe6a576be821a9b +Author: Keith Packard +Date: Wed Oct 4 23:22:52 2006 -0700 + + Remove mode origins, add preferred mode count. + + Just tracking changes in the 1.2 protocol spec. + +commit 103b4edce7859ddf58f3e1fadeb427a5e85c7acd +Author: Eric Anholt +Date: Wed Oct 4 15:00:19 2006 -0700 + + Move the save, restore, and DPMS per-output settings to per-output files. + +commit 16988b27258acfe3d56fc2415aa9ade1ae8d03a9 +Merge: cc4148e 5a06000 +Author: Keith Packard +Date: Wed Oct 4 18:44:43 2006 -0700 + + Merge branch 'modesetting-guitar' into modesetting + +commit 5a060002487e16c53dc96e32af72cd1bfcf6a227 +Author: Keith Packard +Date: Wed Oct 4 18:43:07 2006 -0700 + + Add mode origins for randr + +commit 07cdc60be8ebe5d0c21149f3cd2aeb8fed05022a +Author: Alan Hourihane +Date: Wed Oct 4 11:05:30 2006 +0100 + + Fix bug #5795, VT switching fails because of a bad test on some platforms. + +commit 8da10d15f84ccc992b828546af5ba0d848e7263e +Author: Keith Packard +Date: Tue Oct 3 22:00:14 2006 -0700 + + Enable XV_PORT attribute even when not in Clone mode. + + As Clone mode is now something that can change after server startup, always + enable the XV_PORT attribute as we cannot change the list of reported + attributes. + (cherry picked from 1bc1cedbcdf6ea4d2a3e8b07b553ac50b3c126f4 commit) + +commit cc4148e25dc226cb1365e090db21f01b77cb3cbe +Merge: 1bc1ced 3e6f81f +Author: Keith Packard +Date: Tue Oct 3 22:00:41 2006 -0700 + + Merge branch 'modesetting-origin' into modesetting + +commit 1bc1cedbcdf6ea4d2a3e8b07b553ac50b3c126f4 +Author: Keith Packard +Date: Tue Oct 3 22:00:14 2006 -0700 + + Enable XV_PORT attribute even when not in Clone mode. + + As Clone mode is now something that can change after server startup, always + enable the XV_PORT attribute as we cannot change the list of reported + attributes. + +commit 33629ed304b64e45d5640397bd1807c5a98907d1 +Author: Keith Packard +Date: Tue Oct 3 09:39:22 2006 -0700 + + Always register list of modes for outputs, even when disabled. + +commit 3e6f81f70f65a5ba6b5c3a4e0eeaf67776a5f54d +Author: Eric Anholt +Date: Mon Oct 2 09:53:57 2006 -0700 + + Move cursor base address register setting to a separate function. + +commit f337eea9e73cbf5c71d07df50d2e5b661a1f34cf +Author: Alan Hourihane +Date: Mon Oct 2 11:16:42 2006 +0100 + + silence warning + +commit 2b9bdd8a4021231e4b5f4c5831a46c9ff1e38081 +Author: Alan Hourihane +Date: Mon Oct 2 11:12:23 2006 +0100 + + bump to 1.7.0 + +commit eca082ca0fec12973a4dbb0106b841136b5b6cdb +Author: Alan Hourihane +Date: Sat Sep 30 13:44:43 2006 +0100 + + Missing gamma bit + +commit cece9a455b54ab184a3277c164ee6dfa65b70f48 +Author: Alan Hourihane +Date: Sat Sep 30 13:27:27 2006 +0100 + + Fix issues with Xv locking up the engine. bug #7915. + +commit 2013b839de3733fd12becb2cc3c1daadde329eb4 +Author: Michel Dänzer +Date: Thu Sep 28 13:49:44 2006 +0200 + + Always call I830UpdateXineramaScreenInfo() unconditionally, and document why. + +commit 92c5020bbd31e02c7224798a8f094d237afa19a0 +Author: Wang Zhenyu +Date: Thu Sep 28 13:55:52 2006 +0800 + + Fix picture's transform checking + +commit 518802843284973f1f86132afd805c0e662e1ba6 +Author: Wang Zhenyu +Date: Thu Sep 28 11:15:33 2006 +0800 + + Fallback in mask picture for now + + Do it later after finish wm kernel program. + +commit 25ff5baad95c205c7c690da72fc0f252b3ed9289 +Author: Wang Zhenyu +Date: Thu Sep 28 11:09:52 2006 +0800 + + Fix compile, add wm header file. + +commit c3a49b5123d094280b5ff358ceef961958319ce4 +Author: Wang Zhenyu +Date: Thu Sep 28 10:36:00 2006 +0800 + + Add simplest wm kernel program for no mask picture composite + + This is a try to use new gen4asm language, and will finish + composite program for mask picture with or without CA case later. + +commit 6ea16bf6b06c8b3aed4d2c98679ab28304d1b56c +Merge: fdb6de6 b970166 +Author: Eric Anholt +Date: Wed Sep 27 16:38:01 2006 -0700 + + Merge branch 'master' into modesetting + + This reverts most of the mergedfb code. This will instead be done in device- + independent RandR code. + + Conflicts: + + src/Makefile.am + src/i810_driver.c + src/i810_reg.h + src/i830.h + src/i830_cursor.c + src/i830_driver.c + src/i830_modes.c + src/i830_video.c + +commit fdb6de663579d3b9f31bf9e8a93430b8505ca73f +Author: Eric Anholt +Date: Wed Sep 27 13:59:41 2006 -0700 + + Re-disable broken load-based CRT detection. + +commit 1407a42c7378706644fd8be554b43b0e7b581011 +Merge: 25890ec 4bd3b89 +Author: Eric Anholt +Date: Wed Sep 27 13:33:23 2006 -0700 + + Merge branch 'randr-1.2' into modesetting + +commit 25890ecda9fd00fad9bc53dea83fc58e0013fcdf +Merge: 965609f 117ff04 +Author: Eric Anholt +Date: Wed Sep 27 13:33:17 2006 -0700 + + Merge branch 'acpi-hotkey' into modesetting + + Conflicts: + + src/i830.h + src/i830_driver.c + +commit 117ff04b504578a24dff70659e2db1b81aaa1177 +Author: Eric Anholt +Date: Thu Sep 21 17:03:34 2006 -0700 + + Attempt to make the ACPI hotkey support a little more modesetting-compatible. + + Previously, we watched for the BIOS to have changed the layout, and repaired + the resulting configuration. Now, we request that the BIOS make no changes, + but leave a note in a register for when the key has been pressed. When we + notice this, we reprobe monitors and turn on/off the things we find. + + This is a temporary solution until we can get the hotkey hooked up as an + input key to external applications to control the change using RandR 1.2. It + is also untested as neither of my laptops do anything with the hotkey. + However, this code does result in many fewer BIOS calls. + +commit fe691953f08b4d299295f91450412404ba42810b +Author: Michel Dänzer +Date: Thu Aug 31 18:35:10 2006 +0200 + + Store viewport limits of both pipes in SAREA. + + This allows DRI clients to determine which pipe they should synchronize buffer + swaps of each window to. + +commit 06c5f7bd076e9ba4b925e061a40b837714bc8267 +Author: Michel Dänzer +Date: Wed Aug 30 19:45:33 2006 +0200 + + If the DRM can handle it, enable vertical blank interrupts for both pipes. + +commit 89cbc6e215a5f313ccc17370424c35630cf75892 +Author: Michel Dänzer +Date: Thu Aug 24 10:30:27 2006 +0200 + + Only enable the IRQ after DRIFinishScreenInit. + + This makes sure we've been assigned a context ID, so the interrupt context + won't mess things up if it grabs the HW lock. + +commit 185df8a18102eea79b8c8e11304dfee148ac2002 +Author: Wang Zhenyu +Date: Wed Sep 27 16:48:43 2006 +0800 + + Add mask sampler state + +commit 1422d4f04ac2d57899eee91f6522f8670f7263da +Author: Wang Zhenyu +Date: Wed Sep 27 13:54:14 2006 +0800 + + change some src sampler states + + sampler for mask should also be set up, and fix + default border texel. + +commit 6614b4bda2e079fd1e56e0825894481b80e2df58 +Merge: d6ca9fe b3ddcf3 +Author: Alan Hourihane +Date: Mon Sep 25 12:04:01 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit d6ca9feb78a9211758510751bbf47013caabff49 +Author: Alan Hourihane +Date: Mon Sep 25 12:03:27 2006 +0100 + + Fix bug #7943 where video flickers when changing + attributes. This code was a leftover from testing lockups + and shouldn't be needed anymore. + +commit 52a4f2a02b8f38108bfa866bf74b1596b8125512 +Author: Wang Zhenyu +Date: Mon Sep 25 14:35:51 2006 +0800 + + Add file for i965 exa composite + + This does not include ps program, which will be added + in g4a form. + +commit f272f0d811f9ee059e8f8617a516e6c8bff917a1 +Merge: ff202f8 b3ddcf3 +Author: Wang Zhenyu +Date: Mon Sep 25 14:15:21 2006 +0800 + + Merge branch 'master' into exa + +commit 4bd3b89c73b6c5aa9b0eb553ad5d553ee0e8a489 +Author: Keith Packard +Date: Sat Sep 23 16:41:38 2006 +0100 + + Oops, duplicated CRT-redetect code. + +commit c34490bbda6604a21809d15c798607806fa6c725 +Author: Keith Packard +Date: Sat Sep 23 12:00:43 2006 +0100 + + Construct default monitor description for hotplug non-DDC monitor. + + When detecting a monitor that doesn't support DDC, construct a default + monitor with "sensible" values instead of using whatever the builtin LCD + screen uses. Clearly we need a way to set the monitor parameters when we + cannot detect them. + +commit 965609f6fa63e28e5a28128f5bc44f8c4d7b9f68 +Author: Eric Anholt +Date: Fri Sep 22 09:51:45 2006 -0700 + + Restructure i830_bios.c so we don't leak a copy of the BIOS per generation. + +commit c52242c22779a51aa12b18a7a589080ce44c8484 +Author: Eric Anholt +Date: Fri Sep 22 09:41:07 2006 -0700 + + Remove some dead code related to clock ranges. + +commit c2446be9b444b16c95f78dab17bf130f9f491ee2 +Author: Eric Anholt +Date: Fri Sep 22 09:38:11 2006 -0700 + + Remove the GetDevicePresence BIOS call which just printed BIOS information. + + Because we aren't using the BIOS to set modes any more, what the BIOS thinks is + present is probably even less important than before. + +commit b6ba268d0d5f22c6a18ce45416452fce83438620 +Author: Eric Anholt +Date: Fri Sep 22 09:31:37 2006 -0700 + + Remove the no-longer-connected VBERestore option. + +commit 20956a5d6f1eb518717a680e58938f31461ca5e4 +Author: Eric Anholt +Date: Fri Sep 22 09:27:30 2006 -0700 + + Remove unused display{Attached,Present} fields. + +commit 2cd28be71472d67956f47c7d49283ebabefa089a +Author: Eric Anholt +Date: Fri Sep 22 08:55:55 2006 -0700 + + Remove empty SAVERESTORE_HWSTATE code. + +commit ff202f8e2ae4117b464c94047001023d5d0531cc +Author: Wang Zhenyu +Date: Fri Sep 22 15:02:19 2006 +0800 + + Fix a typo to mark sync for XAA. + + This should fix the scrolling screen corrupt in + XAA method. + +commit d87d1f5bb0475c6f651fcb7e2cab2a7d46edcc69 +Author: Keith Packard +Date: Fri Sep 22 02:20:35 2006 +0100 + + Remove BIOS from non-BIOS related names. + + Lots of names included BIOS for no apparent reason; as we try to eliminate + BIOS calls from the driver, these only serve to confuse us. + (cherry picked from 8e5d280d94ad3d3ba3c75871c17abec9da62ed34 commit) + +commit b3ddcf3348365873aed4a2b8b2750b330fb4cf26 +Author: A Costa +Date: Thu Sep 21 23:18:43 2006 +1000 + + Typo fix in man page (Debian bug #364559). + +commit 4820caf46e050761d9b347b8a440381e1b1f4727 +Author: Keith Packard +Date: Thu Sep 21 01:47:27 2006 -0700 + + Make planeEnabled track pipes controlled by randr. + + Also add code to deal with disabling pipes. + +commit c11c445bdeac34253b48192a5d406b55ff8b2be7 +Author: Keith Packard +Date: Thu Sep 21 01:23:10 2006 -0700 + + Consistently use Cursor A on Pipe 0 and Cursor B on Pipe 1. + + Mixing random cursors and pipes didn't work very well. I'm left wondering + whether the palette stuff will work on pre-9xx series hardware though; it is + special cased everwhere else. + +commit 4a8b9515e914369e1faf1dca6b11204b233c73ee +Merge: 18a510b bdca869 +Author: Keith Packard +Date: Wed Sep 20 22:46:55 2006 -0700 + + Merge branch 'modesetting' into randr-1.2 + +commit bdca8697cc6ac5a98e0548b2ce2e0032e9bcfa52 +Merge: d9db5ec daade50 +Author: Keith Packard +Date: Wed Sep 20 22:46:42 2006 -0700 + + Merge branch 'modesetting-origin' into modesetting + +commit 18a510bf9af2f288c0e94359f672775d6e9c9ab2 +Merge: f6500e9 d9db5ec +Author: Keith Packard +Date: Wed Sep 20 22:45:48 2006 -0700 + + Merge branch 'modesetting' into randr-1.2 + +commit f6500e94fec0d6db8c1f1350bee1d137bf06a09e +Author: Keith Packard +Date: Wed Sep 20 22:38:55 2006 -0700 + + Update driver for RandR 1.2 X server API. + + This is not entirely what I'd like to see, but it's at least functional. + + Limitations: + Can't disable/enable crtcs + Can't move outputs on/off crtcs + + But, it does handle monitor hot-plug, detecting changes in VGA and SDVO + status on-the fly. Which makes for good demo material. + +commit daade50ca271d1cdf236bbe84afade85d4111ac9 +Author: Linus Torvals +Date: Wed Sep 20 12:07:09 2006 -0700 + + Add standard C headers to fix build on some systems after xf86_ansic.h removal. + + This appears to have been hidden for others by header pollution in X Server + headers. + +commit 1681fe6bb041385e5aefb11baa9afd1f614abc5b +Author: Wang Zhenyu +Date: Wed Sep 20 09:36:02 2006 +0800 + + Revert "fix default tex wrap mode with clamp" + + oops, we've set border color to all zero, which should + give us transparent in RepeatNone case. + +commit d9db5ec6866555ec13ba3ddabb1516eb45637afa +Merge: cbaf3cf e3f4caf +Author: Keith Packard +Date: Tue Sep 19 16:03:04 2006 -0700 + + Merge branch 'modesetting-origin' into modesetting + +commit 5adb05f0b82ee3a168142d803ab3434f75cf15a3 +Author: Wang Zhenyu +Date: Tue Sep 19 17:14:05 2006 +0800 + + fix default tex wrap mode with clamp + + we don't set any 'default' border color, + default tex wrap mode should be clamp to edge. + +commit e3ab89b0327ef6ff790ab53bba29c721aef032cd +Author: Eric Anholt +Date: Tue Sep 19 10:27:36 2006 +0800 + + shader program fix for component alpha set + + If CA is set and blend op needs src alpha, the src + value is not needed and should be (src.A * mask.X). + This is found in handling exa magic two pass composite. + +commit 37429c3ecb97df8faf0f3f56128d7a2b22eb8a5e +Author: Wang Zhenyu +Date: Tue Sep 19 10:08:31 2006 +0800 + + misc cleanup + +commit e3f4caf40708478ef327b029d0a75944c51ea905 +Author: Adam Jackson +Date: Fri Sep 15 13:51:18 2006 -0400 + + Add model-specific tweaks for some funky 945GM boards. + + For the Aopen Mini-PC, ignore the claimed attached 800x600 LVDS panel. + Likewise for the Apple Mac Mini, but done slightly differently since it + shares PCI IDs with the Macbook Pro. + +commit bd758030a6a59af32f9d73655cb691e018e94a7d +Author: Eric Anholt +Date: Thu Sep 14 11:12:03 2006 -0700 + + Add a compile flag to enable syncing after each operation in EXA. + + This replaces other debug sync options sprinkled around the EXA code. It + doesn't change the mis-rendering of text on the 915. + +commit f46c70e877a3432ba23696e1a16d5906183876af +Author: Eric Anholt +Date: Thu Sep 14 10:05:51 2006 -0700 + + Add a note on maxX/maxY for the 2D rendering. + +commit ce00db054bf0b7f62ff0be312d7e3470141922dc +Author: Eric Anholt +Date: Thu Sep 14 10:00:06 2006 -0700 + + Replace a couple of mis-uses of the screen's bpp when the pixmap's was needed. + +commit 71c2dd63361be9616c77db80a93445307d63dd41 +Author: Eric Anholt +Date: Thu Sep 14 09:54:19 2006 -0700 + + Replace duplicated sync code in exa with a call to I830Sync. + + The I830Sync version has additional code for the 965. + +commit 564c830a91afda76706a8c4c2f3287d0b8d514e9 +Merge: bf49084 b970166 +Author: Alan Hourihane +Date: Wed Sep 13 16:34:10 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit bf49084ad700f064b732bf39a163209eee1d6845 +Author: root +Date: Wed Sep 13 16:32:39 2006 +0100 + + bump max Xvideo height to 1088 to cope with some players. + +commit 59ce4180b95270432540624a1fdf7ae8dd18a7f3 +Author: Wang Zhenyu +Date: Mon Sep 11 22:57:23 2006 +0800 + + reimplement Solid function + + Replace COLOR_BLT_CMD with XY_COLOR_BLT_CMD, by which + device would care for direction and provide a (x,y) coord + interface. This fixes pixmap artifacts even in no composite + case. + +commit 2b9c87bbf8ee5f7f56631114eb98303cd80e4a48 +Author: Eric Anholt +Date: Fri Sep 8 11:14:05 2006 -0700 + + Remove xf86_ansic.h usage. + +commit b970166eab95ac024ff481b0f5fd9aaf3644aabf +Author: Eric Anholt +Date: Fri Sep 8 11:09:19 2006 -0700 + + Fix a compile failure from the last commit. + +commit 2b7602847aa7ae9b4e88fbea070710695d2cb8a4 +Merge: e4cdc42 b45f4b5 +Author: Eric Anholt +Date: Fri Sep 8 11:02:41 2006 -0700 + + Merge branch 'exa-origin' into exa + + Conflicts: + + src/i915_exa_render.c + +commit e4cdc42a98dd1be74e5c2bf5d9566f7449523b14 +Author: Eric Anholt +Date: Thu Sep 7 10:32:02 2006 -0700 + + Remove another debug printf. + +commit 099be52a3bb52516fb5e8d56c154a4d6b6707e09 +Author: Eric Anholt +Date: Thu Sep 7 10:28:09 2006 -0700 + + Re-remove xf86_ansic.h, and move copyright to the top of the file. + +commit 4ad577f83f7190df4d64e66fbf7c515ee6f411ce +Author: Eric Anholt +Date: Thu Sep 7 10:24:23 2006 -0700 + + Remove the UTS/DFS implementations that just match the fallback versions. + +commit 8b9d7a5f8560ee55ca5cb5376517a4246cd79fb9 +Merge: 6500a3a 1e6e288 +Author: Alan Hourihane +Date: Thu Sep 7 17:45:57 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 6500a3aa134e11a75b7ddaf7fff253003b223241 +Author: Alan Hourihane +Date: Thu Sep 7 17:45:28 2006 +0100 + + When in MergedFB mode, fix offscreen memory allocation. + +commit c378328ece701756ddca966eb108e2b1f5c3ed6c +Author: Eric Anholt +Date: Wed Sep 6 11:15:17 2006 -0700 + + Remove a debug printf. + +commit 1e6e288b8826789f3b2520d12426ff7852a67ccd +Author: Eric Anholt +Date: Fri Sep 1 16:47:17 2006 -0700 + + Add a check for intel-gen4asm, and rules to compile {wm,sf}_prog.h using it. + + This adds assembly source for the two programs used in the textured video + implementation on the 965, which should make them easier to modify in the + future. The compiled versions are also included, so that intel-gen4asm isn't a + build requirement for people that aren't modifying these programs. + + There are minor differences in the compiled versions of these programs compared + to their previous versions which were compiled with a different tool. I + believe the changes should be harmless, and video continues to work on my + system. + +commit cbaf3cf74bd420533d299c4113761ec536097e33 +Author: Keith Packard +Date: Thu Aug 31 18:25:21 2006 -0700 + + verbose debug message for panel sync data + +commit 1feb733eb8b09a8b07b7a6987add5149c53b0157 +Author: Alan Hourihane +Date: Tue Aug 29 14:54:15 2006 +0100 + + Fix bug with probing info of DFP2 and LFP2 connected + devices (Aaron Ridout) + +commit 26e6c074c17b2d4e9b9f165468ad45a3b0ecc0ef +Author: Alan Hourihane +Date: Mon Aug 28 11:55:38 2006 +0100 + + Fix SetVBlank to operate all the time + +commit b45f4b54b189a496255ddae12af38fc4c4408a51 +Author: Wang Zhenyu +Date: Fri Aug 25 16:23:18 2006 +0800 + + Making render log a little quiet in normal + +commit 6f0d352b83fc9f39dd86edbda9af83243b50c764 +Author: Ross Burton +Date: Thu Aug 24 18:16:42 2006 -0700 + + Bug #7957: Fix distcheck. + +commit cc79b3ec19a7e858972228a270ef774041eb8946 +Author: Wang Zhenyu +Date: Thu Aug 24 10:28:59 2006 +0800 + + Current 915 render operations for 915G/945G only + +commit 078af29fa65653c5322b006404f7ad29aec24cce +Merge: 7458a6a ea63e82 +Author: Wang Zhenyu +Date: Thu Aug 24 10:23:22 2006 +0800 + + Merge branch 'master' into exa + + Conflicts: + + man/i810.man + src/Makefile.am + src/i830_accel.c + src/i830_dga.c + src/i830_driver.c + +commit ea63e82ef417a9918e7d7105910a8ddeba2994f6 +Author: Alan Hourihane +Date: Tue Aug 22 16:40:08 2006 +0100 + + fix typo + +commit b7e57deebbda527e878326cf3e6358c0a48d7817 +Author: Wang Zhenyu +Date: Tue Aug 22 19:38:13 2006 +0800 + + pci id update for Crestline + + The "Crestline" banner should be replaced with official + name later. + +commit dc4128ea0781124984dee0cb41e7b6ee87e362a1 +Author: Alan Hourihane +Date: Mon Aug 21 12:13:42 2006 +0100 + + remove GL* usage + +commit dad0e7fc09fa7794f20278d9d99abd96a21b691e +Merge: 361c49a 43daaec +Author: Alan Hourihane +Date: Mon Aug 21 12:08:01 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 361c49ad3cfe58b9ab98dfb6e95de505c0d63730 +Author: Alan Hourihane +Date: Mon Aug 21 12:07:29 2006 +0100 + + Fix bug #7930, i810 doesn't compile without DRI + (Samuel Thibault) + +commit 43daaec63929c1f0e54a5125375d8147629da4b9 +Author: Eric Anholt +Date: Thu Aug 17 15:57:31 2006 -0700 + + Bug #7905: Mark DRI state as dirty in 965 textured video, fixing hangs with 3d. + +commit cdcc6f23e8cad797e6cfd57e2ff454ec8509b5ba +Author: Alan Hourihane +Date: Wed Aug 16 17:16:28 2006 +0100 + + Disable device check when mergedfb in operation. + +commit a94c96abf90c691faecbebf0c8d08f8010bc67ef +Author: Alan Hourihane +Date: Wed Aug 16 17:15:26 2006 +0100 + + Fix bug #5150. Disable LVDS usage on i915G, i945G and i965G. + +commit 2a4e486d2990af433e915cfa26dc57cae02e01b7 +Author: Wang Zhenyu +Date: Fri Aug 11 11:07:08 2006 +0800 + + Fix undefined alloc type for agp memory + + This shuts up the nonfatal warning that type 3 for alloc agp + memory is undefined for intel-agp. + +commit 4cfed93df6b23903704348cafe050a6546e84479 +Author: Eric Anholt +Date: Thu Aug 10 15:41:32 2006 -0700 + + Bump to 1.6.5 for release. + +commit 38e7e48418cd48a46e48f5bc8a6547721db8f76d +Author: Eric Anholt +Date: Thu Aug 10 15:38:14 2006 -0700 + + Fix README typos from in the generated file. + +commit 975e60261088dee124b329d28c64e508bce1f90b +Author: Eric Anholt +Date: Thu Aug 10 13:49:43 2006 -0700 + + Bug #7829: Fix reported driver version. + + The driver now reports itself as the PACKAGE_VERSION from autoconf. The DRI + DDX -> client interface version is dissociated from this so that we can do + appropriate major/minor versioning of the interface that's not tied to the + package version. Bumped the i830 ddx dri version patchlevel to note the + fix in the previous commit. + +commit 820e9a22fdb759cbdaac4a488322825bc0908b0d +Author: Eric Anholt +Date: Thu Aug 10 13:37:18 2006 -0700 + + Bug #7835: Restore unused fields in I830DRIRec to avoid i915 DRI breakage. + + As it was, 1.6.4 broke compatibility with the released DRI driver. + +commit caa3b35cd772fc75d65a7ff791f00addbb39a764 +Author: Eric Anholt +Date: Wed Aug 9 16:11:30 2006 -0700 + + Correct typos in README source. + +commit 2a7426cf138e518a5eafb40f478359160a7ec98b +Author: Eric Anholt +Date: Wed Aug 9 15:47:09 2006 -0700 + + Clean up warnings. + +commit 24e59a0daa20b7c3e5028c9ca7972052801d02a1 +Merge: bb60807 32f1199 +Author: Eric Anholt +Date: Wed Aug 9 14:19:06 2006 -0700 + + Merge branch 'textured-video', bringing in fixed-up i915 textured video. + + Conflicts: + + src/i830_video.c + +commit bb6080735efc40e103e92b65d0c2f1f729156632 +Author: Eric Anholt +Date: Wed Aug 9 12:21:16 2006 -0700 + + Bump to 1.6.4 for release. + +commit 3ca14275d13b1261b69b0e3fda90a112cb567472 +Author: Keith Packard +Date: Wed Aug 9 10:35:57 2006 -0700 + + Add missing headers to i810_drv_la_SOURCES + +commit 309374f78df35207b1398e14bba986fb891f3643 +Author: Keith Packard +Date: Wed Aug 9 10:30:41 2006 -0700 + + Use double quotes to avoid sgml syntax error + +commit dca9f856ca21e63abeb87e4ef2c40944c26d4429 +Author: Keith Packard +Date: Wed Aug 9 10:29:59 2006 -0700 + + Reformat README + +commit b19ea222727ed47b69d28a03242c09d3a6ab2673 +Author: Eric Anholt +Date: Wed Aug 9 10:01:29 2006 -0700 + + Update the README.sgml file for the upcoming release. + +commit f8b47f607297e0591b63e5f25296af07ee74f433 +Author: Keith Packard +Date: Tue Aug 8 16:19:51 2006 -0700 + + Update manual page to include i945 and later details. + (cherry picked from 7833d0733bc146cf1ae7f588516c49797886b396 commit) + +commit d150b53d102c511f3c9245ef1f6fd36c12b01ca3 +Merge: bb65a4d bc5f565 +Author: Eric Anholt +Date: Tue Aug 8 15:51:58 2006 -0700 + + Merge branch 'i965', adding i965G support. + + Conflicts: + + src/i830_cursor.c + src/i830_driver.c + +commit bc5f56568021d8c63313e2b6bf30710e7516c04a +Author: Eric Anholt +Date: Tue Aug 8 15:48:04 2006 -0700 + + Intel bug #49: Fix video output at 32bpp by using B8G8R8A8 instead of B8G8R8X8. + + While here, don't overallocate video memory for the i965G state. + +commit c3b3d479788fcea7e543f29acf83c85b8b148fbe +Author: Alan Hourihane +Date: Tue Aug 8 15:28:14 2006 -0700 + + Intel bug #35: Fix accelerator syncing with DGA. + + Fixes glitches seen with Mark Vojkovich's "texture" demo. + +commit bc12208f6e145ec29c3ebe38ae04dc2ebca1b4cc +Author: Wang Zhenyu +Date: Mon Aug 7 13:27:00 2006 +0800 + + Disable error register dumping in dri TransitionTo2d. This's for + debug which might confuse QA. + +commit bb65a4dc55b416437d61ccbee8b6056fe8e08357 +Author: Alan Hourihane +Date: Tue Aug 8 14:51:18 2006 +0100 + + bump to 1.6.3 + +commit 37644293da751bfc7268c9fc74ecda1044607dee +Author: Alan Hourihane +Date: Tue Aug 8 14:42:32 2006 +0100 + + check for xineramaproto + +commit 3661d4df86db012682ab4b393287aa02e9fc8453 +Author: Alan Hourihane +Date: Tue Aug 8 12:25:03 2006 +0100 + + Re-enable monitor detect after a few fixups. + +commit 995b142f510d1daab3914d336f3c0d017a043b41 +Author: Alan Hourihane +Date: Tue Aug 8 12:01:39 2006 +0100 + + Disable detecting of new monitors on VT switch. + It's doesn't always work. The modesetting + branch will deal with hotplug displays correctly. + +commit 8e5844bbf9c8880c9eb6eff29b6db2db06b01933 +Author: Alan Hourihane +Date: Tue Aug 8 11:43:10 2006 +0100 + + bump to 1.6.2 to indicate mergedfb support + +commit 421b415e23c1ddc78837cd222167d6ed71a3ef88 +Author: Alan Hourihane +Date: Tue Aug 8 11:28:42 2006 +0100 + + Fix a build problem. + +commit e4f63eaf5efb654121db148f2f8e32cc3b23b6b5 +Merge: 633a683 e26f3e3 +Author: Alan Hourihane +Date: Tue Aug 8 11:07:56 2006 +0100 + + Merge branch 'master' of git+ssh://xorg.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 633a683a4adcb9a44a54519fd7ff66aab2d12f97 +Author: Alan Hourihane +Date: Tue Aug 8 10:23:29 2006 +0100 + + Ensure palette is updated in mergedfb & clone modes + +commit 71e3e2d4e3b2a2c538fe6f1cea41f442fdb8d756 +Author: Alan Hourihane +Date: Fri Aug 4 20:39:50 2006 +0100 + + Fix a problem creating the I2C bus for the SDVOC + interface, due to a name match with SDVOB. + + Bus names must be unique. + +commit 0fd4831fdcf4c8f43d80c66e43eff8942f89b324 +Author: Eric Anholt +Date: Fri Aug 4 00:21:53 2006 -0700 + + Disable dynamic front buffer mapping on i965. + + Moving front buffers should only be necessary for rotation. Currently, the + server isn't ready for it, and the method attempted to work around it caused + crashes with DRI. Since i965 doesn't support rotation yet, this should be + harmless for now. + +commit 8d0a5138503586cbf980eb9464f2db91b72509c7 +Author: Eric Anholt +Date: Thu Aug 3 19:16:59 2006 -0700 + + Add parenthesis so that IS_I965G doesn't make the test pass for 8-bit. + +commit aa69018c01d2fa963fb940718dbd653d6ca2c9eb +Author: Eric Anholt +Date: Thu Aug 3 19:12:15 2006 -0700 + + Turn off video debugging now that it appears to work fine. + +commit d15f87110807111ab7d71f1254ebe3dfef1fee80 +Merge: a79aa0d d56ffa5 +Author: Eric Anholt +Date: Thu Aug 3 19:08:34 2006 -0700 + + Merge branch 'broadwater-video-rehash' into i965 + + The previous merge wasn't done on a synced-up tree, and missed necessary + changes. + +commit a79aa0d7b27b0b9b032472776d7dda410fd66a98 +Merge: 760021e f9e94c1 +Author: Eric Anholt +Date: Thu Aug 3 17:58:56 2006 -0700 + + Merge branch 'broadwater-video-rehash' into broadwater + + Conflicts: + + src/Makefile.am + src/common.h + src/i810_driver.c + src/i810_reg.h + src/i830.h + src/i830_accel.c + src/i830_cursor.c + src/i830_dri.c + src/i830_dri.h + src/i830_driver.c + src/i830_memory.c + src/i830_rotate.c + src/i830_video.c + +commit 760021e3983f7783900075b8c9603bd4fbe7e0a2 +Author: Alan Hourihane +Date: Thu Aug 3 17:08:39 2006 -0700 + + Add current Tungsten Graphics code drop for i965 support. + +commit d56ffa5f35e3cf4262d66469052b2122fdb24027 +Author: Eric Anholt +Date: Thu Aug 3 16:03:50 2006 -0700 + + Bump PS_MAX_THREADS to 32 now that the program doesn't fail. + +commit 4525379d95ff292d7322e1a7a516c0bedd1f7543 +Author: Eric Anholt +Date: Thu Aug 3 16:03:15 2006 -0700 + + Make the sampler's payload be the WM payload rather than uninitialized data. + + The sampler's payload happens to be in the same format as the WM payload, + though most of the fields are ignored. + + This appears to fix the program in the presence of multiple PS threads. + +commit ad2c70b4121121f1fb53190ea49edf2323c804a9 +Author: Eric Anholt +Date: Thu Aug 3 12:47:19 2006 -0700 + + Remove some stale XXX-prefixed comments. + +commit f9e94c17c55e4c75802d8574c908744e286e7843 +Author: Eric Anholt +Date: Wed Aug 2 21:18:19 2006 -0700 + + Set the WM scratch space that we had already allocated. + + It appears to be required, even if the kernel doesn't use any scratch space. + +commit aefa6fdfc5300546caeb64ace14a7854d3dc7dae +Author: Eric Anholt +Date: Wed Aug 2 21:14:14 2006 -0700 + + Clean up GRF allocation (which was wrong at 16-register boundaries). + + Also use PS_MAX_THREADS rather than hard-coding 1 thread, and remove the dead + SF_KERNEL_NUM_URB macro. + +commit 7a64e14624514ef31f6fa9f15e8804c45f930212 +Author: Eric Anholt +Date: Wed Aug 2 20:48:13 2006 -0700 + + Crank down the SF allocation and comment on why this is a fine lower limit. + +commit bc6a2bb7576a7c1e7971f6d1e0b893b2ada1aaa3 +Author: Eric Anholt +Date: Wed Aug 2 20:34:57 2006 -0700 + + Remove the clip URB allocation. + + Previously, the VS was misconfigured and exceeding its allocation, which the + (unused) clip was providing padding for. + +commit defe2795429484ffe4c1438bafb86bb5e5469ba9 +Author: Eric Anholt +Date: Wed Aug 2 20:32:41 2006 -0700 + + Correct the VS setup, and allocate a correct, minimal number of URB entries. + + The VS number of URB entries and URB entry size are always used, even when + the VS is disabled. Similarly, the cache enable bit is always used. + +commit b57ccb682cb3dea3e26c6f1b0c709e63dfde0d31 +Author: Eric Anholt +Date: Wed Aug 2 19:46:15 2006 -0700 + + Replace the SF max threads setting with a define for easier tweaking. + + Tweak it to 1 for now. + +commit 82037a12758c41a304f2e0bbd033d3345cccbe1a +Author: Eric Anholt +Date: Wed Aug 2 19:33:28 2006 -0700 + + Remove CS URB allocation since we don't use any constants. + +commit 1d45668d7a42bfa5d7f5bfb68d8bae38bda0936b +Author: Eric Anholt +Date: Wed Aug 2 19:18:20 2006 -0700 + + We only need 3 vertices to fit in the URB, since we only dispatch 3. + +commit a076d35bed6f13cf943a0f8948176aa0c999e2da +Author: Eric Anholt +Date: Wed Aug 2 19:16:03 2006 -0700 + + No GS URB allocation is necessary when the function is disabled. + +commit befa655168fb8dcb6806592eb44f7ac49f191822 +Author: Eric Anholt +Date: Wed Aug 2 19:11:38 2006 -0700 + + Reduce URB_VS_ENTRY_SIZE to 1 as our vertices are under 8 floats. + +commit 33acbdca0a0f82725e5bf7887b325726403a6ffd +Author: Eric Anholt +Date: Wed Aug 2 19:09:19 2006 -0700 + + Remove the VS kernel and binding table. + + The VS URB entries have to remain as they're used to store the VF output which + isn't modified by a VS program. + +commit aafa48cb85cd03c735fb968a4275c19e1a68cd02 +Author: Eric Anholt +Date: Wed Aug 2 18:26:26 2006 -0700 + + Fix wm prog to correct the ordering of the Cr and Cb channels. + +commit bc2c842d93de04d48c7de60482814db346bd0b78 +Author: Eric Anholt +Date: Wed Aug 2 18:10:01 2006 -0700 + + Allocate space for the 965's state at the end of the video buffer. + + Fixes corruption in the first few lines of the video. + + Based on 1b506798d98d911be733543da2c40cb451a28912 + +commit 524460ea1f02bb6e8e2239d7763334666012cec4 +Author: Eric Anholt +Date: Wed Aug 2 17:47:55 2006 -0700 + + Updated WM kernel to load video and do colorspace conversion. + +commit ba896c779c697e1d7458028798ec49013bd9da9f +Author: Eric Anholt +Date: Wed Aug 2 17:47:37 2006 -0700 + + Updated grf/urb state for WM. + +commit e5c572f841b626b8b6f21a6966a33956d3b0b35b +Author: Adam Jackson +Date: Wed Aug 2 20:47:12 2006 -0400 + + Fix a braino in mode list pruning. + + Interpreting the size of the display in centimeters as the size in pixels, + and then clipping the modes list based on that, rarely does what you want. + +commit 21b62df7c34217be5dd95985c35e33be11c25846 +Author: Eric Anholt +Date: Wed Aug 2 17:36:49 2006 -0700 + + Move the WM kernel to a separate file. + +commit 5d3424492f9586a4c5a28962a9757f48f2c12e83 +Author: Eric Anholt +Date: Wed Aug 2 17:34:12 2006 -0700 + + Replace SF kernel with the one from broadwater-video HEAD. + +commit 7458a6adb5ea62f56bb3d4ab19ad7d1aa6ad2d19 +Author: Eric Anholt +Date: Mon Jul 31 10:09:17 2006 -0700 + + Move MAPSURF_XBIT settings into the texture formats structure. + +commit 7ea74843bbdbf54b6804727be9b41d26832c8f76 +Author: Eric Anholt +Date: Mon Jul 31 10:06:34 2006 -0700 + + Whitespace cleanup. + +commit e71108f1e05b7a8d8edd174eb64edd6cccacbcdc +Author: Alan Hourihane +Date: Fri Jul 28 10:32:12 2006 +0100 + + Fix DGA with MergedFB + Turn off rotation support when MergedFB enabled + +commit a91a4f95c664f6905fef61dab251707bf2548bb8 +Author: Alan Hourihane +Date: Thu Jul 27 16:11:48 2006 +0100 + + Fix pipe reversal for Xv + +commit ac3ad32f667b306e771617d784648f7111743f1a +Author: Alan Hourihane +Date: Thu Jul 27 15:28:42 2006 +0100 + + Calculate allowable refresh rates on the private + mode data for each independent screen in mergedfb. + + Lots of other fixes too. + +commit 30952e58ed83e2e18d1007f662d2cc9a773c876c +Author: Eric Anholt +Date: Wed Jul 26 13:42:12 2006 -0700 + + Limit drawing to the destination pixmap's boundaries, not the screen's. + + This shouldn't matter, as miComputeCompositeRegion shouldn't giving us + anything that would draw outside the bounds, anyway. + +commit cffd2cd36d0437b38ac8164d66ea71be50b19330 +Author: Eric Anholt +Date: Wed Jul 26 13:22:51 2006 -0700 + + Fix hangs when compositing with a mask. + + The modify bits in the mask field for sampler/map state appear to actually + be enable bits. So, prepare the state values in I915TextureSetup, + then write the sampler/map state out all at once in PrepareComposite. + +commit 96754b822df7ac110a70b2d08dda2ebb299772be +Author: Eric Anholt +Date: Wed Jul 26 13:19:12 2006 -0700 + + Fix a couple of typos from code review. + +commit e786e2f9f3a4df31702736db6f68a44c9ebba546 +Author: Alan Hourihane +Date: Wed Jul 26 16:45:38 2006 +0100 + + When detecting new monitors in mergedfb renew the modepool. + +commit 8e6e990db34d63174670512f494fa9adb44786f5 +Author: Alan Hourihane +Date: Wed Jul 26 10:48:47 2006 +0100 + + Update Xvideo to deal with MergedFB modes. + +commit e26f3e30b30a57ab4aad0267d689a9a5d7a5e877 +Author: Alan Hourihane +Date: Wed Jul 26 09:17:52 2006 +0100 + + Fix a build problem + +commit b919db75d2f6dc1019f981534b0d5d87c6029727 +Author: Alan Hourihane +Date: Wed Jul 26 09:07:19 2006 +0100 + + Bump to 1.6.1 + +commit 9c93d1498fa2363c52ef7fbe97d781560f67acf5 +Author: Eric Anholt +Date: Tue Jul 25 21:17:05 2006 -0700 + + Oops, partial revert of last commit. Some were obviously not NOOPS. + +commit 38d1a5e0dbe059f5c01bd5120a108a386ff10718 +Author: Eric Anholt +Date: Tue Jul 25 21:09:12 2006 -0700 + + Replace some OUT_RING(0)s with OUT_RING(MI_NOOP) to remind me why they're there. + +commit fd19b12793f09b6714468556ace875ef36ed9e1c +Author: Alan Hourihane +Date: Tue Jul 25 11:14:11 2006 +0100 + + Add mergedfb support to the intel driver with + additional pseudo-Xinerama support. + +commit aec88cf4c66833f89afa5f8fa4f8bcf30b2b6b4b +Author: Wang Zhenyu +Date: Mon Jul 24 15:46:19 2006 +0800 + + remove crap blit in UploadToScreen, we should find a more + efficent way and implement blit correctly. + +commit 32f1199937e92b9100aba52cbbb97157014e3182 +Author: Wang Zhenyu +Date: Mon Jul 24 15:42:15 2006 +0800 + + remove an extra '-' + +commit 02c5c4cd1dd44058d80ec23cccfd45a13bc3bb2c +Author: Wang Zhenyu +Date: Fri Jul 21 12:54:06 2006 +0800 + + add copyright info + +commit 4f0ad337098eb0bacb1c11bc61d780ac18041e1d +Author: Wang Zhenyu +Date: Fri Jul 21 11:59:04 2006 +0800 + + fixup segfault in xaa when xaa not initialized in i830WaitSync. + +commit 914327f40d07a3f7c069752ce005bf8e21352b03 +Author: Eric Anholt +Date: Thu Jul 20 17:58:07 2006 -0400 + + Disable drawing to PICT_a8, and turn on support for non-extended repeats. + + We don't know what COLOR_BUF_8BIT does, so it's disabled for now while we're + stabilizing the code. + + The non-extended repeats appear to be working according to the rendercheck + tests on a8 and a8r8g8b8 sources. Masks continue to hang the card, as before + this change. + +commit 45cb032e2b7ac1e4c765fc29a2e4dd0cef19066d +Author: Eric Anholt +Date: Thu Jul 20 17:34:50 2006 -0400 + + Use MT_8BIT_A8 so PICT_a8 expands to (0,0,0,a) not (a,a,a,a) + +commit fd6d825ae0780f3daf436f4224bf5f177cb8630e +Author: Eric Anholt +Date: Thu Jul 20 17:25:31 2006 -0400 + + Move ss6 setting with other immediate state, and ensure that stencil is off. + +commit d6d6a44c66446f34b57394e5ea9a8e32917f7569 +Author: Eric Anholt +Date: Thu Jul 20 11:23:05 2006 -0400 + + Try to fix up the basic RepeatNormal and RepeatNone support. + + With RepeatNone, access outside of the drawable should return 0 alpha values, + which is done by using the border color. For RepeatNormal, we use the wrap + mode (which requires that we use normalized texture coordinates). + +commit 2b2173c618c080b1678990d65fe49b52bd8001b4 +Author: Eric Anholt +Date: Thu Jul 20 11:15:18 2006 -0400 + + The pixmap's drawable x/y coordinates are always 0, so don't bother using them. + +commit 9f1cec83e0aef36c7d3482e62e8f01595f1fd076 +Author: Eric Anholt +Date: Thu Jul 20 11:05:49 2006 -0400 + + The vertex data are all floats, so write the dest coords as floats. + +commit 4737955a62c39177e7a7ce7749a2f20e111afc68 +Author: Wang Zhenyu +Date: Fri Jul 21 01:02:38 2006 +0800 + + move i830 default coord set into I830EmitInvarientState + +commit a7e30bb051bc03063fe699473610a57054a64973 +Author: Wang Zhenyu +Date: Fri Jul 21 00:56:58 2006 +0800 + + Take from i915, blend ctl code cleanup. + +commit ac34a37cb60d763cbd99b6e2f6fdcb639592b99b +Author: Wang Zhenyu +Date: Fri Jul 21 00:52:59 2006 +0800 + + Take instruction fixes into i830, with indent changes. + +commit 3e86bf4273241daa23645f5a8104913e4205a74b +Author: Wang Zhenyu +Date: Thu Jul 20 13:43:27 2006 +0800 + + remove i915 default ctx setup. + +commit 5c945bf9eb9f5bedd34d98dcc7abc3f1ea3cb962 +Author: Wang Zhenyu +Date: Thu Jul 20 13:40:39 2006 +0800 + + Revert "Fix several size error with STATE3D_LOAD_STATE_IMMEDIATE cmd." + + This reverts commit 433cb6ba82698676f6f72e09834aba4d64611d54. + +commit d5243d1b35ab1db608c81889819e4d4d87048154 +Author: Eric Anholt +Date: Wed Jul 19 19:27:53 2006 -0400 + + The height and width of texture maps are one more than the programmed values. + +commit 13e372c2095fde94ae41bea959fba0ad95a59c08 +Author: Eric Anholt +Date: Wed Jul 19 16:42:57 2006 -0400 + + Fix the texture map pitch setting as documented, and as used by the 3d driver. + +commit da5efb09d55291ce5bcabff7db8d1490bb5e838b +Author: Eric Anholt +Date: Wed Jul 19 16:36:52 2006 -0400 + + Fix the alignment padding fix (didn't bump BEGIN_LP_RING count). + +commit 36aa43bf73ee1268f0a250788eb637a4123f08eb +Author: Eric Anholt +Date: Wed Jul 19 16:22:46 2006 -0400 + + Force texture alpha channels to 1 if not present. + +commit adce6bd0fc9533156da09da7d029ba0d76606b4f +Author: Eric Anholt +Date: Wed Jul 19 16:21:49 2006 -0400 + + Add a trailing MI_NOOP to frag shader output for alignment if necessary. + +commit 4e409ea44180f7ef2780d70c9d2f54629bbd0fc3 +Author: Eric Anholt +Date: Wed Jul 19 15:57:09 2006 -0400 + + The map bits per pixel must come from the drawable, not the visible screen. + +commit 449e4be503c8b938d5bd46ee810244f8bcf54ceb +Author: Eric Anholt +Date: Wed Jul 19 13:34:06 2006 -0400 + + Correct the DWORD count of several 3D instructions. + +commit f1b62d890ca22e12d61f7ef67bc4e35d68cde019 +Author: Eric Anholt +Date: Wed Jul 19 13:02:24 2006 -0400 + + Replace hand register setting with new i915 fragmet program API. + +commit 76a316d0cec92a04c8735926a76e76c21f960d7e +Merge: 433cb6b 8480516 +Author: Eric Anholt +Date: Wed Jul 19 12:31:36 2006 -0400 + + Merge branch 'master' into exa + + Conflicts: + + src/Makefile.am + +commit baf65ce98abcdd21dff2531a43bb9c5044732c28 +Author: Eric Anholt +Date: Tue Jul 18 19:42:37 2006 -0400 + + Re-convert i915 video to new fragment shader API. + + Although in the history of this branch it had happened before, this time it's + for real. + +commit bb81e8d6c777a5e16b8193c07667fbee8e21203e +Merge: 2a1b3cf 8480516 +Author: Eric Anholt +Date: Tue Jul 18 19:23:21 2006 -0400 + + Merge branch 'master' into textured-video + + This moves the i915 textured video implementation into i915_video.c to avoid + conflicts in register definitions with i830_reg.h when we use i915_reg.h. + This also means that i810_reg.h's i915 3D regs definitions are removed and + replaced with i915_reg.h usage. + + Conflicts: + + src/i830_rotate.c + +commit 84805167ab8a422966355b9753bfcb4dad802413 +Author: Eric Anholt +Date: Tue Jul 18 18:27:10 2006 -0400 + + Convert i915 rotate code to the new fragment program API. + +commit 5176d62ba58c100c87f75a4f333d00129d780c99 +Author: Eric Anholt +Date: Tue Jul 18 16:18:18 2006 -0400 + + Add an API for programming i915 fragment programs. + +commit 148ef9bdd9e0ef3e7ac86b56a8662b53a3ea9168 +Author: Eric Anholt +Date: Mon Jul 17 22:32:25 2006 -0700 + + Convert magic numbers to symbolic names in i915 rotate code. + + This doesn't cover the fragment shader yet, which we need to make a sensible + set of macros for (at least the basic bits). + + Reviewed by: md5 + +commit 433cb6ba82698676f6f72e09834aba4d64611d54 +Author: Wang Zhenyu +Date: Tue Jul 18 17:00:50 2006 +0800 + + Fix several size error with STATE3D_LOAD_STATE_IMMEDIATE cmd. + Issue texture coord set with proper scale value. + +commit 855a9f13cb7fd4f6c489ff280bf389475bbd9bbe +Author: Wang Zhenyu +Date: Tue Jul 18 10:02:47 2006 +0800 + + fallback in 'repeat' case for now + +commit a6d438ebe3cf141a0331e0cd55eb9b5e137a5e37 +Author: Keith Packard +Date: Mon Jul 17 14:11:19 2006 -0400 + + Disable spread spectrum clock usage. + + The spread spectrum clock generator that improves EMI characteristics for + laptop screens lives in an external chip that is programmed over an i2c bus. + Without correct programming, attempts to use this mode for the LVDS can + result in a DC signal being sent to the panel. + + Until we find programming information for this external chip, we should + leave this mode disabled. + +commit 16d6263e6518a4a05562e2842ff2d0fdb4710304 +Author: Alan Hourihane +Date: Sun Jul 16 20:39:52 2006 +0100 + + whoops, reverse part of that. + +commit 2f50f6d1b1b3fa4fbec98bd8fa5818df890070e7 +Author: Alan Hourihane +Date: Sun Jul 16 20:17:38 2006 +0100 + + move ContextMem out of XF86DRI + +commit c7083a267209c93b2a91ef00dea2ca840400d160 +Author: Eric Anholt +Date: Fri Jul 14 13:23:40 2006 -0700 + + Bug #7404: Only save/restore VGA fonts and not other VGA regs. + + This fixes a hang on the i945 during restore. It appears that saving/restoring + the VGA registers is not important, as we're correctly saving/restoring the + registers we touch within the driver anyway. + +commit 49b827605628d3e1a6d4d41447cf46c5f38cc0c2 +Author: Eric Anholt +Date: Fri Jul 14 14:23:04 2006 -0700 + + Add a register restore implementation so we don't crash on LeaveVT. + + We shouldn't ever need to save/restore the hi/lo frequency regs, as they're + read-only. + +commit 6a92a779646ec03a03a3b1f45170b2e705ce8934 +Author: Eric Anholt +Date: Fri Jul 14 14:20:41 2006 -0700 + + Don't try to probe on more pipes than we really have. + +commit 04d1584737fd0d14e99608a97281fd7b1549ae0e +Author: Wang Zhenyu +Date: Fri Jul 14 16:14:18 2006 +0800 + + Current exa render implement for i830 and i915, test on + 865GM and 915G. There is issue in picture 'repeat' support. + And also stop recursive behavior in I830WaitLpRing to allow + server to abort instead of system hang. + +commit de470aaf5c47f4d2b0f477ac678039ef43af773d +Author: Adam Jackson +Date: Thu Jul 13 19:10:11 2006 -0400 + + In I830xf86SortModes, catch cases where two modes are equal in only one + dimension, by comparing the areas of the modes. Otherwise, 800x600 would + sort before 1024x600 if it was added later. + +commit 22843830ebdd14247aa76d19f89494a56e2ac887 +Author: Adam Jackson +Date: Thu Jul 13 17:20:17 2006 -0400 + + Fix a thinko; would only inject the FP native mode if a mode list was already + found, which is never the case when there's no xorg.conf. + +commit 05bcbadd130524694e11e372d54cb419cea566cc +Author: Eric Anholt +Date: Tue Jul 11 14:05:38 2006 -0700 + + Avoid NULL dereference if cursor position changes during a mode change. + +commit b65f18b05a5fba506b71293b495cab95197037ac +Author: Eric Anholt +Date: Tue Jul 11 13:29:57 2006 -0700 + + Bug #7443: Respect the user's Modes configuration, and make it more useful. + + Now, mode names generated by DDC get names of the form "WIDTHxHEIGHTxREFRESH". + The matching for user Modes lines takes the user Modes as the prefix that + needs to match, rather than an exact string match or "WIDTHxHEIGHT" match. So + one can, for example, specify "1024x768" to get any old 1024x768, or + 1024x768x60 to get one of the modes named 1024x768x60. + +commit 5a2e04bd1b700a8a6e26136b8831ef5e4d11b565 +Author: Eric Anholt +Date: Tue Jul 11 10:21:51 2006 -0700 + + Fix crash with DDC when there are no user modes to add. + +commit f9499a68da0ce459fed0b29b998678fd81898a51 +Author: Luká\u0161 Hejtmánek +Date: Tue Jul 11 10:13:18 2006 -0700 + + Make gamma settings apply to the cursor as well, and fix clone-mode gamma. + +commit 7068468ac1951bfca0071bb9b1a99df4f37368a0 +Author: Luká\u0161 Hejtmánek +Date: Tue Jul 11 09:51:26 2006 -0700 + + Add support for adjusting saturation value of overlay video. + +commit b1c2ea653502dd8547079e7014b698f241433dff +Author: Alan Hourihane +Date: Tue Jul 11 08:13:30 2006 +0100 + + whoops, revert some unnecessary changes + +commit 8a44a7acfcadbba2410dca750afc9d32bc83706e +Merge: 584b544 e7723a4 +Author: Alan Hourihane +Date: Tue Jul 11 07:41:27 2006 +0100 + + Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel + +commit 584b544987be5cf23dce29ddaf3130e59cfe6fa8 +Author: Alan Hourihane +Date: Tue Jul 11 07:40:40 2006 +0100 + + Add an additional check before rotating + +commit b912bf5673e38e03b0b25c2f5d05fe7e26994ba1 +Author: Eric Anholt +Date: Mon Jul 10 18:35:20 2006 -0700 + + Clean up warnings in sil164 module. + +commit d75490701cdbf2ab6eab82eaa078790a5fe0aea0 +Author: Eric Anholt +Date: Mon Jul 10 18:21:04 2006 -0700 + + Hook up SiI164 mode setting (just a matter of turning the chip on). + + Also adds register dumping in case this turns out to not be enough, and fixes + a couple of prototypes. + +commit 426d26ea446d646fa8f561ea0e03c8e4a2c0c315 +Author: Eric Anholt +Date: Mon Jul 10 18:19:51 2006 -0700 + + Fix prototype for SaveRegs. + +commit 8d7987d00242020d29a2574ac0c8b6e55cc22112 +Author: Eric Anholt +Date: Mon Jul 10 17:34:57 2006 -0700 + + Move to 4-space indents in sil164. + +commit f5a01a2ef02125611d5fb74c20d53d52e544701a +Author: Eric Anholt +Date: Mon Jul 10 17:17:51 2006 -0700 + + Make DVO code light up my sil164-based DVI output, when already set up by BIOS. + +commit 23a0ee73bce12f9e0b881af420413aeec4c0517f +Author: Eric Anholt +Date: Mon Jul 10 17:16:18 2006 -0700 + + Fix modelist with a configured monitor to not begin with all unvalidated modes. + +commit 48ba9273ddfb36d3525e19238b94b18c56667c4d +Author: Eric Anholt +Date: Mon Jul 10 15:01:51 2006 -0700 + + Fix validation when the first mode is thrown out, and print hsync in modelines. + +commit 3924ffb7d7b71cb9c6ab9eeb12d0f1b2c26244c0 +Merge: 5a8f6a4 f76f94a +Author: Eric Anholt +Date: Mon Jul 10 12:12:38 2006 -0700 + + Merge branch 'dvo-merge' into modesetting + + Conflicts: + + src/i830_driver.c + +commit f76f94a743505da16e121992eb789c1f74eb7673 +Author: Eric Anholt +Date: Mon Jul 10 12:04:09 2006 -0700 + + Supply proper NULL-terminated symbol lists to avoid crashing. + +commit 5a8f6a486d79f50d2d659e615283289d59f9caa4 +Author: Eric Anholt +Date: Sat Jul 8 15:26:19 2006 -0700 + + Improve output bus setup to include LVDS setup for pre-i915. + +commit df333cc9a848bc2299a52a7613fe4ffdff8038a2 +Author: Eric Anholt +Date: Fri Jul 7 13:41:33 2006 -0700 + + Initial add of DVO support code. Probes my sil164. + + This is a mostly-untested merge of airlied's work. The I2C modules are intended + to be moved into the core server or a separate driver module when they're + functional and we're happy with the API. + +commit e1064f52b0ff69ea7937897b8c951cc3e32cd752 +Author: Eric Anholt +Date: Wed Jul 5 16:00:03 2006 -0700 + + Don't try to probe modes on an SDVO device with NULL sdvo_drv. + +commit ffa6ecc18bc54151061d9956f1d12575fc057da3 +Author: Eric Anholt +Date: Wed Jul 5 14:41:08 2006 -0700 + + More fixes to "choose closest mode for the pipe" code to select correct refresh. + +commit dfd7fef457c048c9f0d826e37d91453d9e1485b9 +Author: Eric Anholt +Date: Mon Jul 3 12:01:57 2006 -0700 + + Bug #7375: Don't double-free the current XF86 mode after a randr reprobe. + +commit 5d07ebdf4f23e16fb8f60eafeadc947701e7877c +Author: Eric Anholt +Date: Mon Jul 3 11:59:21 2006 -0700 + + Only override display size with the XFree86 mode's for actual panel scaling. + +commit 48f27ac62128251640a9b1ca54f63376676b47eb +Author: Eric Anholt +Date: Wed Jun 28 15:07:01 2006 +0200 + + Replace i830InjectModes with i830DuplicateModes usage. + + The remaining functionality of DuplicateModes was OBE, and the name was bad. + +commit ce5bd108c55d2378db072617c380514a39672603 +Author: Eric Anholt +Date: Wed Jun 28 14:21:49 2006 +0200 + + Validate and insert user and VESA standard modes for DDC or configured fallback. + + This isn't really tested because I lack a good CRT to test against currently. + +commit 367f69f8e7710e53dcd286f1b62506a3276e80f9 +Author: Eric Anholt +Date: Wed Jun 28 13:10:02 2006 +0200 + + Replace xf86ValidateModes usage with a set of custom validators and pruning. + + This moves us to maintaining MonPtrs per pipe instead of using the EDID + structure "xf86MonPtr", which is closer to what we want to be looking at when + doing validation. The new validation isn't enough yet -- particularly, we + aren't importing and validating the custom modelines to the pipes when + applicable, but this will be easier than (for example) trying to make flat + panel modes pass xf86ValidateModes through various gross hacks. + + Hotplug turn-on/off also happens at SwitchMode time now, instead of at randr + probe time. + +commit 9fbd3d8f4befb75ed6f6bd9a9ffe0175626e8785 +Author: Eric Anholt +Date: Tue Jun 27 23:31:40 2006 +0200 + + If the panel power registers are all zeroes on Mobile parts, disable LVDS. + + This is the case on the Mac mini, which is an i945GM but has no LVDS attached. + Powering on with the power timing registers zeroed would probably be a bad idea, + even if there was a panel attached. + +commit 56f7aedd0ad1f5645a90a5509b1263ec6b7b7ee1 +Author: Eric Anholt +Date: Tue Jun 27 00:37:56 2006 +0200 + + Fix randr current mode reporting and mode loss/mis-configuration on re-randr. + +commit b85f268051a785f90e4c55bd1cac80d673388f16 +Author: Eric Anholt +Date: Mon Jun 26 16:26:58 2006 +0200 + + Fix remaining warning. + +commit 6a3f89f4b6035534c7b93a4c05fd704305349785 +Merge: 3cdc537 e7723a4 +Author: Eric Anholt +Date: Mon Jun 26 16:25:58 2006 +0200 + + Merge branch 'master' into exa + + Conflicts: + + src/i830.h + +commit 3cdc53797bf6fdbfbcb53e07b269a5071f5ec97d +Author: Eric Anholt +Date: Mon Jun 26 16:23:55 2006 +0200 + + Fix build with new EXA headers. + +commit e7723a4e5725147d3bd9ba22c5a3314b0556e440 +Merge: 5111b88 dae9cb7 +Author: Eric Anholt +Date: Mon Jun 26 16:04:33 2006 +0200 + + Merge branch 'origin' + +commit 7104b915da412a26661bab7b5a940e935e8cbc8a +Author: Eric Anholt +Date: Mon Jun 26 15:11:13 2006 +0200 + + Clean up warnings. + +commit 21dc3edfc41987bb8cf0f8d265fba9775cbe8cdb +Merge: f113e90 5111b88 +Author: Eric Anholt +Date: Mon Jun 26 15:06:42 2006 +0200 + + Merge branch 'master' into modesetting + + Conflicts: + + src/i830.h + +commit 5111b883480a5a9cc82200f2684cba67b515aa73 +Author: Eric Anholt +Date: Mon Jun 26 14:53:10 2006 +0200 + + Turn on extra warning flags for GCC, and clean up the resulting fallout. + +commit f113e9002cf53510e30984f816d44b06f1e71216 +Author: Eric Anholt +Date: Mon Jun 26 12:54:30 2006 +0200 + + Fix the plane/pipe disabling and turn off missing outputs when no longer DDCed. + +commit 0e5cda3796ba0164496f0814eb57d1dfa7ab9257 +Author: Eric Anholt +Date: Mon Jun 26 10:30:46 2006 +0200 + + Fix FP scaling by using the desired mode to get at the real [HV]Display. + +commit 51d14f803aae6d0a738520c3cad110289ee444db +Author: Eric Anholt +Date: Mon Jun 26 10:21:23 2006 +0200 + + Add a function to turn off unused outputs, DPLLs, planes, and pipes. + +commit d2c18d8d79596513149273e4a0d322f04bf27e80 +Author: Eric Anholt +Date: Mon Jun 26 10:15:11 2006 +0200 + + Fix DDC probing after last (untested) commit. + +commit 6d1d105d68d9c25890c3fd2ebad1367529c2a991 +Author: Eric Anholt +Date: Mon Jun 26 10:14:27 2006 +0200 + + Unset pipe current mode on EnterVT, so we reprogram the mode for sure. + +commit 52e8231a19f28bd4744f983aee2197a18c20aa3a +Author: Eric Anholt +Date: Mon Jun 26 07:46:28 2006 +0200 + + Major cleanup of mode reprobing: + - Don't mess with pScrn->monitor->Modes, and instead make our own availModes. + - Don't re-program the pipe with the same values (no flicker at xrandr) + - Move a bunch of stuff that should be exposed through the public API (probably) + to i830_xf86Modes.c + - Use a table with established modes plus GTF to come up with modes from EDID, + instead of trying to walk and find one in pScrn->monitor->Modes. I think + this is correct. + - Reset clone state if we've detected new pipes, which should turn on the + cursor. + +commit f5e5f8aeddb3e0d6d073471aeff6176fb54576e2 +Author: Eric Anholt +Date: Fri Jun 23 23:29:55 2006 -0700 + + WIP to allow re-probing and validation of modes for new heads at "xrandr" time. + + Now, DDC modes always end up being preferred to custom modelines, even if + smaller. This should probably be fixed by inserting custom modelines into + the probed mode list if they're valid according to the probed parameters of the + monitor. + + Too much code is lifted from static functions in xf86Mode.c, and those should be + made unstatic if possible. Using xf86ValidateModes is also rather hacky, and + I want to break the function down, but this is a first step. + +commit 89791914d2a78f19f4f60ca370d387e5b1ccfb46 +Author: Eric Anholt +Date: Fri Jun 23 18:21:17 2006 -0700 + + Split probed modes out per pipe, and union them into the available modes. + + This is the first stage of getting runtime monitor attachment. The old i830 + GTF code is returned to use to provide suitable modelines for xf86ValidateModes + in the LVDS case, even though the LVDS doesn't care about the modeline and just + always programs its fixed values. + +commit dae9cb7712d5d8f88697ca83808c59af08364c0e +Author: Alan Coopersmith +Date: Thu Jun 22 15:07:16 2006 -0700 + + Provide definitions of __FUNCTION__ for non-gcc compilers + +commit bb4810521633b6c3db2fc7d01ddc71325583d265 +Author: Eric Anholt +Date: Thu Jun 22 09:38:27 2006 -0700 + + Move FP mode validation next to other mode validation code. + +commit 66d9a1be302ad34573de98de21cbdf6419592092 +Author: Eric Anholt +Date: Wed Jun 21 17:11:54 2006 -0700 + + Detect SDVO display presence at startup and default to displaying to it, too. + +commit 72e25a7488c2eabcc92e9e0769a89dee687f52fd +Author: Eric Anholt +Date: Wed Jun 21 16:04:18 2006 -0700 + + Fix SDVO output at low pixel clocks. + + I had interpreted the docs as saying that the multiplier setting would further + divide the clock and stuff dummy bytes in. Instead, we have to set the DPLL at + the higher clock rate, and the pixel multiplier just controls the stuffing of + dummy bytes. Also, we have to set the multiplier both in the graphics chip and + on the SDVO device on the other side. + +commit 726443309d72134341cff1f6db978aa1d6e3ce52 +Author: Eric Anholt +Date: Wed Jun 21 15:38:19 2006 -0700 + + Add decoding of SDVO command names for debug output. + +commit 5a1b68993f3a3a2e8dcd428a7118e29c36703cd6 +Author: Alan Hourihane +Date: Wed Jun 21 08:41:16 2006 +0100 + + Fix build without DRI + +commit 16b310823bacab6be4947da234b3a081b0a3cd62 +Author: Matthieu Herrb +Date: Wed Jun 21 00:12:27 2006 +0200 + + Fix build without DRI + +commit 896ffe78fe96469cdd3ade77c8e68e1503967223 +Merge: 89c2c4b 52243d4 +Author: Eric Anholt +Date: Tue Jun 20 15:10:35 2006 -0700 + + Merge branch 'modesetting-origin' into modesetting + +commit 89c2c4bc40b8c032915ccb3ed4f3c143c3d8db12 +Author: Eric Anholt +Date: Tue Jun 20 15:10:19 2006 -0700 + + Add #if 0-ed code I've been using for CRT detection debugging. + +commit be08661e3126907c50c54485042fcde00b0da2b4 +Author: Eric Anholt +Date: Tue Jun 20 14:48:03 2006 -0700 + + Only default to enabling CRT or LVDS output if they're actually detected. + + Still, if we haven't detected any outputs automatically (including CRT through + DDC), default to CRT anyway. + +commit b454c9601f005c69c11556a558150403378d34d9 +Author: Eric Anholt +Date: Tue Jun 20 14:32:40 2006 -0700 + + Add support for CRT detection using DDC. + + This method is slower (~5ms), but works on older chipsets. Also, load-based + detection is disabled, as it can be fooled by other outputs on the pipe being + active, such as LVDS. + +commit 0b76646666e9d330e77c6f81af8b91e34623be92 +Author: Eric Anholt +Date: Tue Jun 20 13:57:26 2006 -0700 + + Add CRT detection function by testing for load, and clean up hotplug version. + +commit e4584a4f44a70d746396ed48b8e40033504d68b2 +Author: Eric Anholt +Date: Tue Jun 20 10:39:28 2006 -0700 + + Remove dead DisplayInfo option. + +commit ab60e34dcfc52ab5f22a82145d5b4db51b4c62c5 +Author: Eric Anholt +Date: Tue Jun 20 10:07:47 2006 -0700 + + Add debugging info for pipe/display plane size. + +commit 8a6edba33213911cc2210b5e903428b81d45862f +Author: Keith Packard +Date: Mon Jun 19 13:47:28 2006 -0700 + + Set vblank interrupt configuration to match pipe configuration + + New i915 drm ioctl (in version 1.5) allows the X server to select + which pipe drives vblank interrupts. Use this to drive from the 'preferred' + pipe. Yes, per-window vblanks would be nice in a shared fb environment. + Maybe someday. + (cherry picked from 2fb375b665f4802819b89f2277fd6154006c11ee commit) + +commit 52243d407cad93283956660de4771097ac0b4b2d +Merge: 2fb375b 34f6a82 +Author: Keith Packard +Date: Mon Jun 19 13:28:09 2006 -0700 + + Merge branch 'modesetting-origin' into modesetting + +commit 2fb375b665f4802819b89f2277fd6154006c11ee +Author: Keith Packard +Date: Mon Jun 19 13:24:57 2006 -0700 + + Set vblank interrupt configuration to match pipe configuration + + New i915 drm ioctl (in version 1.5) allows the X server to select + which pipe drives vblank interrupts. Use this to drive from the 'preferred' + pipe. Yes, per-window vblanks would be nice in a shared fb environment. + Maybe someday. + +commit b5acc6b3a3a3a109014d6b971f4722d0f0a4c29a +Author: Keith Packard +Date: Mon Jun 19 13:22:17 2006 -0700 + + Add backlight control to DPMS logic. + + Turn backlight on and off in response to DPMS state changes. + +commit d7e5d996aa123e52857362fa8a1e69f709bfe218 +Merge: 89a5a00 a73ab7f +Author: Wang Zhenyu +Date: Tue Jun 20 01:22:53 2006 +0800 + + Merge branch 'master' into exa + +commit a73ab7f0e6e3b0462e05c0031ffd602ed3e2bcd4 +Author: Alan Hourihane +Date: Mon Jun 19 11:35:42 2006 +0100 + + additions for rotation fixes + +commit 1fe3dd38eb613475d62140850e64767defed7d34 +Author: Alan Hourihane +Date: Mon Jun 19 11:27:28 2006 +0100 + + Set some invarient state, cures some problems with + rotation at startup. + + This mimicks the 3D drivers setup. + +commit 89a5a0024a7e077a0726ffe1427e573df3bcbef5 +Author: Eric Anholt +Date: Sun Jun 18 00:25:34 2006 -0700 + + Fix crash with EXA during randr, when XAA structures were being accessed. EXA + shouldn't have any issues with there also being pixmaps in framebuffer while + rotation is active. + +commit f2ab3aa3199e1c4b0edec72b5acea6d725cc514a +Author: Eric Anholt +Date: Sun Jun 18 00:32:01 2006 -0700 + + Fix DRI in EXA mode: Don't attempt to use XAA symbols (use the driver's internal + ones for EXA support when available). Also, add an abstraction of XAA/EXA + MarkSync and WaitSync functionality so we don't need to sprinkle the ifdefs all + over, and correctly use them. + +commit 3592b432b48d51d2273c1e1064f85e656fbba130 +Author: Alan Hourihane +Date: Tue Jun 13 21:42:53 2006 +0100 + + fix 8bpp & 16bpp rotation modes for i8xx + series chips + +commit a50610b7719bfe800c3496c17d0ba77739167b35 +Author: Alan Hourihane +Date: Mon Jun 12 13:53:20 2006 +0100 + + Use 800x600 mode to double check + +commit f02268b2091c9a785d26e82bcb35a8b713463072 +Author: Alan Hourihane +Date: Mon Jun 12 12:16:58 2006 +0100 + + Don't rely on register check to find out + if we're resuming - it's not reliable. + + But then, neither is the BIOS, but it's + the best we can hope for until Eric's work + is complete. + + Try setting another mode to cater for some + broken BIOS' too. + +commit 672c3d18dbb405095e465126053ff887d891409e +Author: Alan Hourihane +Date: Mon Jun 12 10:02:06 2006 +0100 + + Only mark rotation flags after initial screen setup. + Fixes bug #7053 + +commit 34f6a8204f1edec015283fc6b5f196e47897e3de +Author: Keith Packard +Date: Sun Jun 4 00:15:06 2006 -0700 + + Get sDVO output working on mac mini. + Add lots of register debugging to track delta from BIOS settings. + Fix various mode settings to mirror BIOS sDVO values. + Disable analog/lvds output on pipe with sDVO. + Borrow Dave Airlie's I830xf86ValidateDDCModes code. + Fix various sDVO I2C messages to mirror Dave's code. + +commit 6812b5382077e5d3f421aceeeb2f337e9b3f570e +Author: Dave Airlie +Date: Fri Jun 2 12:22:14 2006 +1000 + + intel: fix VT switch DRI locking + + The DRI locking is incorrect at VT switch, due to reference counting + inside the driver. Just call the DRI directly. + +commit 3f158fd610a3363a23daa7205bcd9f213686cf1c +Author: Keith his master's voice Packard +Date: Mon May 29 18:05:57 2006 -0700 + + Nice texture coordinate gradient, broken slightly in y + +commit bb0ad04d46eba2fed57a888ff960d2436ec7d70d +Author: Keith his master's voice Packard +Date: Sun May 28 22:59:58 2006 -0700 + + Ok, finally something sensible up on the screen. + Replace PS kernel with constant data source (pink). + Dodge g0/g1 so URB data doesn't land on top of thread data. + Flip source/dest coordinates (dunno why they're fetched this way). + +commit ddf3e5b2737399dca6d401f91db51a51f93b6373 +Author: Keith his master's voice Packard +Date: Sun May 28 21:03:39 2006 -0700 + + Using tiny rectangle, still locks up in pixel shader program somehow + +commit 2e16c79dc2f24b0a04111aa6236a44870c6c64df +Author: Keith his master's voice Packard +Date: Sun May 28 20:31:23 2006 -0700 + + Lots more debug code. Appears to execute pixel shader thread now though. hurray! + +commit 79a514412bda7e38e018c105a603970c4a9d758a +Author: Keith his master's voice Packard +Date: Sun May 28 16:09:59 2006 -0700 + + dump out piles of debug. Create VS thread just to see how it works + +commit 9c111d89fe19f1773af2eefb000e1c2389b4b6e1 +Author: Keith his master's voice Packard +Date: Sat May 27 19:52:13 2006 -0700 + + Push all of the obvious Mesa state setting into the video code + +commit 01101196b16010ac3dadab647bfe7000a53fa94d +Author: Keith his master's voice Packard +Date: Sat May 27 01:05:09 2006 -0700 + + flesh out cc state. set cull mode to none. enable sf kernel + +commit 462a860af89ed855fe2b718342fcaf9c169af3fb +Author: Keith his master's voice Packard +Date: Sat May 27 00:17:25 2006 -0700 + + Rename BRW instructions, check video instruction generation. Doesnt lock up, but doesnt display anything either + +commit 9ec7cf22e3f03c13524bb2d15711699dfcc02984 +Author: Keith his master's voice Packard +Date: Fri May 26 21:30:55 2006 -0700 + + Use broadwater video code on broadwater hardware. Pad ring to even length. compute state base as address rather than offset + +commit f5fe700b9a943c956bcfcc3a0d2de13c23b978bc +Author: Keith his master's voice Packard +Date: Fri May 26 13:47:39 2006 -0700 + + Prepare real SF kernel and fake WM kernel + +commit 1549accb6f52498fef3dcbd87bb72d89fcd5bccd +Author: Keith his master's voice Packard +Date: Thu May 25 16:10:31 2006 -0700 + + Scale video source vertices. Allocate space for kernels + +commit c1c46f882f9a11c383c8d1d1ce393be8fda55ed0 +Merge: 1e2da24 f2967a2 +Author: Eric Anholt +Date: Mon May 22 10:42:24 2006 -0700 + + Merge branch 'master' into modesetting + + Conflicts: + + man/.gitignore + +commit 1e2da2450d7213c0aa4d4bd1fba5723dcda13ddf +Author: Lukáš Hejtmanek +Date: Mon May 22 09:48:09 2006 -0700 + + Replace VBE call to do DPMS with native code, and fix screensaver in clone mode. + +commit 2a1b3cfccb7de53f7ce8f9e4816e4278afb1fcab +Author: Eric Anholt +Date: Mon May 22 10:32:13 2006 -0700 + + Use RECTLIST instead of TRIFAN for video so we get horizontal shearing instead + of diagonal. Also remove the unnecessary vertex elements that were being + emitted. + +commit bc42dbe07cbd61b357d8eed02608e026c4cf4485 +Author: Wang Zhenyu +Date: Mon May 22 11:22:03 2006 +0800 + + fix a typo + +commit bce209cd3f60cb5d51aadc5fc8ec1a4151435ec3 +Author: Eric Anholt +Date: Fri May 19 17:13:37 2006 -0700 + + Put in code for idling accelerator on subsequent cliprects. + +commit 3640117bd9f2073ff54dc474f0cdefff49742584 +Author: Eric Anholt +Date: Fri May 19 17:10:04 2006 -0700 + + Set up the state buffer in framebuffer. + +commit e70d99d51edc39ea53536c2f4d62ac622ba3e0d9 +Author: Wang Zhenyu +Date: Fri May 19 15:47:19 2006 +0800 + + revert wrong setting for memorySize, which should + be at the range of pI830->Offscreen. + +commit de06cd70a9edb8b56d05d3f505137f7c7f083c2f +Author: Eric Anholt +Date: Thu May 18 18:27:11 2006 -0700 + + Checkpoint for filling out more 3D state. + +commit ad7ec6a24b436d5492d38e4fa56845b229cf5fb8 +Author: Eric Anholt +Date: Thu May 18 15:26:28 2006 -0700 + + Checkpoint of BW textured video work, filling out vertex submission stuff and + some more other state. + +commit 291770efc691a02650e3c580ca40c2f9fce3896c +Author: Eric Anholt +Date: Thu May 18 10:43:07 2006 -0700 + + Start laying out some of the bits that need to be done for BW textured video. + Headers taken from TG code drop. + +commit b3d79ad9ecc70e9f841092fc75b7e23576b685dd +Author: Wang Zhenyu +Date: Thu May 18 16:31:40 2006 +0800 + + oop I830FALLBACK define error + +commit 1bc2a8f7a20b2ea9251e93157c0f2342fdbb951c +Author: Dave Airlie +Date: Thu May 18 16:58:22 2006 +1000 + + fixup I830SDVOGetActiveInputs to use return values not args + +commit 33ad959323f70f76c494c66ec35a04d7d839f612 +Author: Wang Zhenyu +Date: Thu May 18 11:32:59 2006 +0800 + + Add DEBUG_I830FALLBACK for easier tracking + +commit 52af679c94a25c0c6e5df5f3647f62fdd256c826 +Author: Wang Zhenyu +Date: Thu May 18 11:31:14 2006 +0800 + + Check alignment require in PrepareSolid, noticed by Eric, + as pixmap offset align set is violated in Solid. + +commit fdb52a8c6da0f3d3f4cfbf1583b2dc4d91f7e933 +Author: Wang Zhenyu +Date: Thu May 18 11:24:46 2006 +0800 + + Solid planemask in PrepareSolid/Copy might be 0xffffffff + or bits up to the depth. This should save some fallback + case, noticed by Eric. + +commit bc51d6525a12c748d0a293b7e560f6dcea33eecb +Author: Eric Anholt +Date: Wed May 17 13:42:51 2006 -0700 + + Turn off overlay video on BW until we have stable PCI IDs so we can know whether + the hardware supports overlay. + +commit f97895efd5532cca145b6f224f9615739b1e8f26 +Author: Dave Airlie +Date: Wed May 17 14:46:37 2006 +1000 + + fixup chipid override + + This makes the ChipID override work so that we actually override the pci id + that gets used everywhere in the driver. + +commit 011a1c99d49c1c69b5fa81ade6a2ed73e84276ae +Author: Wang Zhenyu +Date: Wed May 17 11:16:00 2006 +0800 + + Fix memorySize to enable offscreen mem manage. + +commit b0ac5303f33f75dc607cf0c705c23db1da836983 +Merge: 4c72725 c2cd10e +Author: Eric Anholt +Date: Tue May 16 15:21:17 2006 -0700 + + Merge branch 'textured-video' into broadwater-video + + Conflicts: + + src/i830_video.c + +commit c2cd10e1fba0e75c0ed3db5d17211bddf7ab1e33 +Author: Eric Anholt +Date: Tue May 16 10:08:58 2006 -0700 + + Flag the 3D state as dirty when we draw textured video, which should help + + rotation (I have other issues with rotation anyway). + +commit 63a72e46fa20a4a4ba74efed386f6c3c167be5b5 +Author: Eric Anholt +Date: Tue May 16 08:54:43 2006 -0700 + + Turn debugging back off. + +commit 01c043de0393170e98515169f8239fef4d3e2053 +Author: Eric Anholt +Date: Tue May 16 08:53:40 2006 -0700 + + Use linear min/mag blending. + +commit db3683907d15959e79adfb8f0cd94e861fae5c36 +Author: Eric Anholt +Date: Tue May 16 08:40:53 2006 -0700 + + For textured video, disable double buffering and sync before uploading new video + + data. Allows more videos to play simultaneously. + +commit 29a8e88ed01c9e15a2ceba5eb62b19773e14c1f8 +Author: Eric Anholt +Date: Mon May 15 17:19:33 2006 -0700 + + Relax the alignment requirements for textured video. + +commit c9be11459bc2198b435c97c5a3432425246c4d2d +Author: Eric Anholt +Date: Mon May 15 17:04:27 2006 -0700 + + Enable overlay and/or textured video at runtime according to hardware + + capabilities. Sets up 16 textured-video ports. Left in one hack (disconnected + but advertised BRIGHTNESS and CONTRAST atoms) which may actually not be + necessary. + +commit f268979a0c779641c84e8d5b763acbda131474cf +Author: Eric Anholt +Date: Mon May 15 10:05:19 2006 -0700 + + Correct drawing issues with planar formats when top or left != 0, and Y didn't + + get its offset. + +commit b09fd42d7088ead6c23e040ac4b71114f62de82b +Author: Eric Anholt +Date: Mon May 15 09:29:43 2006 -0700 + + Fix the planar formats to display correctly in textured mode. Still has issues + + with clipping, and some sampling differences between ximagesink and xvimagesink. + +commit dd48790f4600a880fc4907c6e3b1cd51e9c0f0b7 +Author: Eric Anholt +Date: Fri May 12 13:27:33 2006 -0700 + + Divide width by 2 in planar-to-packed conversion loop, since each pass through + + the loop writes two source pixels. + +commit eec5e996ec9361099bf81d8d3b66933d5981c5a8 +Author: Eric Anholt +Date: Thu May 11 20:26:26 2006 -0700 + + Merge textured-video-wip to textured-video-planar-full. + +commit 4154a2f74811b91c0ef5bef32a919d6f8baf1a70 +Author: Eric Anholt +Date: Wed May 10 12:09:00 2006 -0700 + + Experimental work to use a full pixel shader for planar to YUV conversion, which + + also doesn't quite work. + +commit 3e0a9c9082942eb6f52612235d84b8408e1e03e9 +Author: Eric Anholt +Date: Tue May 9 16:57:19 2006 -0700 + + Do a separate BEGIN/ADVANCE_LP_RING set in the planar vs packed blocks, so I + + can adjust the planar code more easily. + +commit 3af4a967e73b367bb531f2760b4803db1388bcf9 +Author: Eric Anholt +Date: Tue May 9 16:50:48 2006 -0700 + + Add a couple of macros to simplify writing of video pixel shaders. + +commit 06e62ec521ed3f7ed232ace8e188891bedb53097 +Author: Eric Anholt +Date: Tue May 9 12:04:58 2006 -0700 + + Commit a WIP implementation of the planar video shader that does the + + planar-to-packed conversion for us. Unfortunately the documentation is unclear, + and I haven't managed to get any implementation of it working correctly. + +commit b1090a42b200710628dd8b0c7ced15db7bbe71a1 +Author: Eric Anholt +Date: Mon May 8 14:22:00 2006 -0700 + + More magic number reduction in rotation code. + +commit 3a2d8af214a79591322ce6e5546f856a1ee41736 +Author: Eric Anholt +Date: Mon May 8 09:42:40 2006 -0700 + + Add initial textured XV support for i915, which can do YUY2 and UYVY, but fails + + on I420 and YV12 currently, doesn't support the composite extension, and should + break XV support on non-i915. + +commit 66875c1559bc20b531ab72e5d6b921d9f50b29f3 +Author: Eric Anholt +Date: Fri May 5 10:15:23 2006 -0700 + + Convert magic numbers in i915 rotation 3D state to symbolic names. + +commit 4c727254da354cfd6f35148a334d046d67a50e99 +Author: Eric Anholt +Date: Fri May 12 16:26:58 2006 -0700 + + Remove the local, renamed copy of lnx_agp.c. The diff between lnx_agp.c and it + appeared to be removal of bugfixes. + +commit a115c4b872a385530dcf94b7e7f2fa9b3b7e3155 +Author: Eric Anholt +Date: Fri May 12 16:11:29 2006 -0700 + + Remove the code that changes our behavior based on whether a magic file exists + with magic contents in /tmp (created by some install script). + +commit 0cb251fadca1cbb3d4c5b97982cd0d8c2fc3e840 +Author: Eric Anholt +Date: Fri May 12 16:10:02 2006 -0700 + + Do a couple of reverts to get the DRI code building. At this point, the whole + driver builds. + +commit 78b95386b630039864b31954ebcd02ec8829b0c8 +Author: Eric Anholt +Date: Fri May 12 16:09:40 2006 -0700 + + Remove intel_randr.c and stick with the previous code. Broadwater shouldn't be + changing our randr, and the new version didn't compile. + +commit 2e58aa401dfbab438752038a9034df571c8f8bde +Author: Eric Anholt +Date: Fri May 12 15:54:37 2006 -0700 + + Make the intel_acpi.c code non-modular and make it compile. I think we'll end + up nuking this code anyway, as keithp (and I, as well) disagree about how ACPI + should be handled, but the goal is to compile at the moment. + +commit 2cd6c8fa2321ca217ef89db1027dbe9e716ad7aa +Author: Eric Anholt +Date: Fri May 12 15:37:44 2006 -0700 + + Revert internal shadow module changes back like master, along with RandR + initialization. RandR initialization retains the no-rotation setting for BW. + +commit 88558ebeed12d6cefd73bba0ddac3c043861ac89 +Author: Eric Anholt +Date: Fri May 12 15:00:17 2006 -0700 + + Start fixing up the build and remove a regression from master (I think) in + rotation. + +commit 9e387ef92be9b38c68bda8a6a28b0d9eb98d53a4 +Author: Eric Anholt +Date: Fri May 12 13:41:38 2006 -0700 + + Re-add authorship note in i830_driver.c accidentally left out of last commit. + +commit af2432322ba1d561057c34ab185561a8e799e8cd +Author: Eric Anholt +Date: Fri May 12 13:32:38 2006 -0700 + + First pass of integrating the Tungsten Graphics driver for Broadwater. This + patch is based off of diffing from the branchpoint to the supplied code, but + with many chunks containing reversions of commits removed. Won't work yet. + +commit fbba4312e7cb326fdcf6a71194c4fc4a7a9b5488 +Author: Dave Airlie +Date: Fri May 12 18:44:27 2006 +1000 + + add sdvo capability reading support + + This reads the SDVO cap bits and uses them to figure out the input/output + to save/restore + +commit f2967a2f5f47b636b2445fa69dbc3ec79e065c90 +Author: Keith Packard +Date: Tue May 9 13:51:25 2006 -0700 + + Video overlay gamma bounds checking must be done bytewise. + Also, pend bound computations to register writes to allow + updates to individual values that are 'out of spec' so + the client can update multiple values. + (cherry picked from 190f9ad0606e96e684e0b028d576d822dc9aa3cf commit) + +commit 190f9ad0606e96e684e0b028d576d822dc9aa3cf +Author: Keith Packard +Date: Tue May 9 13:51:25 2006 -0700 + + Video overlay gamma bounds checking must be done bytewise. + Also, pend bound computations to register writes to allow + updates to individual values that are 'out of spec' so + the client can update multiple values. + +commit fb10966e9f43f44488097b0daf2fbe10c6a804dc +Author: Eric Anholt +Date: Thu May 4 18:52:08 2006 -0700 + + Use xf86int10Addr() when calculating an address to read the video BIOS from, out + + of int10's copy. Fixes a crash on FreeBSD. + +commit a66f2c01f7d557d860883346671fb864807dbdca +Author: Eric Anholt +Date: Mon May 1 12:35:21 2006 -0700 + + Stop doing the BIOS memory size tweaking now that we don't ask the BIOS about + what modes are available. + +commit 99b0e53244aa49f4e7461a1c96aba69453b3516f +Author: Matthieu Herrb +Date: Mon May 1 10:47:09 2006 +0200 + + Fix non-dri build. + +commit 86f0119f47d8be975016ffdea850f0227e32eebc +Author: Matthieu Herrb +Date: Mon May 1 10:41:10 2006 +0200 + + Fix non-dri build. + +commit fcec956807038a2e90287850df8b4410b1f8b3c2 +Author: Wang Zhenyu +Date: Sat Apr 29 10:55:25 2006 +0800 + + Save initialize EXADriverPtr, and free it in failure. + +commit 0be9bc604420e4433697cc31e8ac58c9f36185e1 +Author: Wang Zhenyu +Date: Sat Apr 29 10:54:02 2006 +0800 + + I830CheckDevicesTimer() sync should be in I830_USE_XAA case. + +commit a00a3d198aee7c173c2c36858f4447e13c86eb7f +Author: Wang Zhenyu +Date: Sat Apr 29 10:52:45 2006 +0800 + + fix I830BIOSAdjustFrame() sync in I830_USE_EXA case, use exaWaitSync() helper. + +commit c94cc67bcc507e8256ae4b51b84dfe3f4aa12ab5 +Author: Eric Anholt +Date: Fri Apr 28 15:33:57 2006 -0700 + + Update to EXA 2.0 API. + +commit a4a4ced50cc235e79013ce8dd78e35c6eb4c98ca +Author: Eric Anholt +Date: Fri Apr 28 14:59:52 2006 -0700 + + Get it to compile. + +commit 941a49f91eac02e256706d8821a2cb069ff7ffef +Author: Eric Anholt +Date: Fri Apr 28 14:57:03 2006 -0700 + + Commit what applied from Jesse Barnes's i830-exa-latest.patch. + +commit a555e28e5afc81969ef7b28482e654cc26b3a446 +Author: Eric Anholt +Date: Mon Apr 24 16:55:44 2006 -0700 + + Correct some SDVO-related register definitions. + +commit cc70e6b789a1901bbe4e3501b6b654542d3cdc20 +Author: Eric Anholt +Date: Mon Apr 24 16:49:48 2006 -0700 + + Save/restore the output's SDVO reg. Note that we might be programming the other + SDVO reg instead of the one assigned to the output. When trying to fix that, I + ended up getting no output at all. + +commit b498d2b1d1170123595ada65353428578b59a361 +Author: Eric Anholt +Date: Mon Apr 24 15:42:46 2006 -0700 + + Start trying to save/restore SDVO state on VT switches. + +commit 56c1f8b0de9b6acc50f51561caf14d3e6bac09ec +Author: Eric Anholt +Date: Mon Apr 24 14:10:20 2006 -0700 + + Clean up some argument passing, and remove extra SetTarget{In,Out}Puts that had + no effect. Note that we are currently trying to program both outputs of any + SDVO device the same way. + +commit 9ba5319b36e7286e33cf0dcdd804dfc0458a81f5 +Author: Eric Anholt +Date: Mon Apr 24 13:55:05 2006 -0700 + + Only write out as many arguments as the commands need, and fix up the numbers in + some cases. Pretty-print the return status. + +commit d32514aee4b00b035652830e8b5e6c0b43cf159c +Author: Eric Anholt +Date: Mon Apr 24 12:21:45 2006 -0700 + + Start trying to implement DDC over SDVO. It's slightly tricky because the + control bus will reset from DDC mode to internal-registers mode after every + Stop afer a Start on the DDC bus. The xf86 DDC code causes multiple Start/Stops + in one probe. So, we create a wrapper bus that does the control bus switch at + every Start. It's not working yet on my hardware, but I'm pretty sure this is + the right way to go. + +commit effab21c3d108fac7a4e28ae4dabb0b5f74a5380 +Author: Eric Anholt +Date: Mon Apr 24 11:42:24 2006 -0700 + + Set displayWidth to a sufficient value for the modes we come up with for LVDS. + + Reported by: Lukáš Hejtmánek + +commit bcb441225d1365435bc3373901180de944298e86 +Author: Eric Anholt +Date: Mon Apr 24 10:54:45 2006 -0700 + + Simplify the i2c code by using the GetBits/PutBits interface rather than + reimplementing it. + +commit 47bd9059431eadfd8824e496eb91bb50efa0e282 +Merge: 729c373 32a0ad5 +Author: Eric Anholt +Date: Mon Apr 24 10:36:24 2006 -0700 + + Merge branch 'lukas-resume' + +commit 1dbb19059f5dd5cd2ad386c4f73498095987b943 +Author: Alan Hourihane +Date: Thu Apr 20 10:43:19 2006 +0100 + + fix bug 6365 + +commit 729c373121ce2bbb0d813cc923f1254e8b37a025 +Author: Dave Airlie +Date: Thu Apr 20 13:34:55 2006 +1000 + + move sdvo output setting + + we have to set the sdvo register a lot earlier in order for them to sync + properly otherwise my monitor doesn't sync unfortunately, also + disable the sdvo while tweaking the PLLs. + + This also comments out a setting that seems to break my system here for + Eric to look at later. + +commit 0ba7b13fb4410c6a48b2fb098d2033e040eca6d2 +Author: Dave Airlie +Date: Thu Apr 20 12:29:06 2006 +1000 + + fix type 0 instead of O + +commit 2991d81a3b643161babab6b8f44c057aaaf351c3 +Author: Dave Airlie +Date: Thu Apr 20 12:27:47 2006 +1000 + + correct height parameter in sdvo packet + +commit b5f099e03a9f58b6b99933fb06526bce4db72bd3 +Author: Dave Airlie +Date: Thu Apr 20 09:50:36 2006 +1000 + + cleanup sDVO for device on C only + + This destroys the i2c device properly if the device isn't detected, + and allows sDVO to work on GM chipsets, and doesn't initialise + the i2c bus twice for sDVO. + +commit 2909802de63756972b38651a496b4ff1b36ac8a2 +Author: Eric Anholt +Date: Wed Apr 19 16:29:06 2006 -0700 + + Clean up SDVO initialization, include config.h, and make it check the right + slave address on the first device as well. This gets me to the point of + bringing up some modes on my device. + +commit 32a0ad570d9c010e7d26d980830f719782d9f2f3 +Author: Lukáš Hejtmanek +Date: Wed Apr 19 19:43:45 2006 -0300 + + Add more registers to save/restore. Save/restore palette as well + +commit 132dc0599cf44389c4cc03919f1da8d3a0762b44 +Author: Eric Anholt +Date: Wed Apr 19 15:04:17 2006 -0700 + + Whine if SDVO I2C device init fails, rather than be silent. + +commit 88bb4b578857588f34ac84b7a20577139eccab6d +Author: Eric Anholt +Date: Wed Apr 19 14:23:45 2006 -0700 + + Add more SDVO code. It's taken from airlied's driver, but with magic numbers + replaced by symbolic names in many places. I tried to restrain myself from + functional changes in airlied's code in this pass. + +commit d8f7dfac769d7b03f069306b1296bb2e1e08b009 +Author: Eric Anholt +Date: Wed Apr 19 10:45:13 2006 -0700 + + Start bringing in some SDVO code, mostly from airlied. + +commit a371a04a57620b7128e3c4395bc7c2ac55effe19 +Author: Eric Anholt +Date: Mon Apr 17 14:10:50 2006 -0700 + + Use the IS_I9XX macro intead of >= i915G, since by PCI ID number, 855GM > 915. + +commit 33413a3cf34b06e3207fe1cdb733d586d55a4337 +Author: Eric Anholt +Date: Mon Apr 17 13:42:57 2006 -0700 + + Remove some dead code and one particularly useless debug printf. + +commit a85be820033af8bf30d1fec4a899349af35a6ef6 +Author: Ian Romanick +Date: Mon Apr 17 12:52:30 2006 -0700 + + Add missing new-line character in log message. + +commit 365b4a53ee965002a5452e6f6016b528e51cee69 +Author: Eric Anholt +Date: Mon Apr 17 01:12:28 2006 -0500 + + Disable the BIOS dump-to-file since it's a trivial local DOS, and I can just ask + people to turn it on and recompile when I need to. + +commit ee7be006b63b6b1ce7f786b045fb8f26d337433c +Author: Eric Anholt +Date: Sun Apr 16 13:13:42 2006 -0500 + + Bug #6589: Use alternate offsets to successfully get at the panel data for + some broken video BIOSes. + +commit 786ee3df1726f08953167d05f7fa1930452703bb +Author: Eric Anholt +Date: Sun Apr 16 13:05:35 2006 -0500 + + Add a standalone program for parsing VBT. + +commit 62652127cd12f5a0fc9364285b81d2661372148a +Author: Eric Anholt +Date: Sat Apr 15 12:16:46 2006 -0700 + + Check for LVDS BIOS tables exactly once at startup. While there, dump the BIOS + data to /tmp/xf86-video-intel-VBIOS, for offline debugging. + +commit 830fa81792a613fe2127a2b89a3eaa326f56114c +Author: Alan Hourihane +Date: Wed Apr 12 21:55:31 2006 +0100 + + fix typo + +commit 3c9bc19db63a317db9e2d67a5bc15b1de1a1060a +Author: Alan Hourihane +Date: Wed Apr 12 21:54:50 2006 +0100 + + fix typo + +commit d6edffee7d987ef551e1a94d9fac21beb72a9598 +Author: Eric Anholt +Date: Wed Apr 12 12:16:51 2006 -0700 + + Initial support for pre-i915 PLL programming. Untested. + +commit 59f88955f57cf0f98458b57418dae25cf53ca180 +Author: Eric Anholt +Date: Wed Apr 12 11:11:14 2006 -0700 + + Automatically enable clone mode if we detect two active outputs. + +commit a797a6626a8117cd16456a206ed96300e4a0ceeb +Author: Wang Zhenyu +Date: Tue Apr 11 16:44:42 2006 -0700 + + Fix a broken test that resulted in page flipping always being enabled, not just + when the user enabled it. + +commit 66d216da3bfe7c143d681b610130e6daf6dfa52f +Author: Eric Anholt +Date: Tue Apr 11 16:37:10 2006 -0700 + + Replace .cvsignore with .gitignore. + +commit 185b5251419724fa9377421d67981daa674908c8 +Author: Eric Anholt +Date: Mon Apr 10 20:25:13 2006 -0700 + + Add missing MIT copyright licenses, which should have been on all versions. + +commit c0a2dc608d95f92b0f5a151c623745f09df3afc5 +Author: Keith Packard +Date: Mon Apr 10 20:09:37 2006 -0700 + + Save/restore PFIT_CONTROL. Eliminate compiler warnings + +commit 498abf474b90b04bc4085397a209cc493d98d15c +Merge: c26f073 3de82ff +Author: Keith Packard +Date: Mon Apr 10 19:41:50 2006 -0700 + + Merge branch 'modesetting-origin' into modesetting + +commit c26f0737e2c0f000f67f21ef6007b351160036a4 +Merge: 11ad8a5 692a4a4 +Author: Keith Packard +Date: Mon Apr 10 19:41:41 2006 -0700 + + Merge in master to modesetting + +commit 3de82ff3938c6559c90079be0c28dc507d62f79e +Author: Eric Anholt +Date: Mon Apr 10 15:10:15 2006 -0700 + + Improve LVDS modes when outputting a CRT+LVDS combo at larger than the LVDS's + panel size. This is a hack until we get better clone mode, but it correctly + displays a subset of the root on the LVDS by using a correct pixel clock and + pipe/display size. + +commit 692a4a4bafd4cab197b761cda22368581b78f996 +Author: Adam Jackson +Date: Mon Apr 10 11:27:25 2006 -0700 + + Bump to 1.6.0. + +commit 43c93057c044f33c20b1dd639eaeabefc0901589 +Author: Aaron Plattner +Date: Mon Apr 10 11:26:33 2006 -0700 + + Add a DrawablePtr argument to the XV functions to pave the way for redirected + video. + +commit 39bdfbb4c23c9ba2a44888f22330a892c4becedc +Author: Alan Hourihane +Date: Mon Apr 10 11:26:06 2006 -0700 + + x86_64 warning fixes + +commit 11ad8a590d65849be00e1be4e9dd52c1159a4f24 +Author: Eric Anholt +Date: Mon Apr 10 09:39:24 2006 -0700 + + Remove the int10 POST on EnterVT. It has been reported to cause crashes now, + and I believe it is the responsibility of the kernel to bring the device back to + a mostly-sane state on resume anyway. + +commit 4217ce18cec257cad435adf9ddc9258a3c8164ec +Author: Eric Anholt +Date: Mon Apr 10 09:37:02 2006 -0700 + + Warnings cleanup. + +commit 334512e0604c208ffec914374a76d85720c1dcf9 +Author: Eric Anholt +Date: Mon Apr 10 09:32:45 2006 -0700 + + Don't try to use LVDS by default on chipsets that won't have an LVDS attached. + The BIOS tables may still exist, so we can't rely on their presence to indicate + LVDS attachment. + +commit 69083a2fc3ca4a3d06c1985c8a630d5628c1110c +Author: Eric Anholt +Date: Mon Apr 3 16:29:14 2006 -0700 + + Remove BIOS save/restore code, fixing VT switching. Removes some other dead + code, too. + +commit 2e5d85fb83def483ab1fd96877aae4a89a962b7f +Author: Eric Anholt +Date: Mon Apr 3 16:27:24 2006 -0700 + + Turn off the VGA plane when we're setting our native modes. + +commit ceb08d28f4a4e9f42c9417938b8541bf1b4e8245 +Author: Eric Anholt +Date: Mon Apr 3 15:32:41 2006 -0700 + + Remove the hacky-looking Set640x480. I'll be removing things it depends on + (setpipe), and I suspect we'll end up with different hacks for resume, anyway. + +commit 1f0ba458d02f7d4777c1669aae02138f3a6628c1 +Author: Eric Anholt +Date: Mon Apr 3 15:28:47 2006 -0700 + + Remove more BIOS stuff, particularly Get/SetDisplayDevices. Now, if there's no + hardcoding in the config file, we default to LFP if we detect it from BIOS, and + LFP or CRT if we can get EDID out of them. + +commit b20b466aaed54708ae9e4676623c8c394a6f00d5 +Author: Eric Anholt +Date: Mon Apr 3 14:28:55 2006 -0700 + + Remove the now-unused displaySize and pipeDisplaySize. + +commit d960c3ca1512a58a53b5c24702cb5c97124817ee +Author: Eric Anholt +Date: Mon Apr 3 14:12:29 2006 -0700 + + Remove more BIOS modesetting stuff. + +commit 4e3a4827007d624aa3da1a9f5a299837bd601a33 +Author: Keith Packard +Date: Fri Mar 31 14:05:46 2006 -0800 + + autodetect LVDS dither. Fix 16bpp depth selection + +commit 8d27f8246ed5a73f7a78043e128b47be784186c0 +Author: Eric Anholt +Date: Tue Mar 28 13:49:41 2006 -0800 + + Clean up (and I believe fix a couple of bugs in) the divisor selection code. + +commit e45581cd073b23a62719f20783d617bd35316fec +Author: Eric Anholt +Date: Tue Mar 28 13:40:32 2006 -0800 + + Fill in clock information from VBT table, so that a good clock value gets + requested for choosing divisors. + +commit 33977d23830b5f9bb7d9e2e9c141f91cb127b7de +Author: Eric Anholt +Date: Mon Mar 27 18:50:53 2006 -0800 + + Port code from radeon driver for panel mode validation, which will hopefully get + the right mode chosen on the VAIO. Untested. + +commit febdfa967dbe1df487db71ba5f677ef37450bf7a +Author: Eric Anholt +Date: Mon Mar 27 15:19:52 2006 -0800 + + Remove some VBE DDC code that I believe is OBE. + +commit f86892c9163473a683ab591adeb9fb1c0be2ef99 +Author: Eric Anholt +Date: Fri Mar 24 16:00:30 2006 -0800 + + Make auto panel fitting work by pulling LVDS timing EDID info out of the static + BIOS table, and always using that. + +commit f6a3243f40074aee471ec1cda2cc8e5f05116284 +Author: Eric Anholt +Date: Fri Mar 24 13:49:10 2006 -0800 + + Add more VBT reading, so we find the panel size. + +commit 64756e215016730b5cc2e174f08d47c0288c0ba4 +Author: Eric Anholt +Date: Fri Mar 24 11:55:01 2006 -0800 + + Start interpreting VBT information with the goal of pulling out LVDS timings + for panel fitting. + +commit c2d554be671f5368bd98867b8ecf9428e4560a81 +Author: Eric Anholt +Date: Thu Mar 23 14:33:04 2006 -0800 + + Save/restore a couple of important VGA plane registers, and have vgahw + save/restore everything it knows about. Also moves the save to just after the + other reg saves, above the VBE save stuff which may have side effects. + +commit 8411c126ae66239f8b3a2261e338a723c36aa44f +Author: Eric Anholt +Date: Thu Mar 23 11:31:24 2006 -0800 + + Update to newer airlied DDC code, and do some cleanups as well. Now tries DDC + on LVDS, though my current LVDS gives no results. + +commit 6414ad89b9d368a032adf2358a65404f5443ef35 +Author: Eric Anholt +Date: Thu Mar 23 09:48:18 2006 -0800 + + Add enough of airlied's DDC/I2C work to pull EDID info from my CRT. + +commit 5215e19af58f5c2746c8d281e33ecee86e55f0a5 +Author: Eric Anholt +Date: Mon Mar 13 10:29:51 2006 -0800 + + Add some register information for VGACNTRL, and do the reg-debug thing on it. + +commit b77bdc2c15640a3b15233f2190179d66bc8b2a4b +Author: Eric Anholt +Date: Wed Mar 8 15:08:06 2006 -0800 + + Move the PFIT enabling before the enabling of the pipe, as the specs say we + should. This doesn't work yet, as we apparently need to adjust the pipe to + output at the full resolution of the panel, not the displayed image size, + because PFIT controls scaling between the display planes and the pipe. + +commit de4a9e4a7891daa1488d17bf4c22283759f97373 +Author: Eric Anholt +Date: Wed Mar 8 12:54:14 2006 -0800 + + Add a couple more bits to panel auto-fitting, though it isn't working yet. + +commit 02341aa68cf2171e037196019f2553f0d1b1bd0d +Author: Eric Anholt +Date: Mon Mar 6 13:23:29 2006 -0800 + + Make the reg-snapshot code work, add a couple more registers, and use it on VT + switching to hopefully help point out where we aren't restoring enough. + Currently doesn't reveal anything. + +commit 2b6fc7ddb020a5511f6f599a2f5c37db27eddbcc +Author: Eric Anholt +Date: Fri Mar 3 15:42:15 2006 -0800 + + Add missed save/restore of DSP*SIZE registers. + +commit 12ce799818722473dde2f82739d50ba4ec7f6ecd +Author: Eric Anholt +Date: Fri Mar 3 15:38:31 2006 -0800 + + Add some untested debugging code to for helping figure out VT switch issues. + +commit 585cc5f256b8e91460414a26409d0e484a86718c +Author: Eric Anholt +Date: Fri Mar 3 10:37:26 2006 -0800 + + Add more integrated LVDS support code. + +commit 33c62e8e654fa2228bc3fd31ec0fe010703f363a +Author: Eric Anholt +Date: Thu Mar 2 17:53:38 2006 -0800 + + Change the order of reg writes for restore, possibly increasing chances of + success. Also save and restore ADPA. + +commit 7f4dc09dcafc7f0423b7f3e970a0b19fbbf515dd +Author: Eric Anholt +Date: Thu Mar 2 15:55:18 2006 -0800 + + Remove some dead VBE code. + +commit f3ec8653ab4c9b26d249bcf4393326de37ac8321 +Author: Eric Anholt +Date: Thu Mar 2 14:31:39 2006 -0800 + + Include config.h, fixing many issues with reading from pI830. + +commit 84fc3971d76f78546a0bb7dd57dba52dd893a921 +Author: Eric Anholt +Date: Thu Mar 2 13:35:40 2006 -0800 + + Turn off panel power before poking pipe B, and turn it back on if we're doing + LVDS. Also, refuse to do LVDS on pipe A, as the docs say you can't. + +commit aca0f942f377d997c5c0b5be790ee7f255d6e046 +Author: Eric Anholt +Date: Thu Mar 2 13:31:51 2006 -0800 + + Fix prototype for i830DetectCRT. + +commit df6347139bc9de22af981f776d711ac9d44fad1c +Author: Eric Anholt +Date: Thu Mar 2 12:52:19 2006 -0800 + + Use DISPPLANE_32BPP_NO_ALPHA for depth 24, else the empty alpha channel results + in a black display plane. + +commit 8e819ced8397f0330fd44efa60fef89bd10ff70e +Author: Eric Anholt +Date: Thu Mar 2 11:55:00 2006 -0800 + + It appears from the specs that you have to wait for vblank after disabling the + plane, not the pipe. + +commit ee2410b965321e3d9d64fc500fdcfa6d6dc3a039 +Author: Eric Anholt +Date: Thu Mar 2 11:43:41 2006 -0800 + + Move display base setting to a separate function and use it from both mode setup + and AdjustFrame. Rename AdjustFrame to reflect the fact that it doesn't touch + the BIOS. + +commit 980fb78e759b752a6cae3c87d188c50ab131ba80 +Author: Eric Anholt +Date: Thu Mar 2 10:49:31 2006 -0800 + + Correct capitalization of i830SetMode. + +commit 2b842c7ee3f9c33cabf16561f11bf1c3a2502d4a +Author: Eric Anholt +Date: Thu Mar 2 10:08:20 2006 -0800 + + Start implementing support for setting modes for multiple output devices, + particularly LVDS. Untested. + +commit a09d9cf27af7016bbd9e562c7b1c338154fd3d40 +Author: Eric Anholt +Date: Thu Mar 2 09:05:13 2006 -0800 + + Replace I830VESASetMode with simpler i830SetMode, which is all native and + doesn't have BIOS-setup workarounds. Multihead behavior may be wrong, and it is + all untested. + +commit 7edb25789bd13f26134e8f5bf493897c8df322e0 +Author: Eric Anholt +Date: Wed Mar 1 14:02:51 2006 -0800 + + Start making i830SetMode aware of multiple pipes. + +commit b5915ac77a3887cd3aa4ce0bb77b8a36e1aa5a1b +Author: Eric Anholt +Date: Wed Mar 1 13:12:25 2006 -0800 + + Clean up a couple of warnings. + +commit c20e15fbe4daeb7288f5c56cf5467eed13686080 +Author: Eric Anholt +Date: Wed Mar 1 13:08:38 2006 -0800 + + Disable I830VESASetVBEMode on restore, since I've removed that code. Note that + this means that VT switching is broken. We're fine with that for now, but at + least now we get a bad display rather than X crashing about an undefined symbol. + +commit 7d37c5036956609d0c7ae874d0dc1c616f76f849 +Author: Eric Anholt +Date: Wed Mar 1 13:06:04 2006 -0800 + + Re-disable chatty debug code. + +commit 2538cbeb5014e40280a3ae782a755512b1dc85fa +Author: Eric Anholt +Date: Wed Mar 1 13:01:52 2006 -0800 + + Enable -Wall on GCC, and do a cleanup of existing warnings. + +commit 7746da3b346968ab8d2534fc158d026da67cc7b5 +Author: Eric Anholt +Date: Wed Mar 1 12:49:06 2006 -0800 + + Move LVDS panel power state setting to a separate function, and reduce magic + numbers. + +commit 142bc4f91a5d776e7ab44cc5fb2328e3f7267557 +Author: Eric Anholt +Date: Tue Feb 28 18:50:57 2006 -0800 + + Write the ADPA (CRTC) register on mode setup. Obtained from airlied. + +commit 6877f532c5f41a445d41eb6a9982bf6bcf691bf2 +Author: Eric Anholt +Date: Tue Feb 28 15:56:06 2006 -0800 + + Add untested CRT detection code. + +commit a085813714818a23aa8d326804f642cd699e0f17 +Author: Eric Anholt +Date: Tue Feb 28 15:16:59 2006 -0800 + + Add adjustments of PLL divisor limits for "Almador". + +commit 2d4415ff1729554537b20be2b6c878444485e406 +Author: Eric Anholt +Date: Mon Feb 27 16:57:43 2006 -0800 + + Remove the hacked local xf86SetModeCRTC now that xf86SetCrtcForModes is taking + effect on all of our modes. + +commit 611264ab9b82bca6648a9b27e5ba4b7457c46aa6 +Author: Eric Anholt +Date: Mon Feb 27 15:44:11 2006 -0800 + + Remove more VBE stuff and start using xf86ValidateModes. Guessed some params to + xf86ValidateModes. + +commit 9838f639911e8c165ab615fdd9a00e02fa4b3f8a +Author: Eric Anholt +Date: Mon Feb 27 14:12:50 2006 -0800 + + Always ErrorF output debugging info when doing BIOS calls, including file/line. + +commit 767944e3782f9941e9fc72a6705cc3115a6e24ac +Author: Eric Anholt +Date: Mon Feb 27 13:08:46 2006 -0800 + + Replace a few magic numbers with symbolic names. Reviewed by md5. + +commit 4955cd267e7f8ed70e90b2a3de6f93de2ef859c8 +Author: Eric Anholt +Date: Mon Feb 27 09:37:47 2006 -0800 + + Add untested save/restore code, and starting on not using VBEValidateModes + +commit 73496b765c9783a8a271b4774a44fa263dd47684 +Author: Eric Anholt +Date: Mon Feb 27 09:26:51 2006 -0800 + + Change an if statement to a more obvious but equivalent case statement. + +commit 9fe316da7390918dd88940087567314b6f253981 +Author: Eric Anholt +Date: Thu Feb 23 13:49:31 2006 -0800 + + Add the manpage's possible names when generated. + +commit 1555229f29fa7479d6a7a51f451d04a5ef3460bd +Author: Eric Anholt +Date: Thu Feb 23 13:48:26 2006 -0800 + + Move .cvsignore to .gitignore + +commit 139d33ac807fb0fc35c37c3689a6e80238199442 +Author: Eric Anholt +Date: Thu Feb 23 13:46:30 2006 -0800 + + Initial add of native CRT modesetting code. + +commit 35e4756645891bfc85f25f1ab60c287eba9ef749 +Author: Dave Airlie +Date: Wed Apr 5 07:12:00 2006 +0000 + + Fix some argument inversions in xf86DrvMsg function calls + +commit 6e5f9b026372eea295c390b18fc41f7018e0e797 +Author: Kristian Høgsberg +Date: Tue Apr 4 18:22:32 2006 +0000 + + Add more missing #include's, in particular assert.h. + +commit fdfce49c54dabf0f6b0d20aa7e5eeb62b5b57eda +Author: Kristian Høgsberg +Date: Wed Mar 22 23:24:03 2006 +0000 + + Drop libc wrapper; don't include xf86_ansic.h and add includes now missing. + +commit 58817c9909ba659d0070afab0ff7f4e26f722403 +Author: Alan Hourihane +Date: Fri Mar 10 13:07:00 2006 +0000 + + Enable gamma for hw cursor when ARGB cursor in use (Lukas Hejtmanek) + +commit ab4c2f3bf4b26fdd597ea7b7a726ae77778617b2 +Author: Alan Hourihane +Date: Fri Mar 3 16:27:37 2006 +0000 + + Check the version of shadow being used and turn off rotation if it isn't the + right one. + Bump the Xvideo resolution support from 1920x1080 to 1920x1088. + +commit be6216cd8c6a47dd053240f7a5d1445b61f79038 +Author: Alan Hourihane +Date: Mon Feb 20 03:25:50 2006 +0000 + + Fix a rotation problem when DRI is disabled + +commit 073c4a6a18e98e2dde114756b5d787b13bb2b7a5 +Author: Alan Hourihane +Date: Mon Feb 20 03:22:26 2006 +0000 + + Fix a rotation problem when DRI is disabled + +commit 7cca2ae73e0114a9df2152ed5ed5b66fc44f65dd +Author: Alan Hourihane +Date: Sun Feb 19 00:04:49 2006 +0000 + + fix another build problem + +commit 2e01277da0be55687ca901efadcaf5c919826824 +Author: Alan Hourihane +Date: Fri Feb 17 16:16:10 2006 +0000 + + fix build failure + +commit 86fa25369353471dc9a1041df74e66e9029863a7 +Author: Alan Hourihane +Date: Wed Feb 15 18:31:22 2006 +0000 + + a little more of a workaround until we unplug the frontbuffer from libdri + +commit 32f97e02ac3611fd5e3870826dedf701f3b69a51 +Author: Alan Hourihane +Date: Fri Feb 10 21:59:37 2006 +0000 + + temporary workaround until DRI frontbuffer mapping code is removed from + libdri.a + +commit 50e5c2696389cb4d5907a822aa79d5e0e03cee8c +Author: Alan Hourihane +Date: Thu Jan 26 09:55:15 2006 +0000 + + update Changelog + +commit 91d2ba5743041077754de3bd3565df930b036c7d +Author: Alan Hourihane +Date: Thu Jan 26 09:05:50 2006 +0000 + + add changelog + +commit 076971b95ed3b89e1a333adbffceab1c2a5b7743 +Author: Alan Hourihane +Date: Wed Jan 25 22:22:42 2006 +0000 + + When going dual head only take a portion of memory for the second head + instead of doubling the requirements. + +commit 77d1c579f3031789031dd203175d3c9555226f79 +Author: Alan Hourihane +Date: Wed Jan 25 22:17:00 2006 +0000 + + Fix a glitch in a dual head fix from #3105 + +commit d8d749080923e88376db1aa18ae2ad722d5113d9 +Author: Alan Hourihane +Date: Tue Jan 24 15:20:34 2006 +0000 + + Bump version to 1.5.0.0 + Add Intel 945GM support + Add RandR rotation support (full 3D acceleration, HWcursor & Xvideo rotated too) + Remove shadow framebuffer rotation code + Add a new LinearAlloc option to allow more offscreen memory to be allocated + for XVideo applications. This allows HDTV movies to be played via Xvideo. + +commit 919d36b6717e9a7d930c5120309778da7b0fe16c +Author: Kevin E Martin +Date: Wed Dec 21 02:30:00 2005 +0000 + + Update package version for X11R7 release. + +commit 92962f32fccac6df751268190928d8becb558b64 +Author: Adam Jackson +Date: Mon Dec 19 16:25:53 2005 +0000 + + Stub COPYING files + +commit d2ef609211306b6bd3861c0e5f6d3a9af3e145fb +Author: Alan Coopersmith +Date: Mon Dec 19 09:07:50 2005 +0000 + + Typo fixes, mailing list & url updates, and other changes to prepare for + X11R6.9 & 7.0 releases. + +commit 1c51ff5c652690d66d1f7cba803c0bb26208b509 +Author: Kevin E Martin +Date: Thu Dec 15 00:24:17 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit c5007a4b46ffb66f5d98abe8bcae6df8c6eb1b31 +Author: Kevin E Martin +Date: Tue Dec 6 22:48:35 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 15df4215347854604fd3f6795ac5f971444cf39d +Author: Kevin E Martin +Date: Sat Dec 3 05:49:33 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit c50cd5a7f5af7d45550f25f173b512eb89bf41c5 +Author: Kevin E Martin +Date: Fri Dec 2 02:16:08 2005 +0000 + + Remove extraneous AC_MSG_RESULT. + +commit da2c00c0e85a284e3fbd237f3a77212f9647da37 +Author: Adam Jackson +Date: Wed Nov 30 18:47:54 2005 +0000 + + Bump libdrm dep to 2.0. + +commit ca36f1da4e254c779b38df30fd655533e548a294 +Author: Adam Jackson +Date: Tue Nov 29 23:29:59 2005 +0000 + + Only build dlloader modules by default. + +commit 0b337390d6919e9a3d31ca654c8bc44b30756862 +Author: Alan Coopersmith +Date: Mon Nov 28 22:04:09 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 159bea027893ce5996a452a6f493372792e95122 +Author: Eric Anholt +Date: Mon Nov 21 10:49:14 2005 +0000 + + Add .cvsignores for drivers. + +commit e62939e30e664592085ce394680fd8e7f3d31339 +Author: Kevin E Martin +Date: Sat Nov 19 07:15:38 2005 +0000 + + Update pkgconfig files to separate library build-time dependencies + from application build-time dependencies, and update package deps + to work with separate build roots. + +commit 08f03e4237ce9a54f0dffa37307af402b0bd2e55 +Author: Kevin E Martin +Date: Wed Nov 9 21:31:20 2005 +0000 + + Bump version numbers for X11R6.9/X11R7 RC2. + +commit a600e89a1547908f2018de96b5ecb814e2427b34 +Author: Kevin E Martin +Date: Wed Nov 9 21:15:15 2005 +0000 + + Update package version number for X11R7 RC2 release. + +commit f73c23b4c588c2f5dbc3c36a2f43b8bbb1e0f36a +Author: Kevin E Martin +Date: Tue Nov 1 15:08:53 2005 +0000 + + Update pkgcheck depedencies to work with separate build roots. + +commit 25a63bfefda420f85b3cba89bdae4b35ef80c84f +Author: Adam Jackson +Date: Fri Oct 21 18:40:19 2005 +0000 + + Bug #4829: Remove some useless DRI symbol checks. + +commit 53c122fa162709f618be26d5940e3488c0cbbafa +Author: Kevin E Martin +Date: Wed Oct 19 02:48:03 2005 +0000 + + Update package version number for RC1 release. + +commit 4b97a544cac9fb507b4a2a7c8017607ea2cac1bb +Author: Alan Coopersmith +Date: Tue Oct 18 00:01:53 2005 +0000 + + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro substitutions + to work better with BSD make + +commit c7b7ece6330561b3745f0e1136b57575eadec5ad +Author: Adam Jackson +Date: Mon Oct 17 22:57:33 2005 +0000 + + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead of indirectly + +commit 0586dbe1c5d0432e8d8da2f3576ac2ccbe139919 +Author: Alan Coopersmith +Date: Mon Oct 17 00:09:03 2005 +0000 + + Use sed & cpp to substitute variables in driver man pages + +commit 1317f2d1f35241969dcf376abd106ffe3f918432 +Author: Søren Sandmann Pedersen +Date: Tue Oct 4 20:01:03 2005 +0000 + + Check in generated README files + +commit bd48e0531a16bdf27fc8549826cc1123ba12d5bd +Author: Søren Sandmann Pedersen +Date: Mon Oct 3 21:22:07 2005 +0000 + + - For all drivers that have a .sgml file, add code in their build + system to build the README file at make dist time + + - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that + will check if the required tools and files exist, and if so set a + conditional. + + - util/modular/symlink.sh + - Link all the .sgml to xf86-video-/README.sgml + - Add all the README. to the list of excluded files + + - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes + to make it spew less warnings when the text file is built. + +commit 6fda4e886c30669e346f7f30a38b93a77004a7f6 +Author: Alan Hourihane +Date: Mon Oct 3 09:39:17 2005 +0000 + + Bug #4353: Fix lockup when suspend and resume when playing video. + Shutdown the overlay on LeaveVT. + +commit 154724cc4be1e951649c29e4abdbde964a8c112e +Author: Alan Hourihane +Date: Tue Sep 27 08:58:23 2005 +0000 + + Put back the print code to display the DDC information, and remove some bogus + DDC messages. + +commit 2174848266940e1896970c12717e106a4742dcbc +Author: Adam Jackson +Date: Sat Sep 24 18:45:45 2005 +0000 + + Disable the {Open,Close}FullScreen DRI protocol. + Remove empty FullScreen stubs from drivers, comment the non-empty ones. + +commit b6443515e9d485b1ab8ee266c5b21750d2a5a551 +Author: Alan Coopersmith +Date: Thu Sep 22 01:58:17 2005 +0000 + + Don't build xvmc module if DRI support is not present + +commit 76033c2c885524c2116ccf0bdd30c89fa2636150 +Author: Eric Anholt +Date: Thu Sep 15 06:04:59 2005 +0000 + + Bug #4458: Check for the xvmc proto package, since it's required to build these. + (Joshua Baergen) + +commit 50f0bf51a67c89bf445a682f8fec34c52ff909a8 +Author: Alan Hourihane +Date: Thu Sep 8 14:51:40 2005 +0000 + + fix another possible crash + +commit 521e357c1846960b48e83fb97f77025f6f91e638 +Author: Alan Hourihane +Date: Thu Sep 8 09:31:04 2005 +0000 + + Fix a crash situation + +commit e8c46c897564f038744b9274949482568d654ecc +Author: Alan Hourihane +Date: Tue Sep 6 10:31:33 2005 +0000 + + Fix DirectColor visual colormap issues at 16bpp in the i830 driver. + +commit bf6fef41935ebf624cc1ae6faa084dfa0a7eee72 +Author: Alan Hourihane +Date: Tue Sep 6 10:23:57 2005 +0000 + + Sync the accelerator before calling AdjustFrame to avoid lockups. + +commit 5fc5f02d76e077b09bf3ab1c7deeb1263033d57a +Author: Dave Airlie +Date: Mon Aug 29 12:06:13 2005 +0000 + + Add i810 XvMC support, it passes distcheck for me. + +commit 86e6935bd50b129519b24ee3d694a3f75b8d4f1c +Author: Dave Airlie +Date: Mon Aug 29 12:02:29 2005 +0000 + + Fix include paths for i810 XvMC add config.h to driDrawable.c + +commit 6f1406753da102ccce1898b3f160d6eaaccc9b7c +Author: Kristian Høgsberg +Date: Fri Aug 26 15:32:40 2005 +0000 + + Added i830_io.c, which just includes i810_io.c with BUILD_FOR_I830 set. + +commit 219beaca91b88dabfe05b8e756d558269f7a5148 +Author: Daniel Stone +Date: Sun Aug 21 06:26:33 2005 +0000 + + Fix typo in debug ErrorF. + +commit fdc6997f2edf4dfdcfd877152028bff2a0306999 +Author: Daniel Stone +Date: Thu Aug 18 09:03:47 2005 +0000 + + Update autogen.sh to one that does objdir != srcdir. + +commit 461d43be78f49e6cb965b7a206c77f6fe1622601 +Author: Alan Hourihane +Date: Mon Aug 15 07:30:05 2005 +0000 + + Egbert's 64bit fixes for mixed 32/64bit clients + +commit 95bd8dbee69b4b35e4c37e19d15e0449c38726b6 +Author: Alan Hourihane +Date: Fri Aug 12 21:23:59 2005 +0000 + + add missing i830_shadow.c + +commit 7476d0413f161ddb3f3cc4a77c3f2a2912d17e60 +Author: Alan Hourihane +Date: Mon Aug 8 09:17:06 2005 +0000 + + Enable gamma correction bit even for 8bit modes. + + The pipeconf register handles the real enablement. + +commit a89f89a2423aecb199d5f4af2e9430e180aa1131 +Author: Ian Romanick +Date: Fri Aug 5 23:04:33 2005 +0000 + + I have resolved this by making all the "Direct rendering disabled" messages + X_WARNING and all the "Direct rendering enabled" messages X_INFO. Ideally, + we need to factor some of this stuff out to common code. There is a *LOT* of + duplication among the *_dri.c files under programs/Xserver/hw/xfree86/drivers. + + I'm trying to clean up as much low hanging fruit as I can and got tired of + waiting for ajax. :P + +commit fd6d7d7f7ea03961c5ecf7db029f12ece93d414a +Author: Alan Hourihane +Date: Tue Aug 2 16:22:42 2005 +0000 + + Adjust newPipe code for BIOS's starting at 1200 + +commit da7b85176fc061995e1b04fa22dc736b6c9353e6 +Author: Adam Jackson +Date: Sun Jul 31 17:19:29 2005 +0000 + + Post-merge fixups: + - Disable building the gamma driver + - Fix numerous Imakefiles to get header paths and subdirs right + - Symlink client-side GLX lib source from Mesa + - Add new shader subdirs to the Mesa core build + - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need + it, since they don't generate protocol, and it was breaking the + build. + +commit 1561ec3ca4f0d774f2664e9354d537061a0102d1 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:43 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n + to reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit d165b7dc4ec3793e921363cdeb1ad41c0a3653d6 +Author: Søren Sandmann Pedersen +Date: Wed Jul 27 21:23:29 2005 +0000 + + Add xf86driproto to dependencies for drivers with DRI support. Patch from + Donnie Berkholz + +commit 0cd371c6e57f899c34c4d2e2a8531ef7ce3967a4 +Author: Alan Hourihane +Date: Tue Jul 26 21:55:42 2005 +0000 + + Bump the DDX version to 1.4.0 to indicate the removal of drmAddress. + Thus allowing 32/64bit clients to cohabit. + +commit adef005c2f96395d396834f2173125f0c06d40cb +Author: Alan Hourihane +Date: Tue Jul 26 08:07:37 2005 +0000 + + Bug #3850: + Fix non-DRI builds. + +commit 09e871b1b4a67cfe818613bc012d72965b449f1c +Author: Søren Sandmann Pedersen +Date: Tue Jul 26 00:41:42 2005 +0000 + + Build system for i810 + +commit ac920dae7c22ed3956e4f31a0d3baf1909762b76 +Author: Adam Jackson +Date: Mon Jul 11 02:29:51 2005 +0000 + + Prep for modular builds by adding guarded #include "config.h" everywhere. + +commit f90f661652e5fe0986eb804f8dff3eeffe0af820 +Author: Alan Hourihane +Date: Sat Jul 9 21:19:11 2005 +0000 + + Copy mode strings upon mode copy + +commit 8fced5b648b0666ca88221e37bc1131ab5c2072d +Author: Alan Hourihane +Date: Tue Jul 5 09:25:03 2005 +0000 + + Fix Xvideo when operating in one line mode and video is pushed off the top of + the screen. Also some fixes for Xvideo skew in certain resolutions. + +commit 68bc259fa1082f7780e524fc703e926a27fc7f9a +Author: Alan Hourihane +Date: Mon Jul 4 20:45:39 2005 +0000 + + NULL check + +commit 83c3e3ee49a0aa3ceaf52e2408cc253fc5dc8af4 +Author: Alan Hourihane +Date: Tue Jun 28 16:13:02 2005 +0000 + + Add support to check the in-built VESA mode list. + +commit 0d64e9e1f5494cff633a1499545d55a0edd0d92e +Author: Adam Jackson +Date: Sat Jun 25 21:16:55 2005 +0000 + + Bug #3626: _X_EXPORT tags for video and input drivers. + +commit 67174d67e740b9082ed0a65a79f08b5df3b4fcfb +Author: Alan Hourihane +Date: Mon Jun 13 12:15:25 2005 +0000 + + commit missing piece from resume patch + +commit ddab0558d584fb906cc0dfb383cc0e7a122d5336 +Author: Alan Hourihane +Date: Thu Jun 9 09:26:03 2005 +0000 + + Bug #3496 + Remove a bogus check for DRM 1.2 for resume functionality as it's + been present since 1.1 + +commit 7f49513afe9d4490bdfdac182d50383c089875e0 +Author: Alan Hourihane +Date: Wed Jun 8 17:50:32 2005 +0000 + + Fix the mode validation such that using function 5f05 to set the refresh rate + works again. + +commit f8de9b4b9a5ce2756652c6b9ec1e84aedbc3519a +Author: Alan Hourihane +Date: Tue Jun 7 18:54:10 2005 +0000 + + Fix text restoration when display switching has been activated and we could be + potentially on a different display than the initial one. + +commit 1f538007e9da7d4ad30ec4d4d281fb07ef300ddb +Author: Alan Hourihane +Date: Mon Jun 6 09:47:29 2005 +0000 + + missed a hunk + +commit d8a32bf4274ad91cc2b9ca425f5b0a017c2dd293 +Author: Alan Hourihane +Date: Mon Jun 6 09:40:23 2005 +0000 + + Bug #3436 + Fix some offset, pitch and overlay scaler size problems with + the video overlay. Solves various spontaneous lockups. + +commit 005d121d280ff4502f4d6e3d3d585ff0175367bb +Author: Alan Hourihane +Date: Tue May 31 20:29:01 2005 +0000 + + and another. sheesh. + +commit 27f86d693c32e550d9ebf4d6ff05c2d827754c8b +Author: Alan Hourihane +Date: Tue May 31 20:27:24 2005 +0000 + + missed hunk + +commit 27feb0f3474c1e21557225e10b13558e002c0ebf +Author: Alan Hourihane +Date: Tue May 31 17:58:26 2005 +0000 + + Add Intel(R) 945G support + +commit 2d10e8dc8184b0514e8ac9f835a06b85d609bb1b +Author: Alan Hourihane +Date: Wed May 25 09:10:44 2005 +0000 + + Change the sequence on how refresh rates are set in the i830 driver. This works + much better with custom modelines. + +commit 89ec4ac201c09329d5d732323bdce6250b8592fe +Author: Alan Hourihane +Date: Fri May 20 15:24:02 2005 +0000 + + Bugzilla #3292: https://bugs.freedesktop.org/show_bug.cgi?id=3292 + Add shadowFB support to the Intel driver (Dima Dorfman) + +commit df0964ea8f92c6b278dd87b95380dbc3ada625e5 +Author: Alan Hourihane +Date: Fri May 20 13:24:02 2005 +0000 + + Bugzilla #2339: https://bugs.freedesktop.org/show_bug.cgi?id=2339 + Bugzilla #1064: https://bugs.freedesktop.org/show_bug.cgi?id=1064 + Bugzilla #3055: https://bugs.freedesktop.org/show_bug.cgi?id=3055 + Much better display switching support for mobile chipsets using + the Fn+F? combination keys. + Add DirectColor support. + Add gamma correction support. + +commit b99ef9cd59fce0e02e8829210c7cb8aadb6a3499 +Author: Alan Hourihane +Date: Fri May 20 11:56:45 2005 +0000 + + Bugzilla #2585: https://bugs.freedesktop.org/show_bug.cgi?id=2585 + Support the Intel E7221 server chipset. + +commit 3b87fac327b5549678f91a9c961b9fe5c0bf8a37 +Author: Adam Jackson +Date: Wed May 18 17:47:35 2005 +0000 + + Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the + version number of the DRIInfoRec, disambiguating it from the XF86DRI + protocol version number. Modify DRIQueryVersion to return the libdri + version number, which all DDXes were requesting implicitly. Fix the + DDXes to check for the DRIINFO version they were compiled against. + +commit 72100ac7cff7485db3e869f1331caddb0bc21a24 +Author: Daniel Stone +Date: Wed Apr 20 12:25:28 2005 +0000 + + Fix includes right throughout the Xserver tree: + * change "foo.h" to for core headers, e.g. X.h, Xpoll.h; + * change "foo.h", "extensions/foo.h" and "X11/foo.h" to + for extension headers, e.g. Xv.h; + * change "foo.[ch]" to for Xtrans files. + +commit c813bf655908cd72049f346919abbdff8365b944 +Author: Alan Hourihane +Date: Thu Apr 14 22:55:01 2005 +0000 + + Fix initial DDC parameters when validating modes. + +commit e637630908f40f42367c94344d44918b6cdb0eb2 +Author: Alan Hourihane +Date: Fri Apr 1 14:17:24 2005 +0000 + + Check the VESA BIOS scanline requirements and adjust the displayWidth + accordingly. Fixes an assumption that the screen width was always used as the + displayWidth. + +commit 5090c8ba6778091aa4ce24b16b058d534ba78dc7 +Author: Alan Hourihane +Date: Mon Mar 21 21:20:39 2005 +0000 + + a one line fixup to the UseDDC code + +commit 8bc9b0d7da5de9a3294687f450afb50452898c7d +Author: Alan Hourihane +Date: Mon Mar 21 18:57:39 2005 +0000 + + Fix some bad alignment problems when allocating memory from + the end of AGP space. + Bugzilla #2764 (https://bugs.freedesktop.org/show_bug.cgi?id=2764) + +commit 50a105e88cfdfc22fef8cfd2397fc5e9fae17663 +Author: Alan Hourihane +Date: Tue Mar 15 13:10:23 2005 +0000 + + LFP's may exist on Pipe A in older i830's. Check that case so that Panel ID can + be obtained and Xvideo is correctly setup for panel fitting. + +commit eb8b5df739e7be4509423c2bf757a7df35ce02f6 +Author: Alan Hourihane +Date: Tue Mar 15 11:32:10 2005 +0000 + + Enforce DDC monitor ranges usage if we have them and reject bad + modes. Use NoDDC option to override DDC timings. We currently + only use DS_RANGES, but could use other DDC information, as does + the common layer, to deduce the h/v ranges. + +commit 49dcbacf7fa7f29d18c18eec7e2f99e859bf4c7e +Author: Alan Hourihane +Date: Thu Mar 3 18:01:51 2005 +0000 + + Limit the maximum refresh rate to 85Hz and remove the bogus + 100Hz and 120Hz settings as they don't match close enough and + are really unsupported. + +commit 7eaf88d00d7539fde68422ae6566f23993aa2633 +Author: Alan Hourihane +Date: Tue Mar 1 19:53:28 2005 +0000 + + Fix an off by one error when scaling which caused occasional + overlay color lines at the far right and bottom of the window. + +commit 28d65bceaec3ef636f0f5bdd03b38fd76f87c8c6 +Author: Alan Hourihane +Date: Thu Feb 10 13:16:08 2005 +0000 + + Fix unaligned YV12 videos that caused skew when playing. + +commit 6352e65b9cd635e9f266e0e9ed64c5beae9e5c44 +Author: Alan Hourihane +Date: Thu Feb 10 10:41:20 2005 +0000 + + Fix pixmap cache corruption when Xv was in use due to a memory allocator + calculation problem. + +commit f691f959213d3eb5c365edaf5a5a53fa96300491 +Author: Alan Hourihane +Date: Tue Feb 8 20:13:33 2005 +0000 + + Setup the Xv atoms correctly. + +commit 31a4191a97f538b2c6d4b8036796f06443f783c1 +Author: Egbert Eich +Date: Mon Feb 7 11:56:31 2005 +0000 + + Check the pixel clock choosen for a specific refresh rate + against the maximally allowed pixel clock when choosing + mode lines for VBESetVBEMode() and VESA BIOS version >= 3.0 + (Bugzilla #2486). + +commit a103496e08f699b609be875827ecf1f3afa45e68 +Author: Alan Hourihane +Date: Tue Feb 1 19:47:32 2005 +0000 + + Check return value of i830InitDma() and fail to initialize the DRI + if that fails. + Also, check the DRM module name that it matches i915 and not the + older i830 driver which some people were still trying to use + and was causing Dma Initialization failures and lockups. + +commit 7ff7cec9220815eb5f74cfd95860aaa5f1f263bd +Author: Egbert Eich +Date: Mon Jan 24 15:02:17 2005 +0000 + + Unmap XCursor AGP memory on VT switch to prevent system from lockup + (Matthias Hopf). + +commit d4c87adf6792ae9af641b9824c547d18cdd1e521 +Author: Alan Hourihane +Date: Mon Jan 10 11:29:02 2005 +0000 + + Revert some changes to TweakMemorySize + +commit 076c5116ae5eda1822da70184cbcc8942b470541 +Author: Alan Hourihane +Date: Thu Jan 6 14:43:14 2005 +0000 + + Add: + - Intel i915GM support to 2D DDX and 3D Mesa drivers. + - PanelID identification + - DRI suspend/resume support + - Detection of monitor changes on VT switches + - Support custom video modes if available in the Video BIOS + - 3D enhancements: + * GL_ARB_texture_cube_map + * GL_EXT_blend_equation_separate + * GL_ATI_blend_equation_separate + * GL_ARB_point_parameters + * GL_NV_blend_square + * GL_EXT_cull_vertex + * GL_ARB_depth_texture + * GL_SGIX_depth_texture + * GL_ARB_shadow + * GL_EXT_shadow_funcs + * GL_3DFX_texture_compression_FXT1 + By Tungsten Graphics, Keith Whitwell & Alan Hourihane. + +commit edb9b6fde0948bb1121a8456500ef9f55f734376 +Author: Adam Jackson +Date: Mon Jan 3 16:03:56 2005 +0000 + + Bug #1488: Fix crash on i830 during startup. (Eric Anholt) + +commit 59cecb714b78f7f384c24bf159bd39c81e9c7ee1 +Author: Markus Kuhn +Date: Sat Dec 4 00:43:09 2004 +0000 + + Encoding of numerous files changed to UTF-8 + +commit c24b0e04f3a1b064412e0bea44c4af546ec9fb77 +Author: Egbert Eich +Date: Tue Nov 2 08:54:53 2004 +0000 + + Fixed KGA handling for i810. KGA handling for chips derived from C&T chips is + slightly different. The changes make the code consistent with the C&T (chips) + and i740 drivers. + +commit 7ce4898ee319d149cf86e938e7257ea7490d327f +Author: Egbert Eich +Date: Wed Oct 27 09:52:15 2004 +0000 + + Removing vtSema shilding of accel sync - should have been '&&' instead of '||' + anyway. + +commit 88714c3b2274fcfe50837631b1d38a7cd96f692a +Author: Egbert Eich +Date: Tue Oct 12 19:13:43 2004 +0000 + + Change order of SetDisplayDevice(), HWRestore(), UnbindGART() and + RestoreBIOSMemSize() to be exactly opposite to the Save procedure in EnterVT() + (Matthias Hopf, Alan Hourihane). + Fixed server crash on reset when a structure allocated in PreInit() was freed on + CloseScreen(). + Fixed ring buffer lock ups that happened because the structure that contained + ringbuffer data was not zeroed after allocation. + Fixed numerous warnings due to signed unsigned comparisons. + +commit 687298daed40aaade44e61342a9abe984088541b +Author: Egbert Eich +Date: Mon Oct 11 09:58:04 2004 +0000 + + Checking if server isn't switched away before calling sync. + Sanity check for possible bugs in aother areas of the code. + Fixing default amount of of allocated video memory from AGP for i810: Use 16MB + if less than 192MB are installed else use 24MB (Matthias Hopf). + +commit d2866271b8d42a0d44b65e30667adab96ac8fd54 +Author: Adam Jackson +Date: Wed Sep 22 04:38:03 2004 +0000 + + Bug #1252, #1253, #1255, #1256: Various typo fixes from Dave Jones. + +commit 88fd270d23ed1a1761cfdb98367c89ca89735b12 +Author: Adam Jackson +Date: Fri Sep 17 03:04:51 2004 +0000 + + Bug #1192: Remove cfb support from drivers where its use is an option. + Delete xf24_32bpp, as s3virge was the last user. Fix up some comments + to refer to fb rather than cfb. + +commit 9e8e19c6fde15fe5b9bb7532316dedeeca54b8d9 +Author: Kevin E Martin +Date: Mon Aug 30 03:19:08 2004 +0000 + + Fix ARGB cursor problem on i810 (Bug #1195, Alan Hourihane). + +commit 15c61546ea1a64d6c7dd60764164143ea7174123 +Author: Kevin E Martin +Date: Thu Aug 26 05:10:56 2004 +0000 + + Fix i810 compilation without Xinerama (Bug #1180, Simon Schubert). + +commit 828c0fb8050dcbed8026365cbcb17d4d4330c268 +Author: Kevin E Martin +Date: Wed Aug 25 00:30:41 2004 +0000 + + Fix i810 driver startup on Sony VAIO laptop (Bug #1084, Dave Airlie). + +commit c4626af83d760c2a6aae90ad478430eac1c4f4ea +Author: Egbert Eich +Date: Fri Jul 30 21:36:40 2004 +0000 + + Do I810EmitFlush() during screen init to make sure 2D engine is in a sane state + (Peter Kunzmann). + +commit e0e01b7d6188a83c7539256ac1710ace04ce132a +Author: Egbert Eich +Date: Fri Jul 30 20:38:27 2004 +0000 + + add i845 to the list of chips that allow memory size tweaking. + +commit 199620cdc924e6aa98683e305843ea91c7e1771d +Author: Adam Jackson +Date: Fri Jul 30 20:30:52 2004 +0000 + + Bug #400 (partial): Driver fixes for the dlloader. When using + dlloader, all framebuffer formats except cfb and the overlay modes + should work, and r128 and radeon need to be loaded from the ati + driver (both issues to be fixed soon). Tested on i740, s3virge, + mach64, tdfx, vesa, and vga drivers. elfloader users shouldn't be + affected. + +commit 54e644ffbb63290b7e2ec51b041f5b2df26e164b +Author: Egbert Eich +Date: Fri Jul 30 19:04:14 2004 +0000 + + Removed bugs on TweakMemorySize() which prevented it from working at all. + Initialized last element of BIOS version number string to 0 to avoid random + problems. + +commit 3a3b00f18ac5edd7dfef06a96342c95f3cb97f79 +Author: Kevin E Martin +Date: Fri Jul 30 04:44:13 2004 +0000 + + Fix "DoLoadableServer NO" build + +commit 986bc24892e7ce3784fc723fda54b1f89dd75b66 +Author: Egbert Eich +Date: Tue Jul 6 14:37:47 2004 +0000 + + Increase default video RAM size to 16MB when DRI is enabled and more than 128MB + are available (Egbert Eich). + Fixed lockups during mode switch. Problem was introduced when attempting to copy + the behavior during LeaveVT()/EnterVT() but but forgetting to call + I810DRILeave() before I810DRIEnter(). The entire DRILeave()/Enter() scenario has + been commented out as it didn't seem to be necessary (Egbert Eich). + Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich). + +commit b7310758e60956a7de14dcf968bb713dfc56738f +Author: Alan Hourihane +Date: Tue Jun 22 15:12:42 2004 +0000 + + add CmdBuffer + +commit 5ed7e6f8424236dd57d83f6ab1282693260969cb +Author: Alan Hourihane +Date: Tue Jun 22 14:28:46 2004 +0000 + + i915 support + Dual Head support for i830, i855, i915. + ARGB cursor support (including i810) for all chipsets. + +commit a46e95722d3c2b9dfb9eacf9a390a7c47d427773 +Author: Eric Anholt +Date: Wed Jun 16 19:16:54 2004 +0000 + + Mop-up from the DRI 20040613 import, taking care of some drm.h + header location and type changes, and update the ChangeLog. + +commit 35a5cf103e9e41d178f980f685307f8c8063a006 +Author: Eric Anholt +Date: Wed Jun 16 09:44:00 2004 +0000 + + Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers, with + the following notes: + + - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to insecurity. + - VIA driver converted to new drmContext and drmHandle names. + - Radeon driver merge conflicted in many places, and MergedFB at least could + probably use some checking at this point. + +commit bec47f9369b6f02ce4537ab1ac547ba933609edc +Author: Eric Anholt +Date: Wed Jun 16 09:26:18 2004 +0000 + + DRI trunk-20040613 import + +commit c5b1972b50a6dbe57c67d3cc88ae010386b908a6 +Author: Eric Anholt +Date: Wed Jun 16 09:23:18 2004 +0000 + + DRI XFree86-4_3_99_12-merge import + +commit 41eba03d0d62fe03a7b437c9c4914016c3125141 +Author: Egbert Eich +Date: Fri Apr 23 19:35:55 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit e27494f2a9262b6310c2f1e0a40c406f578fc693 +Author: Egbert Eich +Date: Sun Mar 14 08:33:22 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 5ece535dc7f77185cc8c327a57ae3c02c8b9f918 +Author: Egbert Eich +Date: Wed Mar 3 12:12:19 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit ba904078dd22e013f4112479e7c2669c33e708a8 +Author: Egbert Eich +Date: Thu Feb 26 13:35:53 2004 +0000 + + readding XFree86's cvs IDs + +commit 13ea363db30dc0010cd09df29df90074db77f646 +Author: Egbert Eich +Date: Thu Feb 26 09:23:19 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 64b129e800d915f0d82a67ce0f8b1850e67012fc +Author: Egbert Eich +Date: Thu Jan 29 08:08:35 2004 +0000 + + Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 + +commit 64d7bbf0ac060a57761aa2ecf21ddbe8169674c0 +Author: Kaleb Keithley +Date: Fri Dec 19 20:55:10 2003 +0000 + + XFree86 4.3.99.902 (RC 2) + +commit 418eaaee109acd3ea178b147dd29f90318d159f9 +Author: Kaleb Keithley +Date: Thu Dec 4 22:03:17 2003 +0000 + + XFree86 4.3.99.901 (RC 1) + +commit 72063c52b82faf80a0183f66d2fd5789def76d8f +Author: Kaleb Keithley +Date: Tue Nov 25 19:28:37 2003 +0000 + + XFree86 4.3.99.16 + Bring the tree up to date for the Cygwin folks + +commit e04a1a8f862eb63b546fb74e73ee602fefb82e00 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + XFree86 4.3.0.1 + +commit 3ad0d9a73bc0a4f3edb858d5f3a7c36827b7a429 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:55 2003 +0000 + + Initial revision --- xserver-xorg-video-intel-2.9.1.orig/autogen.sh +++ xserver-xorg-video-intel-2.9.1/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-intel-2.9.1.orig/RELEASING +++ xserver-xorg-video-intel-2.9.1/RELEASING @@ -0,0 +1,52 @@ +The process for releasing a new tarball is as follows: + +1. Make sure you have the latest build requirements installed: + + git://git.freedesktop.org/git/util/macros + git://git.freedesktop.org/git/util/modular + +2. Add relevant release notes to the NEWS files + + Skim the git log since the last release, and add notes in a + similar style to previous releases. + + For major releases list added features and known limitations. + + For minor releases indicate which bugs were fixed and which + are still present. + + +3. Update your module version (usually found in configure.ac) + + $ vi configure.ac # bump version + $ git commit + $ git push origin # make sure you're on the release branch + +4. Verify your module builds + + $ make distcheck + +5. Tag the release + + $ git tag -m "Intel release" + +6. Run the release script (this should push the tag) + + $ /util/modular/release.sh driver + +7. Edit and send the generated release message. + + At the very least, add the release notes from the NEWS file. + + The message is generated as xf86-video-intel-.announce + + For snapshots and release candidates, mail to: + + intel-gfx@lists.freedesktop.org + + For major releases also send to: + + xorg@lists.freedesktop.org + xorg-announce@lists.freedesktop.org + +8. Throw a release party, you're done! :) --- xserver-xorg-video-intel-2.9.1.orig/src/i830.h +++ xserver-xorg-video-intel-2.9.1/src/i830.h @@ -388,7 +388,7 @@ /* For Xvideo */ i830_memory *overlay_regs; - void *offscreenImages; /**< remembered memory block for release */ + Bool use_drmmode_overlay; #ifdef INTEL_XVMC /* For XvMC */ Bool XvMCEnabled; @@ -694,6 +694,7 @@ extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); extern void drmmode_closefb(ScrnInfoPtr scrn); extern int drmmode_output_dpms_status(xf86OutputPtr output); +extern int drmmode_crtc_id(xf86CrtcPtr crtc); void drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor); --- xserver-xorg-video-intel-2.9.1.orig/src/i830_video.c +++ xserver-xorg-video-intel-2.9.1/src/i830_video.c @@ -86,8 +86,6 @@ #define TIMER_MASK (OFF_TIMER | FREE_TIMER) -static void I830InitOffscreenImages(ScreenPtr); - static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr); static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr); static void I830StopVideo(ScrnInfoPtr, pointer, Bool); @@ -105,7 +103,7 @@ #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) -static Atom xvBrightness, xvContrast, xvSaturation, xvColorKey, xvPipe, xvDoubleBuffer; +static Atom xvBrightness, xvContrast, xvSaturation, xvColorKey, xvPipe; static Atom xvGamma0, xvGamma1, xvGamma2, xvGamma3, xvGamma4, xvGamma5; static Atom xvSyncToVblank; @@ -216,13 +214,12 @@ {XvSettable | XvGettable, -1, 1, "XV_PIPE"} }; -#define NUM_ATTRIBUTES 5 +#define NUM_ATTRIBUTES 4 static XF86AttributeRec Attributes[NUM_ATTRIBUTES] = { {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"}, {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"}, {XvSettable | XvGettable, 0, 255, "XV_CONTRAST"}, - {XvSettable | XvGettable, 0, 1023, "XV_SATURATION"}, - {XvSettable | XvGettable, 0, 1, "XV_DOUBLE_BUFFER"} + {XvSettable | XvGettable, 0, 1023, "XV_SATURATION"} }; #define NUM_TEXTURED_ATTRIBUTES 3 @@ -359,6 +356,138 @@ static void I830SetOneLineModeRatio(ScrnInfoPtr pScrn); +/* kernel modesetting overlay functions */ +static Bool +drmmode_has_overlay(ScrnInfoPtr pScrn) +{ + I830Ptr p830 = I830PTR(pScrn); + struct drm_i915_getparam gp; + int has_overlay = 0; + + gp.param = I915_PARAM_HAS_OVERLAY; + gp.value = &has_overlay; + drmCommandWriteRead(p830->drmSubFD, DRM_I915_GETPARAM, + &gp, sizeof(gp)); + + return has_overlay ? TRUE : FALSE; +} + +static void +drmmode_overlay_update_attrs(ScrnInfoPtr pScrn) +{ + I830Ptr p830 = I830PTR(pScrn); + I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn); + struct drm_intel_overlay_attrs attrs; + int ret; + + attrs.flags = I915_OVERLAY_UPDATE_ATTRS; + attrs.brightness = pPriv->brightness; + attrs.contrast = pPriv->contrast; + attrs.saturation = pPriv->saturation; + attrs.color_key = pPriv->colorKey; + attrs.gamma0 = pPriv->gamma0; + attrs.gamma1 = pPriv->gamma1; + attrs.gamma2 = pPriv->gamma2; + attrs.gamma3 = pPriv->gamma3; + attrs.gamma4 = pPriv->gamma4; + attrs.gamma5 = pPriv->gamma5; + + ret = drmCommandWriteRead(p830->drmSubFD, DRM_I915_OVERLAY_ATTRS, + &attrs, sizeof(attrs)); + + if (ret != 0) + OVERLAY_DEBUG("overlay attrs ioctl failed: %i\n", ret); +} + +static void +drmmode_overlay_off(ScrnInfoPtr pScrn) +{ + I830Ptr p830 = I830PTR(pScrn); + struct drm_intel_overlay_put_image request; + int ret; + + request.flags = 0; + + ret = drmCommandWrite(p830->drmSubFD, DRM_I915_OVERLAY_PUT_IMAGE, + &request, sizeof(request)); + + if (ret != 0) + OVERLAY_DEBUG("overlay switch-off ioctl failed: %i\n", ret); +} + +static Bool +drmmode_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, + int id, short width, short height, + int dstPitch, int x1, int y1, int x2, int y2, BoxPtr dstBox, + short src_w, short src_h, short drw_w, short drw_h) +{ + I830Ptr p830 = I830PTR(pScrn); + I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn); + struct drm_intel_overlay_put_image request; + int ret; + int planar = is_planar_fourcc(id); + float scale; + + request.flags = I915_OVERLAY_ENABLE; + + request.bo_handle = pPriv->buf->handle; + if (planar) { + request.stride_Y = dstPitch*2; + request.stride_UV = dstPitch; + } else { + request.stride_Y = dstPitch; + request.stride_UV = 0; + } + request.offset_Y = pPriv->YBufOffset; + request.offset_U = pPriv->UBufOffset; + request.offset_V = pPriv->VBufOffset; + OVERLAY_DEBUG("off_Y: %i, off_U: %i, off_V: %i\n", request.offset_Y, + request.offset_U, request.offset_V); + + request.crtc_id = drmmode_crtc_id(crtc); + request.dst_x = dstBox->x1; + request.dst_y = dstBox->y1; + request.dst_width = dstBox->x2 - dstBox->x1; + request.dst_height = dstBox->y2 - dstBox->y1; + + request.src_width = width; + request.src_height = height; + /* adjust src dimensions */ + if (request.dst_height > 1) { + scale = ((float) request.dst_height - 1) / ((float) drw_h - 1); + request.src_scan_height = src_h * scale; + } else + request.src_scan_height = 1; + + if (request.dst_width > 1) { + scale = ((float) request.dst_width - 1) / ((float) drw_w - 1); + request.src_scan_width = src_w * scale; + } else + request.src_scan_width = 1; + + if (planar) { + request.flags |= I915_OVERLAY_YUV_PLANAR | I915_OVERLAY_YUV420; + } else { + request.flags |= I915_OVERLAY_YUV_PACKED | I915_OVERLAY_YUV422; + if (id == FOURCC_UYVY) + request.flags |= I915_OVERLAY_Y_SWAP; + } + + ret = drmCommandWrite(p830->drmSubFD, DRM_I915_OVERLAY_PUT_IMAGE, + &request, sizeof(request)); + + /* drop the newly displaying buffer right away */ + drm_intel_bo_disable_reuse(pPriv->buf); + drm_intel_bo_unreference(pPriv->buf); + pPriv->buf = NULL; + + if (ret != 0) { + OVERLAY_DEBUG("overlay put-image ioctl failed: %i\n", ret); + return FALSE; + } else + return TRUE; +} + static void i830_overlay_switch_to_crtc (ScrnInfoPtr pScrn, xf86CrtcPtr crtc) { @@ -489,6 +618,8 @@ OUT_BATCH(flip_addr); ADVANCE_BATCH(); OVERLAY_DEBUG("overlay_continue\n"); + + I830Sync(pScrn); } static void @@ -598,17 +729,19 @@ } /* Set up overlay video if we can do it at this depth. */ - if (!OVERLAY_NOEXIST(pI830) && pScrn->bitsPerPixel != 8 && - !pI830->use_drm_mode && pI830->overlay_regs != NULL) + if (!OVERLAY_NOEXIST(pI830) && pScrn->bitsPerPixel != 8) { - overlayAdaptor = I830SetupImageVideoOverlay(pScreen); - if (overlayAdaptor != NULL) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up overlay video\n"); - } else { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to set up overlay video\n"); + pI830->use_drmmode_overlay = drmmode_has_overlay(pScrn); + if ((!pI830->use_drm_mode && pI830->overlay_regs != NULL) + || pI830->use_drmmode_overlay) { + overlayAdaptor = I830SetupImageVideoOverlay(pScreen); + if (overlayAdaptor != NULL) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up overlay video\n"); + } else { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to set up overlay video\n"); + } } - I830InitOffscreenImages(pScreen); } if (overlayAdaptor && pI830->XvPreferOverlay) @@ -898,14 +1031,14 @@ pPriv->current_crtc = NULL; pPriv->desired_crtc = NULL; pPriv->buf = NULL; - pPriv->currentBuf = 0; + pPriv->oldBuf = NULL; + pPriv->oldBuf_pinned = FALSE; pPriv->gamma5 = 0xc0c0c0; pPriv->gamma4 = 0x808080; pPriv->gamma3 = 0x404040; pPriv->gamma2 = 0x202020; pPriv->gamma1 = 0x101010; pPriv->gamma0 = 0x080808; - pPriv->doubleBuffer = 1; pPriv->rotation = RR_Rotate_0; @@ -931,7 +1064,6 @@ xvBrightness = MAKE_ATOM("XV_BRIGHTNESS"); xvContrast = MAKE_ATOM("XV_CONTRAST"); xvSaturation = MAKE_ATOM("XV_SATURATION"); - xvDoubleBuffer = MAKE_ATOM("XV_DOUBLE_BUFFER"); /* Allow the pipe to be switched from pipe A to B when in clone mode */ xvPipe = MAKE_ATOM("XV_PIPE"); @@ -945,9 +1077,12 @@ xvGamma5 = MAKE_ATOM("XV_GAMMA5"); } - I830ResetVideo(pScrn); - - I830UpdateGamma(pScrn); + if (pI830->use_drmmode_overlay) + drmmode_overlay_update_attrs(pScrn); + else { + I830ResetVideo(pScrn); + I830UpdateGamma(pScrn); + } return adapt; } @@ -1011,8 +1146,8 @@ pPriv->textured = TRUE; pPriv->videoStatus = 0; pPriv->buf = NULL; - pPriv->currentBuf = 0; - pPriv->doubleBuffer = 0; + pPriv->oldBuf = NULL; + pPriv->oldBuf_pinned = FALSE; pPriv->rotation = RR_Rotate_0; pPriv->SyncToVblank = 1; @@ -1029,9 +1164,33 @@ } static void +i830_free_video_buffers(I830PortPrivPtr pPriv) +{ + if (pPriv->buf) { + drm_intel_bo_unreference(pPriv->buf); + pPriv->buf = NULL; + } + + if (pPriv->oldBuf) { + if (pPriv->oldBuf_pinned) + drm_intel_bo_unpin(pPriv->oldBuf); + drm_intel_bo_unreference(pPriv->oldBuf); + pPriv->oldBuf = NULL; + pPriv->oldBuf_pinned = FALSE; + } +} + +static void +ums_overlay_off(ScrnInfoPtr pScrn) +{ + i830_overlay_off (pScrn); +} + +static void I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown) { I830PortPrivPtr pPriv = (I830PortPrivPtr) data; + I830Ptr pI830 = I830PTR(pScrn); if (pPriv->textured) return; @@ -1042,15 +1201,14 @@ if (shutdown) { if (pPriv->videoStatus & CLIENT_VIDEO_ON) { - i830_overlay_off(pScrn); + if (pI830->use_drmmode_overlay) + drmmode_overlay_off(pScrn); + else + ums_overlay_off(pScrn); } - if (pPriv->buf) { - drm_intel_bo_unpin(pPriv->buf); - drm_intel_bo_unreference(pPriv->buf); - pPriv->buf = NULL; - pPriv->videoStatus = 0; - } + i830_free_video_buffers(pPriv); + pPriv->videoStatus = 0; } else { if (pPriv->videoStatus & CLIENT_VIDEO_ON) { pPriv->videoStatus |= OFF_TIMER; @@ -1079,7 +1237,6 @@ } else if (attribute == xvSyncToVblank) { if ((value < -1) || (value > 1)) return BadValue; - pPriv->SyncToVblank = value; return Success; } else { @@ -1087,36 +1244,56 @@ } } +static void +ums_overlay_update_attrs(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv) +{ + I830Ptr pI830 = I830PTR(pScrn); + I830OverlayRegPtr overlay; + + overlay = I830OVERLAYREG(pI830); + + overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff); + overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff); + overlay->OCLRC1 = pPriv->saturation; + + switch (pScrn->depth) { + case 16: + overlay->DCLRKV = RGB16ToColorKey(pPriv->colorKey); + break; + case 15: + overlay->DCLRKV = RGB15ToColorKey(pPriv->colorKey); + break; + default: + overlay->DCLRKV = pPriv->colorKey; + break; + } + + I830UpdateGamma(pScrn); + + i830_overlay_continue(pScrn, FALSE); +} + static int I830SetPortAttributeOverlay(ScrnInfoPtr pScrn, Atom attribute, INT32 value, pointer data) { I830PortPrivPtr pPriv = (I830PortPrivPtr) data; I830Ptr pI830 = I830PTR(pScrn); - I830OverlayRegPtr overlay; - - overlay = I830OVERLAYREG(pI830); if (attribute == xvBrightness) { if ((value < -128) || (value > 127)) return BadValue; pPriv->brightness = value; - overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff); OVERLAY_DEBUG("BRIGHTNESS\n"); - i830_overlay_continue (pScrn, FALSE); } else if (attribute == xvContrast) { if ((value < 0) || (value > 255)) return BadValue; pPriv->contrast = value; - overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff); OVERLAY_DEBUG("CONTRAST\n"); - i830_overlay_continue (pScrn, FALSE); } else if (attribute == xvSaturation) { if ((value < 0) || (value > 1023)) return BadValue; pPriv->saturation = value; - overlay->OCLRC1 = pPriv->saturation; - i830_overlay_continue (pScrn, FALSE); } else if (attribute == xvPipe) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); if ((value < -1) || (value > xf86_config->num_crtc)) @@ -1129,7 +1306,7 @@ * Leave this to be updated at the next frame */ } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) { - pPriv->gamma0 = value; + pPriv->gamma0 = value; } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) { pPriv->gamma1 = value; } else if (attribute == xvGamma2 && (IS_I9XX(pI830))) { @@ -1142,26 +1319,7 @@ pPriv->gamma5 = value; } else if (attribute == xvColorKey) { pPriv->colorKey = value; - switch (pScrn->depth) { - case 16: - overlay->DCLRKV = RGB16ToColorKey(pPriv->colorKey); - break; - case 15: - overlay->DCLRKV = RGB15ToColorKey(pPriv->colorKey); - break; - default: - overlay->DCLRKV = pPriv->colorKey; - break; - } OVERLAY_DEBUG("COLORKEY\n"); - i830_overlay_continue (pScrn, FALSE); - REGION_EMPTY(pScrn->pScreen, &pPriv->clip); - } else if(attribute == xvDoubleBuffer) { - if ((value < 0) || (value > 1)) - return BadValue; - /* Do not allow buffer change while playing video */ - if(!pI830->overlayOn) - pPriv->doubleBuffer = value; } else return BadMatch; @@ -1173,9 +1331,16 @@ attribute == xvGamma4 || attribute == xvGamma5) && (IS_I9XX(pI830))) { OVERLAY_DEBUG("GAMMA\n"); - I830UpdateGamma(pScrn); } + if (pI830->use_drmmode_overlay) + drmmode_overlay_update_attrs(pScrn); + else + ums_overlay_update_attrs(pScrn, pPriv); + + if (attribute == xvColorKey) + REGION_EMPTY(pScrn->pScreen, &pPriv->clip); + return Success; } @@ -1215,8 +1380,6 @@ *value = pPriv->gamma5; } else if (attribute == xvColorKey) { *value = pPriv->colorKey; - } else if (attribute == xvDoubleBuffer) { - *value = pPriv->doubleBuffer; } else if (attribute == xvSyncToVblank) { *value = pPriv->SyncToVblank; } else @@ -1242,12 +1405,11 @@ } static void -I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +I830CopyPackedData(I830PortPrivPtr pPriv, unsigned char *buf, int srcPitch, int dstPitch, int top, int left, int h, int w) { - I830Ptr pI830 = I830PTR(pScrn); unsigned char *src, *dst, *dst_base; int i,j; unsigned char *s; @@ -1260,18 +1422,10 @@ src = buf + (top * srcPitch) + (left << 1); - if (pPriv->textured) { - drm_intel_bo_map(pPriv->buf, TRUE); - dst_base = pPriv->buf->virtual; - } else { - drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE); - dst_base = pI830->FbBase; - } + drm_intel_bo_map(pPriv->buf, TRUE); + dst_base = pPriv->buf->virtual; - if (pPriv->currentBuf == 0) - dst = dst_base + pPriv->YBuf0offset; - else - dst = dst_base + pPriv->YBuf1offset; + dst = dst_base + pPriv->YBufOffset; switch (pPriv->rotation) { case RR_Rotate_0: @@ -1336,29 +1490,74 @@ for (j = 0; j < w; j+=2) { /* Copy U */ dst[(((h - i)*2) - 3) + (j * dstPitch)] = src[(j*2) + 1 + (i * srcPitch)]; - dst[(((h - i)*2) - 3) + ((j - 1) * dstPitch)] = src[(j*2) + 1 + ((i+1) * srcPitch)]; + dst[(((h - i)*2) - 3) + ((j + 1) * dstPitch)] = src[(j*2) + 1 + ((i+1) * srcPitch)]; /* Copy V */ dst[(((h - i)*2) - 1) + (j * dstPitch)] = src[(j*2) + 3 + (i * srcPitch)]; - dst[(((h - i)*2) - 1) + ((j - 1) * dstPitch)] = src[(j*2) + 3 + ((i+1) * srcPitch)]; + dst[(((h - i)*2) - 1) + ((j + 1) * dstPitch)] = src[(j*2) + 3 + ((i+1) * srcPitch)]; } } break; } - if (pPriv->textured) - drm_intel_bo_unmap(pPriv->buf); + drm_intel_bo_unmap(pPriv->buf); +} + +static void i830_memcpy_plane(unsigned char *dst, unsigned char *src, + int height, int width, + int dstPitch, int srcPitch, Rotation rotation) +{ + int i, j = 0; + unsigned char *s; + + switch (rotation) { + case RR_Rotate_0: + /* optimise for the case of no clipping */ + if (srcPitch == dstPitch && srcPitch == width) + memcpy (dst, src, srcPitch * height); + else + for (i = 0; i < height; i++) { + memcpy(dst, src, width); + src += srcPitch; + dst += dstPitch; + } + break; + case RR_Rotate_90: + for (i = 0; i < height; i++) { + s = src; + for (j = 0; j < width; j++) { + dst[(i) + ((width - j - 1) * dstPitch)] = *s++; + } + src += srcPitch; + } + break; + case RR_Rotate_180: + for (i = 0; i < height; i++) { + s = src; + for (j = 0; j < width; j++) { + dst[(width - j - 1) + ((height - i - 1) * dstPitch)] = *s++; + } + src += srcPitch; + } + break; + case RR_Rotate_270: + for (i = 0; i < height; i++) { + s = src; + for (j = 0; j < width; j++) { + dst[(height - i - 1) + (j * dstPitch)] = *s++; + } + src += srcPitch; + } + break; + } } static void -I830CopyPlanarData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, +I830CopyPlanarData(I830PortPrivPtr pPriv, unsigned char *buf, int srcPitch, int srcPitch2, int dstPitch, int srcH, int top, int left, int h, int w, int id) { - I830Ptr pI830 = I830PTR(pScrn); - int i, j = 0; unsigned char *src1, *src2, *src3, *dst_base, *dst1, *dst2, *dst3; - unsigned char *s; int dstPitch2 = dstPitch << 1; #if 0 @@ -1375,59 +1574,12 @@ (unsigned long)src1 - (unsigned long)buf); #endif - if (pPriv->textured) { - drm_intel_bo_map(pPriv->buf, TRUE); - dst_base = pPriv->buf->virtual; - } else { - drm_intel_gem_bo_start_gtt_access(pPriv->buf, TRUE); - dst_base = pI830->FbBase; - } + drm_intel_bo_map(pPriv->buf, TRUE); + dst_base = pPriv->buf->virtual; - if (pPriv->currentBuf == 0) - dst1 = dst_base + pPriv->YBuf0offset; - else - dst1 = dst_base + pPriv->YBuf1offset; + dst1 = dst_base + pPriv->YBufOffset; - switch (pPriv->rotation) { - case RR_Rotate_0: - /* optimise for the case of no clipping */ - if (srcPitch == dstPitch2 && srcPitch == w) - memcpy (dst1, src1, srcPitch * h); - else - for (i = 0; i < h; i++) { - memcpy(dst1, src1, w); - src1 += srcPitch; - dst1 += dstPitch2; - } - break; - case RR_Rotate_90: - for (i = 0; i < h; i++) { - s = src1; - for (j = 0; j < w; j++) { - dst1[(i) + ((w - j - 1) * dstPitch2)] = *s++; - } - src1 += srcPitch; - } - break; - case RR_Rotate_180: - for (i = 0; i < h; i++) { - s = src1; - for (j = 0; j < w; j++) { - dst1[(w - j - 1) + ((h - i - 1) * dstPitch2)] = *s++; - } - src1 += srcPitch; - } - break; - case RR_Rotate_270: - for (i = 0; i < h; i++) { - s = src1; - for (j = 0; j < w; j++) { - dst1[(h - i - 1) + (j * dstPitch2)] = *s++; - } - src1 += srcPitch; - } - break; - } + i830_memcpy_plane(dst1, src1, h, w, dstPitch2, srcPitch, pPriv->rotation); /* Copy V data for YV12, or U data for I420 */ src2 = buf + /* start of YUV data */ @@ -1439,58 +1591,13 @@ ErrorF("src2 is %p, offset is %ld\n", src2, (unsigned long)src2 - (unsigned long)buf); #endif - if (pPriv->currentBuf == 0) { - if (id == FOURCC_I420) - dst2 = dst_base + pPriv->UBuf0offset; - else - dst2 = dst_base + pPriv->VBuf0offset; - } else { - if (id == FOURCC_I420) - dst2 = dst_base + pPriv->UBuf1offset; - else - dst2 = dst_base + pPriv->VBuf1offset; - } + if (id == FOURCC_I420) + dst2 = dst_base + pPriv->UBufOffset; + else + dst2 = dst_base + pPriv->VBufOffset; - switch (pPriv->rotation) { - case RR_Rotate_0: - /* optimise for the case of no clipping */ - if (srcPitch2 == dstPitch && srcPitch2 == (w/2)) - memcpy (dst2, src2, h/2 * srcPitch2); - else - for (i = 0; i < h / 2; i++) { - memcpy(dst2, src2, w / 2); - src2 += srcPitch2; - dst2 += dstPitch; - } - break; - case RR_Rotate_90: - for (i = 0; i < (h/2); i++) { - s = src2; - for (j = 0; j < (w/2); j++) { - dst2[(i) + (((w/2) - j - 1) * (dstPitch))] = *s++; - } - src2 += srcPitch2; - } - break; - case RR_Rotate_180: - for (i = 0; i < (h/2); i++) { - s = src2; - for (j = 0; j < (w/2); j++) { - dst2[((w/2) - j - 1) + (((h/2) - i - 1) * dstPitch)] = *s++; - } - src2 += srcPitch2; - } - break; - case RR_Rotate_270: - for (i = 0; i < (h/2); i++) { - s = src2; - for (j = 0; j < (w/2); j++) { - dst2[((h/2) - i - 1) + (j * dstPitch)] = *s++; - } - src2 += srcPitch2; - } - break; - } + i830_memcpy_plane(dst2, src2, h/2, w/2, + dstPitch, srcPitch2, pPriv->rotation); /* Copy U data for YV12, or V data for I420 */ src3 = buf + /* start of YUV data */ @@ -1502,61 +1609,15 @@ ErrorF("src3 is %p, offset is %ld\n", src3, (unsigned long)src3 - (unsigned long)buf); #endif - if (pPriv->currentBuf == 0) { - if (id == FOURCC_I420) - dst3 = dst_base + pPriv->VBuf0offset; - else - dst3 = dst_base + pPriv->UBuf0offset; - } else { - if (id == FOURCC_I420) - dst3 = dst_base + pPriv->VBuf1offset; - else - dst3 = dst_base + pPriv->UBuf1offset; - } + if (id == FOURCC_I420) + dst3 = dst_base + pPriv->VBufOffset; + else + dst3 = dst_base + pPriv->UBufOffset; - switch (pPriv->rotation) { - case RR_Rotate_0: - /* optimise for the case of no clipping */ - if (srcPitch2 == dstPitch && srcPitch2 == (w/2)) - memcpy (dst3, src3, srcPitch2 * h/2); - else - for (i = 0; i < h / 2; i++) { - memcpy(dst3, src3, w / 2); - src3 += srcPitch2; - dst3 += dstPitch; - } - break; - case RR_Rotate_90: - for (i = 0; i < (h/2); i++) { - s = src3; - for (j = 0; j < (w/2); j++) { - dst3[(i) + (((w/2) - j - 1) * (dstPitch))] = *s++; - } - src3 += srcPitch2; - } - break; - case RR_Rotate_180: - for (i = 0; i < (h/2); i++) { - s = src3; - for (j = 0; j < (w/2); j++) { - dst3[((w/2) - j - 1) + (((h/2) - i - 1) * dstPitch)] = *s++; - } - src3 += srcPitch2; - } - break; - case RR_Rotate_270: - for (i = 0; i < (h/2); i++) { - s = src3; - for (j = 0; j < (w/2); j++) { - dst3[((h/2) - i - 1) + (j * dstPitch)] = *s++; - } - src3 += srcPitch2; - } - break; - } + i830_memcpy_plane(dst3, src3, h/2, w/2, + dstPitch, srcPitch2, pPriv->rotation); - if (pPriv->textured) - drm_intel_bo_unmap(pPriv->buf); + drm_intel_bo_unmap(pPriv->buf); } typedef struct { @@ -1782,6 +1843,41 @@ } static void +i830_calc_src_regs(I830Ptr pI830, int planar, short width, short height, + uint32_t *swidth_out, uint32_t *swidthsw_out, uint32_t *sheigth_out) +{ + unsigned int mask, shift, offsety, offsetu; + unsigned int swidth, swidthy, swidthuv; + I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr; + + if (IS_I9XX(pI830)) { + shift = 6; + mask = 0x3f; + } else { + shift = 5; + mask = 0x1f; + } + + offsety = pPriv->YBufOffset; + offsetu = pPriv->UBufOffset; + + if (planar) { + *swidth_out = width | ((width/2 & 0x7ff) << 16); + swidthy = i830_swidth (pI830, offsety, width, mask, shift); + swidthuv = i830_swidth (pI830, offsetu, width/2, mask, shift); + *swidthsw_out = (swidthy) | (swidthuv << 16); + *sheigth_out = height | ((height / 2) << 16); + } else { + *swidth_out = width; + swidth = i830_swidth (pI830, offsety, width << 1, mask, shift); + *swidthsw_out = swidth; + *sheigth_out = height; + } + + return; +} + +static void i830_update_dst_box_to_crtc_coords(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, BoxPtr dstBox) { @@ -1849,21 +1945,48 @@ } } -static double -i830_limit_coeff(double coeff) +static uint32_t +i830_overlay_cmd(int id, int planar) { - /* Limit to between 1.0 and 3.0. */ - if (coeff < MIN_CUTOFF_FREQ) - coeff = MIN_CUTOFF_FREQ; - if (coeff > MAX_CUTOFF_FREQ) - coeff = MAX_CUTOFF_FREQ; - - return coeff; -} + uint32_t OCMD = OVERLAY_ENABLE; -static void -i830_update_polyphase_coeffs(I830OverlayRegPtr overlay, - int xscaleFract, int xscaleFractUV) + if (planar) { + OVERLAY_DEBUG("YUV420\n"); + OCMD &= ~SOURCE_FORMAT; + OCMD &= ~OV_BYTE_ORDER; + OCMD |= YUV_420; + } else { + OVERLAY_DEBUG("YUV422\n"); + OCMD &= ~SOURCE_FORMAT; + OCMD |= YUV_422; + OCMD &= ~OV_BYTE_ORDER; + if (id == FOURCC_UYVY) + OCMD |= Y_SWAP; + } + + OCMD &= ~(BUFFER_SELECT | FIELD_SELECT); + OCMD |= BUFFER0; + + OVERLAY_DEBUG("OCMD is 0x%x\n", OCMD); + + return OCMD; +} + +static double +i830_limit_coeff(double coeff) +{ + /* Limit to between 1.0 and 3.0. */ + if (coeff < MIN_CUTOFF_FREQ) + coeff = MIN_CUTOFF_FREQ; + if (coeff > MAX_CUTOFF_FREQ) + coeff = MAX_CUTOFF_FREQ; + + return coeff; +} + +static void +i830_update_polyphase_coeffs(I830OverlayRegPtr overlay, + int xscaleFract, int xscaleFractUV) { /* * Only Horizontal coefficients so far. @@ -1972,8 +2095,37 @@ return scaleChanged; } -static void -i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, +int +is_planar_fourcc(int id) +{ + switch (id) { + case FOURCC_YV12: + case FOURCC_I420: +#ifdef INTEL_XVMC + case FOURCC_XVMC: +#endif + return 1; + case FOURCC_UYVY: + case FOURCC_YUY2: + return 0; + default: + ErrorF("Unknown format 0x%x\n", id); + return 0; + } +} + +static int +xvmc_passthrough(int id, Rotation rotation) +{ +#ifdef INTEL_XVMC + return id == FOURCC_XVMC && rotation == RR_Rotate_0; +#else + return 0; +#endif +} + +static Bool +ums_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, int id, short width, short height, int dstPitch, int x1, int y1, int x2, int y2, BoxPtr dstBox, short src_w, short src_h, short drw_w, short drw_h) @@ -1981,31 +2133,14 @@ I830Ptr pI830 = I830PTR(pScrn); I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr; I830OverlayRegPtr overlay = I830OVERLAYREG(pI830); - unsigned int swidth, swidthy, swidthuv; - unsigned int mask, shift, offsety, offsetu; - int tmp; - uint32_t OCMD; - Bool scaleChanged = FALSE; - - OVERLAY_DEBUG("I830DisplayVideo: %dx%d (pitch %d)\n", width, height, - dstPitch); + int planar; + uint32_t swidth, swidthsw, sheigth; + Bool scaleChanged; + drm_intel_bo *tmp_buf; -#if VIDEO_DEBUG - CompareOverlay(pI830, (uint32_t *) overlay, 0x100); -#endif - - /* - * If the video isn't visible on any CRTC, turn it off - */ - if (!crtc) - { - pPriv->current_crtc = NULL; - i830_overlay_off (pScrn); - return; - } - if (crtc != pPriv->current_crtc) { + /* this may adjust pPriv->oneLineMode */ i830_overlay_switch_to_crtc (pScrn, crtc); if (pPriv->overlayOK) { pPriv->current_crtc = crtc; @@ -2014,21 +2149,7 @@ } if (!pPriv->overlayOK) - return; - - i830_update_dst_box_to_crtc_coords(pScrn, crtc, dstBox); - - if (crtc->rotation & (RR_Rotate_90 | RR_Rotate_270)) { - tmp = width; - width = height; - height = tmp; - tmp = drw_w; - drw_w = drw_h; - drw_h = tmp; - tmp = src_w; - src_w = src_h; - src_h = tmp; - } + return TRUE; if (pPriv->oneLineMode) { /* change the coordinates with panel fitting active */ @@ -2039,54 +2160,14 @@ drw_h = ((drw_h * pPriv->scaleRatio) >> 16) + 1; } - if (IS_I9XX(pI830)) { - shift = 6; - mask = 0x3f; - } else { - shift = 5; - mask = 0x1f; - } - - if (pPriv->currentBuf == 0) { - offsety = pPriv->YBuf0offset; - offsetu = pPriv->UBuf0offset; - } else { - offsety = pPriv->YBuf1offset; - offsetu = pPriv->UBuf1offset; - } - - switch (id) { - case FOURCC_YV12: - case FOURCC_I420: - overlay->SWIDTH = width | ((width/2 & 0x7ff) << 16); - swidthy = i830_swidth (pI830, offsety, width, mask, shift); - swidthuv = i830_swidth (pI830, offsetu, width/2, mask, shift); - overlay->SWIDTHSW = (swidthy) | (swidthuv << 16); - overlay->SHEIGHT = height | ((height / 2) << 16); - break; - case FOURCC_UYVY: - case FOURCC_YUY2: - default: - overlay->SWIDTH = width; - swidth = ((offsety + (width << 1) + mask) >> shift) - - (offsety >> shift); - - if (IS_I9XX(pI830)) - swidth <<= 1; - - swidth -= 1; + planar = is_planar_fourcc(id); - swidth <<= 2; - - OVERLAY_DEBUG("swidthsw is old %d new %d\n", - swidth, - i830_swidth (pI830, offsety, width << 1, - mask, shift)); + i830_calc_src_regs(pI830, planar, width, height, + &swidth, &swidthsw, &sheigth); - overlay->SWIDTHSW = swidth; - overlay->SHEIGHT = height; - break; - } + overlay->SWIDTH = swidth; + overlay->SWIDTHSW = swidthsw; + overlay->SHEIGHT = sheigth; overlay->DWINPOS = (dstBox->y1 << 16) | dstBox->x1; @@ -2097,13 +2178,16 @@ dstBox->x1, dstBox->y1, dstBox->x2, dstBox->y2); /* buffer locations */ - overlay->OBUF_0Y = pPriv->YBuf0offset; - overlay->OBUF_0U = pPriv->UBuf0offset; - overlay->OBUF_0V = pPriv->VBuf0offset; - if(pPriv->doubleBuffer) { - overlay->OBUF_1Y = pPriv->YBuf1offset; - overlay->OBUF_1U = pPriv->UBuf1offset; - overlay->OBUF_1V = pPriv->VBuf1offset; + if (xvmc_passthrough(id, pPriv->rotation)) { + overlay->OBUF_0Y = pPriv->YBufOffset; + overlay->OBUF_0U = pPriv->UBufOffset; + overlay->OBUF_0V = pPriv->VBufOffset; + } else { + if (drm_intel_bo_pin(pPriv->buf, GTT_PAGE_SIZE) != 0) + return FALSE; + overlay->OBUF_0Y = pPriv->YBufOffset + pPriv->buf->offset; + overlay->OBUF_0U = pPriv->UBufOffset + pPriv->buf->offset; + overlay->OBUF_0V = pPriv->VBufOffset + pPriv->buf->offset; } OVERLAY_DEBUG("pos: 0x%x, size: 0x%x\n", @@ -2113,51 +2197,90 @@ scaleChanged = i830_update_scaling_factors(overlay, src_w, src_h, drw_w, drw_h); - OCMD = OVERLAY_ENABLE; - - switch (id) { - case FOURCC_YV12: - case FOURCC_I420: -#ifdef INTEL_XVMC - case FOURCC_XVMC: -#endif - OVERLAY_DEBUG("YUV420\n"); + if (planar) { #if 0 /* set UV vertical phase to -0.25 */ overlay->UV_VPH = 0x30003000; #endif + overlay->OSTRIDE = (dstPitch * 2) | (dstPitch << 16); OVERLAY_DEBUG("UV stride is %d, Y stride is %d\n", dstPitch, dstPitch * 2); - overlay->OSTRIDE = (dstPitch * 2) | (dstPitch << 16); - OCMD &= ~SOURCE_FORMAT; - OCMD &= ~OV_BYTE_ORDER; - OCMD |= YUV_420; - break; - case FOURCC_UYVY: - case FOURCC_YUY2: - OVERLAY_DEBUG("YUV422\n"); + } else overlay->OSTRIDE = dstPitch; - OCMD &= ~SOURCE_FORMAT; - OCMD |= YUV_422; - OCMD &= ~OV_BYTE_ORDER; - if (id == FOURCC_UYVY) - OCMD |= Y_SWAP; - break; - } - - OCMD &= ~(BUFFER_SELECT | FIELD_SELECT); - if (pPriv->currentBuf == 0) - OCMD |= BUFFER0; - else - OCMD |= BUFFER1; - overlay->OCMD = OCMD; - OVERLAY_DEBUG("OCMD is 0x%x\n", OCMD); + overlay->OCMD = i830_overlay_cmd(id, planar); /* make sure the overlay is on */ i830_overlay_on (pScrn); /* and show this frame */ i830_overlay_continue (pScrn, scaleChanged); + + if (xvmc_passthrough(id, pPriv->rotation)) + return TRUE; + + /* unpin the old buffer and exchange buffers */ + if (pPriv->oldBuf_pinned) { + drm_intel_bo_unpin(pPriv->oldBuf); + } + tmp_buf = pPriv->buf; + pPriv->buf = pPriv->oldBuf; + pPriv->oldBuf = tmp_buf; + pPriv->oldBuf_pinned = TRUE; + + return TRUE; +} + +static Bool +i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc, + int id, short width, short height, + int dstPitch, int x1, int y1, int x2, int y2, BoxPtr dstBox, + short src_w, short src_h, short drw_w, short drw_h) +{ + I830Ptr pI830 = I830PTR(pScrn); + I830PortPrivPtr pPriv = pI830->adaptor->pPortPrivates[0].ptr; + int tmp; + + OVERLAY_DEBUG("I830DisplayVideo: %dx%d (pitch %d)\n", width, height, + dstPitch); + +#if VIDEO_DEBUG + CompareOverlay(pI830, (uint32_t *) overlay, 0x100); +#endif + + /* + * If the video isn't visible on any CRTC, turn it off + */ + if (!crtc) + { + pPriv->current_crtc = NULL; + if (pI830->use_drmmode_overlay) + drmmode_overlay_off(pScrn); + else + ums_overlay_off(pScrn); + + return TRUE; + } + + i830_update_dst_box_to_crtc_coords(pScrn, crtc, dstBox); + + if (crtc->rotation & (RR_Rotate_90 | RR_Rotate_270)) { + tmp = width; + width = height; + height = tmp; + tmp = drw_w; + drw_w = drw_h; + drw_h = tmp; + tmp = src_w; + src_w = src_h; + src_h = tmp; + } + + if (pI830->use_drmmode_overlay) + return drmmode_overlay_put_image(pScrn, crtc, id, width, height, dstPitch, + x1, y1, x2, y2, dstBox, src_w, src_h, drw_w, drw_h); + else + return ums_overlay_put_image(pScrn, crtc, id, width, height, dstPitch, + x1, y1, x2, y2, dstBox, src_w, src_h, drw_w, drw_h); } static Bool @@ -2238,114 +2361,75 @@ FreeScratchGC (gc); } -/* - * The source rectangle of the video is defined by (src_x, src_y, src_w, src_h). - * The dest rectangle of the video is defined by (drw_x, drw_y, drw_w, drw_h). - * id is a fourcc code for the format of the video. - * buf is the pointer to the source data in system memory. - * width and height are the w/h of the source data. - * If "sync" is TRUE, then we must be finished with *buf at the point of return - * (which we always are). - * clipBoxes is the clipping region in screen space. - * data is a pointer to our port private. - * pDraw is a Drawable, which might not be the screen in the case of - * compositing. It's a new argument to the function in the 1.1 server. - */ -static int -I830PutImage(ScrnInfoPtr pScrn, - short src_x, short src_y, - short drw_x, short drw_y, - short src_w, short src_h, - short drw_w, short drw_h, - int id, unsigned char *buf, - short width, short height, - Bool sync, RegionPtr clipBoxes, pointer data, - DrawablePtr pDraw) +static void +i830_wait_for_scanline(ScrnInfoPtr pScrn, PixmapPtr pPixmap, + xf86CrtcPtr crtc, RegionPtr clipBoxes) { I830Ptr pI830 = I830PTR(pScrn); - I830PortPrivPtr pPriv = (I830PortPrivPtr) data; - ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; - I830OverlayRegPtr overlay; - PixmapPtr pPixmap = get_drawable_pixmap(pDraw);; - INT32 x1, x2, y1, y2; - int srcPitch = 0, srcPitch2 = 0, dstPitch, destId; - int dstPitch2 = 0; - int top, left, npixels, nlines, size; - BoxRec dstBox; - int pitchAlignMask; - int alloc_size; - xf86CrtcPtr crtc; - - if (pPriv->textured) - overlay = NULL; - else - overlay = I830OVERLAYREG(pI830); - -#if 0 - ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n" - "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x, drw_y, - drw_w, drw_h, width, height); -#endif + BoxPtr box; + pixman_box16_t box_in_crtc_coordinates; + int pipe = -1, event, load_scan_lines_pipe; + + if (pixmap_is_scanout(pPixmap)) + pipe = i830_crtc_to_pipe(crtc); + + if (pipe >= 0) { + if (pipe == 0) { + event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW; + load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEA; + } else { + event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW; + load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEB; + } - if (!pPriv->textured) { - /* If dst width and height are less than 1/8th the src size, the - * src/dst scale factor becomes larger than 8 and doesn't fit in - * the scale register. */ - if(src_w >= (drw_w * 8)) - drw_w = src_w/7; + box = REGION_EXTENTS(unused, clipBoxes); + box_in_crtc_coordinates = *box; + if (crtc->transform_in_use) + pixman_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &box_in_crtc_coordinates); + + BEGIN_BATCH(5); + /* The documentation says that the LOAD_SCAN_LINES command + * always comes in pairs. Don't ask me why. */ + OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe); + OUT_BATCH((box_in_crtc_coordinates.y1 << 16) | box_in_crtc_coordinates.y2); + OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe); + OUT_BATCH((box_in_crtc_coordinates.y1 << 16) | box_in_crtc_coordinates.y2); + OUT_BATCH(MI_WAIT_FOR_EVENT | event); + ADVANCE_BATCH(); + } +} - if(src_h >= (drw_h * 8)) - drw_h = src_h/7; +static Bool +i830_setup_video_buffer(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, + int alloc_size, int id) +{ + I830Ptr pI830 = I830PTR(pScrn); + /* Free the current buffer if we're going to have to reallocate */ + if (pPriv->buf && pPriv->buf->size < alloc_size) { + drm_intel_bo_unreference(pPriv->buf); + pPriv->buf = NULL; } - /* Clip */ - x1 = src_x; - x2 = src_x + src_w; - y1 = src_y; - y2 = src_y + src_h; - - dstBox.x1 = drw_x; - dstBox.x2 = drw_x + drw_w; - dstBox.y1 = drw_y; - dstBox.y2 = drw_y + drw_h; - - if (!i830_clip_video_helper(pScrn, - pPriv, - &crtc, - &dstBox, &x1, &x2, &y1, &y2, clipBoxes, - width, height)) - return Success; + if (xvmc_passthrough(id, pPriv->rotation)) { + i830_free_video_buffers(pPriv); + } else { + if (pPriv->buf == NULL) { + pPriv->buf = drm_intel_bo_alloc(pI830->bufmgr, + "xv buffer", alloc_size, 4096); + if (pPriv->buf == NULL) + return FALSE; + } + } - if (!pPriv->textured) { - /* texture video handles rotation differently. */ - if (crtc) - pPriv->rotation = crtc->rotation; - else { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Fail to clip video to any crtc!\n"); - return Success; - } - } + return TRUE; +} - destId = id; - switch (id) { - case FOURCC_YV12: - case FOURCC_I420: - srcPitch = (width + 0x3) & ~0x3; - srcPitch2 = ((width >> 1) + 0x3) & ~0x3; - break; -#ifdef INTEL_XVMC - case FOURCC_XVMC: - srcPitch = (width + 0x3) & ~0x3; - srcPitch2 = ((width >> 1) + 0x3) & ~0x3; - break; -#endif - case FOURCC_UYVY: - case FOURCC_YUY2: - default: - srcPitch = width << 1; - break; - } +static void +i830_dst_pitch_and_size(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, short width, + short height, int *dstPitch, int *dstPitch2, int *size, int id) +{ + I830Ptr pI830 = I830PTR(pScrn); + int pitchAlignMask; /* Only needs to be DWORD-aligned for textured on i915, but overlay has * stricter requirements. @@ -2367,160 +2451,200 @@ /* Determine the desired destination pitch (representing the chroma's pitch, * in the planar case. */ - switch (destId) { + switch (id) { case FOURCC_YV12: case FOURCC_I420: if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) { - dstPitch = ((height / 2) + pitchAlignMask) & ~pitchAlignMask; - size = dstPitch * width * 3; + *dstPitch = ((height / 2) + pitchAlignMask) & ~pitchAlignMask; + *size = *dstPitch * width * 3; } else { - dstPitch = ((width / 2) + pitchAlignMask) & ~pitchAlignMask; - size = dstPitch * height * 3; + *dstPitch = ((width / 2) + pitchAlignMask) & ~pitchAlignMask; + *size = *dstPitch * height * 3; } break; case FOURCC_UYVY: case FOURCC_YUY2: if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) { - dstPitch = ((height << 1) + pitchAlignMask) & ~pitchAlignMask; - size = dstPitch * width; + *dstPitch = ((height << 1) + pitchAlignMask) & ~pitchAlignMask; + *size = *dstPitch * width; } else { - dstPitch = ((width << 1) + pitchAlignMask) & ~pitchAlignMask; - size = dstPitch * height; + *dstPitch = ((width << 1) + pitchAlignMask) & ~pitchAlignMask; + *size = *dstPitch * height; } break; #ifdef INTEL_XVMC case FOURCC_XVMC: - dstPitch = ((width / 2) + pitchAlignMask ) & ~pitchAlignMask; - dstPitch2 = (width + pitchAlignMask ) & ~pitchAlignMask; - size = 0; + *dstPitch = ((width / 2) + pitchAlignMask ) & ~pitchAlignMask; + *dstPitch2 = (width + pitchAlignMask ) & ~pitchAlignMask; + *size = 0; break; #endif default: - dstPitch = 0; - size = 0; + *dstPitch = 0; + *size = 0; break; } #if 0 - ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, dstPitch, size); + ErrorF("srcPitch: %d, dstPitch: %d, size: %d\n", srcPitch, *dstPitch, size); #endif +} - alloc_size = size; - if (pPriv->doubleBuffer) - alloc_size *= 2; - - /* Free the current buffer if we're going to have to reallocate */ - if (pPriv->buf && pPriv->buf->size < alloc_size) { - if (!pPriv->textured) - drm_intel_bo_unpin(pPriv->buf); - drm_intel_bo_unreference(pPriv->buf); - pPriv->buf = NULL; - } +static Bool +i830_copy_video_data(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, + short width, short height, int *dstPitch, int *dstPitch2, + INT32 x1, INT32 y1, INT32 x2, INT32 y2, + int id, unsigned char *buf) +{ + I830Ptr pI830 = I830PTR(pScrn); + int srcPitch = 0, srcPitch2 = 0; + int top, left, npixels, nlines, size; -#ifdef INTEL_XVMC - if (id == FOURCC_XVMC && - pPriv->rotation == RR_Rotate_0) { - if (pPriv->buf) { - assert(pPriv->textured); - drm_intel_bo_unreference(pPriv->buf); - pPriv->buf = NULL; - } + if (is_planar_fourcc(id)) { + srcPitch = (width + 0x3) & ~0x3; + srcPitch2 = ((width >> 1) + 0x3) & ~0x3; } else { -#endif - if (pPriv->buf == NULL) { - pPriv->buf = drm_intel_bo_alloc(pI830->bufmgr, - "xv buffer", alloc_size, 4096); - if (pPriv->buf == NULL) - return BadAlloc; - if (!pPriv->textured && drm_intel_bo_pin(pPriv->buf, 4096) != 0) { - drm_intel_bo_unreference(pPriv->buf); - pPriv->buf = NULL; - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to pin xv buffer\n"); - return BadAlloc; - } - } -#ifdef INTEL_XVMC + srcPitch = width << 1; } -#endif + + i830_dst_pitch_and_size(pScrn, pPriv, width, height, dstPitch, dstPitch2, + &size, id); + + if (!i830_setup_video_buffer(pScrn, pPriv, size, id)) + return FALSE; /* fixup pointers */ #ifdef INTEL_XVMC if (id == FOURCC_XVMC && IS_I915(pI830)) { - pPriv->YBuf0offset = (uint32_t)((uintptr_t)buf); - pPriv->VBuf0offset = pPriv->YBuf0offset + (dstPitch2 * height); - pPriv->UBuf0offset = pPriv->VBuf0offset + (dstPitch * height / 2); - destId = FOURCC_YV12; + pPriv->YBufOffset = (uint32_t)((uintptr_t)buf); + pPriv->VBufOffset = pPriv->YBufOffset + (*dstPitch2 * height); + pPriv->UBufOffset = pPriv->VBufOffset + (*dstPitch * height / 2); } else { #endif - if (pPriv->textured) - pPriv->YBuf0offset = 0; - else - pPriv->YBuf0offset = pPriv->buf->offset; + pPriv->YBufOffset = 0; if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) { - pPriv->UBuf0offset = pPriv->YBuf0offset + (dstPitch * 2 * width); - pPriv->VBuf0offset = pPriv->UBuf0offset + (dstPitch * width / 2); - if(pPriv->doubleBuffer) { - pPriv->YBuf1offset = pPriv->YBuf0offset + size; - pPriv->UBuf1offset = pPriv->YBuf1offset + (dstPitch * 2 * width); - pPriv->VBuf1offset = pPriv->UBuf1offset + (dstPitch * width / 2); - } + pPriv->UBufOffset = pPriv->YBufOffset + (*dstPitch * 2 * width); + pPriv->VBufOffset = pPriv->UBufOffset + (*dstPitch * width / 2); } else { - pPriv->UBuf0offset = pPriv->YBuf0offset + (dstPitch * 2 * height); - pPriv->VBuf0offset = pPriv->UBuf0offset + (dstPitch * height / 2); - if(pPriv->doubleBuffer) { - pPriv->YBuf1offset = pPriv->YBuf0offset + size; - pPriv->UBuf1offset = pPriv->YBuf1offset + (dstPitch * 2 * height); - pPriv->VBuf1offset = pPriv->UBuf1offset + (dstPitch * height / 2); - } + pPriv->UBufOffset = pPriv->YBufOffset + (*dstPitch * 2 * height); + pPriv->VBufOffset = pPriv->UBufOffset + (*dstPitch * height / 2); } #ifdef INTEL_XVMC } #endif - /* Pick the idle buffer */ - if (!pPriv->textured && pI830->overlayOn && pPriv->doubleBuffer) - pPriv->currentBuf = !((INREG(DOVSTA) & OC_BUF) >> 20); - /* copy data */ top = y1 >> 16; left = (x1 >> 16) & ~1; npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left; - switch (id) { - case FOURCC_YV12: - case FOURCC_I420: - top &= ~1; - nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top; - I830CopyPlanarData(pScrn, pPriv, buf, srcPitch, srcPitch2, dstPitch, - height, top, left, nlines, npixels, id); - break; - case FOURCC_UYVY: - case FOURCC_YUY2: - nlines = ((y2 + 0xffff) >> 16) - top; - I830CopyPackedData(pScrn, pPriv, buf, srcPitch, dstPitch, top, left, - nlines, npixels); - break; -#ifdef INTEL_XVMC - case FOURCC_XVMC: - if (pPriv->rotation != RR_Rotate_0) { + if (is_planar_fourcc(id)) { + if (!xvmc_passthrough(id, pPriv->rotation)) { top &= ~1; nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top; - I830CopyPlanarData(pScrn, pPriv, buf, srcPitch, srcPitch2, dstPitch, + I830CopyPlanarData(pPriv, buf, srcPitch, srcPitch2, *dstPitch, height, top, left, nlines, npixels, id); } + } else { + nlines = ((y2 + 0xffff) >> 16) - top; + I830CopyPackedData(pPriv, buf, srcPitch, *dstPitch, top, left, + nlines, npixels); + } - break; + return TRUE; +} + +/* + * The source rectangle of the video is defined by (src_x, src_y, src_w, src_h). + * The dest rectangle of the video is defined by (drw_x, drw_y, drw_w, drw_h). + * id is a fourcc code for the format of the video. + * buf is the pointer to the source data in system memory. + * width and height are the w/h of the source data. + * If "sync" is TRUE, then we must be finished with *buf at the point of return + * (which we always are). + * clipBoxes is the clipping region in screen space. + * data is a pointer to our port private. + * pDraw is a Drawable, which might not be the screen in the case of + * compositing. It's a new argument to the function in the 1.1 server. + */ +static int +I830PutImage(ScrnInfoPtr pScrn, + short src_x, short src_y, + short drw_x, short drw_y, + short src_w, short src_h, + short drw_w, short drw_h, + int id, unsigned char *buf, + short width, short height, + Bool sync, RegionPtr clipBoxes, pointer data, + DrawablePtr pDraw) +{ + I830Ptr pI830 = I830PTR(pScrn); + I830PortPrivPtr pPriv = (I830PortPrivPtr) data; + ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; + PixmapPtr pPixmap = get_drawable_pixmap(pDraw);; + INT32 x1, x2, y1, y2; + int dstPitch; + int dstPitch2 = 0; + BoxRec dstBox; + xf86CrtcPtr crtc; + +#if 0 + ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n" + "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x, drw_y, + drw_w, drw_h, width, height); #endif - default: - break; + + if (!pPriv->textured) { + /* If dst width and height are less than 1/8th the src size, the + * src/dst scale factor becomes larger than 8 and doesn't fit in + * the scale register. */ + if(src_w >= (drw_w * 8)) + drw_w = src_w/7; + + if(src_h >= (drw_h * 8)) + drw_h = src_h/7; + } + + /* Clip */ + x1 = src_x; + x2 = src_x + src_w; + y1 = src_y; + y2 = src_y + src_h; + + dstBox.x1 = drw_x; + dstBox.x2 = drw_x + drw_w; + dstBox.y1 = drw_y; + dstBox.y2 = drw_y + drw_h; + + if (!i830_clip_video_helper(pScrn, + pPriv, + &crtc, + &dstBox, &x1, &x2, &y1, &y2, clipBoxes, + width, height)) + return Success; + + if (!pPriv->textured) { + /* texture video handles rotation differently. */ + if (crtc) + pPriv->rotation = crtc->rotation; + else { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Fail to clip video to any crtc!\n"); + return Success; + } } + if (!i830_copy_video_data(pScrn, pPriv, width, height, + &dstPitch, &dstPitch2, + x1, y1, x2, y2, id, buf)) + return BadAlloc; + if (!pPriv->textured) { - i830_display_video(pScrn, crtc, destId, width, height, dstPitch, + if (!i830_display_overlay(pScrn, crtc, id, width, height, dstPitch, x1, y1, x2, y2, &dstBox, src_w, src_h, - drw_w, drw_h); + drw_w, drw_h)) + return BadAlloc; /* update cliplist */ if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) { @@ -2528,66 +2652,25 @@ i830_fill_colorkey (pScreen, pPriv->colorKey, clipBoxes); } } else { - Bool sync = TRUE; - - if (crtc == NULL) { - sync = FALSE; - } else if (pPriv->SyncToVblank == 0) { - sync = FALSE; - } - - if (sync) { - BoxPtr box; - pixman_box16_t box_in_crtc_coordinates; - int pipe = -1, event, load_scan_lines_pipe; - - if (pixmap_is_scanout(pPixmap)) - pipe = i830_crtc_to_pipe(crtc); - - if (pipe >= 0) { - if (pipe == 0) { - event = MI_WAIT_FOR_PIPEA_SCAN_LINE_WINDOW; - load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEA; - } else { - event = MI_WAIT_FOR_PIPEB_SCAN_LINE_WINDOW; - load_scan_lines_pipe = MI_LOAD_SCAN_LINES_DISPLAY_PIPEB; - } - - box = REGION_EXTENTS(unused, clipBoxes); - box_in_crtc_coordinates = *box; - if (crtc->transform_in_use) - pixman_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &box_in_crtc_coordinates); - - BEGIN_BATCH(5); - /* The documentation says that the LOAD_SCAN_LINES command - * always comes in pairs. Don't ask me why. */ - OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe); - OUT_BATCH((box_in_crtc_coordinates.y1 << 16) | box_in_crtc_coordinates.y2); - OUT_BATCH(MI_LOAD_SCAN_LINES_INCL | load_scan_lines_pipe); - OUT_BATCH((box_in_crtc_coordinates.y1 << 16) | box_in_crtc_coordinates.y2); - OUT_BATCH(MI_WAIT_FOR_EVENT | event); - ADVANCE_BATCH(); - } + if (crtc && pPriv->SyncToVblank != 0) { + i830_wait_for_scanline(pScrn, pPixmap, crtc, clipBoxes); } if (IS_I965G(pI830)) { -#ifdef INTEL_XVMC - if (id == FOURCC_XVMC && pPriv->rotation == RR_Rotate_0) { - pPriv->YBuf0offset = buf - pI830->FbBase; - pPriv->UBuf0offset = pPriv->YBuf0offset + height*width; - pPriv->VBuf0offset = pPriv->UBuf0offset + height*width/4; + if (xvmc_passthrough(id, pPriv->rotation)) { + pPriv->YBufOffset = buf - pI830->FbBase; + pPriv->UBufOffset = pPriv->YBufOffset + height*width; + pPriv->VBufOffset = pPriv->UBufOffset + height*width/4; } -#endif - I965DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height, + I965DisplayVideoTextured(pScrn, pPriv, id, clipBoxes, width, height, dstPitch, x1, y1, x2, y2, src_w, src_h, drw_w, drw_h, pPixmap); } else { - I915DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height, + I915DisplayVideoTextured(pScrn, pPriv, id, clipBoxes, width, height, dstPitch, dstPitch2, x1, y1, x2, y2, src_w, src_h, drw_w, drw_h, pPixmap); } - } - if (pPriv->textured) { + DamageDamageRegion(pDraw, clipBoxes); } @@ -2706,215 +2789,23 @@ /* Turn off the overlay */ OVERLAY_DEBUG("BLOCKHANDLER\n"); - i830_overlay_off (pScrn); + if (pI830->use_drmmode_overlay) + drmmode_overlay_off(pScrn); + else + ums_overlay_off (pScrn); pPriv->videoStatus = FREE_TIMER; pPriv->freeTime = now + FREE_DELAY; } } else { /* FREE_TIMER */ if (pPriv->freeTime < now) { - if (!pPriv->textured) - drm_intel_bo_unpin(pPriv->buf); - drm_intel_bo_unreference(pPriv->buf); - pPriv->buf = NULL; + i830_free_video_buffers(pPriv); pPriv->videoStatus = 0; } } } } -/*************************************************************************** - * Offscreen Images - ***************************************************************************/ - -typedef struct { - Bool isOn; -} OffscreenPrivRec, *OffscreenPrivPtr; - -static int -I830AllocateSurface(ScrnInfoPtr pScrn, - int id, - unsigned short w, - unsigned short h, XF86SurfacePtr surface) -{ - int pitch, fbpitch, size; - OffscreenPrivPtr pPriv; - I830Ptr pI830 = I830PTR(pScrn); - - OVERLAY_DEBUG("I830AllocateSurface\n"); - - if (IS_845G(pI830) || IS_I830(pI830)) { - if ((w > IMAGE_MAX_WIDTH_LEGACY) || (h > IMAGE_MAX_HEIGHT_LEGACY)) - return BadAlloc; - } else { - if ((w > IMAGE_MAX_WIDTH) || (h > IMAGE_MAX_HEIGHT)) - return BadAlloc; - } - - if (!(surface->pitches = xalloc(sizeof(int)))) - return BadAlloc; - if (!(surface->offsets = xalloc(sizeof(int)))) { - xfree(surface->pitches); - return BadAlloc; - } - if (!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) { - xfree(surface->pitches); - xfree(surface->offsets); - return BadAlloc; - } - - w = (w + 1) & ~1; - pitch = ((w << 1) + 15) & ~15; - fbpitch = pI830->cpp * pScrn->displayWidth; - size = pitch * h; - - surface->width = w; - surface->height = h; - - pPriv->isOn = FALSE; - - surface->pScrn = pScrn; - surface->id = id; - surface->pitches[0] = pitch; - surface->offsets[0] = 0; - surface->devPrivate.ptr = (pointer) pPriv; - - return Success; -} - -static int -I830StopSurface(XF86SurfacePtr surface) -{ - OffscreenPrivPtr pPriv = (OffscreenPrivPtr) surface->devPrivate.ptr; - ScrnInfoPtr pScrn = surface->pScrn; - - if (pPriv->isOn) { - OVERLAY_DEBUG("StopSurface\n"); - - i830_overlay_off (pScrn); - - pPriv->isOn = FALSE; - } - - return Success; -} - -static int -I830FreeSurface(XF86SurfacePtr surface) -{ - I830StopSurface(surface); - xfree(surface->pitches); - xfree(surface->offsets); - xfree(surface->devPrivate.ptr); - - return Success; -} - -static int -I830GetSurfaceAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 * value) -{ - return I830GetPortAttribute(pScrn, attribute, value, NULL); -} - -static int -I830SetSurfaceAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 value) -{ - return I830SetPortAttributeOverlay(pScrn, attribute, value, NULL); -} - -static int -I830DisplaySurface(XF86SurfacePtr surface, - short src_x, short src_y, - short drw_x, short drw_y, - short src_w, short src_h, - short drw_w, short drw_h, RegionPtr clipBoxes) -{ - OffscreenPrivPtr pPriv = (OffscreenPrivPtr) surface->devPrivate.ptr; - ScrnInfoPtr pScrn = surface->pScrn; - ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; - I830Ptr pI830 = I830PTR(pScrn); - I830PortPrivPtr pI830Priv = GET_PORT_PRIVATE(pScrn); - INT32 x1, y1, x2, y2; - BoxRec dstBox; - xf86CrtcPtr crtc; - - OVERLAY_DEBUG("I830DisplaySurface\n"); - - x1 = src_x; - x2 = src_x + src_w; - y1 = src_y; - y2 = src_y + src_h; - - dstBox.x1 = drw_x; - dstBox.x2 = drw_x + drw_w; - dstBox.y1 = drw_y; - dstBox.y2 = drw_y + drw_h; - - if (!i830_clip_video_helper (pScrn, pI830Priv, &crtc, &dstBox, - &x1, &x2, &y1, &y2, clipBoxes, - surface->width, surface->height)) - return Success; - - /* fixup pointers */ - pI830Priv->YBuf0offset = surface->offsets[0]; - pI830Priv->YBuf1offset = pI830Priv->YBuf0offset; - - /* Pick the idle buffer */ - if (!pI830Priv->textured && pI830->overlayOn && pI830Priv->doubleBuffer) - pI830Priv->currentBuf = !((INREG(DOVSTA) & OC_BUF) >> 20); - - i830_display_video(pScrn, crtc, surface->id, surface->width, surface->height, - surface->pitches[0], x1, y1, x2, y2, &dstBox, - src_w, src_h, drw_w, drw_h); - - i830_fill_colorkey (pScreen, pI830Priv->colorKey, clipBoxes); - - pPriv->isOn = TRUE; - /* we've prempted the XvImage stream so set its free timer */ - if (pI830Priv->videoStatus & CLIENT_VIDEO_ON) { - REGION_EMPTY(pScrn->pScreen, &pI830Priv->clip); - UpdateCurrentTime(); - pI830Priv->videoStatus = FREE_TIMER; - pI830Priv->freeTime = currentTime.milliseconds + FREE_DELAY; - } - - return Success; -} - -static void -I830InitOffscreenImages(ScreenPtr pScreen) -{ - XF86OffscreenImagePtr offscreenImages; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - I830Ptr pI830 = I830PTR(pScrn); - - if (!(offscreenImages = xalloc(sizeof(XF86OffscreenImageRec)))) { - return; - } - - pI830->offscreenImages = offscreenImages; - - offscreenImages[0].image = &Images[0]; - offscreenImages[0].flags = VIDEO_OVERLAID_IMAGES /*| VIDEO_CLIP_TO_VIEWPORT*/; - offscreenImages[0].alloc_surface = I830AllocateSurface; - offscreenImages[0].free_surface = I830FreeSurface; - offscreenImages[0].display = I830DisplaySurface; - offscreenImages[0].stop = I830StopSurface; - offscreenImages[0].setAttribute = I830SetSurfaceAttribute; - offscreenImages[0].getAttribute = I830GetSurfaceAttribute; - if (IS_845G(pI830) || IS_I830(pI830)) { - offscreenImages[0].max_width = IMAGE_MAX_WIDTH_LEGACY; - offscreenImages[0].max_height = IMAGE_MAX_HEIGHT_LEGACY; - } else { - offscreenImages[0].max_width = IMAGE_MAX_WIDTH; - offscreenImages[0].max_height = IMAGE_MAX_HEIGHT; - } - offscreenImages[0].num_attributes = 1; - offscreenImages[0].attributes = Attributes; - - xf86XVRegisterOffscreenImages(pScreen, offscreenImages, 1); -} - void i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on) { --- xserver-xorg-video-intel-2.9.1.orig/src/i965_video.c +++ xserver-xorg-video-intel-2.9.1/src/i965_video.c @@ -997,37 +997,18 @@ ErrorF ("INST_PM 0x%08x\n", INREG(INST_PM)); #endif - src_surf_base[0] = pPriv->YBuf0offset; - src_surf_base[1] = pPriv->YBuf0offset; - src_surf_base[2] = pPriv->VBuf0offset; - src_surf_base[3] = pPriv->VBuf0offset; - src_surf_base[4] = pPriv->UBuf0offset; - src_surf_base[5] = pPriv->UBuf0offset; + src_surf_base[0] = pPriv->YBufOffset; + src_surf_base[1] = pPriv->YBufOffset; + src_surf_base[2] = pPriv->VBufOffset; + src_surf_base[3] = pPriv->VBufOffset; + src_surf_base[4] = pPriv->UBufOffset; + src_surf_base[5] = pPriv->UBufOffset; #if 0 ErrorF ("base 0 0x%x base 1 0x%x base 2 0x%x\n", src_surf_base[0], src_surf_base[1], src_surf_base[2]); #endif - switch (id) { - case FOURCC_UYVY: - src_surf_format = BRW_SURFACEFORMAT_YCRCB_SWAPY; - n_src_surf = 1; - src_width[0] = width; - src_height[0] = height; - src_pitch[0] = video_pitch; - break; - case FOURCC_YUY2: - src_surf_format = BRW_SURFACEFORMAT_YCRCB_NORMAL; - src_width[0] = width; - src_height[0] = height; - src_pitch[0] = video_pitch; - n_src_surf = 1; - break; -#ifdef INTEL_XVMC - case FOURCC_XVMC: -#endif - case FOURCC_I420: - case FOURCC_YV12: + if (is_planar_fourcc(id)) { src_surf_format = BRW_SURFACEFORMAT_R8_UNORM; src_width[1] = src_width[0] = width; src_height[1] = src_height[0] = height; @@ -1036,10 +1017,17 @@ src_height[4] = src_height[5] = src_height[2] = src_height[3] = height / 2; src_pitch[4] = src_pitch[5] = src_pitch[2] = src_pitch[3] = video_pitch; n_src_surf = 6; - break; - default: - return; - } + } else { + if (id == FOURCC_UYVY) + src_surf_format = BRW_SURFACEFORMAT_YCRCB_SWAPY; + else + src_surf_format = BRW_SURFACEFORMAT_YCRCB_NORMAL; + + src_width[0] = width; + src_height[0] = height; + src_pitch[0] = video_pitch; + n_src_surf = 1; + } #if 0 ErrorF("dst surf: 0x%08x\n", state_base_offset + dest_surf_offset); --- xserver-xorg-video-intel-2.9.1.orig/src/i830_driver.c +++ xserver-xorg-video-intel-2.9.1/src/i830_driver.c @@ -3090,8 +3090,6 @@ i830_allocator_fini(pScrn); i965_free_video(pScrn); - free(pI830->offscreenImages); - pI830->offscreenImages = NULL; pScreen->CloseScreen = pI830->CloseScreen; (*pScreen->CloseScreen) (scrnIndex, pScreen); --- xserver-xorg-video-intel-2.9.1.orig/src/drmmode_display.c +++ xserver-xorg-video-intel-2.9.1/src/drmmode_display.c @@ -1435,3 +1435,12 @@ drmModeRmFB(drmmode->fd, drmmode->fb_id); drmmode->fb_id = 0; } + +/* for the drmmode overlay */ +int +drmmode_crtc_id(xf86CrtcPtr crtc) +{ + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + + return drmmode_crtc->mode_crtc->crtc_id; +} --- xserver-xorg-video-intel-2.9.1.orig/src/i915_video.c +++ xserver-xorg-video-intel-2.9.1/src/i915_video.c @@ -53,27 +53,12 @@ int nbox_total = REGION_NUM_RECTS(dstRegion); int nbox_this_time; int dxo, dyo, pix_xoff, pix_yoff; - Bool planar; #if 0 ErrorF("I915DisplayVideo: %dx%d (pitch %d)\n", width, height, video_pitch); #endif - switch (id) { - case FOURCC_UYVY: - case FOURCC_YUY2: - planar = FALSE; - break; - case FOURCC_YV12: - case FOURCC_I420: - planar = TRUE; - break; - default: - ErrorF("Unknown format 0x%x\n", id); - return; - } - #define BYTES_FOR_BOXES(n) ((200 + (n) * 20) * 4) #define BOXES_IN_BYTES(s) ((((s)/4) - 200) / 20) #define BATCH_BYTES(p) ((p)->batch_bo->size - 16) @@ -147,7 +132,7 @@ OUT_RELOC_PIXMAP(pPixmap, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); ADVANCE_BATCH(); - if (!planar) { + if (!is_planar_fourcc(id)) { FS_LOCALS(10); BEGIN_BATCH(16); @@ -173,9 +158,9 @@ OUT_BATCH(_3DSTATE_MAP_STATE | 3); OUT_BATCH(0x00000001); /* texture map #1 */ if (pPriv->buf) - OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBufOffset); else - OUT_BATCH(pPriv->YBuf0offset); + OUT_BATCH(pPriv->YBufOffset); ms3 = MAPSURF_422 | MS3_USE_FENCE_REGS; switch (id) { @@ -285,9 +270,9 @@ OUT_BATCH(0x00000007); if (pPriv->buf) - OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->YBufOffset); else - OUT_BATCH(pPriv->YBuf0offset); + OUT_BATCH(pPriv->YBufOffset); ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS; ms3 |= (height - 1) << MS3_HEIGHT_SHIFT; @@ -302,9 +287,9 @@ OUT_BATCH(((video_pitch * 2 / 4) - 1) << MS4_PITCH_SHIFT); if (pPriv->buf) - OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->UBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->UBufOffset); else - OUT_BATCH(pPriv->UBuf0offset); + OUT_BATCH(pPriv->UBufOffset); ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS; ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT; @@ -313,9 +298,9 @@ OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT); if (pPriv->buf) - OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->VBuf0offset); + OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER, 0, pPriv->VBufOffset); else - OUT_BATCH(pPriv->VBuf0offset); + OUT_BATCH(pPriv->VBufOffset); ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS; ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT; --- xserver-xorg-video-intel-2.9.1.orig/src/i830_video.h +++ xserver-xorg-video-intel-2.9.1/src/i830_video.h @@ -28,22 +28,15 @@ #include "xf86_OSproc.h" typedef struct { - uint32_t YBuf0offset; - uint32_t UBuf0offset; - uint32_t VBuf0offset; - - uint32_t YBuf1offset; - uint32_t UBuf1offset; - uint32_t VBuf1offset; - - unsigned char currentBuf; + uint32_t YBufOffset; + uint32_t UBufOffset; + uint32_t VBufOffset; int brightness; int contrast; int saturation; xf86CrtcPtr current_crtc; xf86CrtcPtr desired_crtc; - int doubleBuffer; RegionRec clip; uint32_t colorKey; @@ -58,7 +51,10 @@ uint32_t videoStatus; Time offTime; Time freeTime; - drm_intel_bo *buf; /** YUV data buffer */ + /** YUV data buffers */ + drm_intel_bo *buf; /* current buffer to draw into */ + drm_intel_bo *oldBuf; /* old buffer, may be in use by the overlay hw */ + Bool oldBuf_pinned; /* only actually pinned when in use by the overlay hw */ Bool overlayOK; int oneLineMode; @@ -91,3 +87,5 @@ void I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask); void i965_free_video(ScrnInfoPtr scrn); + +int is_planar_fourcc(int id); --- xserver-xorg-video-intel-2.9.1.orig/src/scripts/fix.5c +++ xserver-xorg-video-intel-2.9.1/src/scripts/fix.5c @@ -0,0 +1,14 @@ +/* + * Convert CSC fix point values to floats + */ + +real fixval (int fix) +{ + int exp = fix >> 9; + int mant = fix & ((1 << 9) - 1); + real ret; + if (exp == 0x7) + return 1.0; + ret = (2 ** -exp) * mant / (1 << 9); + return ret; +} --- xserver-xorg-video-intel-2.9.1.orig/src/scripts/clock-graph.5c +++ xserver-xorg-video-intel-2.9.1/src/scripts/clock-graph.5c @@ -0,0 +1,174 @@ +autoload Cairo; +import Cairo; +library "examples/sort.5c"; +import Sort; + +int width = 1000, height = 200; +int min_vco = 1400000000; +int max_vco = 2800000000; +int min = 0xffffffff; +int max = 0; + +int max_clocks = 2000; +int[4][max_clocks] clocks; +int[4][max_clocks] vcos; +int[4] clock_count = {0...}; + +int[4] p2vals = {5,10,7,14}; + +cairo_t cr = Cairo::new(width, height); + +void calc_p2(int p2i) +{ + int p2 = p2vals[p2i]; + int min_p, max_p; + + clocks[p2i] = (int [max_clocks]){0...}; + + if (p2 == 7 || p2 == 14) { + /* LVDS */ + min_p = 7; + max_p = 98; + } else { + /* SDVO/DAC */ + min_p = 5; + max_p = 80; + } + + for (int m1 = 10; m1 <= 22; m1++) { + for (int m2 = 5; m2 <= 9; m2++) { + for (int n = 1; n <= 5; n++) { + for (int p1 = 1; p1 <= 8; p1++) { + int ref = 96000000; + int m = 5 * (m1 + 2) + (m2 + 2); + int p = p1 * p2; + int vco = floor(ref * m / (n + 2)); + int clock = floor(vco / p); + + if (p < min_p || p > max_p) + continue; + if (m < 70 || m > 120) + continue; + if (m2 > m1) + continue; /* won't happen */ + if (vco < min_vco || vco > max_vco) + continue; + +/* + printf("clock: %d (%d,%d), %d, " + "(%d,%d)\n", + floor(clock / 1000), + m1, m2, n, p1, p2); +*/ + + clocks[p2i][clock_count[p2i]] = clock; + vcos[p2i][clock_count[p2i]] = vco; + clock_count[p2i]++; + } + } + } + } +} + +bool sort_p2(poly a, poly b) +{ + return a > b; +} + +int min_rate = 25000 * 1000; +int max_rate = 200000 * 1000; + +real scale_x(real clock) +{ + int min_x = 75, max_x = width - 50; + + real frac = (clock - min_rate) / (max_rate - min_rate); + + return min_x + frac * (max_x - min_x); +} + +for (p2i = 0; p2i < dim(p2vals); p2i++) { + int p2 = p2vals[p2i]; + calc_p2(p2i); + real row_y1 = (p2i + 1) / (dim(p2vals) + 1) * height; + real row_y2 = p2i / (dim(p2vals) + 1) * height; + + /*qsort(&p2vals[p2i], sort_p2);*/ + + switch (p2) { + case 5: + set_source_rgb(cr, 1,0,0); + break; + case 10: + set_source_rgb(cr, 0,1,0); + break; + case 7: + set_source_rgb(cr, 0,0,1); + break; + case 14: + set_source_rgb(cr, 0,0,0); + break; + } + + /* draw the line for the clock */ + for (int i = 0; i < clock_count[p2i]; i++) { + int clock = clocks[p2i][i]; + real xpos; + + if (clock < min_rate || clock > max_rate) + continue; + + xpos = scale_x(clock); + move_to(cr, xpos, row_y1); + line_to(cr, xpos, row_y2); + stroke(cr); + } + + set_source_rgb(cr, 1, 1, 1); + /* add a mark for the vco value of the clocks at each location */ + for (int i = 0; i < clock_count[p2i]; i++) { + int clock = clocks[p2i][i]; + int vco = vcos[p2i][i]; + real mark_center; + + if (clock < min_rate || clock > max_rate) + continue; + + real xpos = scale_x(clock); + real vcofrac = (vco - min_vco) / (max_vco - min_vco); + real mark_height = (row_y1 + vcofrac * (row_y2 - row_y1)); + + move_to(cr, xpos, mark_height - 1); + line_to(cr, xpos, mark_height + 1); + stroke(cr); + } + + set_source_rgb(cr, 0, 0, 0); + string p2label = sprintf("p2 = %d", p2); + move_to(cr, 5, (p2i + .5) / (dim(p2vals) + 1) * height + 4); + show_text(cr, p2label); +} + +void label_clock(real clock) { + real center_x = scale_x(clock); + string label = sprintf("%d", floor((clock + 500) / 1000000)); + text_extents_t e = text_extents(cr, label); + real left_x = center_x - e.x_advance / 2; + save(cr); + move_to(cr, left_x, height - 20); + show_text(cr, label); + restore(cr); +} + +label_clock(min_rate); +label_clock(max_rate); +label_clock(140 * 1000 * 1000); +label_clock(115 * 1000 * 1000); +label_clock(100 * 1000 * 1000); +label_clock(82 * 1000 * 1000); + +string xlabel = "Clock in Mhz"; +text_extents_t e = text_extents(cr, xlabel); +move_to(cr, width / 2 - e.x_advance / 2, height - 5); +show_text(cr, xlabel); +sleep(10); --- xserver-xorg-video-intel-2.9.1.orig/src/scripts/tv.5c +++ xserver-xorg-video-intel-2.9.1/src/scripts/tv.5c @@ -0,0 +1,128 @@ +/* + * tv.5c + * + * Compute tv encoder subcarrier dda constants + * + * The TV encoder subcarrier must be set precisely to the + * required frequency or the cumulative phase errors will be + * quite visible in the output. To accomplish this, the TV encoder + * has a complex circuit that takes a fixed clock, generated by the PLL + * and generates a precise subcarrier clock from that using the following + * formula: + * + * subcarrier = pixel_clock * (S1 + (S2 + (S3/Z3)) / Z2) / 4096 + * + * Careful selection of the constants will provide the necessarily + * precise clock. + * + * In the code below, S1 is represented by dda1, S2/Z2 by dda2 and S3/Z3 + * by dda3. + */ + +typedef struct { + int step; + int size; +} term_t; + +/* + * Find the approximation closest, but no larger than 'v', where + * 0 <= v < 1, and the result denominator must be less than 30000. + */ +term_t approx (rational v) +{ + rational best_dist = 1.0; + term_t best; + + for (int den = 20000; den < 30000; den++) + { + int num = floor (v * den); + term_t approx = { step = num, size = den }; + rational dist = v - approx.step/approx.size; + if (dist >= 0 && dist < best_dist) + { + best_dist = dist; + best = approx; + } + } + return best; +} + +typedef struct { + rational subcarrier; + rational pixel; + rational result; + term_t dda1; + term_t dda2; + term_t dda3; +} dda; + +/* + * Compute the dda constants for the given pixel clock and + * desired subcarrier frequency + */ + +dda find_dda (rational pixel, rational subcarrier) +{ + dda d; + + d.subcarrier = subcarrier; + d.pixel = pixel; + + rational dda1 = subcarrier / pixel * 4096; + d.dda1 = (term_t) { step = floor (dda1), size = 4096 }; + + rational dda2 = dda1 - d.dda1.step; + d.dda2 = approx (dda2); + + rational dda3 = dda2 * d.dda2.size - d.dda2.step; + d.dda3 = approx (dda3); + + /* Compute the resulting pixel clock to compare */ + d.result = d.pixel * (d.dda1.step + + (d.dda2.step + d.dda3.step/d.dda3.size) / + d.dda2.size) / d.dda1.size; + return d; +} + +/* + * Print out the computed constants + */ +void print_dda (dda d) +{ + printf ("\t/* desired %9.7f actual %9.7f clock %g */\n", + d.subcarrier, d.result, d.pixel); + printf ("\t.dda1_inc\t= %6d,\n", d.dda1.step); + printf ("\t.dda2_inc\t= %6d,\t.dda2_size\t= %6d,\n", + d.dda2.step, d.dda2.step != 0 ? d.dda2.size : 0); + printf ("\t.dda3_inc\t= %6d,\t.dda3_size\t= %6d,\n", + d.dda3.step, d.dda3.step != 0 ? d.dda3.size : 0); +} + +/* + * These are all of the required subcarrier frequencies + */ +rational[] subcarriers = { + /* these are the values we use; for some reason, this generates + * a more stable image (at least for NTSC) */ + 3.580, 4.434, 3.582, 3.576, 4.430, + + /* these are the values pulled out of the various specs */ + 3.579545, 4.433618, 3.582056, 3.575611, 4.433618 +}; + +/* + * We fix the pixel clock to a value which the hardware can + * generate exactly + */ +rational pixel = 107.520; + +void main () +{ + for (int i = 0; i < dim(subcarriers); i++) + { + dda d = find_dda (pixel, subcarriers[i]); + print_dda (d); + } +} + +main (); --- xserver-xorg-video-intel-2.9.1.orig/src/scripts/clock.5c +++ xserver-xorg-video-intel-2.9.1/src/scripts/clock.5c @@ -0,0 +1,40 @@ +int p2 = 14; +int min_p, max_p; + +if (p2 == 7 || p2 == 14) { + /* LVDS */ + min_p = 7; + max_p = 98; +} else { + /* SDVO/DAC */ + min_p = 5; + max_p = 80; +} + +for (int m1 = 10; m1 <= 22; m1++) { + for (int m2 = 5; m2 <= 9; m2++) { + for (int n = 1; n <= 6; n++) { + for (int p1 = 1; p1 <= 8; p1++) { + int ref = 96000000; + int m = 5 * (m1 + 2) + (m2 + 2); + int p = p1 * p2; + int vco = floor(ref * m / (n + 2)); + int clock = floor(vco / p); + + if (p < min_p || p > max_p) + continue; + if (m < 70 || m > 120) + continue; + if (m2 > m1) + continue; /* won't happen */ + if (vco < 1400000000 || + vco > 2800000000) + continue; + + printf("clock: %d (%d,%d),%d,(%d,%d)\n", + floor(clock / 1000), + m1, m2, n, p1, p2); + } + } + } +} --- xserver-xorg-video-intel-2.9.1.orig/src/xvmc/shader/mc/addidct_igd.g4i +++ xserver-xorg-video-intel-2.9.1/src/xvmc/shader/mc/addidct_igd.g4i @@ -0,0 +1,117 @@ +/* GRF allocation: + g1~g30: constant buffer + g1~g2:intra IQ matrix + g3~g4:non intra IQ matrix + g5~g20:IDCT table + g31: thread payload + g32: message descriptor for reading reference data + g58~g81:reference data + g82: thread payload backup + g84~g107:IDCT data */ +//mov (2) g31.0<1>UD g82.12<2,2,1>UW {align1}; //restore x and y +mov (2) g31.0<1>UD g82.0<2,2,1>UD {align1}; //restore x and y + +and.nz (1) null g82.30<1,1,1>UB 0x1UW {align1}; //dct_type +(f0) jmpi field_dct; + +add.sat (32) g58.0<2>UB g84.0<16,16,1>W g58.0<16,16,2>UB {align1 compr}; +add.sat (32) g60.0<2>UB g86.0<16,16,1>W g60.0<16,16,2>UB {align1 compr}; +add.sat (32) g62.0<2>UB g88.0<16,16,1>W g62.0<16,16,2>UB {align1 compr}; +add.sat (32) g64.0<2>UB g90.0<16,16,1>W g64.0<16,16,2>UB {align1 compr}; +add.sat (32) g66.0<2>UB g92.0<16,16,1>W g66.0<16,16,2>UB {align1 compr}; +add.sat (32) g68.0<2>UB g94.0<16,16,1>W g68.0<16,16,2>UB {align1 compr}; +add.sat (32) g70.0<2>UB g96.0<16,16,1>W g70.0<16,16,2>UB {align1 compr}; +add.sat (32) g72.0<2>UB g98.0<16,16,1>W g72.0<16,16,2>UB {align1 compr}; + +add.sat (32) g74.0<2>UB g100.0<16,16,1>W g74.0<16,16,2>UB {align1 compr}; +add.sat (32) g76.0<2>UB g102.0<16,16,1>W g76.0<16,16,2>UB {align1 compr}; +add.sat (32) g78.0<2>UB g104.0<16,16,1>W g78.0<16,16,2>UB {align1 compr}; +add.sat (32) g80.0<2>UB g106.0<16,16,1>W g80.0<16,16,2>UB {align1 compr}; +jmpi write_back; + +field_dct: +add.sat (16) g58.0<2>UB g84.0<16,16,1>W g58.0<16,16,2>UB {align1}; +add.sat (16) g59.0<2>UB g92.0<16,16,1>W g59.0<16,16,2>UB {align1}; +add.sat (16) g60.0<2>UB g85.0<16,16,1>W g60.0<16,16,2>UB {align1}; +add.sat (16) g61.0<2>UB g93.0<16,16,1>W g61.0<16,16,2>UB {align1}; +add.sat (16) g62.0<2>UB g86.0<16,16,1>W g62.0<16,16,2>UB {align1}; +add.sat (16) g63.0<2>UB g94.0<16,16,1>W g63.0<16,16,2>UB {align1}; +add.sat (16) g64.0<2>UB g87.0<16,16,1>W g64.0<16,16,2>UB {align1}; +add.sat (16) g65.0<2>UB g95.0<16,16,1>W g65.0<16,16,2>UB {align1}; +add.sat (16) g66.0<2>UB g88.0<16,16,1>W g66.0<16,16,2>UB {align1}; +add.sat (16) g67.0<2>UB g96.0<16,16,1>W g67.0<16,16,2>UB {align1}; +add.sat (16) g68.0<2>UB g89.0<16,16,1>W g68.0<16,16,2>UB {align1}; +add.sat (16) g69.0<2>UB g97.0<16,16,1>W g69.0<16,16,2>UB {align1}; +add.sat (16) g70.0<2>UB g90.0<16,16,1>W g70.0<16,16,2>UB {align1}; +add.sat (16) g71.0<2>UB g98.0<16,16,1>W g71.0<16,16,2>UB {align1}; +add.sat (16) g72.0<2>UB g91.0<16,16,1>W g72.0<16,16,2>UB {align1}; +add.sat (16) g73.0<2>UB g99.0<16,16,1>W g73.0<16,16,2>UB {align1}; +/* +add.sat (16) g74.0<2>UB g100.0<16,16,1>W g74.0<16,16,2>UB {align1}; +add.sat (16) g75.0<2>UB g101.0<16,16,1>W g75.0<16,16,2>UB {align1}; +add.sat (16) g76.0<2>UB g102.0<16,16,1>W g76.0<16,16,2>UB {align1}; +add.sat (16) g77.0<2>UB g103.0<16,16,1>W g77.0<16,16,2>UB {align1}; +add.sat (16) g78.0<2>UB g104.0<16,16,1>W g78.0<16,16,2>UB {align1}; +add.sat (16) g79.0<2>UB g105.0<16,16,1>W g79.0<16,16,2>UB {align1}; +add.sat (16) g80.0<2>UB g106.0<16,16,1>W g80.0<16,16,2>UB {align1}; +add.sat (16) g81.0<2>UB g107.0<16,16,1>W g81.0<16,16,2>UB {align1}; +*/ +add (16) g100.0<1>W g100.0<16,16,1>W g74.0<16,16,2>UB {align1}; +add (16) g101.0<1>W g101.0<16,16,1>W g75.0<16,16,2>UB {align1}; +add (16) g102.0<1>W g102.0<16,16,1>W g76.0<16,16,2>UB {align1}; +add (16) g103.0<1>W g103.0<16,16,1>W g77.0<16,16,2>UB {align1}; +add (16) g104.0<1>W g104.0<16,16,1>W g78.0<16,16,2>UB {align1}; +add (16) g105.0<1>W g105.0<16,16,1>W g79.0<16,16,2>UB {align1}; +add (16) g106.0<1>W g106.0<16,16,1>W g80.0<16,16,2>UB {align1}; +add (16) g107.0<1>W g107.0<16,16,1>W g81.0<16,16,2>UB {align1}; + +mov.sat (16) g74.0<2>UB g100.0<16,16,1>W {align1}; +mov.sat (16) g75.0<2>UB g101.0<16,16,1>W {align1}; +mov.sat (16) g76.0<2>UB g102.0<16,16,1>W {align1}; +mov.sat (16) g77.0<2>UB g103.0<16,16,1>W {align1}; +mov.sat (16) g78.0<2>UB g104.0<16,16,1>W {align1}; +mov.sat (16) g79.0<2>UB g105.0<16,16,1>W {align1}; +mov.sat (16) g80.0<2>UB g106.0<16,16,1>W {align1}; +mov.sat (16) g81.0<2>UB g107.0<16,16,1>W {align1}; + + +write_back: +mov (1) g31.8<1>UD 0x00F000FUD {align1}; + +mov (16) m1.0<1>UB g58.0<16,16,2>UB {align1}; +mov (16) m1.16<1>UB g59.0<16,16,2>UB {align1}; +mov (16) m2.0<1>UB g60.0<16,16,2>UB {align1}; +mov (16) m2.16<1>UB g61.0<16,16,2>UB {align1}; +mov (16) m3.0<1>UB g62.0<16,16,2>UB {align1}; +mov (16) m3.16<1>UB g63.0<16,16,2>UB {align1}; +mov (16) m4.0<1>UB g64.0<16,16,2>UB {align1}; +mov (16) m4.16<1>UB g65.0<16,16,2>UB {align1}; +mov (16) m5.0<1>UB g66.0<16,16,2>UB {align1}; +mov (16) m5.16<1>UB g67.0<16,16,2>UB {align1}; +mov (16) m6.0<1>UB g68.0<16,16,2>UB {align1}; +mov (16) m6.16<1>UB g69.0<16,16,2>UB {align1}; +mov (16) m7.0<1>UB g70.0<16,16,2>UB {align1}; +mov (16) m7.16<1>UB g71.0<16,16,2>UB {align1}; +mov (16) m8.0<1>UB g72.0<16,16,2>UB {align1}; +mov (16) m8.16<1>UB g73.0<16,16,2>UB {align1}; +send (16) 0 acc0<1>UW g31<8,8,1>UW write(0,0,2,0) mlen 9 rlen 0 {align1}; + +//U +mov (1) g31.8<1>UD 0x0070007UD { align1 }; +shr (2) g31.0<1>UD g31.0<2,2,1>UD 1D {align1}; + +mov (16) m1.0<1>UB g74.0<16,16,2>UB {align1}; +mov (16) m1.16<1>UB g75.0<16,16,2>UB {align1}; +mov (16) m2.0<1>UB g76.0<16,16,2>UB {align1}; +mov (16) m2.16<1>UB g77.0<16,16,2>UB {align1}; +send (16) 0 acc0<1>UW g31<8,8,1>UW write(1, 0, 2, 0) mlen 3 rlen 0 { align1 }; + +//V +mov (16) m1.0<1>UB g78.0<16,16,2>UB {align1}; +mov (16) m1.16<1>UB g79.0<16,16,2>UB {align1}; +mov (16) m2.0<1>UB g80.0<16,16,2>UB {align1}; +mov (16) m2.16<1>UB g81.0<16,16,2>UB {align1}; +send (16) 0 acc0<1>UW g31<8,8,1>UW write(2, 0, 2, 0) mlen 3 rlen 0 { align1 }; + +send (16) 0 acc0<1>UW g0<8,8,1>UW + thread_spawner(0, 0, 0) mlen 1 rlen 0 { align1 EOT}; --- xserver-xorg-video-intel-2.9.1.orig/src/xvmc/shader/vld/read_frame_x0y1_uv.g4i +++ xserver-xorg-video-intel-2.9.1/src/xvmc/shader/vld/read_frame_x0y1_uv.g4i @@ -0,0 +1,56 @@ +/* + * Copyright © 2008 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDINg BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINgEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIgHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAgES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISINg FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINgS IN THE + * SOFTWARE. + * + * Author: + * Zou Nan hai + * Zhang Hua jun + * Xing Dong sheng + * + */ +mov (1) g32.8<1>UD 0x007001FUD {align1}; +send (16) 0 g34.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 8 {align1}; //U +send (16) 0 g44.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 8 {align1}; //V +add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1}; +mov (1) g32.8<1>UD 0x1FUD {align1}; +send (16) 0 g42.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1}; //U +send (16) 0 g52.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1}; //V + +//U +avg (8) g74.0<1>UW g34.0<8,8,1>UB g35.0<8,8,1>UB {align1}; +avg (8) g74.16<1>UW g35.0<8,8,1>UB g36.0<8,8,1>UB {align1}; +avg (8) g75.0<1>UW g36.0<8,8,1>UB g37.0<8,8,1>UB {align1}; +avg (8) g75.16<1>UW g37.0<8,8,1>UB g38.0<8,8,1>UB {align1}; +avg (8) g76.0<1>UW g38.0<8,8,1>UB g39.0<8,8,1>UB {align1}; +avg (8) g76.16<1>UW g39.0<8,8,1>UB g40.0<8,8,1>UB {align1}; +avg (8) g77.0<1>UW g40.0<8,8,1>UB g41.0<8,8,1>UB {align1}; +avg (8) g77.16<1>UW g41.0<8,8,1>UB g42.0<8,8,1>UB {align1}; + +//V +avg (8) g78.0<1>UW g44.0<8,8,1>UB g45.0<8,8,1>UB {align1}; +avg (8) g78.16<1>UW g45.0<8,8,1>UB g46.0<8,8,1>UB {align1}; +avg (8) g79.0<1>UW g46.0<8,8,1>UB g47.0<8,8,1>UB {align1}; +avg (8) g79.16<1>UW g47.0<8,8,1>UB g48.0<8,8,1>UB {align1}; +avg (8) g80.0<1>UW g48.0<8,8,1>UB g49.0<8,8,1>UB {align1}; +avg (8) g80.16<1>UW g49.0<8,8,1>UB g50.0<8,8,1>UB {align1}; +avg (8) g81.0<1>UW g50.0<8,8,1>UB g51.0<8,8,1>UB {align1}; +avg (8) g81.16<1>UW g51.0<8,8,1>UB g52.0<8,8,1>UB {align1}; + --- xserver-xorg-video-intel-2.9.1.orig/src/xvmc/shader/vld/read_field_x1y1_uv.g4i +++ xserver-xorg-video-intel-2.9.1/src/xvmc/shader/vld/read_field_x1y1_uv.g4i @@ -0,0 +1,53 @@ +/* GRF allocation: + g1~g30: constant buffer + g1~g2:intra IQ matrix + g3~g4:non intra IQ matrix + g5~g20:IDCT table + g31: thread payload + g58~g81:reference data + g82: thread payload backup + g83~g106:IDCT data + g115: message descriptor for reading reference data */ +mov (1) g115.8<1>UD 0x07000FUD {align1}; +send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U +send (16) 0 g45.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V +mov (1) g115.8<1>UD 0x01000FUD {align1}; +add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1}; +send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 1 {align1};//U +send (16) 0 g49.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 1 {align1};//V +//U +add (16) g32.0<1>UW g40.0<16,8,1>UB g41.0<16,8,1>UB {align1}; +add (16) g33.0<1>UW g41.0<16,8,1>UB g42.0<16,8,1>UB {align1}; +add (16) g34.0<1>UW g42.0<16,8,1>UB g43.0<16,8,1>UB {align1}; +add (16) g35.0<1>UW g43.0<16,8,1>UB g44.0<16,8,1>UB {align1}; + +add (16) g32.0<1>UW g32.0<16,8,1>UW g40.1<16,8,1>UB {align1}; +add (16) g33.0<1>UW g33.0<16,8,1>UW g41.1<16,8,1>UB {align1}; +add (16) g34.0<1>UW g34.0<16,8,1>UW g42.1<16,8,1>UB {align1}; +add (16) g35.0<1>UW g35.0<16,8,1>UW g43.1<16,8,1>UB {align1}; + +add (16) g32.0<1>UW g32.0<16,8,1>UW g41.1<16,8,1>UB {align1}; +add (16) g33.0<1>UW g33.0<16,8,1>UW g42.1<16,8,1>UB {align1}; +add (16) g34.0<1>UW g34.0<16,8,1>UW g43.1<16,8,1>UB {align1}; +add (16) g35.0<1>UW g35.0<16,8,1>UW g44.1<16,8,1>UB {align1}; +//V +add (16) g36.0<1>UW g45.0<16,8,1>UB g46.0<16,8,1>UB {align1}; +add (16) g37.0<1>UW g46.0<16,8,1>UB g47.0<16,8,1>UB {align1}; +add (16) g38.0<1>UW g47.0<16,8,1>UB g48.0<16,8,1>UB {align1}; +add (16) g39.0<1>UW g48.0<16,8,1>UB g49.0<16,8,1>UB {align1}; + +add (16) g36.0<1>UW g36.0<16,8,1>UW g45.1<16,8,1>UB {align1}; +add (16) g37.0<1>UW g37.0<16,8,1>UW g46.1<16,8,1>UB {align1}; +add (16) g38.0<1>UW g38.0<16,8,1>UW g47.1<16,8,1>UB {align1}; +add (16) g39.0<1>UW g39.0<16,8,1>UW g48.1<16,8,1>UB {align1}; + +add (16) g36.0<1>UW g36.0<16,8,1>UW g46.1<16,8,1>UB {align1}; +add (16) g37.0<1>UW g37.0<16,8,1>UW g47.1<16,8,1>UB {align1}; +add (16) g38.0<1>UW g38.0<16,8,1>UW g48.1<16,8,1>UB {align1}; +add (16) g39.0<1>UW g39.0<16,8,1>UW g49.1<16,8,1>UB {align1}; + +shr (32) g32.0<1>UW g32.0<16,16,1>UW 2UW {align1 compr}; +shr (32) g34.0<1>UW g34.0<16,16,1>UW 2UW {align1 compr}; +shr (32) g36.0<1>UW g36.0<16,16,1>UW 2UW {align1 compr}; +shr (32) g38.0<1>UW g38.0<16,16,1>UW 2UW {align1 compr}; + --- xserver-xorg-video-intel-2.9.1.orig/src/xvmc/shader/vld/read_field_x1y0_uv.g4i +++ xserver-xorg-video-intel-2.9.1/src/xvmc/shader/vld/read_field_x1y0_uv.g4i @@ -0,0 +1,24 @@ +/* GRF allocation: + g1~g30: constant buffer + g1~g2:intra IQ matrix + g3~g4:non intra IQ matrix + g5~g20:IDCT table + g31: thread payload + g58~g81:reference data + g82: thread payload backup + g83~g106:IDCT data + g115: message descriptor for reading reference data */ + +mov (1) g115.8<1>UD 0x07000FUD {align1}; // 8*16/32=4 +send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U +send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V + +avg (16) g32.0<1>UW g40.0<16,8,1>UB g40.1<16,8,1>UB {align1}; +avg (16) g33.0<1>UW g41.0<16,8,1>UB g41.1<16,8,1>UB {align1}; +avg (16) g34.0<1>UW g42.0<16,8,1>UB g42.1<16,8,1>UB {align1}; +avg (16) g35.0<1>UW g43.0<16,8,1>UB g43.1<16,8,1>UB {align1}; + +avg (16) g36.0<1>UW g44.0<16,8,1>UB g44.1<16,8,1>UB {align1}; +avg (16) g37.0<1>UW g45.0<16,8,1>UB g45.1<16,8,1>UB {align1}; +avg (16) g38.0<1>UW g46.0<16,8,1>UB g46.1<16,8,1>UB {align1}; +avg (16) g39.0<1>UW g47.0<16,8,1>UB g47.1<16,8,1>UB {align1}; --- xserver-xorg-video-intel-2.9.1.orig/src/xvmc/shader/vld/read_frame_x1y0_uv.g4i +++ xserver-xorg-video-intel-2.9.1/src/xvmc/shader/vld/read_frame_x1y0_uv.g4i @@ -0,0 +1,42 @@ +/* + * Copyright © 2008 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: + * Zou Nan hai + * Zhang Hua jun + * Xing Dong sheng + * + */ + +mov (1) g32.8<1>UD 0x007000fUD {align1}; +send (16) 0 g34.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 4 {align1}; +send (16) 0 g44.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 4 {align1}; + +avg (16) g74.0<1>UW g34.0<16,8,1>UB g34.1<16,8,1>UB{align1}; +avg (16) g75.0<1>UW g35.0<16,8,1>UB g35.1<16,8,1>UB{align1}; +avg (16) g76.0<1>UW g36.0<16,8,1>UB g36.1<16,8,1>UB{align1}; +avg (16) g77.0<1>UW g37.0<16,8,1>UB g37.1<16,8,1>UB{align1}; + +avg (16) g78.0<1>UW g44.0<16,8,1>UB g44.1<16,8,1>UB{align1}; +avg (16) g79.0<1>UW g45.0<16,8,1>UB g45.1<16,8,1>UB{align1}; +avg (16) g80.0<1>UW g46.0<16,8,1>UB g46.1<16,8,1>UB{align1}; +avg (16) g81.0<1>UW g47.0<16,8,1>UB g47.1<16,8,1>UB{align1}; --- xserver-xorg-video-intel-2.9.1.orig/src/xvmc/shader/vld/read_frame_x1y1_uv.g4i +++ xserver-xorg-video-intel-2.9.1/src/xvmc/shader/vld/read_frame_x1y1_uv.g4i @@ -0,0 +1,74 @@ +/* + */ +mov (1) g32.8<1>UD 0x007001FUD {align1}; +send (16) 0 g34.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 8 {align1}; //U +send (16) 0 g44.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 8 {align1}; //V +add (1) g32.4<1>UD g32.4<1,1,1>UD 8UD {align1}; +mov (1) g32.8<1>UD 0x1FUD {align1}; +send (16) 0 g42.0<1>UW g32<8,8,1>UW read(input_surface1, 2, 0, 2) mlen 1 rlen 1 {align1}; //U +send (16) 0 g52.0<1>UW g32<8,8,1>UW read(input_surface2, 2, 0, 2) mlen 1 rlen 1 {align1}; //V + +//U +add (8) g74.0<1>UW g34.0<8,8,1>UB g34.1<8,8,1>UB {align1}; +add (8) g74.16<1>UW g35.0<8,8,1>UB g35.1<8,8,1>UB {align1}; +add (8) g75.0<1>UW g36.0<8,8,1>UB g36.1<8,8,1>UB {align1}; +add (8) g75.16<1>UW g37.0<8,8,1>UB g37.1<8,8,1>UB {align1}; +add (8) g76.0<1>UW g38.0<8,8,1>UB g38.1<8,8,1>UB {align1}; +add (8) g76.16<1>UW g39.0<8,8,1>UB g39.1<8,8,1>UB {align1}; +add (8) g77.0<1>UW g40.0<8,8,1>UB g40.1<8,8,1>UB {align1}; +add (8) g77.16<1>UW g41.0<8,8,1>UB g41.1<8,8,1>UB {align1}; + +add (8) g74.0<1>UW g74.0<8,8,1>UW g35.0<8,8,1>UB {align1}; +add (8) g74.16<1>UW g74.16<8,8,1>UW g36.0<8,8,1>UB {align1}; +add (8) g75.0<1>UW g75.0<8,8,1>UW g37.0<8,8,1>UB {align1}; +add (8) g75.16<1>UW g75.16<8,8,1>UW g38.0<8,8,1>UB {align1}; +add (8) g76.0<1>UW g76.0<8,8,1>UW g39.0<8,8,1>UB {align1}; +add (8) g76.16<1>UW g76.16<8,8,1>UW g40.0<8,8,1>UB {align1}; +add (8) g77.0<1>UW g77.0<8,8,1>UW g41.0<8,8,1>UB {align1}; +add (8) g77.16<1>UW g77.16<8,8,1>UW g42.0<8,8,1>UB {align1}; + +add (8) g74.0<1>UW g74.0<8,8,1>UW g35.1<8,8,1>UB {align1}; +add (8) g74.16<1>UW g74.16<8,8,1>UW g36.1<8,8,1>UB {align1}; +add (8) g75.0<1>UW g75.0<8,8,1>UW g37.1<8,8,1>UB {align1}; +add (8) g75.16<1>UW g75.16<8,8,1>UW g38.1<8,8,1>UB {align1}; +add (8) g76.0<1>UW g76.0<8,8,1>UW g39.1<8,8,1>UB {align1}; +add (8) g76.16<1>UW g76.16<8,8,1>UW g40.1<8,8,1>UB {align1}; +add (8) g77.0<1>UW g77.0<8,8,1>UW g41.1<8,8,1>UB {align1}; +add (8) g77.16<1>UW g77.16<8,8,1>UW g42.1<8,8,1>UB {align1}; + +//V +add (8) g78.0<1>UW g44.0<8,8,1>UB g44.1<8,8,1>UB {align1}; +add (8) g78.16<1>UW g45.0<8,8,1>UB g45.1<8,8,1>UB {align1}; +add (8) g79.0<1>UW g46.0<8,8,1>UB g46.1<8,8,1>UB {align1}; +add (8) g79.16<1>UW g47.0<8,8,1>UB g47.1<8,8,1>UB {align1}; +add (8) g80.0<1>UW g48.0<8,8,1>UB g48.1<8,8,1>UB {align1}; +add (8) g80.16<1>UW g49.0<8,8,1>UB g49.1<8,8,1>UB {align1}; +add (8) g81.0<1>UW g50.0<8,8,1>UB g50.1<8,8,1>UB {align1}; +add (8) g81.16<1>UW g51.0<8,8,1>UB g51.1<8,8,1>UB {align1}; + +add (8) g78.0<1>UW g78.0<8,8,1>UW g45.0<8,8,1>UB {align1}; +add (8) g78.16<1>UW g78.16<8,8,1>UW g46.0<8,8,1>UB {align1}; +add (8) g79.0<1>UW g79.0<8,8,1>UW g47.0<8,8,1>UB {align1}; +add (8) g79.16<1>UW g79.16<8,8,1>UW g48.0<8,8,1>UB {align1}; +add (8) g80.0<1>UW g80.0<8,8,1>UW g49.0<8,8,1>UB {align1}; +add (8) g80.16<1>UW g80.16<8,8,1>UW g50.0<8,8,1>UB {align1}; +add (8) g81.0<1>UW g81.0<8,8,1>UW g51.0<8,8,1>UB {align1}; +add (8) g81.16<1>UW g81.16<8,8,1>UW g52.0<8,8,1>UB {align1}; + +add (8) g78.0<1>UW g78.0<8,8,1>UW g45.1<8,8,1>UB {align1}; +add (8) g78.16<1>UW g78.16<8,8,1>UW g46.1<8,8,1>UB {align1}; +add (8) g79.0<1>UW g79.0<8,8,1>UW g47.1<8,8,1>UB {align1}; +add (8) g79.16<1>UW g79.16<8,8,1>UW g48.1<8,8,1>UB {align1}; +add (8) g80.0<1>UW g80.0<8,8,1>UW g49.1<8,8,1>UB {align1}; +add (8) g80.16<1>UW g80.16<8,8,1>UW g50.1<8,8,1>UB {align1}; +add (8) g81.0<1>UW g81.0<8,8,1>UW g51.1<8,8,1>UB {align1}; +add (8) g81.16<1>UW g81.16<8,8,1>UW g52.1<8,8,1>UB {align1}; + +shr (16) g74.0<1>UW g74.0<16,16,1>UW 2UW {align1}; +shr (16) g75.0<1>UW g75.0<16,16,1>UW 2UW {align1}; +shr (16) g76.0<1>UW g76.0<16,16,1>UW 2UW {align1}; +shr (16) g77.0<1>UW g77.0<16,16,1>UW 2UW {align1}; +shr (16) g78.0<1>UW g78.0<16,16,1>UW 2UW {align1}; +shr (16) g79.0<1>UW g79.0<16,16,1>UW 2UW {align1}; +shr (16) g80.0<1>UW g80.0<16,16,1>UW 2UW {align1}; +shr (16) g81.0<1>UW g81.0<16,16,1>UW 2UW {align1}; --- xserver-xorg-video-intel-2.9.1.orig/src/xvmc/shader/vld/read_field_x0y1_uv.g4i +++ xserver-xorg-video-intel-2.9.1/src/xvmc/shader/vld/read_field_x0y1_uv.g4i @@ -0,0 +1,28 @@ +/* GRF allocation: + g1~g30: constant buffer + g1~g2:intra IQ matrix + g3~g4:non intra IQ matrix + g5~g20:IDCT table + g31: thread payload + g58~g81:reference data + g82: thread payload backup + g83~g106:IDCT data + g115: message descriptor for reading reference data */ + +mov (1) g115.8<1>UD 0x07000FUD {align1}; // 8*16/32=4 +send (16) 0 g40.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 4 {align1};//U +send (16) 0 g45.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 4 {align1};//V +mov (1) g115.8<1>UD 0xFUD {align1}; +add (1) g115.4<1>UD g115.4<1,1,1>UD 8UD {align1}; +send (16) 0 g44.0<1>UW g115<8,8,1>UW read(surface_u, 2, 0, 2) mlen 1 rlen 1 {align1};//U +send (16) 0 g49.0<1>UW g115<8,8,1>UW read(surface_v, 2, 0, 2) mlen 1 rlen 1 {align1};//V + +avg (16) g32.0<1>UW g40.0<16,8,1>UB g41.0<16,8,1>UB {align1}; +avg (16) g33.0<1>UW g41.0<16,8,1>UB g42.0<16,8,1>UB {align1}; +avg (16) g34.0<1>UW g42.0<16,8,1>UB g43.0<16,8,1>UB {align1}; +avg (16) g35.0<1>UW g43.0<16,8,1>UB g44.0<16,8,1>UB {align1}; + +avg (16) g36.0<1>UW g45.0<16,8,1>UB g46.0<16,8,1>UB {align1}; +avg (16) g37.0<1>UW g46.0<16,8,1>UB g47.0<16,8,1>UB {align1}; +avg (16) g38.0<1>UW g47.0<16,8,1>UB g48.0<16,8,1>UB {align1}; +avg (16) g39.0<1>UW g48.0<16,8,1>UB g49.0<16,8,1>UB {align1}; --- xserver-xorg-video-intel-2.9.1.orig/patches/series +++ xserver-xorg-video-intel-2.9.1/patches/series @@ -0,0 +1,4 @@ +101_copy-fb.patch +102_avoid_flushing_null.patch +103_check_for_overflow.patch +104_fail_when_prop_values_gone.patch --- xserver-xorg-video-intel-2.9.1.orig/patches/104_fail_when_prop_values_gone.patch +++ xserver-xorg-video-intel-2.9.1/patches/104_fail_when_prop_values_gone.patch @@ -0,0 +1,24 @@ +From 2f134b84445d2d0bfe3d81276bc7f6648df062ee Mon Sep 17 00:00:00 2001 +From: Zhao Yakui +Date: Wed, 30 Sep 2009 07:31:57 +0000 +Subject: Return failure when the enum-type output property values are not found + +Failure to do so causes xrandr to report incorrect property values. + +Signed-off-by: Zhao Yakui +Signed-off-by: Eric Anholt +--- +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 472bc74..3417cab 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -1148,6 +1148,7 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property, + return TRUE; + } + } ++ return FALSE; + } + } + +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.9.1.orig/patches/101_copy-fb.patch +++ xserver-xorg-video-intel-2.9.1/patches/101_copy-fb.patch @@ -0,0 +1,159 @@ +Index: xserver-xorg-video-intel-2.9.1/src/drmmode_display.c +=================================================================== +--- xserver-xorg-video-intel-2.9.1.orig/src/drmmode_display.c 2009-10-26 13:48:05.000000000 +0200 ++++ xserver-xorg-video-intel-2.9.1/src/drmmode_display.c 2009-12-07 16:17:51.000000000 +0200 +@@ -35,6 +35,8 @@ + #include + #include + ++#include ++ + #include "xorgVersion.h" + + #include "i830.h" +@@ -910,6 +912,13 @@ + drmmode_ptr drmmode = drmmode_output->drmmode; + int i; + drmModePropertyPtr props; ++ I830Ptr pI830 = I830PTR(output->scrn); ++ ++ /* xf86Crtc.c calls dpms off in set desired modes, so ignore ++ * the request if we're starting up. */ ++ ++ if (pI830->starting) ++ return; + + for (i = 0; i < koutput->count_props; i++) { + props = drmModeGetProperty(drmmode->fd, koutput->props[i]); +@@ -1410,6 +1419,8 @@ + + xf86InitialConfiguration(pScrn, TRUE); + ++ pScrn->canDoBGNoneRoot = TRUE; ++ + return TRUE; + } + +@@ -1435,3 +1446,97 @@ + drmModeRmFB(drmmode->fd, drmmode->fb_id); + drmmode->fb_id = 0; + } ++ ++static PixmapPtr ++drmmode_create_pixmap_for_fbcon(ScrnInfoPtr pScrn) ++{ ++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ drmmode_crtc_private_ptr drmmode_crtc = xf86_config->crtc[0]->driver_private; ++ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ++ drmmode_ptr drmmode = drmmode_crtc->drmmode; ++ I830Ptr pI830 = I830PTR(pScrn); ++ drmModeFBPtr fbcon; ++ struct drm_gem_flink flink; ++ drm_intel_bo *bo; ++ PixmapPtr pixmap = NULL; ++ int i; ++ ++ for (i = 0; i < drmmode->mode_res->count_crtcs; i++) { ++ drmmode_crtc = xf86_config->crtc[i]->driver_private; ++ if (drmmode_crtc->mode_crtc->buffer_id == 0) ++ continue; ++ fbcon = drmModeGetFB(drmmode->fd, ++ drmmode_crtc->mode_crtc->buffer_id); ++ if (fbcon != NULL) ++ break; ++ } ++ if (i == drmmode->mode_res->count_crtcs) ++ return NULL; ++ ++ flink.handle = fbcon->handle; ++ if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't flink fbcon handle\n"); ++ return NULL; ++ } ++ ++ bo = drm_intel_bo_gem_create_from_name(pI830->bufmgr, ++ "fbcon", flink.name); ++ if (bo == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't allocate bo for fbcon handle\n"); ++ return NULL; ++ } ++ ++ pixmap = GetScratchPixmapHeader(pScreen, ++ fbcon->width, fbcon->height, ++ fbcon->depth, fbcon->bpp, ++ fbcon->pitch, NULL); ++ ++ if (pixmap == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't allocate pixmap fbcon contents\n"); ++ return NULL; ++ } ++ ++ i830_set_pixmap_bo(pixmap, bo); ++ drm_intel_bo_unreference(bo); ++ drmModeFreeFB(fbcon); ++ ++ return pixmap; ++} ++void drmmode_copy_fb(ScrnInfoPtr pScrn) ++{ ++ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ++ I830Ptr pI830 = I830PTR(pScrn); ++ PixmapPtr src, dst; ++ unsigned int pitch = pScrn->displayWidth * pI830->cpp; ++ ++ src = drmmode_create_pixmap_for_fbcon(pScrn); ++ if (src == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't create pixmap for fbcon\n"); ++ return; ++ } ++ ++ /* We dont have a screen Pixmap yet */ ++ dst = GetScratchPixmapHeader(pScreen, ++ pScrn->virtualX, pScrn->virtualY, ++ pScrn->depth, pScrn->bitsPerPixel, ++ pitch, ++ NULL); ++ i830_set_pixmap_bo(dst, pI830->front_buffer->bo); ++ ++ pI830->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES); ++ ++ pI830->uxa_driver->copy(dst, 0, 0, 0, 0, ++ pScrn->virtualX, pScrn->virtualY); ++ ++ pI830->uxa_driver->done_copy(dst); ++ ++ I830EmitFlush(pScrn); ++ intel_batch_flush(pScrn, TRUE); ++ ++ (*pScreen->DestroyPixmap)(src); ++ (*pScreen->DestroyPixmap)(dst); ++} +Index: xserver-xorg-video-intel-2.9.1/src/i830.h +=================================================================== +--- xserver-xorg-video-intel-2.9.1.orig/src/i830.h 2009-10-26 13:48:05.000000000 +0200 ++++ xserver-xorg-video-intel-2.9.1/src/i830.h 2009-12-07 16:17:51.000000000 +0200 +@@ -696,6 +696,7 @@ + extern int drmmode_output_dpms_status(xf86OutputPtr output); + void + drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor); ++extern void drmmode_copy_fb(ScrnInfoPtr pScrn); + + extern Bool i830_crtc_on(xf86CrtcPtr crtc); + extern int i830_crtc_to_pipe(xf86CrtcPtr crtc); +Index: xserver-xorg-video-intel-2.9.1/src/i830_driver.c +=================================================================== +--- xserver-xorg-video-intel-2.9.1.orig/src/i830_driver.c 2009-10-26 13:48:05.000000000 +0200 ++++ xserver-xorg-video-intel-2.9.1/src/i830_driver.c 2009-12-07 16:17:51.000000000 +0200 +@@ -3014,6 +3014,8 @@ + /* Clear the framebuffer */ + memset(pI830->FbBase + pScrn->fbOffset, 0, + pScrn->virtualY * pScrn->displayWidth * pI830->cpp); ++ } else { ++ drmmode_copy_fb(pScrn); + } + + if (!xf86SetDesiredModes (pScrn)) --- xserver-xorg-video-intel-2.9.1.orig/patches/102_avoid_flushing_null.patch +++ xserver-xorg-video-intel-2.9.1/patches/102_avoid_flushing_null.patch @@ -0,0 +1,26 @@ +From 370157f4932cf9067ba81c8bd5a311aff610882b Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 02 Dec 2009 20:28:49 +0000 +Subject: batch: Avoid flushing a NULL batch + +During shutdown from a FatalError during batchbuffer submission, it is +possible for the batch_ptr to be NULL, so we must be careful not to +append a flush on this error path. + +Signed-off-by: Chris Wilson + +Backported to 2.9.1 by Bryce Harrington + +--- +diff -Nurp xserver-xorg-video-intel-2.9.1/src/i830_accel.c xserver-xorg-video-intel-2.9.1-working/src/i830_accel.c +--- xserver-xorg-video-intel-2.9.1/src/i830_accel.c 2009-10-26 04:48:05.000000000 -0700 ++++ xserver-xorg-video-intel-2.9.1-working/src/i830_accel.c 2010-03-30 17:24:08.000000000 -0700 +@@ -136,7 +136,7 @@ I830Sync(ScrnInfoPtr pScrn) + if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC)) + ErrorF("I830Sync\n"); + +- if (!pScrn->vtSema || !pI830->batch_bo) ++ if (!pScrn->vtSema || !pI830->batch_bo || !pI830->batch_ptr) + return; + + I830EmitFlush(pScrn); --- xserver-xorg-video-intel-2.9.1.orig/patches/103_check_for_overflow.patch +++ xserver-xorg-video-intel-2.9.1/patches/103_check_for_overflow.patch @@ -0,0 +1,44 @@ +From 33cabbfca6acb5149e26f87a538a7cb79f00cad2 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Tue, 10 Nov 2009 11:09:52 +0000 +Subject: i915: Check for overflow before overflowing. + +As the immediate victim of the overflow would be to overwrite the maximum +permissible value, the test was optimistic. + +Signed-off-by: Chris Wilson +--- +diff --git a/src/i915_3d.h b/src/i915_3d.h +index 500817f..f85780a 100644 +--- a/src/i915_3d.h ++++ b/src/i915_3d.h +@@ -420,8 +420,8 @@ do { \ + */ + #define FS_LOCALS(x) \ + uint32_t _shader_buf[(x) * 3]; \ +- int _max_shader_commands = x; \ +- int _cur_shader_commands ++ unsigned int _max_shader_commands = x; \ ++ unsigned int _cur_shader_commands + + #define FS_BEGIN() \ + do { \ +@@ -430,12 +430,13 @@ do { \ + + #define FS_OUT(_shaderop) \ + do { \ ++ if (_cur_shader_commands >= _max_shader_commands) \ ++ FatalError("fragment shader command buffer exceeded (%d)\n", \ ++ _cur_shader_commands); \ + _shader_buf[_cur_shader_commands * 3 + 0] = _shaderop.ui[0]; \ + _shader_buf[_cur_shader_commands * 3 + 1] = _shaderop.ui[1]; \ + _shader_buf[_cur_shader_commands * 3 + 2] = _shaderop.ui[2]; \ +- if (++_cur_shader_commands > _max_shader_commands) \ +- FatalError("fragment shader command buffer exceeded (%d)\n", \ +- _cur_shader_commands); \ ++ ++_cur_shader_commands; \ + } while (0) + + #define FS_END() \ +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.9.1.orig/debian/watch +++ xserver-xorg-video-intel-2.9.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-intel-(.*)\.tar\.gz --- xserver-xorg-video-intel-2.9.1.orig/debian/changelog +++ xserver-xorg-video-intel-2.9.1/debian/changelog @@ -0,0 +1,2407 @@ +xserver-xorg-video-intel (2:2.9.1-3ubuntu2~nocopyfb) lucid; urgency=low + + * Drop 101_copy-fb.patch for testing. + + -- Robert Hooker Thu, 08 Apr 2010 12:09:30 -0400 + +xserver-xorg-video-intel (2:2.9.1-3ubuntu1) lucid; urgency=low + + * Merge with Debian. + - Backport KMS video overlay from upstream 2.10 (lp: #395932) + * Remaining Ubuntu changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - control: Add intel-gpu-tools to Recommends for use by the above + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + - Drop xserver-xorg-video-intel-dbg.install: intel_reg_dumper is now + provided by the intel-gpu-tools package. + - apport-gpu-error-intel.py, xserver-xorg-video-intel.install, + xserver-xorg-video-intel.udev: Add apport hook to catch X freeze bugs + - 102_avoid_flushing_null.patch: Cherrypick from upstream to I830. + - 103_check_for_overflow.patch: Cherrypick from upstream to I915. + - 104_fail_when_prop_values_gone.patch: Cherrypick from upstream to + drmmode_display. + * Reduce libdrm-dev requirement to 2.6.18 + * Add 105_free_after_printing.patch: Cherrypick from upstream. + Avoid printing a just-freed string if the DRM device could not be opened. + * Add 106_initialize_drmmode_output.patch: Cherrypick from upstream. + Clear mode_output during output destroy. + + -- Bryce Harrington Wed, 31 Mar 2010 14:36:51 -0700 + +xserver-xorg-video-intel (2:2.9.1-3) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + * Add a NEWS.Debian entry about KMS. + * Backport KMS video overlay from upstream 2.10 (closes: #565328). + * Bump libdrm-dev build-dep for the above. + + [ Brice Goglin ] + * Bump Standards-Version to 3.8.4, no changes. + + -- Brice Goglin Sun, 21 Mar 2010 10:25:27 +0100 + +xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 07 Jan 2010 20:53:45 +0000 + +xserver-xorg-video-intel (2:2.9.1-1+exp1) experimental; urgency=low + + [ Julien Cristau ] + * Enable kernel mode setting by default on linux (closes: #555906). + + [ Brice Goglin ] + * Build against xserver 1.7. + + -- Brice Goglin Wed, 02 Dec 2009 15:50:17 +0100 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu18) lucid; urgency=low + + * Add 102_avoid_flushing_null.patch: Cherrypick from upstream to I830. + During shutdown from a FatalError during batchbuffer submission, it is + possible for the batch_ptr to be NULL, so we must be careful not to + append a flush on this error path. + * Add 103_check_for_overflow.patch: Cherrypick from upstream to I915. + Check for overflow before overflowing. As the immediate victim of the + overflow would be to overwrite the maximum permissible value, the test + was optimistic. + * Add 104_fail_when_prop_values_gone.patch: Cherrypick from upstream to + drmmode_display. Return failure when the enum-type output property + values are not found Failure to do so causes xrandr to report + incorrect property values. + + -- Bryce Harrington Tue, 30 Mar 2010 17:36:27 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu17) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Disable freeze hook. We've got ample bug reports now which should + cover the range of bugs people are seeing, and the script is mostly + capturing dupes now. We might re-enable it later once these bugs + are sorted out, if we want more data. + (LP: #533945) + + -- Bryce Harrington Tue, 23 Mar 2010 16:20:18 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu16) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Better fix for checking MachineType and other parameters to + be defined before using them in bug report titles. Thanks Jan! + (LP: #539533) + + -- Bryce Harrington Wed, 17 Mar 2010 11:36:02 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu15) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + It seems ESR is unuseful + + Fix check for MachineType in report to not crash apport + + -- Bryce Harrington Mon, 15 Mar 2010 10:13:44 -0700 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu14) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Also include EIR if non-zero + + -- Bryce Harrington Thu, 11 Mar 2010 16:50:48 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu13) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + 8 characters worth of the dump signature is sufficient for dupe + identification + + Identify error code from PGTBL_ER or ESR if non-zero + + Mention machine type in title if available + + -- Bryce Harrington Thu, 11 Mar 2010 16:19:43 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu12) lucid; urgency=low + + * debian/rules: Dropping the --enable-kms-only flag from revision + 2:2.9.1-1ubuntu4. Subsequent discussion indicates that sticking + with 2.9 and preserving UMS as a fallback option will help users + still seeing severe issues with KMS but not UMS (e.g. 8xx owners). + + -- Bryce Harrington Tue, 09 Mar 2010 13:17:26 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu11) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Drop check_ignored() entirely; pitti says it's unnecessary for + non-crash bugs. + + -- Bryce Harrington Wed, 03 Mar 2010 15:24:22 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu10) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + check_ignored() can be called only after ExecutablePath is defined + (LP: #530650) + + -- Bryce Harrington Wed, 03 Mar 2010 14:11:32 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu9) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Add several new chipnames (thanks Geir!) + + Remove duplicate attach_hardware() call + + -- Bryce Harrington Wed, 03 Mar 2010 09:55:35 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu8) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Set the default title for freeze reports to "GPU lockup" + + Determine the chipset, and prepend it to the title + + Calculate a signature of the dump so we can more easily identify + dupe freezes. Append to the title. + + Include i915_error_state if it exists + + -- Bryce Harrington Mon, 01 Mar 2010 13:28:56 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu7) lucid; urgency=low + + * debian/apport-gpu-error-intel.py: + + Add Xorg.0.log and other useful information to capture + + s/pr/report/g for consistency with xorg apport script + + Tag as a freeze bug + + -- Bryce Harrington Sat, 27 Feb 2010 11:38:41 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu6) lucid; urgency=low + + * debian/xserver-xorg-video-intel.udev: Fix typo + (LP: #525433) + + -- Bryce Harrington Sun, 21 Feb 2010 15:02:03 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu5) lucid; urgency=low + + * debian/xserver-xorg-video-intel.udev: Update udev rule to trigger + apport properly when X freezes. + + -- Bryce Harrington Thu, 18 Feb 2010 16:20:46 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu4) lucid; urgency=low + + * debian/rules: Build -intel to enable KMS only, no UMS. UMS + will be removed in version 2.10 so we don't plan to support + it in Lucid. + + -- Bryce Harrington Fri, 05 Feb 2010 17:17:49 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu3) lucid; urgency=low + + * debian/rules: Need to create usr/share/apport before installing into + it. + + -- Bryce Harrington Wed, 27 Jan 2010 17:31:24 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu2) lucid; urgency=low + + * Drop xserver-xorg-video-intel-dbg.install: intel_reg_dumper is now + provided by the intel-gpu-tools package. + * xserver-xorg-video-intel.install: Install apport-gpu-error-intel.py + to /usr/share/apport/ + + -- Bryce Harrington Tue, 12 Jan 2010 02:52:41 -0800 + +xserver-xorg-video-intel (2:2.9.1-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev: + Add apport script to collect debug information on GPU hangs + - rules: Install udev rule to run the script when the kernel detects hung GPU + - control: Add intel-gpu-tools to Recommends for use by the above + - 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + * Build against xserver 1.7. + + -- Timo Aaltonen Mon, 07 Dec 2009 16:23:16 +0200 + +xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium + + * New upstream bugfix release (closes: #508005). + + reverts change from 2.9.0 that broke DVI detection for some people + (closes: #548045) + + -- Julien Cristau Wed, 25 Nov 2009 16:32:29 +0100 + +xserver-xorg-video-intel (2:2.9.0-1ubuntu4) lucid; urgency=low + + [Matt Zimmerman] + * debian/apport-gpu-error-intel.py, debian/xserver-xorg-video-intel.udev: + Add apport script to collect debug information on GPU hangs + * rules: Install udev rule to run the script when the kernel detects hung GPU + * control: Add intel-gpu-tools to Recommends for use by the above + + -- Bryce Harrington Thu, 26 Nov 2009 00:53:06 -0800 + +xserver-xorg-video-intel (2:2.9.0-1ubuntu3) lucid; urgency=low + + * Add 101_copy-fb.patch: Adds feature to driver so Xserver can draw + root windows with no background. This enables smooth boot with + Plymouth. + + -- Bryce Harrington Mon, 23 Nov 2009 14:29:44 -0800 + +xserver-xorg-video-intel (2:2.9.0-1ubuntu2) karmic; urgency=low + + * Add 100_drop_fb_from_crtc.patch. Fixes lockup with black screen on + logout of KDE with KMS enabled. Patch zeroes out the framebuffer id + to clean up on screen closure. Cherrypick from upstream. + (LP: #432521) + + -- Bryce Harrington Tue, 13 Oct 2009 11:31:29 -0700 + +xserver-xorg-video-intel (2:2.9.0-1ubuntu1) karmic; urgency=low + + [Tormod Volden] + * Merge with Debian. Remaining Ubuntu changes: + + debian/control: Add lpia architecture + * Drop patches now included upstream: + + 100_8xx_perf_pict_a8.patch + + 101_reload_cursors.patch + + 102_dont_destroy_bufmgr_at_closescreen_time.patch + * Ubuntu bugs fixed in this release: + + Calculate the DVO relative offset in LVDS data entry to get the DVO + timing. Fixes black screen at boot on i855 due to not finding LVDS + modes. + (LP: #410455) + + Fix brightness by enabling BACKLIGHT property for KMS. + (LP: #397617) + + -- Bryce Harrington Wed, 07 Oct 2009 20:09:54 -0700 + +xserver-xorg-video-intel (2:2.9.0-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Tue, 29 Sep 2009 07:16:54 +0200 + +xserver-xorg-video-intel (2:2.8.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Fix crash on server regen, closes: #543326. + + -- Brice Goglin Wed, 23 Sep 2009 01:03:49 +0200 + +xserver-xorg-video-intel (2:2.8.1-2) unstable; urgency=low + + * Re-enable render accel on 8xx. The major problem turned out to be related + to agp chipset flushing (see #541307), so hopefully this should work now. + * Add missing xsfclean dependency to debian/rules clean. + * Bump Standards-Version to 3.8.3 (no changes). + * Mention intel_reg_dumper in the debug package's long description. + + -- Julien Cristau Thu, 17 Sep 2009 20:55:47 +0200 + +xserver-xorg-video-intel (2:2.8.1-1ubuntu2) karmic; urgency=low + + * Add 102_dont_destroy_bufmgr_at_closescreen_time.patch: Don't destroy + bufmgr at CloseScreen time (LP: #428662). + + -- Alberto Milone Fri, 25 Sep 2009 14:53:26 +0200 + +xserver-xorg-video-intel (2:2.8.1-1ubuntu1) karmic; urgency=low + + * Merge with Debian. Remaining Ubuntu changes: + + control: Add lpia architecture + + Fixes bad chroma upsampling on videos (LP: #371605) + * Add 100_8xx_perf_pict_a8.patch: Improve performance on i845 by adding + limited support for a8 dests. Cherrypick from upstream master tree. + (LP: #382017) + * Add 101_reload_cursors.patch: Reload cursors as needed when setting + new modes. Fixes issue where cursor doesn't rotate when the screen + is rotated. Cherrypick from upstream master tree. + (LP: #410255) + + -- Bryce Harrington Wed, 26 Aug 2009 23:52:33 -0700 + +xserver-xorg-video-intel (2:2.8.1-1) unstable; urgency=low + + * New upstream release. + + Calculate the DVO relative offset in LVDS data entry to get the + DVO timing, closes: #538148. + + Fix sampler indexes on i965 planar video, closes: #513427. + + -- Brice Goglin Wed, 26 Aug 2009 09:50:15 +0200 + +xserver-xorg-video-intel (2:2.8.0-2) unstable; urgency=low + + [ Julien Cristau ] + * Disable UXA render accel on i8xx chips for now. It currently causes + hangs, and doesn't seem likely to get fixed quickly upstream + (closes: #527349). + * Reenable patch system and bring back quilt build-dep. + + -- Brice Goglin Fri, 31 Jul 2009 22:44:13 +0200 + +xserver-xorg-video-intel (2:2.8.0-1) unstable; urgency=low + + * New upstream release. + + Fixes crash at startup if KMS is not used, closes: #537052. + + -- Brice Goglin Tue, 21 Jul 2009 16:23:39 +0200 + +xserver-xorg-video-intel (2:2.8.0-0ubuntu2) karmic; urgency=low + + * No change rebuild against the new dri2proto 2.1 features since xserver + was upgraded. + + -- Bryce Harrington Wed, 05 Aug 2009 07:49:03 -0700 + +xserver-xorg-video-intel (2:2.8.0-0ubuntu1) karmic; urgency=low + + * New upstream release 2.8.0 + * Disable installation of ChangeLog + + -- Bryce Harrington Tue, 21 Jul 2009 01:23:22 -0700 + +xserver-xorg-video-intel (2:2.7.99.902+git20090720.bb300738-0ubuntu1) karmic; urgency=low + + * Update to git 20090720 (master branch) up to commit bb300738 + - Fix intel driver reports Couldn't find PLL settings on i915 + (LP: #312133) + - Fix X freezing on intel 855GM + (LP: #370292) + - Implement vblank sync'd GL buffer swap + (LP: #377090) + + -- Bryce Harrington Mon, 20 Jul 2009 22:05:31 -0700 + +xserver-xorg-video-intel (2:2.7.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Fix crash in drm_intel_gem_bo_unreference_locked, closes: #535772. + + -- Brice Goglin Tue, 14 Jul 2009 00:17:00 +0200 + +xserver-xorg-video-intel (2:2.7.99.901+git20090702.74227141-0ubuntu1) karmic; urgency=low + + [Robert Hooker] + * Update to git 20090702 (master branch) up to commit 74227141 + - Treat disabled CRTCs as "not covering" for scanline wait purposes. + Fixes problems returning from a dpms off state. + (LP: #390917, #383973, #390633, #385448, #388357) + - Add an xorg.conf option to control swapbuffers behavior. + - Set hot plug interrupt to detect HDMI output. + - Add a pipe-a quirk for Dell mini + (LP: #395306) + - Add a pipe-a quirk for thinkpad x30 + (LP: #304614) + - Reenable XvMC support in UXA. Now includes vld support. + - Fix EDID for LVDS output device to add the default modes in UMS. + (LP: #385832) + - Export EDID when using KMS, so Display options shows info correctly + (LP: #395140) + - Fixes for SDVO LVDS mode detection. + - Fix major performance regression of trapezoid rendering in UXA. + - Fixes for hangs when GL compositing is used with multiple monitors + with different refresh rates. + - Support for new IGDNG devices. + - Only get the VBIOS in non-KMS mode + - Add a few error messages for DRM initialization + - Don't try to pin buffers in KMS mode + - Fix 945GM VT switch in UMS + - Clear the bo on the rotate scratch pixmap (Fixes problems with rotation) + - uxa: Fix segfault on source-only picture usage with FallbackDebug. + - Various XvMC fixes. + * Merge with Debian experimental. Remaining Ubuntu changes: + - Add lpia architecture + * Drop patches since they're already upstream: + - 110_quirk_hp_mini.patch + - 117_quirk_thinkpad_x30.patch + - 118_pixmap_inline_funcs.patch + - 119_fix_drawable_abuse.patch + - 120_fix_dri2_vblank_syncing_segfault.patch + - 121_dont_change_blank_sync_width.patch + - 122_wait_for_vblank_to_sub_border_color.patch + - 123_kms_export_edid.patch + + -- Bryce Harrington Thu, 09 Jul 2009 14:02:45 -0700 + +xserver-xorg-video-intel (2:2.7.99.901-2) experimental; urgency=low + + * Pull upstream fix for xvmc build. + * Update build-depends, and reenable xvmc. + + -- Julien Cristau Thu, 11 Jun 2009 18:52:10 +0200 + +xserver-xorg-video-intel (2:2.7.99.901-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Thu, 11 Jun 2009 08:18:49 +0200 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu5) karmic; urgency=low + + * Add 123_kms_export_edid.patch: Allow EDID to be exported in the KMS + case as a randr property. This should help the display properties applet + list the proper resolutions, and solve some dpi issues. + + -- Bryce Harrington Wed, 01 Jul 2009 19:54:22 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu4) karmic; urgency=low + + * Add 122_wait_for_vblank_to_sub_border_color.patch: Wait for next + Vblank to substitue border color for Color info. Otherwise, this can + result in incorrect resolution detection due to phantom VGA port + on i915 and earlier. Cherrypick from upstream's main branch. + (LP: #273306) + + -- Bryce Harrington Sat, 27 Jun 2009 16:15:14 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu3) karmic; urgency=low + + * Add 121_dont_change_blank_sync_width.patch: Don't change the + blank/sync width when calculating scaled modes. Fixes fullscreen + graphical corruption on LVDS. + (LP: #351761) + + -- Bryce Harrington Sat, 27 Jun 2009 15:53:47 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu2) karmic; urgency=low + + * Add 118_pixmap_inline_funcs.patch, 119_fix_drawable_abuse.patch, + 120_fix_dri2_vblank_syncing_segfault.patch: Cherrypicks from upstream + to fix segfault associated with a last minute commit in the prior + snapshot to enable vsync for DRI2 CopyRegion. + (LP: #383129) + + -- Bryce Harrington Thu, 04 Jun 2009 07:45:05 -0700 + +xserver-xorg-video-intel (2:2.7.99.1+git20090602.ec2fde7c-0ubuntu1) karmic; urgency=low + + * Update to git 20090602 (master branch) up to commit ec2fde7c + - xvmc is disabled since DRI1 no longer supported + - LP: #96991 - 3D stuff breaks with Compiz: Redirected Direct Rendering + is needed in DRI + - LP: #120834 - X freezes with I830WaitLpRing error when running OpenGL apps + - LP: #337608 - X crashes in fbBlt() when using Sun Java Plugin 6 + firefox3.0 + - LP: #339555 - compiz slowmotion after Jaunty upgrade + - LP: #363900 - X.org freezes with intel driver, no apparent trigger + - LP: #331719 - VT switching doesn't work on Intel 915GM + - LP: #339091 - X freezes a few minutes after resuming + - LP: #348436 - Kubuntu: X server crash when screensaver is started (4500MHD) + - LP: #279727 - Kubuntu: Display Corruption w/ Intel 4700MHD + - LP: #357851 - Kubuntu: Distorted display after switching virtual desktops w/ exa + - LP: #158415 - Front buffer dynamic resize not supported + - LP: #324998 - x server restarts itself w/ compiz on Intel 945GM + - LP: #355593 - after upgrade to 9.04, rotating desktop cube ran slow + - LP: #357290 - 1 fps in 3d apps like neverball with EXA + - LP: #360774 - Graphical Corruption with EXA on X4500 + - LP: #364126 - screensaver prefs dialog in 9.04 RC livecd leaves dirt + - LP: #375712 - Native resolution for dell "2005fpw" monitor not listed + - LP: #375264 - Choppy flash video and poor performance with compiz + - LP: #349568 - Jaunty / Compiz slow and tearing on GMA 4500MHD + - LP: #356056 - window tearing during movement on 965 (no compiz) + - LP: #330460 - xorg shows black image/hangs with jpg in firefox + - LP: #347587 - X asserts on pI830->batch_ptr != 0 on resume from suspend + * Merge with Debian experimental. Remaining Ubuntu changes: + - Add lpia architecture + - Re-enable the patch system, add quilt to build-deps. + - 110_quirk_hp_mini.patch: quirk (sent upstream) + - 117_quirk_thinkpad_x30.patch: quirk (sent upstream) + * Drop 116_8xx_disable_dri.patch. There have been fixes for 3d on 8xx + chipsets upstream, so drop the DRI disablement so the fixes can be + re-tested. + * Drop 103_quirk_intel_mb890.patch. Better quirk available upstream. + (LP: #305269) + + -- Bryce Harrington Tue, 02 Jun 2009 10:47:32 -0700 + +xserver-xorg-video-intel (2:2.7.99.1-2) experimental; urgency=low + + [ Julien Cristau ] + * Pull from upstream git branch 'master', commit 8e942b70. + * Bump libdrm-dev build-dep to 2.4.11. + * Merge changes from 2:2.7.1-1. + * Bump Standards-Version to 3.8.1. + + [ David Nusinow ] + * Add README.source + + -- Julien Cristau Thu, 28 May 2009 20:10:30 +0200 + +xserver-xorg-video-intel (2:2.7.99.1-1) experimental; urgency=low + + * New upstream release candidate. + * Stop installing libI810XvMC.so and libIntelXvMC.so for now. They are + disabled in configure for now because DRI1 is not supported anymore. + * Install the upstream NEWS file, closes: #524334, #524336. + * Move the -dbg package to section debug. + + -- Brice Goglin Wed, 29 Apr 2009 19:50:26 +0200 + +xserver-xorg-video-intel (2:2.7.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Add lpia architecture + - 103_quirk_intel_mb890.patch: quirk + - 110_quirk_hp_mini.patch: quirk + - 116_8xx_disable_dri.patch: DRI proved buggy on certain 8xx chips so + this disables it. The DRI probably needs re-testing to verify this + patch is still needed, but it will be kept for now. + - 117_quirk_thinkpad_x30.patch: quirk + * Drop 119_drm_bo_unreference_needs_null.patch: upstream. + * Re-enable the patch system, add quilt to build-deps. + + -- Timo Aaltonen Fri, 22 May 2009 11:17:55 +0300 + +xserver-xorg-video-intel (2:2.7.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + * Install the upstream NEWS file, closes: #524334, #524336. + * Move the -dbg package to section debug. + + [ David Nusinow ] + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + Disable patch system and remove quilt from build-deps. + + -- Brice Goglin Wed, 13 May 2009 07:14:50 +0200 + +xserver-xorg-video-intel (2:2.7.0-1ubuntu2) karmic; urgency=low + + * Drop 109_i830-fifo-watermark-conservative.patch: + + Patch was insufficient to fix #311895, and doesn't help any more + anyway. + + -- Bryce Harrington Sat, 16 May 2009 13:50:15 -0700 + +xserver-xorg-video-intel (2:2.7.0-1ubuntu1) karmic; urgency=low + + * Merge from Debian of upstream's 2.7.0 release. + - Fixes: memory leak causes system to run out of memory + (LP: #360319) + - Fixes: Video playback suffers from tearing on GMA 4500MHD + (LP: #339233) + - Fixes: powertop wakeups 71.6 : i915@pci + (LP: #352763) + - Fixes: `man intel` does not mention UXA in the AccelMethod section + (LP: #364284) + - Fixes: TV Format changes don't work + (LP: #298422) + * Remaining ubuntu changes against Debian version: + - Add lpia architecture + - 103_quirk_intel_mb890.patch: quirk + - 109_i830-fifo-watermark-conservative.patch: Still in progress + upstream in fd.o #19304, but retain as a placeholder until better + fix is found. + - 110_quirk_hp_mini.patch: quirk + - 116_8xx_disable_dri.patch: DRI proved buggy on certain 8xx chips so + this disables it. The DRI probably needs re-testing to verify this + patch is still needed, but it will be kept for now. + - 117_quirk_thinkpad_x30.patch: quirk + - 119_drm_bo_unreference_needs_null.patch: Fixes several crashes; + seems not to be included upstream yet. + * Drop patches no longer needed: + - Drop 112_num_used_fences.patch; no longer needed with updated kernel + - Drop 105_no_modesetting.diff; now we want to enable kernel modesetting + - Drop 115_fix_crash_xv_overlay.patch; included in upstream + - Drop 118_drop_legacy3d.patch; included in upstream + - Drop 120_fix_vt_switch.patch; included in upstream + - Drop 106_remove_triple_buffering.diff; included in upstream + - Drop 107_remove_pageflipping.diff; included in upstream + * Refresh 119_drm_bo_unreference_needs_null.patch to apply + + -- Bryce Harrington Fri, 08 May 2009 12:08:57 -0700 + +xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Thu, 16 Apr 2009 07:11:09 +0200 + +xserver-xorg-video-intel (2:2.6.99.903-1) experimental; urgency=low + + * New upstream release candidate. + * Bump build-dep on libdrm-dev to 2.4.6. + + -- Brice Goglin Sat, 11 Apr 2009 22:45:57 +0200 + +xserver-xorg-video-intel (2:2.6.3-1) unstable; urgency=low + + * New upstream release. + * Bump build-dep on libdrm-dev to 2.4.5. + * Upload to unstable. + * Cherry-pick some patches from upstream git, so this doesn't FTBFS with the + new libdrm (closes: #523125) + + -- Julien Cristau Thu, 09 Apr 2009 10:25:22 +0100 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu9) jaunty; urgency=low + + * Add 120_fix_vt_switch.patch: Fix null pointer deref in + I830StopVideo(), which can lead to segfaults calling + drm_intel_bo_unpin or drm_intel_bo_unreference when entering DPMS. + Thanks to unggnu for shepherding this bug to solution! + (LP: #345796) + + -- Bryce Harrington Wed, 08 Apr 2009 19:12:39 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu8) jaunty; urgency=low + + * Expand patch 116 and rename to 116_8xx_disable_dri.patch to + fix freezing issue on i810 as well. + (LP: #279835) + + -- Bryce Harrington Mon, 06 Apr 2009 18:18:46 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu7) jaunty; urgency=low + + * Add 119_drm_bo_unreference_needs_null.patch: + - The first time through the Xv code, an allocated buffer is + unreferenced but the pointer is not reset to NULL. Thus, the next time + a video is played, -intel thinks it has a valid buffer and crashes + when it tries to access the freed memory. Fixes a number of crashes + reported since moving to the 2.6.3 driver. + - Fixes crash on i945 with frame buffer width > 2048. DRI is disabled + on this chipset when the frame buffer exceeds this width. + (LP: #354688) + - Fixes crash on i865 where DRI is off because of patch 116 + (LP: #352760) + - Fixes crash on i845 starting after 304871 was fixed + (LP: #354889) + - Fixes crash on i830 when manually disabling DRI + (LP: #347527) + + -- Bryce Harrington Mon, 06 Apr 2009 14:28:29 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu6) jaunty; urgency=low + + * Update 116_865g_disable_dri.patch: Permit DRI on 845. + Evidence so far suggests the freezes on 845 due to DRI are gone. + + -- Bryce Harrington Sat, 04 Apr 2009 12:49:38 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu5) jaunty; urgency=low + + * Disable 114_fix_xv_with_non_gem.patch: At the time we accepted it, it + sounded a little risky, so I took it on the condition that it didn't + cause regressions, which apparently we have proof that it does. + (LP: #348428) (Reopen 344740) + + -- Bryce Harrington Fri, 03 Apr 2009 20:03:39 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu4) jaunty; urgency=low + + * Add 117_quirk_thinkpad_x30.patch: + - Pipe-A quirk to fix lid close freeze on Thinkpad X30 + (LP: #304614) + * Add 118_drop_legacy3d.patch: + - Remove Legacy3D as a user-configurable option and force fallback to + legacy fixed textures when GEM is not being used. Fixes "couldn't + bind memory for BO backbuffer" issue on at least i855 chipsets. + (LP: #322646) + + -- Bryce Harrington Wed, 01 Apr 2009 00:25:55 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu3) jaunty; urgency=low + + * Add 116_865g_disable_dri.patch: + - On 865G chipset, X freezes during boot with DRI enabled. Disabling it + as a workaround until a better fix is found. + (LP: #317457) + * Drop explicit dependency on libdrm-intel1, as libdrm now provides + this properly (libdrm2 commit a87c1a081b77a29fe3430d). + + -- Bryce Harrington Tue, 31 Mar 2009 18:36:00 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu2) jaunty; urgency=low + + * Add 114_fix_xv_with_non_gem.patch, 115_fix_crash_xv_overlay.patch: + - Fix green window when playing movies with Xv extension (LP: #344740) + + -- Bryce Harrington Wed, 18 Mar 2009 17:05:09 -0700 + +xserver-xorg-video-intel (2:2.6.3-0ubuntu1) jaunty; urgency=low + + * New upstream release: + - Access the Xv buffer through the GTT for the non-KMS case. + - Fix i915 textured video to work with the i830_memory -> bo change. + - Make i830_allocate_memory take tiling parameters. + - Fixup bogus VBT when detected. Causes incorrect video modes for + several Dell and Sony machines. + - Various KMS, BOs, UXA, and DRI2 fixes + - Various new hw quirks + * Add ChangeLog not included in upstream tarball (else FTBS) + * Add 112_num_used_fences.patch: Work around FTBS due to missing kernel + header changes (from drm commit 0f973f27888e4664b253ab2cf69c67c2eb80ab1b) + * debian/control: Update libdrm2 dependency to 2.4.5 + * Drop patches applied upstream: + - 104_i830-vbt-timing-hack.patch + - 108_dont_disable_vga_centering_bit.patch + - 111_quirks_march4_sync.patch (Fixes LP: #343577) + * Refresh 107_remove_pageflipping.diff to apply + + -- Bryce Harrington Tue, 17 Mar 2009 13:34:59 -0700 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu5) jaunty; urgency=low + + * Add 111_quirks_march4_sync.patch: Cherrypick from upstream's quirks + - Fix LVDS issues on MSI IM-945GSE-A and all GM45 chips + - Fix lid close issue on Mirrus Centrino laptop + - Fix tv-out issue on HP Compaq nx6310 systems + + -- Bryce Harrington Wed, 04 Mar 2009 14:46:30 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu4) jaunty; urgency=low + + * Add 110_quirk_hp_mini.patch: Pipe-A quirk for an HP Mini + * Renumber patch 02_i830-fifo-watermark-conservative.patch to + 109_i830-fifo-watermark-conservative.patch + + -- Bryce Harrington Mon, 02 Mar 2009 21:52:04 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu3) jaunty; urgency=low + + * Add 02_i830-fifo-watermark-conservative.patch: Avoid pipe underruns on + high graphics activity, which caused flicker and sometimes complete screen + corruption. (LP: #311895, fd.o #19304) + + -- Martin Pitt Wed, 25 Feb 2009 08:26:35 +0100 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu2) jaunty; urgency=low + + * Add 108_dont_disable_vga_centering_bit.patch. Cherry-pick from + upstream commit 3aa8591abfbe8db0f13912910c850fdd748808df. + Don't disable vga centering bit. Causes failure to display + lower resolutions on Eee PCs, etc. + (LP: #324913) + + -- Bryce Harrington Mon, 09 Feb 2009 15:20:29 -0800 + +xserver-xorg-video-intel (2:2.6.1-1ubuntu1) jaunty; urgency=low + + * Merge with Debian experimental, remaining changes: + - debian/control: + + Add lpia to the list of architectures. + + Drop Vcs-* as we're not using these repos for -intel. + - debian/patches: + + 103_quirk_intel_mb890.patch + Add ignore lvds quirk for mb890 motherboards to fix issue where + display shows all in one color. (LP: 305269) + + 104_i830-vbt-timing-hack.patch + Adjust h and vblank end to fix issue on Dell Studio 15 and + other similar hardware. Fixes issue where X comes up with an + unusable white screen on the LVDS. (LP: 297245) + * Add 105_no_modesetting.diff + - 2.6.28 doesn't ship drm headers that support modesetting, so + disable it for the driver to build. + * Add 106_remove_triple_buffering.diff + - Obsolete code, prerequisite for the next patch. + * Add 107_remove_pageflipping.diff + - Remove pageflipping support. It never got in the kernel drm code, + so without this the build fails. + + -- Timo Aaltonen Fri, 23 Jan 2009 10:41:27 +0200 + +xserver-xorg-video-intel (2:2.6.1-1) experimental; urgency=low + + * New upstream release. + * Build against xserver 1.6 rc1. + + -- Julien Cristau Thu, 22 Jan 2009 00:18:25 +0100 + +xserver-xorg-video-intel (2:2.6.0-1) experimental; urgency=low + + * New upstream release. + + -- Brice Goglin Thu, 15 Jan 2009 10:54:17 +0100 + +xserver-xorg-video-intel (2:2.5.99.2-1) experimental; urgency=low + + * New upstream release. + + doesn't crash on EnterVT with libdrm 2.4.3 (closes: #511263) + * Update libdrm-dev build-dep to 2.4.3. + + -- Julien Cristau Wed, 14 Jan 2009 08:08:20 +0100 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu9) jaunty; urgency=low + + * i830-vbt-timing-hack.patch: Adjust h and vblank end to fix issue on + Dell Studio 15 and other similar hardware. Fixes issue where X + comes up with an unusable white screen on the LVDS. + (LP: #297245) + + -- Bryce Harrington Tue, 13 Jan 2009 16:18:19 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu8) jaunty; urgency=low + + * 103_quirk_intel_mb890.patch: Add ignore lvds quirk for mb890 + motherboards to fix issue where display shows all in one color. + (LP: #305269) + + -- Bryce Harrington Tue, 13 Jan 2009 00:01:48 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu7) jaunty; urgency=low + + * Also add lpia in the Architecture list of the -dbg package to clear it off + jaunty_outdate.txt (we have the -dbg on other arches anyway). + + -- Loic Minier Sat, 20 Dec 2008 21:38:09 +0100 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu6) jaunty; urgency=low + + * Rebuild against the new xserver + + -- Timo Aaltonen Mon, 15 Dec 2008 10:19:55 +0200 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu5) jaunty; urgency=low + + * Add explicit Depends for libdrm-intel1 (LP: #303177) + + -- Bryce Harrington Fri, 05 Dec 2008 20:03:20 +0000 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu4) jaunty; urgency=low + + * Drop 111_textured_video_option.patch. XvPreferOverlay (commit + 24c34f02) now provides an equivalent capability for turning textured + video off, making this patch redundant. + + -- Bryce Harrington Tue, 02 Dec 2008 12:47:10 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu3) jaunty; urgency=low + + * 102_quirk_hp_2730p.patch: pipea quirk for hp 2730p (LP: #291555) + + -- Bryce Harrington Tue, 02 Dec 2008 11:47:28 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu2) jaunty; urgency=low + + * Drop 128_stolen_memory_counting_g4x.patch (already upstream) + * Refresh and re-enable 111_textured_video_option.patch + + -- Bryce Harrington Tue, 02 Dec 2008 09:13:34 -0800 + +xserver-xorg-video-intel (2:2.5.1-1ubuntu1) jaunty; urgency=low + + * Merge with debian experimental. Remaining changes: + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Drop Vcs-* as we're not using these repos for -intel. + - debian/patches: + + Renumber Ubuntu patches +100 + + 101_quirk_quanta_w251u.patch + + 111_textured_video_option.patch (disabled) + + 128_textured_video_option.patch (disabled) + * Drop 01_fix_compiz_video.diff. Was already disabled in Ubuntu previously + * Drop 05_intel_exa_force_greedy.patch. Should no longer be necessary. + * Drop patches already upstream: + - 20_thinkpad_g40_quirk.patch + - 21_quirk_lenovo.patch + - 22_no_pipe_for_hotplug_detection.patch + - 23_quirks_studiohybrid_eeepc_and_w251u.patch + - 24_no_render_suspend + - 25_quirk_nc6110.patch + - 26_i830-use-lfp-data-ptrs.patch + - 27_disable_fbc_on_965.patch + + -- Bryce Harrington Thu, 27 Nov 2008 10:46:18 -0800 + +xserver-xorg-video-intel (2:2.5.1-1) experimental; urgency=low + + * New upstream release. + * Wrap build-deps in debian/control. + * Build depend on libdrm-dev on all archs, since it's now required, and bump + the build dep to 2.4.1. + + -- Julien Cristau Sun, 23 Nov 2008 17:02:31 +0100 + +xserver-xorg-video-intel (2:2.4.2-1) experimental; urgency=low + + * Drop the xserver-xorg-video-i810 transitional package. + * Build against xorg-server 1.5. + * New upstream release (no changes from the previous snapshot other than the + version number). + + -- Julien Cristau Thu, 04 Sep 2008 02:49:59 +0200 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu11) jaunty; urgency=low + + * Re-enable 11_textured_video_option.patch, but change logic so it is + enabled by default. This allows people seeing issues with it to + turn it off if they wish. (LP: #278318) + + -- Bryce Harrington Fri, 14 Nov 2008 14:55:33 -0800 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu10) intrepid; urgency=low + + * 28_stolen_memory_counting_g4x.patch: + - Fixes freeze on login for G45 hardware when X.org runs in EXA mode. + Issue was fixed upstream in both the kernel and x driver. This + patch is also in Debian. + (LP: #285572) + + -- Bryce Harrington Tue, 21 Oct 2008 11:35:13 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu9) intrepid; urgency=low + + * 27_disable_fbc_on_965.patch: + - Works around issue where flash videos freeze after playing for a few + moments on i965 chipset, by disabling Frame Buffer Compression, which + is not working reliably on this chipset. It can be re-enabled via the + FrameBufferCompression option for testing purposes. + (LP: #275285) + + -- Bryce Harrington Fri, 17 Oct 2008 18:11:03 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu8) intrepid; urgency=low + + * 26_i830-use-lfp-data-ptrs.patch: + - Fixes fatal server error "Couldn't find PLL settings for mode" + on a 855GM chipset, due to having an inaccurate VBT LFP_DATA + section from the BIOS parser. This pulls the info from a + different (more trustworthy) version of the data structure. + (LP: #274045) + + -- Bryce Harrington Thu, 16 Oct 2008 12:38:19 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu7) intrepid; urgency=low + + * Drop Vcs-* as we're not using these repos for -intel. + + -- Loic Minier Wed, 15 Oct 2008 13:24:36 +0200 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu6) intrepid; urgency=low + + * 25_quirks_nx6110.patch: + - Fixes error msg that "Mode 1280x1024 does not fit virtual size" + (LP: #271707) + + -- Bryce Harrington Sat, 20 Sep 2008 18:20:56 -0700 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu5) intrepid; urgency=low + + * 24_no_render_suspend: + - Fix blank screen and crash on startup with x4500 (LP: #265119) + + -- Christopher James Halse Rogers (RAOF) Fri, 19 Sep 2008 14:00:28 +1000 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu4) intrepid; urgency=low + + * 23_quirks_studiohybrid_eeepc_and_w251u.patch: + - Fix blank screen on startup on Asus Eee PC due to LVDS + misconfiguration (LP: #233787) + - Fix blank screen on startup on Dell Studio Hybrid due to LVDS + misconfiguration (LP: #267945) + - Fix crash on lid close on Gigabyte W251U - pipeA quirk (LP: #244242) + + -- Bryce Harrington Fri, 12 Sep 2008 00:53:01 +0000 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu3) intrepid; urgency=low + + * Rebuild against the new xserver-xorg-dev. + + -- Timo Aaltonen Fri, 12 Sep 2008 01:09:40 +0300 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu2) intrepid; urgency=low + + * 22_no_pipe_for_hotplug_detection.patch: Don't allocate a pipe for + hotplug detection. (LP: #256142) + + -- Timo Aaltonen Tue, 02 Sep 2008 16:13:52 +0300 + +xserver-xorg-video-intel (2:2.4.1-1ubuntu1) intrepid; urgency=low + + * New upstream version, this is basically version 2.4.2. (LP: #260603) + * Merge with debian experimental. Remaining changes: + - debian/patches + + 20_thinkpad_g40_quirk.patch: + Quirk for IBM Thinkpad G40 + + 21_quirk_lenovo.patch: + Pipe-A quirks for Lenovo ThinkPad T60 + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + * Disable 01_fix_compiz_video.diff, since it appears to be obsolete + by now. + * Drop 05_intel_exa_force_greedy.patch, since it was not used (crash) + and the option doesn't seem to improve the performance anymore. + * Disable 11_textured_video_option.patch for now, textured video seems + to work just fine now. + + -- Timo Aaltonen Tue, 26 Aug 2008 14:19:55 +0300 + +xserver-xorg-video-intel (2:2.4.1-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + + [ Julien Cristau ] + * Pull from 2.4-branch HEAD as of August 24th. + + -- Julien Cristau Sun, 24 Aug 2008 18:28:32 +0200 + +xserver-xorg-video-intel (2:2.4.0-1ubuntu1) intrepid; urgency=low + + * Merge with debian experimental. + * 20_thinkpad_g40_quirk.patch: don't remove another quirk, must've been + a mistake (and not related to G40). + * 21_quirk_lenovo.patch: rename and drop the HP quirk, since it's + upstream. + * rules: drop the change to not build intel_reg_dumper, libpciaccess is + in main now. + * changelog: bring back old entries lost during an old merge (ahem..). + * Fixes from upstream 2.4-branch: + 30_update_dsparb.patch + - Update DSPARB while planes are still off. + 31_reorder_visuals.patch + - Reorder visuals reported by the intel driver. + 32_dont_program_dsparb.patch + - Don't program dsparb on new Intel chip. + 33_fix_hp_pavilion_quirk.patch + - Fix up the HP Pavilion ze4944ea quirk. The chip is 855GM, not GM45. + + -- Timo Aaltonen Thu, 07 Aug 2008 14:38:09 +0300 + +xserver-xorg-video-intel (2:2.4.0-1) experimental; urgency=low + + * New upstream release. + * Refresh patch 01_gen_pci_ids.diff. + * Don't handle the nostrip build option in debian/rules, dh_strip does that; + allow the parallel=n option. + * Run autoreconf at build-time; build-depend on automake, libtool and + xutils-dev. + * Drop the debian revision from the libxvmc-dev build-dep. + + -- Julien Cristau Sun, 27 Jul 2008 13:18:42 +0200 + +xserver-xorg-video-intel (2:2.3.2-3) experimental; urgency=low + + * Build against xserver 1.5 rc5. + + -- Julien Cristau Mon, 14 Jul 2008 01:26:43 +0200 + +xserver-xorg-video-intel (2:2.3.2-2+lenny1) unstable; urgency=low + + * Cherry-pick patches from the 2.4.0 release: + - Add support for Intel 4 series chipsets + - add some quirks to force enable pipe A on some machines: in particular, + all 855GM (closes: #482819), and Lenovo T60 (closes: #487672) + - i810: Remove an effectively unused variable (only used in an incorrect + free()) + - Give asus and eeepc backlight method higher priority + - Don't use the phase shift bits on GM45 + - Fix official name for GM45 chipset + - Improve FBC size checking + - Only initialize integrated TV encoder for mobile chips + - Add no LVDS quirk for Transtec Senyo 610 mini PC + - Thinkpad R60e TV quirk via DMI info + * Fix debian/rules build/patch dependencies. + + -- Julien Cristau Sun, 27 Jul 2008 11:44:09 +0200 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu3) intrepid; urgency=low + + * Remove 19_check_exa_pitch_to_fix_rotate_crash.patch, fixed upstream + using a different approach. (LP: #246835) + + -- Timo Aaltonen Wed, 09 Jul 2008 15:31:08 +0300 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu2) intrepid; urgency=low + + * Disable 05_intel_exa_force_greedy.patch, since it makes the driver + to segfault the xserver. (LP: #246581) + + -- Timo Aaltonen Tue, 08 Jul 2008 18:31:22 +0300 + +xserver-xorg-video-intel (2:2.3.2-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 11_textured_video_option.patch: + Renamed and reworked version of the old + 11_hw_overlay_option.diff patch, to re-enable the textured video + option, to allow users to turn off textured video. + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + + debian/patches/20_thinkpad_g40_quirk.patch: Quirk for IBM Thinkpad G40 + (LP: #240457) + + 21_quirk_lenovo_and_hp_pavilion.patch: Pipe-A quirks for Lenovo + ThinkPad T60 (LP: #243405) and HP Pavilion ze4944ea (LP: #242389) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + + -- Bryce Harrington Mon, 07 Jul 2008 21:10:38 -0700 + +xserver-xorg-video-intel (2:2.3.2-2) unstable; urgency=high + + * High urgency upload for RC bug fix. + * Update debian/copyright, thanks to Thomas Viehmann for reporting, and + Moritz Muehlenhoff for the thorough analysis (closes: #486340). + * Change the libdrm memory manager check in configure to look for 2.4.0 + instead of 2.3.1, as libdrm 2.3.1 was released without it. + + -- Julien Cristau Thu, 03 Jul 2008 16:55:05 +0200 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu3) intrepid; urgency=low + + * debian/patches/21_quirk_lenovo_and_hp_pavilion.patch: + + Quirk for fixing lockup on lid close for the Lenovo ThinkPad T60 + (LP: #243405) + + Quirk for fixing lockup on lid close for the HP Pavilion ze4944ea + (LP: #242389) + + -- Bryce Harrington Thu, 26 Jun 2008 20:36:29 -0700 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu2) intrepid; urgency=low + + * debian/patches/20_thinkpad_g40_quirk.patch: Quirk for IBM Thinkpad G40 + (LP: #240457) + + -- Bryce Harrington Fri, 20 Jun 2008 22:48:30 -0700 + +xserver-xorg-video-intel (2:2.3.2-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 11_textured_video_option.patch: + Renamed and reworked version of the old + 11_hw_overlay_option.diff patch, to re-enable the textured video + option, to allow users to turn off textured video. + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + + -- Bryce Harrington Thu, 19 Jun 2008 22:36:51 -0700 + +xserver-xorg-video-intel (2:2.3.2-1) unstable; urgency=low + + * New upstream release. + + Revert "Add FIFO watermark regs to register dumper", + closes: #482369, #471413. + + Fix TV programming: add vblank wait after TV_CTL writes, + closes: #485616. + + -- Brice Goglin Wed, 18 Jun 2008 07:16:05 +0200 + +xserver-xorg-video-intel (2:2.3.1-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on intel hardware. + (LP: 177492, 148247, 152206) + + 19_check_exa_pitch_to_fix_rotate_crash.patch: + Fixes crash on xrandr rotation by checking EXA pitch size. + (LP: #174745) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Reduce build depends version of dpkg-dev to 1.14.16 to enable it to + build on Hardy. The version change was to fix a bug we workaround + already in our rules change below. + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Drop dpkg-shlibdeps with --warnings=6 (FTBS) + * 11_textured_video_option.patch: + - Renamed and reworked version of the old 11_hw_overlay_option.diff + patch, to re-enable the textured video option, to allow users to + turn off textured video. + * Dropped patches that are now upstream + * Restore Debian's Conflicts/Replaces for -i810 and symlink i810 to + intel. We are now following suit to Debian and X.org and fully + deprecating the i810 driver and with 915resolution with this + release; remaining issues requiring use of the i810 driver need to + be reported to Launchpad and upstream so they can finally all get + fixed. + + -- Bryce Harrington Fri, 06 Jun 2008 19:34:28 -0700 + +xserver-xorg-video-intel (2:2.3.1-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Mon, 12 May 2008 03:55:45 +0200 + +xserver-xorg-video-intel (2:2.3.0-1) experimental; urgency=low + + * Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings. + * New upstream release. + + -- Julien Cristau Wed, 23 Apr 2008 17:53:26 +0200 + +xserver-xorg-video-intel (2:2.2.99.903-1) experimental; urgency=low + + * New upstream release candidate. + + Fix LVDS regression: disable panel fitting on 855GM, + and fix dither setting, closes: #473838. + + -- Brice Goglin Tue, 15 Apr 2008 15:04:32 +0200 + +xserver-xorg-video-intel (2:2.2.99.902-1) experimental; urgency=low + + * New upstream release candidate. + + Disable DRI earlier if fb width > 2048, closes: #465421, #452357. + + -- Brice Goglin Mon, 31 Mar 2008 08:46:32 +0200 + +xserver-xorg-video-intel (2:2.2.99.901-2) experimental; urgency=low + + * Install libIntelXvMC.so. + + -- Brice Goglin Sat, 29 Mar 2008 12:15:14 +0100 + +xserver-xorg-video-intel (2:2.2.99.901-1) experimental; urgency=low + + [ Julien Cristau ] + * Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to + bring in libpciaccess0 (closes: #467215). + * Only build on x86, this package doesn't make sense anywhere else. + * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix. + * Bump Standards-Version to 3.7.3 (no changes). + + [ Brice Goglin ] + * New upstream release. + + Fix pciaccess version check, closes: #470266. + + Fix crash on VT switch, closes: #469113. + + Fix video playback on rotated display, closes: #432157. + + -- Brice Goglin Fri, 21 Mar 2008 21:50:59 +0100 + +xserver-xorg-video-intel (2:2.2.1-2ubuntu2) intrepid; urgency=low + + * 20_dpll_prg_in_crtc_mode_set.patch: + - Fixes display problems caused by Jesse's force pipe A enablement + patch, which breaks DPLL programming. + + -- Bryce Harrington Wed, 28 May 2008 15:30:31 -0700 + +xserver-xorg-video-intel (2:2.2.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 03_dell_1535_quirk.diff: + Add a quirk for Dell Inspiron 1535 so it does not configure + against the HDMI port instead of the LCD's native resolution + (LP: 187860). + + 04_dell_1735_quirk.diff: + Another HDMI port quirk, for the Dell Inspiron 1735. + (LP: 188204) + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on i965 hardware. + (LP: 177492, 148247, 152206) + + 08_945gm_quirk.diff: + Adds quirk for another laptop model with a tv out detection bug. + (LP: 152416) + + 10_hw_overlay.diff: + Replace explicit checks for G965 for having no overlay since it + has one, with general check for future chips that may have no + overlay. (LP: 201596, 152206) + + 11_hw_overlay_option.diff: + Add a Boolean "TexturedVideo" option with default 'true' value + to be able to turn textured video off. + (LP: 201596, 152206) + + 12_quirk_sync.patch: Add some quirks from current git + upstream, and a quirk for Dell Latitude D630 (LP: 197740) + + 13_dpms_low_power_overlay.patch: + Fix crash triggered by dpms low power mode with hardware overlay + running (LP: 160309) + + 14_sysfs_fujitsu_backlight.patch: + Add sysfs backlight support for Fujitsu laptops (LP: 197620) + + 15_quirk_sony_vaio_vgn-sz4mn.patch: + Another Pipe A quirk - not already included - for the Sony Vaio + VGN-SZ4MN. (LP: 212163) + + 16_legacy_backlight_blc_pwn_ctl.patch: + Fixes issue where gdm, opengl apps, and vlc resets brightness to + xbacklight value on i915, by switching from BCM_LEGACY to + BCM_COMBO. (LP: 201933) + + 17_lockup_virtual_size_2048.patch: + Fixes crash if Virtual set to >2048 by disabling DRI in this case, + prior to initializing the DRI subsystem. (LP: 188178) + - debian/control: + + Change the maintainer address. + + Add lpia to the list of architectures. + + Nuke Conflicts and Replaces related to -i810. + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + Don't conflict with 915resolution, since it breaks upgrades + where people are still using i810 with widescreen resolutions. + (LP: 206167) + - debian/rules: + + Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to + coexist until -intel is able to replace it completely. + * debian/patches/18_quirks.patch: + - Add quirks for pipe A and tv output bugs. + (Closes LP: #204603, #216490, #201257, #224102) + * debian/patches/19_check_exa_pitch_to_fix_rotate_crash.patch: + - Fixes crash on xrandr rotation by checking EXA pitch size. + EXA wasn't checking devKind in ModifyPixmapHeader, which + makes it impossible to check homemade pixmaps (like produced + by rotate_pixmap(). So this patch checks in all !965 cases now. + 965G supports max pitch for current exa limit (128k) so doesn't + need checks. (Closes LP: #174745) + * debian/rules: + - Drop dpkg-shlibdeps with --warnings=6 (FTBS), sounds just cosmetic + + -- Bryce Harrington Fri, 09 May 2008 00:22:45 -0700 + +xserver-xorg-video-intel (2:2.2.1-2) unstable; urgency=low + + * Add the ${shlibs:Depends} substvar to the -dbg package's dependencies, to + bring in libpciaccess0 (closes: #467215). + * Only build on x86, this package doesn't make sense anywhere else. + * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix. + * configure: check for pciaccess 0.10 instead of 0.10.0 (closes: #470266). + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. + + -- Julien Cristau Sun, 13 Apr 2008 02:10:18 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu12) hardy; urgency=low + + * debian/patches/17_lockup_virtual_size_2048.patch: + - merging patch from http://bugs.freedesktop.org/show_bug.cgi?id=13376. + Fixes crash if Virtual set to >2048 by disabling DRI in this case, + prior to initializing the DRI subsystem. (closes LP: #188178) + + -- Emmanuel Bretelle Sat, 29 Mar 2008 14:06:49 +0000 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu11) hardy; urgency=low + + * debian/patches/16_legacy_backlight_blc_pwn_ctl.patch: + - Fixes issue where gdm, opengl apps, and vlc resets brightness to + xbacklight value on i915, by switching from BCM_LEGACY to BCM_COMBO. + This won't affect users using the kernel's /sys/class/backlight + interfaces for managing the backlight, but should produce better + results for the majority of legacy bit users. (LP: #201933) + + -- Bryce Harrington Mon, 07 Apr 2008 23:41:38 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu10) hardy; urgency=low + + * debian/patches/15_quirk_sony_vaio_vgn-sz4mn.patch: + - Another Pipe A quirk - not already included - for the Sony Vaio + VGN-SZ4MN. (LP: #212163) + + -- Bryce Harrington Sat, 05 Apr 2008 13:00:38 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu9) hardy; urgency=low + + * debian/patches/14_sysfs_fujitsu_backlight.patch: + - Add sysfs backlight support for Fujitsu laptops (LP: #197620) + + -- Bryce Harrington Fri, 04 Apr 2008 20:02:03 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu8) hardy; urgency=low + + * debian/patches/13_dpms_low_power_overlay.patch: + - Fix crash triggered by dpms low power mode with hardware overlay + running (LP: #160309) + + -- Bryce Harrington Fri, 04 Apr 2008 16:33:51 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu7) hardy; urgency=low + + * debian/patches/12_quirk_sync.patch: Add some quirks from current git + upstream, and a quirk for Dell Latitude D630 (LP: #197740) + + -- Bryce Harrington Fri, 04 Apr 2008 14:02:07 -0700 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu6) hardy; urgency=low + + [ Bryce Harrington ] + * debian/patches/05_intel_exa_force_greedy.patch: Another shot at the + greedy patch. This time by slightly modifying the working patch by + moving its logic outside the i965 if loop, so it'll apply to all + hardware. (LP: #177492) + + [ Timo Aaltonen ] + * Don't conflict with 915resolution, since it breaks upgrades where + people are still using i810 with widescreen resolutions. + (LP: #206167) + + -- Timo Aaltonen Tue, 25 Mar 2008 11:25:42 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu5) hardy; urgency=low + + * Fix the overlay patch to really disable TexturedVideo by default. + (LP: #201596) + + -- Timo Aaltonen Fri, 14 Mar 2008 11:01:09 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu4) hardy; urgency=low + + * Revert the greedy change, use the old patch again since the new one + doesn't work right. (LP: #177492) + * Add patches to enable hardware overlay for i965, and disable textured + video by default. It can be enabled again by setting + 'Option "TexturedVideo" "true"'. (LP: #152206) + + -- Timo Aaltonen Tue, 11 Mar 2008 21:42:43 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu3) hardy; urgency=low + + * Add 07_intel_exa_force_all_greedy.patch, to expand the fix from + 05_intel_exa_force_greedy.patch to cover all Intel chipsets, not just + 965. (LP: #177492) + * Drop 05_intel_exa_force_greedy.patch, since 07 is a superset of it. + * Add 08_945gm_quirk.diff, to add quirk for another laptop model with a + tv out detection bug. (LP: #152416) + + -- Bryce Harrington Fri, 29 Feb 2008 15:52:16 -0800 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu2) hardy; urgency=low + + * Don't build the intel_reg_dumper tool, since libpciaccess is in + universe. + + -- Timo Aaltonen Wed, 27 Feb 2008 00:04:15 +0200 + +xserver-xorg-video-intel (2:2.2.1-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #189868, #195424), remaining + changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 03_dell_1535_quirk.diff: + Add a quirk for Dell Inspiron 1535 so it does not configure + against the HDMI port instead of the LCD's native resolution + (LP: 187860). + + 04_dell_1735_quirk.diff: + Another HDMI port quirk, for the Dell Inspiron 1735. + (LP: 188204) + + 05_intel_exa_force_greedy.patch: + Force use of greedy mode on i965 hardware. + (LP: 177492, 148247, 152206) + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + -- Timo Aaltonen Tue, 26 Feb 2008 14:04:11 +0200 + +xserver-xorg-video-intel (2:2.2.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + + Fix some blinking pixels and unreadable text, closes: #465921. + + Fix i830 stolen memory mask, closes: #464661. + + Fix flickering on i855, closes: #443809, #435621. + + [ Julien Cristau ] + * Build the intel_reg_dumper tool, and install it in the -dbg package. + Add build-dependency on libpciaccess-dev. + + -- Brice Goglin Sat, 23 Feb 2008 00:52:39 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-3) unstable; urgency=low + + * Grab upstream commit 2c8f87be99957e0e18d8bcda46bd8706ab374253 + to unbreak FramebufferCompression on i965. + + -- Brice Goglin Wed, 06 Feb 2008 21:29:44 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu7) hardy; urgency=low + + * Drop the xaa-patch, as it turns out that not only i965 has issues + with Xv & compiz. + * Bump the build-dep on xserver-xorg-dev to match the current version + that is needed in order to default to greedy EXA. + + -- Timo Aaltonen Thu, 21 Feb 2008 09:00:53 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu6) hardy; urgency=low + + * Add 06_xaa_as_default_except_i965.patch to switch us back to XAA by + default for intel chipsets for performance reasons, except for i965 + which does not work as well with XAA (Xv video doesn't display + properly.) This patch essentially just reverts upstream's 'Default to + EXA' patch, and adds a special case i965 to allow it to use EXA. + + -- Bryce Harrington Tue, 19 Feb 2008 14:27:18 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu5) hardy; urgency=low + + * Add 05_intel_exa_force_greedy.patch to force use of greedy mode on + i965 hardware. (closes LP: #177492, #148247, #152206) + + -- Bryce Harrington Tue, 19 Feb 2008 13:48:02 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu4) hardy; urgency=low + + * 04_dell_1735_quirk.patch: Another HDMI port quirk, for the Dell + Inspiron 1735. (LP: #188204) + + -- Bryce Harrington Thu, 14 Feb 2008 18:08:47 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu3) hardy; urgency=low + + * 03_dell_1535_quirk.patch: Add a quirk for Dell Inspiron 1535 so it + does not configure against the HDMI port instead of the LCD's native + resolution (LP: #187860). + + -- Bryce Harrington Thu, 14 Feb 2008 15:52:01 -0800 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu2) hardy; urgency=low + + * 02_quick_fix.patch: Patch from upstream to prevent a crash on start. + + -- Timo Aaltonen Wed, 06 Feb 2008 19:04:04 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * Drop 05_fix_xv_reset.diff, different implementation upstream. + + -- Timo Aaltonen Wed, 06 Feb 2008 18:03:24 +0200 + +xserver-xorg-video-intel (2:2.2.0.90-2) unstable; urgency=low + + * Actually pull the new upstream release candidate. + + -- Julien Cristau Wed, 06 Feb 2008 10:27:18 +0100 + +xserver-xorg-video-intel (2:2.2.0.90-1) unstable; urgency=low + + * New upstream stable branch release candidate. Fixes the following bugs: + + server leaves pipe disabled at shutdown / vt switch ; closes: #453374 + + [855GM] need to use BIOS for mode information ; closes: #437066 + + Intel 2.2 crashes if playing a video then switching to another desktop; + closes: #452372 + + [G33] 2.2.0 locks up X with error "First SDVO output reported failure to + sync" ; closes: #451917 + + -- David Nusinow Tue, 05 Feb 2008 21:41:13 -0500 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1ubuntu2) hardy; urgency=low + + * 10_merge_upstream.diff: + - Merge all upstream commits from the stable branch up to commit + 103dc34f3afc17cea7e086927e124a30c605a686 + * 02_force_16bit_i81x.diff + - Dropped, upstream now. + + -- Timo Aaltonen Tue, 29 Jan 2008 12:58:37 +0200 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled. + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * debian/patches/02_force_16bit_i81x.diff: + - Force 16bit depth on i81{0,5} chips (LP: #178837) + + -- Timo Aaltonen Tue, 08 Jan 2008 17:22:38 +0200 + +xserver-xorg-video-intel (2:2.2.0+git20080107-1) experimental; urgency=low + + * New upstream snapshot + + Clarifies backlight abilities in the manpage. Closes: #451847 + + Will use a functional backlight on older chips now. Newer chips may + benefit from configured to use something other than the legacy setting + though. Closes: #451848 + + Fixes exa rendering corruption on some 855GM laptops. Closes: #439210 + + Xv window hidden for a little while no longer causes segfaults. + Closes: #457587 + + -- David Nusinow Mon, 07 Jan 2008 22:41:51 -0500 + +xserver-xorg-video-intel (2:2.2.0-2) UNRELEASED; urgency=low + + * Conflict with 915resolution. This driver now handles all of this itself + and better. Closes: #452803 + + -- David Nusinow Mon, 03 Dec 2007 21:35:07 -0500 + +xserver-xorg-video-intel (2:2.2.0-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + - These patches have been disabled for now, since they don't apply + fully and need closer investigation: + + 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + + 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + + 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + -- Timo Aaltonen < tepsipakki@ubuntu.com> Sat, 24 Nov 2007 19:35:11 +0200 + +xserver-xorg-video-intel (2:2.2.0-1) unstable; urgency=low + + * New upstream release. + + Also pull bugfix commit 4a2b0f340357c4ca58dc9586fad1337b83966362. + + Fix backlight problems on various chipsets, + closes: #443111, #438969, #439744. + + Fix some issues with high resolution, closes: #420840. + * Add myself to Uploaders and remove Branden with his permission. + + -- Brice Goglin Fri, 16 Nov 2007 09:30:26 +0100 + +xserver-xorg-video-intel (2:2.1.99-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + * Drop patches 02, 06, 08 which have been merged upstream. + * These patches have been disabled for now, since they don't apply fully + and need closer investigation: + - 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + - 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + - 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + -- Timo Aaltonen Thu, 15 Nov 2007 00:12:47 +0200 + +xserver-xorg-video-intel (2:2.1.99-1) experimental; urgency=low + + [ David Nusinow ] + * Make -i810 arch: all again + + [ Julien Cristau ] + * New upstream release candidate + + fixes VT switch issues (closes: #431373, #436336) + + fixes memory allocation issues (closes: #423416) + + adds support for ch701x LVDS controllers (closes: #438650, #420350, + #424952) + + -- Julien Cristau Sun, 11 Nov 2007 11:16:03 +0100 + +xserver-xorg-video-intel (2:2.1.1-5) unstable; urgency=low + + * Use the same architectures for the -dbg and i810 packages as -intel. + This should allow it to transition to testing. Closes: #449228 + + -- David Nusinow Sun, 04 Nov 2007 09:10:31 -0500 + +xserver-xorg-video-intel (2:2.1.1-4ubuntu2) hardy; urgency=low + + * Duh, really nuke the i810 manpage conflict. + + -- Timo Aaltonen Thu, 08 Nov 2007 18:52:43 +0200 + +xserver-xorg-video-intel (2:2.1.1-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + + 01_fix_compiz_video.diff: + use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + 02_xps1330_tvout_quirk.diff: + add quirk, xps1330 has no tv out + + 03_fix_brightness_control.diff: + add code from upstream to avoid confusing the platform firmware + brightness control + + 04_fix_hw_restore.diff + Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + + 05_fix_xv_reset.diff + Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + + 06_sync_quirks.diff: + Sync TV out quirks with upstream + + 07_fix_startup_blink.diff + Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + + 08_fix_855_3D_state.diff + Emit the invariant 3D state to the GPU during EnterVT after + marking the 3D state as clobbered. This fixes / works around + textured surface corruption after resume on 855GM hardware. + - debian/control + + Change the maintainer address. + + Add lpia to the list of architectures. + - Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + debian/control: + + Nuke Conflicts and Replaces related to -i810. + debian/rules: + + Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + + Nuke /usr/share/man/man4/i810.4 conflict + + -- Timo Aaltonen Thu, 08 Nov 2007 08:53:28 +0200 + +xserver-xorg-video-intel (2:2.1.1-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 16:34:39 -0400 + +xserver-xorg-video-intel (2:2.1.1-3) experimental; urgency=low + + * Shorten the short description of the -dbg package a bit (thanks, Marc 'HE' + Brockschmidt). + * Rebuild for xserver 1.4. + + -- Julien Cristau Wed, 12 Sep 2007 11:21:49 +0200 + +xserver-xorg-video-intel (2:2.1.1-2) experimental; urgency=low + + [ Julien Cristau ] + * Build against xserver 1.3.99.0. + + [ David Nusinow ] + * Add 01_gen_pci_ids.diff. This patch has the driver generate a list of pci + id's that it supports and installs it where the X server can find it. The + server with appropriate support will be able to automatically determine if + the intel driver is the proper driver to load when no driver is specified + in xorg.conf. + + -- Julien Cristau Sun, 19 Aug 2007 03:21:24 +0200 + +xserver-xorg-video-intel (2:2.1.1-1) unstable; urgency=low + + * New upstream release. + + manpage typo fixed (closes: #432061). Thanks, A Costa! + + adds quirk for TV output on some 965-based laptops (closes: #434297). + + -- Julien Cristau Tue, 14 Aug 2007 12:48:02 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu10) hardy; urgency=low + + [ Bryce Harrington ] + [Peter Clifton] + * 08_fix_855_3D_state.diff + - Emit the invariant 3D state to the GPU during EnterVT after + marking the 3D state as clobbered. This fixes / works around + textured surface corruption after resume on 855GM hardware. + (Closes LP: #133118) + * 07_fix_startup_blink.diff + - Alter startup sequence to avoid blinking the display whilst + initialising the graphics chip. + (Closes LP: #148686) + * 04_fix_hw_restore.diff + - Only restore PIPE[AB]CONF if the DPLL for that PIPE is running + and not in VGA pipeline mode. + (Closes LP: #108056) + + [Kyle McMartin, Bryce Harrington] + * 06_sync_quirks.diff: + - Sync TV out quirks with upstream + + -- Timo Aaltonen < tepsipakki@ubuntu.com> Thu, 01 Nov 2007 21:44:36 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu9) gutsy; urgency=low + + [Peter Clifton] + * 01_fix_compiz_video.diff: + - Bracket second clause in test for textured video to avoid + compiler warning and possibly incorrect testing. + * 04_fix_hw_restore.diff + - Only restore palette registers for pipes which are enabled, or + the system may hard-lock. (Initial patch by Bryce Harrington). + (Closes LP: #127101) + * 05_fix_xv_reset.diff + - Playing Xv video after switching modes once the Xv driver is + initialised causes a lockup, as the overlay regisers need + re-programming. Ensure such a reset happens after a mode-switch. + (Closes LP: #141063) + + -- Bryce Harrington Sat, 13 Oct 2007 12:58:07 -0700 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu8) gutsy; urgency=low + + * Brown paper bag release. + * Uncomment dh_installchangelogs. + + -- Kyle McMartin Thu, 11 Oct 2007 13:05:43 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu7) gutsy; urgency=low + + * 04-fix-g33-gtt-stolen-mem-range.diff: + - Nuke, caused graphics corruption on G33, reverted kernel code. + + -- Kyle McMartin Tue, 09 Oct 2007 09:51:18 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu6) gutsy; urgency=low + + * 04-fix-g33-gtt-stolen-mem-range.diff: + - Latest kernel release changes how stolen mem range is computed on + G33 hardware, needs this corresponding X change otherwise we die + trying to allocate GART memory. + + -- Kyle McMartin Sat, 06 Oct 2007 10:01:17 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu5) gutsy; urgency=low + + * 03_fix_brightness_control.diff: + - add code from upstream to avoid confusing the platform firmware + brightness control + + -- Matthew Garrett Thu, 04 Oct 2007 00:09:54 +0100 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu4) gutsy; urgency=low + + * 02_xps1330_tvout_quirk.diff: + - add quirk, xps1330 has no tv out + + -- Kyle McMartin < kyle@ubuntu.com> Fri, 28 Sep 2007 09:45:48 -0400 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu3) gutsy; urgency=low + + * debian/patches/01_fix_compiz_video.diff: + - default to overlay mode on hardware that supports it to + make compiz video work + + -- Michael Vogt Tue, 18 Sep 2007 09:48:45 +0100 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu2) gutsy; urgency=low + + * debian/patches/01_fix_compiz_video.diff: + - use xf86XVFillKeyHelperDrawable() to fix video playback with + compositing enabled + + -- Michael Vogt < michael.vogt@ubuntu.com> Tue, 14 Aug 2007 21:46:28 +0200 + +xserver-xorg-video-intel (2:2.1.1-0ubuntu1) gutsy; urgency=low + + * New upstream version. + * Drop ChangeLog since it isn't updated upstream and is just + needless diff. + + -- Kyle McMartin Tue, 14 Aug 2007 02:38:09 -0400 + +xserver-xorg-video-intel (2:2.1.0-2) unstable; urgency=low + + [ Brice Goglin ] + * Fix XvMC support for only i810 and i815 in the long description. + * Build a xserver-xorg-video-intel-dbg package with debugging symbols. + + [ Julien Cristau ] + * Add upstream URL in the copyright file (thanks, Loïc Minier). + + -- Julien Cristau Mon, 09 Jul 2007 14:25:25 +0200 + +xserver-xorg-video-intel (2:2.1.0-1ubuntu2) gutsy; urgency=low + + * Add lpia to the list of architectures. + + -- Matthias Klose Tue, 07 Aug 2007 13:12:48 +0000 + +xserver-xorg-video-intel (2:2.1.0-1ubuntu1) gutsy; urgency=low + + [ Kyle McMartin ] + + * Merge changes from 2.0.0-1ubuntu2. + * Set Maintainer to core-dev. + * Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + - Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + - Nuke /usr/share/man/man4/i810.4 conflict + - Nuke Conflicts and Replaces related to -i810. + + -- Kyle McMartin Tue, 03 Jul 2007 12:45:17 -0400 + +xserver-xorg-video-intel (2:2.1.0-1) unstable; urgency=low + + * New upstream release. + * Actually install the upstream README. + + -- Julien Cristau Tue, 03 Jul 2007 11:19:48 +0200 + +xserver-xorg-video-intel (2:2.0.0-6) experimental; urgency=low + + * Update to latest upstream (commit 1e2e3013). + * Add myself to uploaders. + + -- Julien Cristau Mon, 02 Jul 2007 03:08:51 +0200 + +xserver-xorg-video-intel (2:2.0.0-5) experimental; urgency=low + + [ Drew Parsons ] + * The upstream README file looks interesting, include it with docs. + + [ Julien Cristau ] + * Pull in latest upstream git. + + -- Julien Cristau Fri, 22 Jun 2007 03:58:48 +0100 + +xserver-xorg-video-intel (2:2.0.0-4) experimental; urgency=low + + [ Julien Cristau ] + * Update watch file (s/i810/intel/). + + [ Drew Parsons ] + * Pull in latest upstream git (probably contains final Xv fix). + Closes: #417860. + + -- Drew Parsons Tue, 05 Jun 2007 18:35:50 +1000 + +xserver-xorg-video-intel (2:2.0.0-3) experimental; urgency=low + + * Pull in latest upstream git (updated Xv fix) + + -- Drew Parsons Wed, 30 May 2007 12:20:45 +1000 + +xserver-xorg-video-intel (2:2.0.0-2) experimental; urgency=low + + [ Julien Cristau ] + * Build xserver-xorg-video-i810 in binary-indep instead of binary-arch + (closes: #420240). Thanks, Aaron M. Ucko! + * Mention i965 chipsets in the long description. + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-i810. + + [ Drew Parsons ] + * Pull in latest upstream git + - Restores Xv video overlay. Closes: #417860, #420281 + * autoreconf + + -- Drew Parsons Sat, 26 May 2007 18:08:33 +1000 + +xserver-xorg-video-intel (2:2.0.0-1ubuntu2) gutsy; urgency=low + + * Set Maintainer to core-dev. + * Allow xserver-xorg-video-i810 and xserver-xorg-video-intel to coexist + until -intel is able to replace it completely. + - Nuke /usr/lib/xorg/modules/drivers/i810_drv.so symlink + - Nuke /usr/share/man/man4/i810.4 conflict + - Nuke Conflicts and Replaces related to -i810. + + -- Kyle McMartin Tue, 22 May 2007 18:53:04 +0000 + +xserver-xorg-video-intel (2:2.0.0-1ubuntu1) gutsy; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/control: + + Stop building the transitional xserver-xorg-video-i810, so that + it doesnt overwrite the identically-named package in main + + Replace and Conflict xserver-xorg-driver-i810. + + Change Maintainer address. + + -- Timo Aaltonen Mon, 21 May 2007 12:54:24 +0300 + +xserver-xorg-video-intel (2:2.0.0-1) unstable; urgency=low + + * New upstream release. + * Add XS-Vcs-*. + * Bump build-dep on xserver-xorg-dev to >= 2:1.3.0.0. + * Remove Fabio from Uploaders, with his permission. + * Install the bug script in the xserver-xorg-video-intel dir instead of + -i810. + * Install the upstream changelog. + * Upload to unstable. + + -- Julien Cristau Fri, 20 Apr 2007 08:54:20 +0200 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu3) feisty; urgency=low + + * Stop building the transitional xserver-xorg-video-i810, so that it doesnt + overwrite the identically-named package in main + + -- Sarah Hobbs Tue, 17 Apr 2007 15:10:03 +1000 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu2) feisty; urgency=low + + * src/ch7017/Makefile.{am,in} + - [FTBFS] Fix AM_CFLAGS to include '-I$(srcdir)/..' and + '-I$(srcdir)/../modes'. + + -- Timo Aaltonen Mon, 16 Apr 2007 15:47:59 +0300 + +xserver-xorg-video-intel (2:1.9.94-1ubuntu1) feisty; urgency=low + + * Merge with Debian, remaining changes: + debian/control + - Change the Maintainer address. + - Replace and Conflict xserver-xorg-driver-i810 + - Ease the dependancy on xserver-xorg-dev. + debian/rules: + - Add '--with-xserver-source=/' so configure uses the included headers. + + -- Timo Aaltonen Wed, 4 Apr 2007 00:15:30 +0300 + +xserver-xorg-video-intel (2:1.9.94-1) experimental; urgency=low + + * New upstream release candidate. + + -- Julien Cristau Tue, 03 Apr 2007 11:36:43 +0200 + +xserver-xorg-video-intel (2:1.9.93-1) experimental; urgency=low + + * New upstream release candidate. + + bump build-dep on xserver-xorg-dev to >= 2:1.2.99.903. + + -- Julien Cristau Tue, 27 Mar 2007 08:25:39 +0200 + +xserver-xorg-video-intel (2:1.9.92-1) experimental; urgency=low + + * New upstream release candidate. + * Build-depend on xserver-xorg-dev 1.3rc2. + + -- Julien Cristau Thu, 15 Mar 2007 14:38:06 +0100 + +xserver-xorg-video-intel (2:1.9.91-2) experimental; urgency=low + + * Revert commit c2c62559e702e7de1fa2ef309fa647ab13564dc3 "Move + single mode setting code to X server." Brings i830PipeFindClosestMode + back into a consistent state. Closes: #414612. + * autoreconf and git-add Makefile.in files in ./src subdirectories. + + -- Drew Parsons Tue, 13 Mar 2007 22:49:18 +1100 + +xserver-xorg-video-intel (2:1.9.91-1) experimental; urgency=low + + * Bump build-dep on libdrm-dev to >= 2.2. Thanks, Marc 'HE' Brockschmidt! + * New upstream release candidate. + * Rename from -i810 to -intel to follow upstream naming. + * (Build-)Depend on a newer xserver. + + -- Julien Cristau Thu, 8 Mar 2007 18:55:05 +0100 + +xserver-xorg-video-i810 (2:1.7.4-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream version + * Generate Provides: line automatically + * Bump xserver-xorg-core build-depend to 2:1.2.0-6 to handle this properly + + [ Julien Cristau ] + * Drop duplicate build dependency on libdrm-dev, so this really + closes: #383918. + * Add support for the armeb and armel architectures, thanks to Riku Voipio + (closes: #408797). + * Drop all our patches, applied upstream. + * debian/rules clean needs to depend on xsfclean. + * Generate the dependency on xserver-xorg-core automatically. + + -- David Nusinow Sun, 4 Mar 2007 18:20:38 -0500 + +xserver-xorg-video-i810 (2:1.7.2-4) unstable; urgency=low + + [ Julien Cristau ] + * Don't build-dep on libdrm-dev on hurd-i386, and don't try to install + the libI810XvMC library there, as it isn't built without drm. Thanks to + Samuel Thibault for the patch! (closes: #383918) + + [ Drew Parsons ] + * Apply patch 20-i915_bios.patch from upsteam (1.7.4) to help with faulty + BIOSes (where VBE initialization failed). Closes: #382120. + + -- Drew Parsons Sat, 20 Jan 2007 02:29:30 +1100 + +xserver-xorg-video-i810 (2:1.7.2-3) unstable; urgency=low + + * Build-Depends: quilt, needed to apply patches. + * Replace the cvs source url in the long description with an XS-Vcs-Git + control field and a reference to the xf86-video-intel module. + Added a link to www.X.org. + + -- Drew Parsons Wed, 6 Dec 2006 12:52:18 +1100 + +xserver-xorg-video-i810 (2:1.7.2-2) unstable; urgency=low + + [ Julien Cristau ] + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + [ Drew Parsons ] + * Apply upstream patch 1-overlay_fix_lockup.patch (git commit + e065324661ad08b3b359136f48090232f6138959, upstream bug #5774). + Should remove remaining lockup problems in I830WaitLpRing(). + Closes: #272294. + * While we're at it, apply upstream patch 11-xv_lockup.patch (git + commit fbb376bd1a4daad4c86e349df98438989ce173f1, upstream bug + #8594), fixing lockups related to Xv. We'll have no lockup bugs + in etch, dammit! Closes: #397485. + + -- Drew Parsons Wed, 6 Dec 2006 11:50:10 +1100 + +xserver-xorg-video-i810 (2:1.7.2-1) unstable; urgency=low + + * New upstream version + + Shipping the git log as part of our diff.gz rather than a separate patch + since upstream didn't include an updated Changelog + + -- David Nusinow Fri, 13 Oct 2006 14:33:20 -0400 + +xserver-xorg-video-i810 (2:1.6.5-4) UNRELEASED; urgency=low + + * Typo fix in man page. Closes: #364559. + + -- Drew Parsons Thu, 21 Sep 2006 23:21:14 +1000 + +xserver-xorg-video-i810 (2:1.6.5-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + [ Drew Parsons ] + * Standards version 3.7.2. + * Use debhelper 5. + * Use dh_installman to install man pages. + * Exclude .la from dh_install. + + -- David Nusinow Mon, 18 Sep 2006 19:57:38 -0400 + +xserver-xorg-video-i810 (2:1.6.5-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:32 +0000 + +xserver-xorg-video-i810 (2:1.6.5-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Thu, 10 Aug 2006 22:53:34 +0000 + +xserver-xorg-video-i810 (2:1.6.4-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Wed, 9 Aug 2006 22:37:24 +0000 + +xserver-xorg-video-i810 (2:1.6.3-1) experimental; urgency=low + + * New upstream release + * Add x11proto-xinerama-dev to build-dep + + -- David Nusinow Tue, 8 Aug 2006 22:01:43 +0000 + +xserver-xorg-video-i810 (2:1.6.1-2) experimental; urgency=low + + * Fix for botched upload. Identical to -1, which I built wrong. + + -- David Nusinow Sun, 6 Aug 2006 18:37:45 +0000 + +xserver-xorg-video-i810 (2:1.6.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ David Nusinow ] + * New upstream version + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + + -- David Nusinow Sun, 6 Aug 2006 17:29:12 +0000 + +xserver-xorg-video-i810 (2:1.4.1.3-1) unstable; urgency=low + + * Roll back the version to what was released with 7.0. Stupid ABI + incompatibilities. (closes: #359328) + * Add call to dh_makeshlibs. Reorder dh_installdeb and dh_shlibdeps so that + ldconfig is called during postinst. Thanks Justin Pryzby and Steve + Langasek. (closes: #364012) + + -- David Nusinow Sat, 22 Apr 2006 18:21:51 -0400 + +xserver-xorg-video-i810 (1:1.5.1.0-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:40 -0500 + +xserver-xorg-video-i810 (1:1.5.1.0-1) experimental; urgency=low + + * New upstream release + + -- David Nusinow Tue, 21 Mar 2006 22:40:04 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-3) experimental; urgency=low + + * Version build dependency on libxvmc-dev. Thanks John Hughes. + (closes: #358165) + + -- David Nusinow Tue, 21 Mar 2006 20:49:27 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-2) experimental; urgency=low + + * Don't build on sparc. Partial port of + sparc/103_sparc_dont_build_useless_drivers.diff. + + -- David Nusinow Sun, 5 Mar 2006 20:32:01 -0500 + +xserver-xorg-video-i810 (1:1.4.1.3-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:37:39 -0500 + +xserver-xorg-driver-i810 (1:1.4.1.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 19:57:22 +1100 + +xserver-xorg-driver-i810 (1:1.4.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:06:03 +1100 + +xserver-xorg-driver-i810 (1:1.4.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Bump Build-Depends on libdrm-dev to >> 2.0. + + -- Daniel Stone Mon, 12 Dec 2005 13:20:11 +1100 + +xserver-xorg-driver-i810 (1:1.4.1-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, libdrm (>> 1.0.5), + x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:54:24 +1100 + +xserver-xorg-driver-i810 (1:1.4.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:30:52 +1100 + +xserver-xorg-driver-i810 (1:1.4.0.1-1) dapper; urgency=low + + * New upstream version. + + -- Daniel Stone Thu, 20 Oct 2005 13:37:40 +1000 + +xserver-xorg-driver-i810 (1:1.4.0-1) breezy; urgency=low + + * First xserver-xorg-driver-i810 release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 + --- xserver-xorg-video-intel-2.9.1.orig/debian/README.source +++ xserver-xorg-video-intel-2.9.1/debian/README.source @@ -0,0 +1,73 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. + +quilt is actually invoked by the Debian X packaging through a larger +set of scripts called XSFBS. XSFBS brings some other X specific +features such as managing dependencies and conflicts due to the video +and input driver ABIs. +XSFBS itself is maintained in a separate repository at + git://git.debian.org/pkg-xorg/xsfbs.git +and it is pulled inside the other Debian X repositories when needed. + +The XSFBS patching system requires a build dependency on quilt. Also +a dependency on $(STAMP_DIR)/patch has to be added to debian/rules +so that the XSFBS patching occurs before the actual build. So the +very first target of the build (likely the one running autoreconf) +should depend on $(STAMP_DIR)/patch. It should also not depend on +anything so that parallel builds are correctly supported (nothing +should probably run while patching is being done). And finally, the +clean target should depend on the xsfclean target so that patches +are unapplied on clean. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.udev +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.udev @@ -0,0 +1,10 @@ +# do not edit this file, it will be overwritten on update + +# Jesse Barnes on ubuntu-devel@lists.ubuntu.com: +# You'll get three events, one when the error is detected, one before the +# reset and one after. Each has a different environment variable set; the +# initial error has ERROR=1, the pre-reset event has RESET=1 and the +# post-reset event has ERROR=0. + +# Disable freeze hook. +#SUBSYSTEM=="drm", ACTION=="change", ENV{ERROR}=="1", RUN+="/usr/share/apport/apport-gpu-error-intel.py" --- xserver-xorg-video-intel-2.9.1.orig/debian/control +++ xserver-xorg-video-intel-2.9.1/debian/control @@ -0,0 +1,70 @@ +Source: xserver-xorg-video-intel +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: David Nusinow , Drew Parsons , Brice Goglin +Build-Depends: + debhelper (>= 5), + pkg-config, + xserver-xorg-dev (>= 2:1.7), + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-xinerama-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, + x11proto-video-dev, + libx11-dev, + libdrm-dev (>= 2.4.18), + x11proto-xf86dri-dev, + x11proto-gl-dev, + libgl1-mesa-dev | libgl-dev, + libpciaccess-dev (>= 0.8.0+git20071002), +# following are only needed for xvmc: + x11proto-dri2-dev, + libxvmc-dev (>= 1:1.0.1), + libxext-dev, + libxfixes-dev, +# end xvmc + dpkg-dev (>= 1.14.17), + quilt, + automake, + libtool, + xutils-dev +Standards-Version: 3.8.4 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-intel +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-intel.git + +Package: xserver-xorg-video-intel +Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386 lpia +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Recommends: intel-gpu-tools +Provides: ${xviddriver:Provides} +Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, xserver-xorg-driver-i810 +Conflicts: xserver-xorg-video-i810 (<< 2:1.9.91-1), xserver-xorg-video-i810-modesetting, xserver-xorg-video-intel-modesetting, xserver-xorg-driver-i810, 915resolution +Description: X.Org X server -- Intel i8xx, i9xx display driver + This package provides the driver for the Intel i8xx and i9xx family + of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945 + and i965 series chips. + . + This package also provides XvMC (XVideo Motion Compensation) drivers + for i810/i815 and i9xx and newer chipsets. + . + More information about X.Org can be found at: + + + + . + This package is built from the X.org xf86-video-intel driver module. + +Package: xserver-xorg-video-intel-dbg +Architecture: amd64 hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 netbsd-i386 lpia +Depends: xserver-xorg-video-intel (= ${binary:Version}), ${shlibs:Depends} +Section: debug +Priority: extra +Description: X.Org X server -- Intel i8xx, i9xx display driver (debug symbols) + This driver provides support for the Intel i8xx and i9xx family of chipsets, + including i810, i815, i830, i845, i855, i865, i915, and i945 series chips. + . + This package provides debugging symbols for this Xorg X driver. --- xserver-xorg-video-intel-2.9.1.orig/debian/apport-gpu-error-intel.py +++ xserver-xorg-video-intel-2.9.1/debian/apport-gpu-error-intel.py @@ -0,0 +1,132 @@ +#!/usr/bin/python + +import os +import os.path +import sys +import re +import hashlib + +from apport.hookutils import * + +from apport import unicode_gettext as _ + +pci_devices = [ + { 'name':'i810', 're':'(8086:7121)' }, + { 'name':'i810dc', 're':'(8086:7123)' }, + { 'name':'i810e', 're':'(8086:7125)' }, + { 'name':'i815', 're':'(8086:1132|82815)' }, + { 'name':'i830', 're':'(8086:3577|82830)' }, + { 'name':'i845', 're':'(8086:2562|82845G)' }, + { 'name':'i855', 're':'(8086:3582|855GM)' }, + { 'name':'i865', 're':'(8086:2572|82865G)' }, + { 'name':'i915g', 're':'(8086:2582)' }, + { 'name':'i915gm', 're':'(8086:2592|915GM)' }, + { 'name':'e7221', 're':'(8086:258a)' }, + { 'name':'i945g', 're':'(8086:2772|945G[ \/]|82945G[ \/])' }, + { 'name':'i945gm', 're':'(8086:27a2|945GM[ \/]|82945GM[ \/])' }, + { 'name':'i945gme', 're':'(8086:27ae|945GME|82945GME)' }, + { 'name':'IGDg', 're':'(8086:a001)' }, + { 'name':'IGDgm', 're':'(8086:a011)' }, + { 'name':'pineviewg', 're':'(8086:a001)' }, + { 'name':'pineviewgm', 're':'(8086:a011)' }, + { 'name':'i946gz', 're':'(8086:2972|82946GZ)' }, + { 'name':'g35', 're':'(8086:2982|82G35)' }, + { 'name':'i965q', 're':'(8086:2992|Q965)' }, + { 'name':'i965g', 're':'(8086:29a2|G965)' }, + { 'name':'g33', 're':'(8086:29c2|82G33)' }, + { 'name':'q35', 're':'(8086:29b2)' }, + { 'name':'q33', 're':'(8086:29d2)' }, + { 'name':'i965gm', 're':'(8086:2a02|GM965)' }, + { 'name':'i965gme', 're':'(8086:2a12)' }, + { 'name':'gm45', 're':'(8086:2a42)' }, + { 'name':'IGDeg', 're':'(8086:2e02)' }, + { 'name':'q45', 're':'(8086:2e12)' }, + { 'name':'g45', 're':'(8086:2e22)' }, + { 'name':'g41', 're':'(8086:2e32)' }, + { 'name':'b43', 're':'(8086:2e42)' }, + { 'name':'clarkdale', 're':'(8086:0042)' }, + { 'name':'arrandale', 're':'(8086:0046)' }, + { 'name':'sandybridge', 're':'(8086:0102)' }, + { 'name':'sandybridgem','re':'(8086:0106)' }, + ] +for device in pci_devices: + device['rc'] = re.compile(device['re'], re.IGNORECASE) + +def get_pci_device(text): + regex_vga = re.compile('VGA compatible controller (.*)', re.IGNORECASE) + + lines = regex_vga.findall(text) + if len(lines) > 0: + for l in lines: + if len(l.strip())>0: + for device in pci_devices: + if device['rc'].search(l.strip()): + return device['name'] + return None + +def get_dump_signature(text): + if not text: + return None + m = hashlib.md5() + m.update(text) + errmsg = m.hexdigest()[:8] + for k in ["EIR", "PGTBL_ER"]: + regex = re.compile(k+": 0x(\d+)") + match = regex.search(text) + if match and match.group(1) != "00000000": + errmsg += " (%s: 0x%s)" %(k, match.group(1)) + break + return errmsg + +def main(argv=None): + if argv is None: + argv = sys.argv + + from apport.packaging_impl import impl as packaging + if not packaging.enabled(): + return -1 + + import apport.report + report = apport.report.Report(type='Crash') + report.setdefault('Tags', '') + report.setdefault('Title', 'GPU lockup') + + report.add_os_info() + report.add_proc_info() + report.add_user_info() + + report['Package'] = 'xserver-xorg-video-intel' + report['Tags'] += ' freeze' + report['Lspci'] = command_output(['lspci', '-vvnn']) + report['IntelGpuDump'] = command_output(['intel_gpu_dump']) + chipset = get_pci_device(report['Lspci']) + if chipset: + report['Chipset'] = chipset + report['Title'] = "[%s] GPU lockup" %(report['Chipset']) + dump_signature = get_dump_signature(report['IntelGpuDump']) + if dump_signature: + report['DumpSignature'] = dump_signature + report['Title'] += " " + report['DumpSignature'] + if 'MachineType' in report and report['MachineType']: + report['Title'] += " on " + report['MachineType'] + + attach_hardware(report) + attach_related_packages(report, ["xserver-xorg", "libdrm2", "xserver-xorg-video-intel"]) + attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf') + attach_file(report, '/var/log/Xorg.0.log', 'XorgLog') + attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld') + attach_file_if_exists(report, '/sys/kernel/debug/dri/0/i915_error_state', 'i915_error_state') + + nowtime = datetime.datetime.now() + report_filename = '/var/crash/%s.%s.crash' % (report['Package'], str(nowtime).replace(' ', '_')) + report_file = os.fdopen(os.open(report_filename, os.O_WRONLY|os.O_CREAT|os.O_EXCL), 'w') + os.chmod(report_filename, 0600) + + try: + report.write(report_file) + finally: + report_file.close() + return 0 + +if __name__ == '__main__': + sys.exit(main()) --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.links +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-intel/script --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.postrm.in +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.postrm.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=postrm +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then + # downgrading to a version without kms + remove_conffile_commit /etc/modprobe.d/i915-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.prerm.in +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.prerm.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=prerm +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then + # downgrading to a version without kms + remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/i915-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-intel-2.9.1.orig/debian/rules +++ xserver-xorg-video-intel-2.9.1/debian/rules @@ -0,0 +1,114 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xserver-xorg-driver-i810 package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include debian/xsfbs/xsfbs.mk + +CFLAGS = -Wall -g +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so +confflags += --disable-static + +configure: $(STAMP_DIR)/patch + dh_testdir + autoreconf -vfi + +build/config.status: configure + dh_testdir + test -d build || mkdir build + cd build && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info $(confflags) \ + CFLAGS="$(CFLAGS)" + +.PHONY: build +build: build-stamp +build-stamp: build/config.status + dh_testdir + cd build && $(MAKE) + >$@ + +clean: xsfclean + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf build + rm -f $$(find -name Makefile.in) + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs + rm -f m4/lt* m4/libtool.m4 + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs usr/share/apport + + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + install -d $(CURDIR)/debian/tmp/usr/bin + install -m 755 build/src/reg_dumper/intel_reg_dumper $(CURDIR)/debian/tmp/usr/bin/ + install -d $(CURDIR)/debian/tmp/usr/share/apport + install -m 755 debian/apport-gpu-error-intel.py $(CURDIR)/debian/tmp/usr/share/apport + +# Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-s +binary-arch: build install serverabi + dh_testdir + dh_testroot + + dh_installdocs README NEWS + dh_installchangelogs ChangeLog + dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4 +ifeq ($(DEB_HOST_ARCH_OS), linux) + install -d -m 755 debian/xserver-xorg-video-intel/etc/modprobe.d/ + install -m 644 debian/i915-kms.conf debian/xserver-xorg-video-intel/etc/modprobe.d/ +endif + dh_installman + dh_installudev + dh_link + dh_strip --dbg-package=xserver-xorg-video-intel-dbg + dh_compress + dh_fixperms + dh_makeshlibs + dh_shlibdeps -- --warnings=6 + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: + # nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.install.hurd-i386 +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.install.hurd-i386 @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/xserver-xorg/pci/* --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.install +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.install @@ -0,0 +1,4 @@ +usr/lib/xorg/modules/drivers/*.so +usr/lib/libI810XvMC.so* +usr/lib/libIntelXvMC.so* +usr/share/apport/* --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.manpages +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man4/* --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.NEWS +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.NEWS @@ -0,0 +1,11 @@ +xserver-xorg-video-intel (2:2.9.1-2) unstable; urgency=low + + Starting with this version, the intel driver enables kernel mode setting + (KMS) by default for 830 and later chips. This comes with a framebuffer + driver which enables native resolution on the console. KMS also allows + faster VT switching and mode changes, as well as e.g. DisplayPort support. + + In case of trouble KMS can be disabled with the 'nomodeset' kernel command + line parameter, or by editing /etc/modprobe.d/i915-kms.conf. + + -- Julien Cristau Tue, 16 Mar 2010 16:09:55 +0100 --- xserver-xorg-video-intel-2.9.1.orig/debian/compat +++ xserver-xorg-video-intel-2.9.1/debian/compat @@ -0,0 +1 @@ +5 --- xserver-xorg-video-intel-2.9.1.orig/debian/copyright +++ xserver-xorg-video-intel-2.9.1/debian/copyright @@ -0,0 +1,440 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +This copyright file is based on xf86-video-intel 2.3.1. + +The files under src/modes/ and src/parser/ are stolen from the xorg-server +source. + +The authors of this core are, see below for copyright declarations. + +* Alan Hourihane / +* Bob Paauwe +* Dave Airlie +* Dave Mueller +* David Dawes +* Eric Anholt +* Jens Owen +* Jesse Barnes +* Jonathan Bian +* Keith Packard +* Keith Whitwell +* Kevin E. Martin / +* Kristian Høgsberg +* Luc Verhaegen +* Matt Sottek +* Rickard E. (Rik) Faith +* Thomas Hellstrom +* Wang Zhenyu +* Xiang Haihao + +==== + +Most of the code is covered by the MIT/X11 license: + +- +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +- + +The copyright holders are: + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas: +src/i810_accel.c +src/i810_wmark.c +src/i810_reg.h +src/i810_driver.c +src/i810_memory.c +src/i810_io.c +src/i810_cursor.c +src/i830_accel.c +src/i830_xaa.c +src/i830_exa.c + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +* Copyright 2000 VA Linux Systems, Inc. +src/xvmc/xf86dri.h +src/xvmc/xf86dri.c + +* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +* Copyright 2002 David Dawes +src/i830_memory.c +src/i830.h +src/i830_ring.h +src/i830_cursor.c +src/i810_ring.h +src/i810.h +src/common.h +src/xvmc/xf86dristr.h + +* Copyright 2000 Intel Corporation. All Rights Reserved: +src/i810_hwmc.c +src/i830_video.h +src/i810_video.c +src/i830_video.c + +* Copyright 2001 Intel Corporation. All Rights Reserved. +src/xvmc/I810XvMC.h +src/xvmc/I810XvMC.c + +* Copyright 2001 VA Linux Systems Inc., Fremont, California. +* Copyright 2002 by David Dawes +src/i830_dri.c +src/i830_driver.c + +* Copyright 2001 VA Linux Systems Inc., Fremont, California. +* Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas. +src/i830_common.h + +* Copyright 2002 David Dawes +* Copyright 2006 Intel Corporation +src/i830_modes.c + +* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. +src/i810_common.h + +* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. +src/i830_reg.h +src/i830_3d.c +src/i915_3d.c +src/i915_reg.h +src/xvmc/intel_batchbuffer.c + +* Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas. +src/brw_structs.h +src/brw_defines.h + +* Copyright 2005 Red Hat, Inc. +src/i830_io.c + +* Copyright 2005 Adam Jackson: +src/Makefile.am + +* Copyright (c) 2005 Jesse Barnes +src/i830_exa.c + +* Copyright 2005 Thomas Hellstrom. All rights reserved. +src/xvmc/driDrawable.c +src/xvmc/driDrawable.h + +* Copyright 2005-2006 Luc Verhaegen. +src/modes/xf86cvt.c + +* Copyright 2006 Luc Verhaegen. +src/modes/xf86EdidModes.c + +* Copyright 2006 Dave Airlie +src/i830_i2c.c +src/i830_sdvo.c +src/i830_dvo.c +src/sil164/sil164.c +src/sil164/sil164.h +src/sil164/sil164_reg.h +src/ch7xxx/ch7xxx_reg.h +src/ch7xxx/ch7xxx.c +src/ch7xxx/ch7xxx.h + +* Copyright 2006 Intel Corporation: +src/xvmc/i915_xvmc.c +src/xvmc/i915_xvmc.h +src/xvmc/i915_structs.h +src/i915_hwmc.h +src/i915_hwmc.c +src/i915_video.c +src/i915_render.c +src/i915_3d.h +src/exa_wm.g4i +src/exa_wm_src_sample_argb.g4a +src/exa_wm_mask_affine.g4a +src/exa_wm_projective.g4i +src/exa_sf.g4a +src/exa_wm_affine.g4i +src/exa_wm_mask_sample_a.g4a +src/exa_sf_mask.g4a +src/exa_wm_write.g4a +src/exa_wm_mask_sample_argb.g4a +src/exa_wm_ca.g4a +src/exa_wm_src_affine.g4a +src/exa_wm_xy.g4a +src/exa_wm_noca.g4a +src/exa_wm_ca_srcalpha.g4a +src/exa_wm_mask_projective.g4a +src/exa_wm_src_sample_a.g4a +src/exa_wm_src_projective.g4a +src/i830_lvds.c +src/i830_sdvo.h +src/i830_bios.c +src/i830_bios.h +src/i830_debug.c +src/i830_crt.c +src/i830_display.c +src/i830_sdvo_regs.h +src/i830_render.c +src/i830_tv.c +src/i830_display.h +src/i830_debug.h +src/packed_yuv_sf.g4a +src/packed_yuv_wm.g4a +src/i965_video.c +src/i965_render.c +src/ch7017/ch7017.c +src/ch7017/ch7017_reg.h +src/sil164/Makefile.am +src/modes/xf86Modes.h +src/ivch/ivch.c +src/ivch/ivch_reg.h +src/ivch/ivch_module.c + +* Copyright 2007 Intel Corporation: +src/bios_reader/bios_dumper.c +src/bios_reader/bios_reader.c +src/i830_hwmc.h +src/i830_hwmc.c +src/i830_quirks.c +src/xvmc/intel_xvmc.c +src/xvmc/intel_xvmc.h +src/reg_dumper/idle.c +src/reg_dumper/stepping.c +src/reg_dumper/main.c +src/reg_dumper/reg_dumper.h + +* Copyright 2007 Dave Mueller +src/tfp410/tfp410.c +src/tfp410/tfp410.h +src/tfp410/tfp410_reg.h + +==== + +src/i810_dga.c is Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK +and covered by the following license: + +- + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Alan Hourihane not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Alan Hourihane makes no representations + * about the suitability of this software for any purpose. It is provided + * "as is" without express or implied warranty. + * + * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. +- + +==== +A few files a covered by the following license: + +- + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. +- + +The copyright holders are: + +* Copyright 2002 Keith Packard, member of The XFree86 Project, Inc. +src/modes/xf86RandR12.c + +* Copyright 2006 Keith Packard +src/modes/xf86Crtc.c +src/modes/xf86RandR12.h +src/modes/xf86Rename.h +src/local_xf86Rename.h +src/modes/xf86DiDGA.c +src/modes/xf86Rotate.c +src/modes/xf86Crtc.h + +* Copyright 2006 Eric Anholt +src/i2c_vid.h + +* Copyright 2007 Keith Packard +src/modes/xf86Cursors.c + +==== + +src/parser/xf86Parser.h and src/parser/xf86Optrec.h are covered by a license +similar to the MIT/X11 license, but with an additional advertising clause: + +* Copyright (c) 1997 Metro Link Incorporated +* Copyright (c) 1997-2003 by The XFree86 Project, Inc. +* Copyright (c) 1997-2001 by The XFree86 Project, Inc. + +- + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Except as contained in this notice, the name of the Metro Link shall not be + * used in advertising or otherwise to promote the sale, use or other dealings + * in this Software without prior written authorization from Metro Link. +- + +==== + +src/modes/xf86Modes.c is covered by a license similar to the MIT/X11 license, +but with an additional advertising clause: + +- + * Copyright (c) 1997-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). + */ +- + +==== + +src/reg_dumper/xprintf.c is covered by a license similar to the MIT/X11 license, +but with an additional advertising clause: + +- + * Copyright (c) 2004 Alexander Gottwald + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name(s) of the above copyright + * holders shall not be used in advertising or otherwise to promote the sale, + * use or other dealings in this Software without prior written authorization. + */ +- + +==== + +All files generated by the buildsystem toolchain (e.g. autogen.sh) remain +under the copyright of their authors from the respective tools. + +==== + + +A couple of files are without explicit copyright: + +Some tiny Makefile.am: +src/reg_dumper/Makefile.am +src/xvmc/Makefile.am +src/ch7017/Makefile.am +src/tfp410/Makefile.am +src/ivch/Makefile.am +src/ch7xxx/Makefile.am + + +src/exa_wm_write.g4b +src/exa_sf.g4b +src/exa_wm_xy.g4b +src/packed_yuv_sf.g4b +src/exa_wm_src_sample_argb.g4b +src/exa_sf_mask.g4b +src/exa_wm_src_sample_a.g4b +src/exa_wm_src_affine.g4b +src/packed_yuv_wm.g4b +src/exa_wm_mask_sample_argb.g4b +src/exa_wm_ca.g4b +src/exa_wm_mask_affine.g4b +src/exa_wm_ca_srcalpha.g4b +src/exa_wm_nomask.g4a +src/exa_wm_mask_projective.g4b +src/exa_wm_noca.g4b +src/exa_wm_mask_sample_a.g4b +src/exa_wm_src_projective.g4b + + +src/tfp410/tfp410_module.c +src/ch7xxx/ch7xxx_module.c +src/ch7017/ch7017_module.c +src/xvmc/i915_program.h +src/xvmc/intel_batchbuffer.h +src/scripts/clock-graph.5c +src/scripts/clock.5c +src/scripts/fix.5c +src/scripts/tv.5c +src/sil164/sil164_module.c +src/i810_dri.h +src/i810_dri.c +src/i830_dri.h --- xserver-xorg-video-intel-2.9.1.orig/debian/xserver-xorg-video-intel.postinst.in +++ xserver-xorg-video-intel-2.9.1/debian/xserver-xorg-video-intel.postinst.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=postinst +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +case "$1" in + abort-upgrade) + if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then + # failed downgrading to a version without kms + remove_conffile_rollback /etc/modprobe.d/i915-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: --- xserver-xorg-video-intel-2.9.1.orig/debian/i915-kms.conf +++ xserver-xorg-video-intel-2.9.1/debian/i915-kms.conf @@ -0,0 +1 @@ +options i915 modeset=1 --- xserver-xorg-video-intel-2.9.1.orig/debian/patches/series +++ xserver-xorg-video-intel-2.9.1/debian/patches/series @@ -0,0 +1,6 @@ +#101_copy-fb.patch +102_avoid_flushing_null.patch +103_check_for_overflow.patch +104_fail_when_prop_values_gone.patch +105_free_after_printing.patch +106_initialize_drmmode_output.patch --- xserver-xorg-video-intel-2.9.1.orig/debian/patches/104_fail_when_prop_values_gone.patch +++ xserver-xorg-video-intel-2.9.1/debian/patches/104_fail_when_prop_values_gone.patch @@ -0,0 +1,24 @@ +From 2f134b84445d2d0bfe3d81276bc7f6648df062ee Mon Sep 17 00:00:00 2001 +From: Zhao Yakui +Date: Wed, 30 Sep 2009 07:31:57 +0000 +Subject: Return failure when the enum-type output property values are not found + +Failure to do so causes xrandr to report incorrect property values. + +Signed-off-by: Zhao Yakui +Signed-off-by: Eric Anholt +--- +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 472bc74..3417cab 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -1148,6 +1148,7 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property, + return TRUE; + } + } ++ return FALSE; + } + } + +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.9.1.orig/debian/patches/105_free_after_printing.patch +++ xserver-xorg-video-intel-2.9.1/debian/patches/105_free_after_printing.patch @@ -0,0 +1,26 @@ +From 3d4b3f257fbbb69c6f236d9803abe54a90d7d434 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Thu, 18 Mar 2010 02:48:39 +0000 +Subject: intel: free bus id in error path after printing it out. + +the error message prints out a freed string, spotted during +code reappropriation to radeon driver. + +Signed-off-by: Dave Airlie +Backported to 2.9.1: Bryce Harrington +--- +diff -Nurp xserver-xorg-video-intel-2.9.1-patched/src/i830_driver.c xserver-xorg-video-intel-2.9.1-working/src/i830_driver.c +--- xserver-xorg-video-intel-2.9.1-patched/src/i830_driver.c 2010-03-31 14:33:10.000000000 -0700 ++++ xserver-xorg-video-intel-2.9.1-working/src/i830_driver.c 2010-03-31 14:34:04.000000000 -0700 +@@ -1380,10 +1380,10 @@ i830_open_drm_master(ScrnInfoPtr scrn) + + i830->drmSubFD = drmOpen("i915", busid); + if (i830->drmSubFD == -1) { +- xfree(busid); + xf86DrvMsg(scrn->scrnIndex, X_ERROR, + "[drm] Failed to open DRM device for %s: %s\n", busid, + strerror(errno)); ++ xfree(busid); + return FALSE; + } + --- xserver-xorg-video-intel-2.9.1.orig/debian/patches/101_copy-fb.patch +++ xserver-xorg-video-intel-2.9.1/debian/patches/101_copy-fb.patch @@ -0,0 +1,159 @@ +Index: xserver-xorg-video-intel-2.9.1/src/drmmode_display.c +=================================================================== +--- xserver-xorg-video-intel-2.9.1.orig/src/drmmode_display.c 2009-10-26 13:48:05.000000000 +0200 ++++ xserver-xorg-video-intel-2.9.1/src/drmmode_display.c 2009-12-07 16:17:51.000000000 +0200 +@@ -35,6 +35,8 @@ + #include + #include + ++#include ++ + #include "xorgVersion.h" + + #include "i830.h" +@@ -910,6 +912,13 @@ + drmmode_ptr drmmode = drmmode_output->drmmode; + int i; + drmModePropertyPtr props; ++ I830Ptr pI830 = I830PTR(output->scrn); ++ ++ /* xf86Crtc.c calls dpms off in set desired modes, so ignore ++ * the request if we're starting up. */ ++ ++ if (pI830->starting) ++ return; + + for (i = 0; i < koutput->count_props; i++) { + props = drmModeGetProperty(drmmode->fd, koutput->props[i]); +@@ -1410,6 +1419,8 @@ + + xf86InitialConfiguration(pScrn, TRUE); + ++ pScrn->canDoBGNoneRoot = TRUE; ++ + return TRUE; + } + +@@ -1435,3 +1446,97 @@ + drmModeRmFB(drmmode->fd, drmmode->fb_id); + drmmode->fb_id = 0; + } ++ ++static PixmapPtr ++drmmode_create_pixmap_for_fbcon(ScrnInfoPtr pScrn) ++{ ++ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ drmmode_crtc_private_ptr drmmode_crtc = xf86_config->crtc[0]->driver_private; ++ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ++ drmmode_ptr drmmode = drmmode_crtc->drmmode; ++ I830Ptr pI830 = I830PTR(pScrn); ++ drmModeFBPtr fbcon; ++ struct drm_gem_flink flink; ++ drm_intel_bo *bo; ++ PixmapPtr pixmap = NULL; ++ int i; ++ ++ for (i = 0; i < drmmode->mode_res->count_crtcs; i++) { ++ drmmode_crtc = xf86_config->crtc[i]->driver_private; ++ if (drmmode_crtc->mode_crtc->buffer_id == 0) ++ continue; ++ fbcon = drmModeGetFB(drmmode->fd, ++ drmmode_crtc->mode_crtc->buffer_id); ++ if (fbcon != NULL) ++ break; ++ } ++ if (i == drmmode->mode_res->count_crtcs) ++ return NULL; ++ ++ flink.handle = fbcon->handle; ++ if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't flink fbcon handle\n"); ++ return NULL; ++ } ++ ++ bo = drm_intel_bo_gem_create_from_name(pI830->bufmgr, ++ "fbcon", flink.name); ++ if (bo == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't allocate bo for fbcon handle\n"); ++ return NULL; ++ } ++ ++ pixmap = GetScratchPixmapHeader(pScreen, ++ fbcon->width, fbcon->height, ++ fbcon->depth, fbcon->bpp, ++ fbcon->pitch, NULL); ++ ++ if (pixmap == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't allocate pixmap fbcon contents\n"); ++ return NULL; ++ } ++ ++ i830_set_pixmap_bo(pixmap, bo); ++ drm_intel_bo_unreference(bo); ++ drmModeFreeFB(fbcon); ++ ++ return pixmap; ++} ++void drmmode_copy_fb(ScrnInfoPtr pScrn) ++{ ++ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ++ I830Ptr pI830 = I830PTR(pScrn); ++ PixmapPtr src, dst; ++ unsigned int pitch = pScrn->displayWidth * pI830->cpp; ++ ++ src = drmmode_create_pixmap_for_fbcon(pScrn); ++ if (src == NULL) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Couldn't create pixmap for fbcon\n"); ++ return; ++ } ++ ++ /* We dont have a screen Pixmap yet */ ++ dst = GetScratchPixmapHeader(pScreen, ++ pScrn->virtualX, pScrn->virtualY, ++ pScrn->depth, pScrn->bitsPerPixel, ++ pitch, ++ NULL); ++ i830_set_pixmap_bo(dst, pI830->front_buffer->bo); ++ ++ pI830->uxa_driver->prepare_copy(src, dst, -1, -1, GXcopy, FB_ALLONES); ++ ++ pI830->uxa_driver->copy(dst, 0, 0, 0, 0, ++ pScrn->virtualX, pScrn->virtualY); ++ ++ pI830->uxa_driver->done_copy(dst); ++ ++ I830EmitFlush(pScrn); ++ intel_batch_flush(pScrn, TRUE); ++ ++ (*pScreen->DestroyPixmap)(src); ++ (*pScreen->DestroyPixmap)(dst); ++} +Index: xserver-xorg-video-intel-2.9.1/src/i830.h +=================================================================== +--- xserver-xorg-video-intel-2.9.1.orig/src/i830.h 2009-10-26 13:48:05.000000000 +0200 ++++ xserver-xorg-video-intel-2.9.1/src/i830.h 2009-12-07 16:17:51.000000000 +0200 +@@ -696,6 +696,7 @@ + extern int drmmode_output_dpms_status(xf86OutputPtr output); + void + drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor); ++extern void drmmode_copy_fb(ScrnInfoPtr pScrn); + + extern Bool i830_crtc_on(xf86CrtcPtr crtc); + extern int i830_crtc_to_pipe(xf86CrtcPtr crtc); +Index: xserver-xorg-video-intel-2.9.1/src/i830_driver.c +=================================================================== +--- xserver-xorg-video-intel-2.9.1.orig/src/i830_driver.c 2009-10-26 13:48:05.000000000 +0200 ++++ xserver-xorg-video-intel-2.9.1/src/i830_driver.c 2009-12-07 16:17:51.000000000 +0200 +@@ -3014,6 +3014,8 @@ + /* Clear the framebuffer */ + memset(pI830->FbBase + pScrn->fbOffset, 0, + pScrn->virtualY * pScrn->displayWidth * pI830->cpp); ++ } else { ++ drmmode_copy_fb(pScrn); + } + + if (!xf86SetDesiredModes (pScrn)) --- xserver-xorg-video-intel-2.9.1.orig/debian/patches/102_avoid_flushing_null.patch +++ xserver-xorg-video-intel-2.9.1/debian/patches/102_avoid_flushing_null.patch @@ -0,0 +1,26 @@ +From 370157f4932cf9067ba81c8bd5a311aff610882b Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 02 Dec 2009 20:28:49 +0000 +Subject: batch: Avoid flushing a NULL batch + +During shutdown from a FatalError during batchbuffer submission, it is +possible for the batch_ptr to be NULL, so we must be careful not to +append a flush on this error path. + +Signed-off-by: Chris Wilson + +Backported to 2.9.1 by Bryce Harrington + +--- +diff -Nurp xserver-xorg-video-intel-2.9.1/src/i830_accel.c xserver-xorg-video-intel-2.9.1-working/src/i830_accel.c +--- xserver-xorg-video-intel-2.9.1/src/i830_accel.c 2009-10-26 04:48:05.000000000 -0700 ++++ xserver-xorg-video-intel-2.9.1-working/src/i830_accel.c 2010-03-30 17:24:08.000000000 -0700 +@@ -136,7 +136,7 @@ I830Sync(ScrnInfoPtr pScrn) + if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC)) + ErrorF("I830Sync\n"); + +- if (!pScrn->vtSema || !pI830->batch_bo) ++ if (!pScrn->vtSema || !pI830->batch_bo || !pI830->batch_ptr) + return; + + I830EmitFlush(pScrn); --- xserver-xorg-video-intel-2.9.1.orig/debian/patches/103_check_for_overflow.patch +++ xserver-xorg-video-intel-2.9.1/debian/patches/103_check_for_overflow.patch @@ -0,0 +1,44 @@ +From 33cabbfca6acb5149e26f87a538a7cb79f00cad2 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Tue, 10 Nov 2009 11:09:52 +0000 +Subject: i915: Check for overflow before overflowing. + +As the immediate victim of the overflow would be to overwrite the maximum +permissible value, the test was optimistic. + +Signed-off-by: Chris Wilson +--- +diff --git a/src/i915_3d.h b/src/i915_3d.h +index 500817f..f85780a 100644 +--- a/src/i915_3d.h ++++ b/src/i915_3d.h +@@ -420,8 +420,8 @@ do { \ + */ + #define FS_LOCALS(x) \ + uint32_t _shader_buf[(x) * 3]; \ +- int _max_shader_commands = x; \ +- int _cur_shader_commands ++ unsigned int _max_shader_commands = x; \ ++ unsigned int _cur_shader_commands + + #define FS_BEGIN() \ + do { \ +@@ -430,12 +430,13 @@ do { \ + + #define FS_OUT(_shaderop) \ + do { \ ++ if (_cur_shader_commands >= _max_shader_commands) \ ++ FatalError("fragment shader command buffer exceeded (%d)\n", \ ++ _cur_shader_commands); \ + _shader_buf[_cur_shader_commands * 3 + 0] = _shaderop.ui[0]; \ + _shader_buf[_cur_shader_commands * 3 + 1] = _shaderop.ui[1]; \ + _shader_buf[_cur_shader_commands * 3 + 2] = _shaderop.ui[2]; \ +- if (++_cur_shader_commands > _max_shader_commands) \ +- FatalError("fragment shader command buffer exceeded (%d)\n", \ +- _cur_shader_commands); \ ++ ++_cur_shader_commands; \ + } while (0) + + #define FS_END() \ +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.9.1.orig/debian/patches/106_initialize_drmmode_output.patch +++ xserver-xorg-video-intel-2.9.1/debian/patches/106_initialize_drmmode_output.patch @@ -0,0 +1,20 @@ +From d1dfab6b1649214177435629d8e85239dbe44d89 Mon Sep 17 00:00:00 2001 +From: Matthias Hopf +Date: Wed, 17 Mar 2010 14:13:51 +0000 +Subject: Clear drmmode_output->mode_output in drmmode_output_destroy(). + +--- +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 0172a2e..1348e08 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -817,6 +817,7 @@ drmmode_output_destroy(xf86OutputPtr output) + } + xfree(drmmode_output->props); + drmModeFreeConnector(drmmode_output->mode_output); ++ drmmode_output->mode_output = NULL; + if (drmmode_output->private_data) { + xfree(drmmode_output->private_data); + drmmode_output->private_data = NULL; +-- +cgit v0.8.3-6-g21f6 --- xserver-xorg-video-intel-2.9.1.orig/debian/xsfbs/xsfbs.sh +++ xserver-xorg-video-intel-2.9.1/debian/xsfbs/xsfbs.sh @@ -0,0 +1,622 @@ +# This is the X Strike Force shell library for X Window System package +# maintainer scripts. It serves to define shell functions commonly used by +# such packages, and performs some error checking necessary for proper operation +# of those functions. By itself, it does not "do" much; the maintainer scripts +# invoke the functions defined here to accomplish package installation and +# removal tasks. + +# If you are reading this within a Debian package maintainer script (e.g., +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# skip past this library by scanning forward in this file to the string +# "GOBSTOPPER". + +SOURCE_VERSION=@SOURCE_VERSION@ +OFFICIAL_BUILD=@OFFICIAL_BUILD@ + +# Use special abnormal exit codes so that problems with this library are more +# easily tracked down. +SHELL_LIB_INTERNAL_ERROR=86 +SHELL_LIB_THROWN_ERROR=74 +SHELL_LIB_USAGE_ERROR=99 + +# old -> new variable names +if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then + DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" +fi +if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then + DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" +fi + +# initial sanity checks +if [ -z "$THIS_PACKAGE" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of this package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ -z "$THIS_SCRIPT" ]; then + cat >&2 < on the World Wide Web for +instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the +"doc-debian" package, or install the "reportbug" package and use the command of +the same name to file a report against version $SOURCE_VERSION of the +"$THIS_PACKAGE" package. +EOF + exit $SHELL_LIB_USAGE_ERROR +fi + +if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then + RECONFIGURE="true" +else + RECONFIGURE= +fi + +if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then + FIRSTINST="yes" +fi + +if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then + UPGRADE="yes" +fi + +trap "message;\ + message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ + message;\ + exit 1" HUP INT QUIT TERM + +reject_nondigits () { + # syntax: reject_nondigits [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters other than decimal digits and barf if any are found + while [ -n "$1" ]; do + # does the operand contain anything but digits? + if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then + # can't use die(), because it wraps message() which wraps this function + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ + "possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +reject_unlikely_path_chars () { + # syntax: reject_unlikely_path_chars [ operand ... ] + # + # scan operands (typically shell variables whose values cannot be trusted) for + # characters unlikely to be seen in a path and which the shell might + # interpret and barf if any are found + while [ -n "$1" ]; do + # does the operand contain any funny characters? + if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then + # can't use die(), because I want to avoid forward references + echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ + "encountered possibly malicious garbage \"$1\"" >&2 + exit $SHELL_LIB_THROWN_ERROR + fi + shift + done +} + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the +# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while +# the script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +message () { + # pretty-print messages of arbitrary length + reject_nondigits "$COLUMNS" + echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 +} + +observe () { + # syntax: observe message ... + # + # issue observational message suitable for logging someday when support for + # it exists in dpkg + if [ -n "$DEBUG_XORG_PACKAGE" ]; then + message "$THIS_PACKAGE $THIS_SCRIPT note: $*" + fi +} + +warn () { + # syntax: warn message ... + # + # issue warning message suitable for logging someday when support for + # it exists in dpkg; also send to standard error + message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" +} + +die () { + # syntax: die message ... + # + # exit script with error message + message "$THIS_PACKAGE $THIS_SCRIPT error: $*" + exit $SHELL_LIB_THROWN_ERROR +} + +internal_error () { + # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message + message "internal error: $*" + if [ -n "$OFFICIAL_BUILD" ]; then + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + fi + exit $SHELL_LIB_INTERNAL_ERROR +} + +usage_error () { + message "usage error: $*" + message "Please report a bug in the $THIS_SCRIPT script of the" \ + "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ + "Tracking System. Include all messages above that mention the" \ + "$THIS_PACKAGE package. Visit " \ + " on the World Wide Web for" \ + "instructions, read the file" \ + "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ + "package, or install the reportbug package and use the command of" \ + "the same name to file a report." + exit $SHELL_LIB_USAGE_ERROR +} + +font_update () { + # run $UPDATECMDS in $FONTDIRS + + local dir cmd shortcmd x_font_dir_prefix + + x_font_dir_prefix="/usr/share/fonts/X11" + + if [ -z "$UPDATECMDS" ]; then + usage_error "font_update() called but \$UPDATECMDS not set" + fi + if [ -z "$FONTDIRS" ]; then + usage_error "font_update() called but \$FONTDIRS not set" + fi + + reject_unlikely_path_chars "$UPDATECMDS" + reject_unlikely_path_chars "$FONTDIRS" + + for dir in $FONTDIRS; do + if [ -d "$x_font_dir_prefix/$dir" ]; then + for cmd in $UPDATECMDS; do + if which "$cmd" > /dev/null 2>&1; then + shortcmd=${cmd##*/} + observe "running $shortcmd in $dir font directory" + cmd_opts= + if [ "$shortcmd" = "update-fonts-alias" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-dir" ]; then + cmd_opts=--x11r7-layout + fi + if [ "$shortcmd" = "update-fonts-scale" ]; then + cmd_opts=--x11r7-layout + fi + $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ + "failed; font directory data may not" \ + "be up to date" + else + warn "$cmd not found; not updating corresponding $dir font" \ + "directory data" + fi + done + else + warn "$dir is not a directory; not updating font directory data" + fi + done +} + +remove_conffile_prepare () { + # syntax: remove_conffile_prepare filename official_md5sum ... + # + # Check a conffile "filename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 2 ]; then + usage_error "remove_conffile_prepare() called with wrong number of" \ + "arguments; expected at least 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + shift + + # does the conffile even exist? + if [ -e "$conffile" ]; then + # calculate its checksum + current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//') + # compare it to each supplied checksum + while [ -n "$1" ]; do + if [ "$current_checksum" = "$1" ]; then + # we found a match; move the confffile and stop looking + observe "preparing obsolete conffile $conffile for removal" + mv "$conffile" "$conffile.$THIS_PACKAGE-tmp" + break + fi + shift + done + fi +} + +remove_conffile_lookup () { + # syntax: remove_conffile_lookup package filename + # + # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal + # if it matches the actual file's md5sum. + # + # Call this function when you would call remove_conffile_prepare but only + # want to check against dpkg's status database instead of known checksums. + + local package conffile old_md5sum + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "remove_conffile_lookup() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + package="$1" + conffile="$2" + + if ! [ -e "$conffile" ]; then + return + fi + old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \ + awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')" + if [ -n "$old_md5sum" ]; then + remove_conffile_prepare "$conffile" "$old_md5sum" + fi +} + +remove_conffile_commit () { + # syntax: remove_conffile_commit filename + # + # Complete the removal of a conffile "filename" that has become obsolete. + # + # Call this function from a postinst script after having used + # remove_conffile_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_commit() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, remove it + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "committing removal of obsolete conffile $conffile" + rm "$conffile.$THIS_PACKAGE-tmp" + fi +} + +remove_conffile_rollback () { + # syntax: remove_conffile_rollback filename + # + # Roll back the removal of a conffile "filename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" is after having used remove_conffile_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "remove_conffile_rollback() called with wrong number of" \ + "arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + # if the temporary file created by remove_conffile_prepare() exists, move it + # back + if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then + observe "rolling back removal of obsolete conffile $conffile" + mv "$conffile.$THIS_PACKAGE-tmp" "$conffile" + fi +} + +replace_conffile_with_symlink_prepare () { + # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \ + # official_md5sum ... + # + # Check a conffile "oldfilename" against a list of canonical MD5 checksums. + # If the file's current MD5 checksum matches one of the "official_md5sum" + # operands provided, then prepare the conffile for removal from the system. + # We defer actual deletion until the package is configured so that we can + # roll this operation back if package installation fails. Otherwise copy it + # to newfilename and let dpkg handle it through conffiles mechanism. + # + # Call this function from a preinst script in the event $1 is "upgrade" or + # "install" and verify $2 to ensure the package is being upgraded from a + # version (or installed over a version removed-but-not-purged) prior to the + # one in which the conffile was obsoleted. + + local conffile current_checksum + + # validate arguments + if [ $# -lt 3 ]; then + usage_error "replace_conffile_with_symlink_prepare() called with wrong" \ + " number of arguments; expected at least 3, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + shift + newconffile="$1" + shift + + remove_conffile_prepare "$_oldconffile" "$@" + # If $oldconffile still exists, then md5sums didn't match. + # Copy it to new one. + if [ -f "$oldconffile" ]; then + cp "$oldconffile" "$newconffile" + fi + +} + +replace_conffile_with_symlink_commit () { + # syntax: replace_conffile_with_symlink_commit oldfilename + # + # Complete the removal of a conffile "oldfilename" that has been + # replaced by a symlink. + # + # Call this function from a postinst script after having used + # replace_conffile_with_symlink_prepare() in the preinst. + + local conffile + + # validate arguments + if [ $# -ne 1 ]; then + usage_error "replace_conffile_with_symlink_commit() called with wrong" \ + "number of arguments; expected 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + conffile="$1" + + remove_conffile_commit "$conffile" +} + +replace_conffile_with_symlink_rollback () { + # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename + # + # Roll back the replacing of a conffile "oldfilename" with symlink to + # "newfilename". + # + # Call this function from a postrm script in the event $1 is "abort-upgrade" + # or "abort-install" and verify $2 to ensure the package failed to upgrade + # from a version (or install over a version removed-but-not-purged) prior + # to the one in which the conffile was obsoleted. + # You should have used replace_conffile_with_symlink_prepare() in the + # preinst. + + local conffile + + # validate arguments + if [ $# -ne 2 ]; then + usage_error "replace_conffile_with_symlink_rollback() called with wrong" \ + "number of arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + oldconffile="$1" + newconffile="$2" + + remove_conffile_rollback "$_oldconffile" + if [ -f "$newconffile" ]; then + rm "$newconffile" + fi +} + +run () { + # syntax: run command [ argument ... ] + # + # Run specified command with optional arguments and report its exit status. + # Useful for commands whose exit status may be nonzero, but still acceptable, + # or commands whose failure is not fatal to us. + # + # NOTE: Do *not* use this function with db_get or db_metaget commands; in + # those cases the return value of the debconf command *must* be checked + # before the string returned by debconf is used for anything. + + local retval + + # validate arguments + if [ $# -lt 1 ]; then + usage_error "run() called with wrong number of arguments; expected at" \ + "least 1, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + "$@" || retval=$? + + if [ ${retval:-0} -ne 0 ]; then + observe "command \"$*\" exited with status $retval" + fi +} + +make_symlink_sane () { + # syntax: make_symlink_sane symlink target + # + # Ensure that the symbolic link symlink exists, and points to target. + # + # If symlink does not exist, create it and point it at target. + # + # If symlink exists but is not a symbolic link, back it up. + # + # If symlink exists, is a symbolic link, but points to the wrong location, fix + # it. + # + # If symlink exists, is a symbolic link, and already points to target, do + # nothing. + # + # This function wouldn't be needed if ln had an -I, --idempotent option. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "make_symlink_sane() called with wrong number of arguments;" \ + "expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local symlink target + + symlink="$1" + target="$2" + + if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then + observe "link from $symlink to $target already exists" + else + observe "creating symbolic link from $symlink to $target" + mkdir -p "${target%/*}" "${symlink%/*}" + ln -s -b -S ".dpkg-old" "$target" "$symlink" + fi +} + +migrate_dir_to_symlink () { + # syntax: migrate_dir_to_symlink old_location new_location + # + # Per Debian Policy section 6.5.4, "A directory will never be replaced by a + # symbolic link to a directory or vice versa; instead, the existing state + # (symlink or not) will be left alone and dpkg will follow the symlink if + # there is one." + # + # We have to do it ourselves. + # + # This function moves the contents of old_location, a directory, into + # new_location, a directory, then makes old_location a symbolic link to + # new_location. + # + # old_location need not exist, but if it does, it must be a directory (or a + # symlink to a directory). If it is not, it is backed up. If new_location + # exists already and is not a directory, it is backed up. + # + # This function should be called from a package's preinst so that other + # packages unpacked after this one --- but before this package's postinst runs + # --- are unpacked into new_location even if their payloads contain + # old_location filespecs. + + # Validate arguments. + if [ $# -ne 2 ]; then + usage_error "migrate_dir_to_symlink() called with wrong number of" + "arguments; expected 2, got $#" + exit $SHELL_LIB_USAGE_ERROR + fi + + # We could just use the positional parameters as-is, but that makes things + # harder to follow. + local new old + + old="$1" + new="$2" + + # Is old location a symlink? + if [ -L "$old" ]; then + # Does it already point to new location? + if [ "$(readlink "$old")" = "$new" ]; then + # Nothing to do; migration has already been done. + observe "migration of $old to $new already done" + return 0 + else + # Back it up. + warn "backing up symbolic link $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + fi + + # Does old location exist, but is not a directory? + if [ -e "$old" ] && ! [ -d "$old" ]; then + # Back it up. + warn "backing up non-directory $old as $old.dpkg-old" + mv -b "$old" "$old.dpkg-old" + fi + + observe "migrating $old to $new" + + # Is new location a symlink? + if [ -L "$new" ]; then + # Does it point the wrong way, i.e., back to where we're migrating from? + if [ "$(readlink "$new")" = "$old" ]; then + # Get rid of it. + observe "removing symbolic link $new which points to $old" + rm "$new" + else + # Back it up. + warn "backing up symbolic link $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + fi + + # Does new location exist, but is not a directory? + if [ -e "$new" ] && ! [ -d "$new" ]; then + warn "backing up non-directory $new as $new.dpkg-old" + mv -b "$new" "$new.dpkg-old" + fi + + # Create new directory if it does not yet exist. + if ! [ -e "$new" ]; then + observe "creating $new" + mkdir -p "$new" + fi + + # Copy files in old location to new location. Back up any filenames that + # already exist in the new location with the extension ".dpkg-old". + observe "copying files from $old to $new" + if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then + die "error(s) encountered while copying files from $old to $new" + fi + + # Remove files at old location. + observe "removing $old" + rm -r "$old" + + # Create symlink from old location to new location. + make_symlink_sane "$old" "$new" +} + +# vim:set ai et sw=2 ts=2 tw=80: + +# GOBSTOPPER: The X Strike Force shell library ends here. --- xserver-xorg-video-intel-2.9.1.orig/debian/xsfbs/xsfbs.mk +++ xserver-xorg-video-intel-2.9.1/debian/xsfbs/xsfbs.mk @@ -0,0 +1,276 @@ +#!/usr/bin/make -f + +# Debian X Strike Force Build System (XSFBS): Make portion + +# Copyright 1996 Stephen Early +# Copyright 1997 Mark Eichin +# Copyright 1998-2005, 2007 Branden Robinson +# Copyright 2005 David Nusinow +# +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# Originally by Stephen Early +# Modified by Mark W. Eichin +# Modified by Adam Heath +# Modified by Branden Robinson +# Modified by Fabio Massimo Di Nitto +# Modified by David Nusinow +# Acknowledgements to Manoj Srivastava. + +# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. +export DH_OPTIONS + +# force quilt to not use ~/.quiltrc and to use debian/patches +QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +# Set up parameters for the upstream build environment. + +# Determine (source) package name from Debian changelog. +SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Source:' | awk '{print $$2}') + +# Determine package version from Debian changelog. +SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ + | grep '^Version:' | awk '{print $$2}') + +# Determine upstream version number. +UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') + +# Determine the source version without the epoch for make-orig-tar-gz +NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') + +# Figure out who's building this package. +BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) + +# Find out if this is an official build; an official build has nothing but +# digits, dots, and/or the codename of a release in the Debian part of the +# version number. Anything else indicates an unofficial build. +OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) + +# Set up parameters for the Debian build environment. + +# Determine our architecture. +BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Work around some old-time dpkg braindamage. +BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) +# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. +ifdef DEB_HOST_ARCH + ARCH:=$(DEB_HOST_ARCH) +else + # dpkg-cross sets the ARCH environment variable; if set, use it. + ifdef ARCH + ARCH:=$(ARCH) + else + ARCH:=$(BUILD_ARCH) + endif +endif + +# $(STAMP_DIR) houses stamp files for complex targets. +STAMP_DIR:=stampdir + +# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place +# their files. +DEBTREEDIR:=$(CURDIR)/debian/tmp + +# All "important" targets have four lines: +# 1) A target name that is invoked by a package-building tool or the user. +# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. +# 2) A line delcaring 1) as a phony target (".PHONY:"). +# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may +# depend on other targets. +# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the +# "$(STAMP_DIR)/" prefix is omitted. +# +# This indirection is needed so that the "stamp" files that signify when a rule +# is done can be located in a separate "stampdir". Recall that make has no way +# to know when a goal has been met for a phony target (like "build" or +# "install"). +# +# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" +# so that the target will not be run again. Removing the file will make Make +# run the target over. + +# All phony targets should be declared as dependencies of .PHONY, even if they +# do not have "($STAMP_DIR)/"-prefixed counterparts. + +# Define a harmless default rule to keep things from going nuts by accident. +.PHONY: default +default: + +# Set up the $(STAMP_DIR) directory. +.PHONY: stampdir +stampdir_targets+=stampdir +stampdir: $(STAMP_DIR)/stampdir +$(STAMP_DIR)/stampdir: + mkdir $(STAMP_DIR) + >$@ + +# Set up the package build directory as quilt expects to find it. +.PHONY: prepare +stampdir_targets+=prepare +prepare: $(STAMP_DIR)/prepare +$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts + >$@ + +.PHONY: log +stampdir_targets+=log +log: $(STAMP_DIR)/log +$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir + mkdir -p $(STAMP_DIR)/log + +# Apply all patches to the upstream source. +.PHONY: patch +stampdir_targets+=patch +patch: $(STAMP_DIR)/patch +$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare + if ! [ `which quilt` ]; then \ + echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ + exit 1; \ + fi; \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + cat $(STAMP_DIR)/log/patch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/patch; \ + echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi; \ + >$@ + +# Revert all patches to the upstream source. +.PHONY: unpatch +unpatch: $(STAMP_DIR)/log + rm -f $(STAMP_DIR)/patch + @echo -n "Unapplying patches..."; \ + if $(QUILT) applied >/dev/null 2>/dev/null; then \ + if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "successful."; \ + else \ + cat $(STAMP_DIR)/log/unpatch; \ + echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ + exit 1; \ + fi; \ + else \ + echo "nothing to do."; \ + fi + +# Clean the generated maintainer scripts. +.PHONY: cleanscripts +cleanscripts: + rm -f $(STAMP_DIR)/genscripts + rm -f debian/*.config \ + debian/*.postinst \ + debian/*.postrm \ + debian/*.preinst \ + debian/*.prerm + +# Clean the package build tree. +.PHONY: xsfclean +xsfclean: cleanscripts unpatch + dh_testdir + rm -rf .pc + rm -rf $(STAMP_DIR) + dh_clean + +# Remove files from the upstream source tree that we don't need, or which have +# licensing problems. It must be run before creating the .orig.tar.gz. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: prune-upstream-tree +prune-upstream-tree: + # Ensure we're in the correct directory. + dh_testdir + grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf + +# Verify that there are no offsets or fuzz in the patches we apply. +# +# Note: This rule is for Debian package maintainers' convenience, and is not +# needed for conventional build scenarios. +.PHONY: patch-audit +patch-audit: prepare unpatch + @echo -n "Auditing patches..."; \ + >$(STAMP_DIR)/log/patch; \ + FUZZY=; \ + while [ -n "$$($(QUILT) next)" ]; do \ + RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ + case "$$RESULT" in \ + succeeded) \ + echo "fuzzy patch: $$($(QUILT) top)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ + FUZZY=yes; \ + ;; \ + FAILED) \ + echo "broken patch: $$($(QUILT) next)" \ + | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ + exit 1; \ + ;; \ + esac; \ + done; \ + if [ -n "$$FUZZY" ]; then \ + echo "there were fuzzy patches; please fix."; \ + exit 1; \ + else \ + echo "done."; \ + fi + +# Generate the maintainer scripts. +.PHONY: genscripts +stampdir_targets+=genscripts +genscripts: $(STAMP_DIR)/genscripts +$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir + for FILE in debian/*.config.in \ + debian/*.postinst.in \ + debian/*.postrm.in \ + debian/*.preinst.in \ + debian/*.prerm.in; do \ + if [ -e "$$FILE" ]; then \ + MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ + sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ + cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ + sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ + | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ + sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ + -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ + <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ + rm $$MAINTSCRIPT.tmp; \ + fi; \ + done + # Validate syntax of generated shell scripts. + #sh debian/scripts/validate-posix-sh debian/*.config \ + # debian/*.postinst \ + # debian/*.postrm \ + # debian/*.preinst \ + # debian/*.prerm + >$@ + +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: install +ifeq ($(SERVERMINVERS),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars +endif + +# vim:set noet ai sts=8 sw=8 tw=0: --- xserver-xorg-video-intel-2.9.1.orig/debian/xsfbs/repack.sh +++ xserver-xorg-video-intel-2.9.1/debian/xsfbs/repack.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +if ! [ -d debian/prune ]; then + exit 0 +fi + +if [ "x$1" != x--upstream-version ]; then + exit 1 +fi + +version="$2" +filename="$3" + +if [ -z "$version" ] || ! [ -f "$filename" ]; then + exit 1 +fi + +dir="$(pwd)" +tempdir="$(mktemp -d)" + +cd "$tempdir" +tar xf "$dir/$filename" +cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done + +tar czf "$dir/$filename" * +cd "$dir" +rm -rf "$tempdir" +echo "Done pruning upstream tarball" + +exit 0