[Intel-gfx] [PATCH] Reintegrate legacy UMS.
Chris Wilson
chris at chris-wilson.co.uk
Tue Aug 24 21:31:14 CEST 2010
As downstream still carries our old UMS driver in order to workaround
the catastrophic incoherency issues that currently plague the earlier
i8xx chipsets when trying to use GEM, it makes sense to integrate their
work into the main repository so that their fixes are shared and
available for all users.
This combines the EXA code from 2.6 with the most recent updates through
to 2.9 when the UMS code was removed and the distributions were forced
to fork.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
Patch removed for decency. Please see my legacy branch on annarchy.
To justify re-integrating this code, I'd like a show of commitment from
the distributions that this is how we should proceed. Our goal, and our
focus, is on providing KMS and GEM for Intel chipsets. We do not want
legacy/ums to hinder that, however we also do not want to leave machines
behind (i8xx, the current bane of our existence) and force each
distributions to fork their own legacy driver.
---
configure.ac | 65 +-
src/Makefile.am | 2 +
src/i830_render.c | 1 -
src/intel.h | 7 +-
src/intel_driver.c | 3 +-
src/intel_driver.h | 4 +-
src/intel_module.c | 32 +-
src/intel_transform.c | 92 +
src/intel_transform.h | 14 +
src/intel_uxa.c | 83 -
src/legacy/Makefile.am | 3 +-
src/legacy/i810/i810.h | 6 +-
src/legacy/i810/i810_accel.c | 4 +-
src/legacy/i810/i810_driver.c | 42 +-
src/legacy/legacy.h | 8 +-
src/legacy/ums/Makefile.am | 161 +
src/legacy/ums/brw_defines.h | 874 +++++
src/legacy/ums/brw_structs.h | 1469 +++++++++
src/legacy/ums/ch7017/Makefile.am | 10 +
src/legacy/ums/ch7017/ch7017.c | 324 ++
src/legacy/ums/ch7017/ch7017_module.c | 36 +
src/legacy/ums/ch7017/ch7017_reg.h | 162 +
src/legacy/ums/ch7xxx/Makefile.am | 11 +
src/legacy/ums/ch7xxx/ch7xxx.c | 317 ++
src/legacy/ums/ch7xxx/ch7xxx.h | 31 +
src/legacy/ums/ch7xxx/ch7xxx_module.c | 35 +
src/legacy/ums/ch7xxx/ch7xxx_reg.h | 80 +
src/legacy/ums/ivch/Makefile.am | 10 +
src/legacy/ums/ivch/ivch.c | 368 +++
src/legacy/ums/ivch/ivch_module.c | 64 +
src/legacy/ums/ivch/ivch_reg.h | 291 ++
src/legacy/ums/render_programs/exa_sf.g4a | 107 +
src/legacy/ums/render_programs/exa_sf.g4b | 15 +
src/legacy/ums/render_programs/exa_sf_mask.g4a | 107 +
src/legacy/ums/render_programs/exa_sf_mask.g4b | 15 +
src/legacy/ums/render_programs/exa_wm.g4i | 156 +
src/legacy/ums/render_programs/exa_wm_affine.g4i | 44 +
src/legacy/ums/render_programs/exa_wm_ca.g4a | 38 +
src/legacy/ums/render_programs/exa_wm_ca.g4b | 4 +
.../ums/render_programs/exa_wm_ca_srcalpha.g4a | 37 +
.../ums/render_programs/exa_wm_ca_srcalpha.g4b | 4 +
.../ums/render_programs/exa_wm_mask_affine.g4a | 41 +
.../ums/render_programs/exa_wm_mask_affine.g4b | 8 +
.../ums/render_programs/exa_wm_mask_projective.g4a | 53 +
.../ums/render_programs/exa_wm_mask_projective.g4b | 16 +
.../ums/render_programs/exa_wm_mask_sample_a.g4a | 48 +
.../ums/render_programs/exa_wm_mask_sample_a.g4b | 2 +
.../render_programs/exa_wm_mask_sample_argb.g4a | 48 +
.../render_programs/exa_wm_mask_sample_argb.g4b | 2 +
src/legacy/ums/render_programs/exa_wm_noca.g4a | 38 +
src/legacy/ums/render_programs/exa_wm_noca.g4b | 4 +
src/legacy/ums/render_programs/exa_wm_nomask.g4a | 143 +
.../ums/render_programs/exa_wm_projective.g4i | 51 +
.../ums/render_programs/exa_wm_src_affine.g4a | 45 +
.../ums/render_programs/exa_wm_src_affine.g4b | 8 +
.../ums/render_programs/exa_wm_src_projective.g4a | 49 +
.../ums/render_programs/exa_wm_src_projective.g4b | 16 +
.../ums/render_programs/exa_wm_src_sample_a.g4a | 47 +
.../ums/render_programs/exa_wm_src_sample_a.g4b | 2 +
.../ums/render_programs/exa_wm_src_sample_argb.g4a | 47 +
.../ums/render_programs/exa_wm_src_sample_argb.g4b | 2 +
.../render_programs/exa_wm_src_sample_planar.g4a | 65 +
.../render_programs/exa_wm_src_sample_planar.g4b | 4 +
src/legacy/ums/render_programs/exa_wm_write.g4a | 74 +
src/legacy/ums/render_programs/exa_wm_write.g4b | 18 +
src/legacy/ums/render_programs/exa_wm_xy.g4a | 52 +
src/legacy/ums/render_programs/exa_wm_xy.g4b | 4 +
src/legacy/ums/render_programs/exa_wm_yuv_rgb.g4a | 98 +
src/legacy/ums/render_programs/exa_wm_yuv_rgb.g4b | 12 +
src/legacy/ums/render_programs/packed_yuv_sf.g4a | 45 +
src/legacy/ums/render_programs/packed_yuv_sf.g4b | 17 +
src/legacy/ums/render_programs/packed_yuv_wm.g4a | 221 ++
src/legacy/ums/render_programs/packed_yuv_wm.g4b | 79 +
src/legacy/ums/sil164/Makefile.am | 11 +
src/legacy/ums/sil164/sil164.c | 264 ++
src/legacy/ums/sil164/sil164.h | 31 +
src/legacy/ums/sil164/sil164_module.c | 38 +
src/legacy/ums/sil164/sil164_reg.h | 60 +
src/legacy/ums/tfp410/Makefile.am | 11 +
src/legacy/ums/tfp410/tfp410.c | 286 ++
src/legacy/ums/tfp410/tfp410.h | 33 +
src/legacy/ums/tfp410/tfp410_module.c | 38 +
src/legacy/ums/tfp410/tfp410_reg.h | 91 +
src/legacy/ums/ums.h | 1021 ++++++
src/legacy/ums/ums_accel.c | 284 ++
src/legacy/ums/ums_batchbuffer.c | 204 ++
src/legacy/ums/ums_batchbuffer.h | 160 +
src/legacy/ums/ums_bios.c | 406 +++
src/legacy/ums/ums_bios.h | 632 ++++
src/legacy/ums/ums_common.h | 190 ++
src/legacy/ums/ums_crt.c | 557 ++++
src/legacy/ums/ums_cursor.c | 321 ++
src/legacy/ums/ums_debug.c | 1903 +++++++++++
src/legacy/ums/ums_debug.h | 33 +
src/legacy/ums/ums_display.c | 2428 ++++++++++++++
src/legacy/ums/ums_display.h | 42 +
src/legacy/ums/ums_dri.c | 1441 ++++++++
src/legacy/ums/ums_dri.h | 63 +
src/legacy/ums/ums_driver.c | 3096 ++++++++++++++++++
src/legacy/ums/ums_drmmode_display.c | 1364 ++++++++
src/legacy/ums/ums_dvo.c | 521 +++
src/legacy/ums/ums_exa.c | 468 +++
src/legacy/ums/ums_hdmi.c | 368 +++
src/legacy/ums/ums_hwmc.c | 159 +
src/legacy/ums/ums_hwmc.h | 113 +
src/legacy/ums/ums_i2c.c | 392 +++
src/legacy/ums/ums_i2c_vid.h | 132 +
src/legacy/ums/ums_i810_reg.h | 3444 ++++++++++++++++++++
src/legacy/ums/ums_i830_3d.c | 251 ++
src/legacy/ums/ums_i830_common.h | 242 ++
src/legacy/ums/ums_i830_reg.h | 747 +++++
src/legacy/ums/ums_i830_render.c | 807 +++++
src/legacy/ums/ums_i915_3d.c | 111 +
src/legacy/ums/ums_i915_3d.h | 435 +++
src/legacy/ums/ums_i915_hwmc.c | 890 +++++
src/legacy/ums/ums_i915_reg.h | 873 +++++
src/legacy/ums/ums_i915_render.c | 722 ++++
src/legacy/ums/ums_i915_video.c | 417 +++
src/legacy/ums/ums_i965_hwmc.c | 320 ++
src/legacy/ums/ums_i965_hwmc.h | 25 +
src/legacy/ums/ums_i965_render.c | 1725 ++++++++++
src/legacy/ums/ums_i965_video.c | 1180 +++++++
src/legacy/ums/ums_io.c | 131 +
src/legacy/ums/ums_lvds.c | 1513 +++++++++
src/legacy/ums/ums_memory.c | 1717 ++++++++++
src/legacy/ums/ums_modes.c | 69 +
src/legacy/ums/ums_quirks.c | 424 +++
src/legacy/ums/ums_ring.h | 93 +
src/legacy/ums/ums_sdvo.c | 2443 ++++++++++++++
src/legacy/ums/ums_sdvo.h | 29 +
src/legacy/ums/ums_sdvo_regs.h | 726 +++++
src/legacy/ums/ums_tv.c | 2042 ++++++++++++
src/legacy/ums/ums_video.c | 2970 +++++++++++++++++
src/legacy/ums/ums_video.h | 93 +
src/legacy/ums/ums_xaa.c | 230 ++
135 files changed, 48174 insertions(+), 151 deletions(-)
More information about the Intel-gfx
mailing list