Commit Graph

2210 Commits

Author SHA1 Message Date
Zhenyu Wang 32e7d47925 Disable XvMC on DRI2 for now 2008-12-04 09:24:31 +08:00
Dave Airlie 293f6232c6 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)
2008-12-03 16:55:31 -08:00
Eric Anholt 457a680afd 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.
2008-12-03 13:30:10 -08:00
Eric Anholt b662ecccb5 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.
2008-12-03 10:52:34 -08:00
Paulo Cesar Pereira de Andrade d426f799f5 Include <X11/Xfuncproto.h> prior to including "edid.h" from the sdk. 2008-12-03 14:59:21 -02:00
Robert Lowery 07f5a82231 TV: add support to set TV margins in xorg.conf 2008-12-03 09:48:23 +08:00
Eric Anholt 00ae7a571b UXA: Add support for tiled front/back/depth by cutting over to the GTT map. 2008-12-02 13:08:23 -08:00
Eric Anholt 34d54db945 Remove DRI_MM defines which are always true now. 2008-12-02 13:01:56 -08:00
Keith Packard f7540df184 Merge commit 'origin/dri2' 2008-12-01 19:06:09 -08:00
Paulo Cesar Pereira de Andrade 5f347020a5 Export libIntelXvMC and libI80XvMC symbols.
This is a side effect of adding the visibility flags to XORG_CFLAGS.
2008-11-29 02:35:59 -02:00
Zou Nan hai ec7fd3d1b4 Merge branch '965-xvmc'
Conflicts:

	src/common.h
	src/i830_hwmc.c
	src/i830_video.c
2008-11-27 10:48:09 +08:00
Wu Fengguang d978cd4b45 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 <wfg@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
2008-11-24 15:10:39 -08:00
Kristian Høgsberg ee87f7becc Merge commit 'origin/master' into dri2
Conflicts:
	src/i830_dri.c
	src/i830_driver.c
	src/i830_memory.c
2008-11-17 12:26:38 -05:00
Jesse Barnes 30c29627c8 Make sure DRM library paths are included
We need @DRM_LIBS@ in order to find drm_intel if installed in a
non-standard path.
2008-11-13 12:35:02 -08:00
Ma Ling 42ec6938bd 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 <ling.ma@intel.com>
Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
2008-11-13 09:51:17 +08:00
Wu Fengguang 42b3903c3f 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 <wfg@linux.intel.com>
2008-11-13 09:51:17 +08:00
Wu Fengguang 293f4a8b6d 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 <wfg@linux.intel.com>
2008-11-13 09:50:37 +08:00
Jesse Barnes 6679235592 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.
2008-11-11 12:55:06 -08:00
Zhenyu Wang 65cd0fbb01 TV: fix contrast and saturation for 915/945G
915/945G uses exponent-mantissa format instead of
fixed-point format on 965G.
2008-11-11 09:36:50 +08:00
Zhenyu Wang a5b1e62337 quirk LVDS on Asus Eee box
Reported by Yang Sheng <sheng.yang@intel.com>
2008-11-07 16:06:26 +08:00
Keith Packard 9942cfa6dc 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 <keithp@keithp.com>
2008-11-06 15:04:27 -08:00
Zhenyu Wang 226efa7c74 TV: subcarrier fix for NTSC and PAL
Using subcarrier DDA values from spec give more close result to
standard frequency.
2008-11-06 10:47:49 +08:00
Zhenyu Wang 3651341292 TV: fix timing parameters for PAL, 480p, 1080i 2008-11-06 10:47:32 +08:00
Zhenyu Wang b404afb755 TV: save serveral TV_CTL register fields in mode set
Driver should keep those fields according with spec.
2008-11-06 10:47:18 +08:00
Zhenyu Wang 2ae91f0ffd 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.
2008-11-06 10:46:36 +08:00
Zhenyu Wang c4cab00ef7 TV: white space cleanup 2008-11-06 10:46:11 +08:00
Zhenyu Wang b130f94f26 SDVO: fix more command definition errors 2008-11-06 10:14:00 +08:00
Zhenyu Wang 3ab979da5c 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.
2008-11-06 10:11:38 +08:00
Zhenyu Wang f558a4972d SDVO: add GetScaledHDTVResolutionSupport command 2008-11-06 09:58:15 +08:00
Zhenyu Wang cd8cbff5d7 SDVO: fix sdvo tv format and sdtv resolution request/reply definition 2008-11-06 09:57:08 +08:00
Zhenyu Wang 61672b8c45 SDVO: add HDMI audio encrypt change bit for GetInterruptEventSource command 2008-11-06 09:56:37 +08:00
Zhenyu Wang 45fb04474d SDVO: fix wrong order of sdvo version's major/minor 2008-11-06 09:55:47 +08:00
Zhenyu Wang 5cbf1e7271 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.
2008-11-06 09:46:54 +08:00
Eric Anholt 78b6cff3b6 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).
2008-11-05 17:22:02 -08:00
Eric Anholt 801f0eac4f Make I830FALLBACK debugging a runtime instead of compile-time option. 2008-11-05 17:22:00 -08:00
Maxim Levitsky d828b0802c Add an option to make the overlay be the first XV adaptor. 2008-11-05 13:51:19 -08:00
Eric Anholt 040d9bf9d8 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.
2008-11-04 10:39:34 -08:00
Carl Worth 08914cceda 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.
2008-11-03 22:46:28 -08:00
Carl Worth 47cc3d79da Unreference the vertex_buffer_bo in gen4_render_state_cleanup
This avoids leaking one buffer object.
2008-11-03 22:46:28 -08:00
Carl Worth 88700acf30 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).
2008-11-03 22:46:28 -08:00
Carl Worth 9e95722763 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.
2008-11-03 22:46:28 -08:00
Carl Worth fcb2a5a125 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).
2008-11-03 22:46:17 -08:00
Jesse Barnes 7e68786cf7 Don't modify render standby if kernel mode setting is active
Since we can't bang on registers directly in that case.
2008-10-30 13:40:23 -07:00
Adam Jackson 87ea531c5d Quirk: No LVDS on Dell Studio Hybrid 2008-10-24 14:47:27 -04:00
Carl Worth 4d5360b1f3 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.
2008-10-22 16:17:39 -07:00
Carl Worth 36fc53d068 Rename state_base_offset to static_state_offset in gen4_static_state_init
More cleanup here, and again no functional change.
2008-10-22 16:16:30 -07:00
Carl Worth 8fda7df007 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.
2008-10-22 15:43:21 -07:00
Carl Worth acba423811 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.
2008-10-22 15:20:22 -07:00
Carl Worth c6550fa53d Ignore intel_gtt binary
We simply forgot to add this to .gitignore when it was created.
2008-10-22 14:51:42 -07:00
Dave Airlie ee3df629ea Default kernel mode setting to off, add configure flag to enable
Should help avoid unpleasantness.
2008-10-20 18:46:49 -07:00