rpms/xorg-x11-drv-intel/devel copy-fb.patch, NONE, 1.1 import.log, NONE, 1.1 intel-2.1.1-fix-xv-reset.patch, NONE, 1.1 intel-2.5.0-no-gem-legacy-3d.patch, NONE, 1.1 intel-2.5.0-no-legacy-3d.patch, NONE, 1.1 intel-2.6.0-to-170f00.patch, NONE, 1.1 intel.xinf, NONE, 1.1 kill-svideo.patch, NONE, 1.1 xorg-x11-drv-intel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Adam Jackson
ajax at fedoraproject.org
Tue Feb 24 20:51:41 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13433/devel
Modified Files:
.cvsignore sources
Added Files:
copy-fb.patch import.log intel-2.1.1-fix-xv-reset.patch
intel-2.5.0-no-gem-legacy-3d.patch
intel-2.5.0-no-legacy-3d.patch intel-2.6.0-to-170f00.patch
intel.xinf kill-svideo.patch xorg-x11-drv-intel.spec
Log Message:
Rename to xorg-x11-drv-intel
copy-fb.patch:
--- NEW FILE copy-fb.patch ---
>From e65e1eeb74775ab98b9e8912e35fc7ad1af1ffb2 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
Date: Tue, 24 Feb 2009 10:49:45 -0500
Subject: [PATCH 2/2] Copy initial framebuffer contents when starting with -br.
---
src/drmmode_display.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++-
src/i830.h | 1 +
src/i830_driver.c | 2 +
3 files changed, 89 insertions(+), 1 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 5b48bda..527b293 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -29,6 +29,8 @@
#include "config.h"
#endif
+#include <sys/ioctl.h>
+
#include "xorgVersion.h"
#ifdef XF86DRM_MODE
@@ -145,7 +147,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
unsigned int pitch = pScrn->displayWidth * pI830->cpp;
if (drmmode->fb_id == 0) {
- ret = drmModeAddFB(drmmode->fd,
+ ret = drmModeAddFB(drmmode->fd,
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
pitch, pI830->front_buffer->bo->handle,
@@ -733,6 +735,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
xf86InitialConfiguration(pScrn, pI830->can_resize);
+ pScrn->canDoBGNoneRoot = TRUE;
+
return TRUE;
}
@@ -760,4 +764,85 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo)
#endif
}
+static PixmapPtr
+drmmode_create_pixmap_for_fbcon(ScrnInfoPtr pScrn)
+{
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ drmmode_crtc_private_ptr
+ /* FIXME: Find currently active crtc */
+ drmmode_crtc = xf86_config->crtc[1]->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;
+
+ fbcon = drmModeGetFB(drmmode->fd, drmmode_crtc->mode_crtc->buffer_id);
+ if (fbcon == NULL)
+ 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);
+
+ /* 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);
+}
+
#endif
diff --git a/src/i830.h b/src/i830.h
index 7904b9f..74b04e9 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -832,6 +832,7 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
extern Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData,
dri_bo **bo);
+extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
#endif
extern Bool I830AccelInit(ScreenPtr pScreen);
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 0a8a9c6..8aa33b6 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3690,6 +3690,8 @@ I830EnterVT(int scrnIndex, int flags)
/* Clear the framebuffer */
memset(pI830->FbBase + pScrn->fbOffset, 0,
pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
+ } else {
+ drmmode_copy_fb(pScrn);
}
if (!xf86SetDesiredModes (pScrn))
--
1.6.1.3
--- NEW FILE import.log ---
xorg-x11-drv-intel-2_6_0-8_fc11:HEAD:xorg-x11-drv-intel-2.6.0-8.fc11.src.rpm:1235508628
intel-2.1.1-fix-xv-reset.patch:
--- NEW FILE intel-2.1.1-fix-xv-reset.patch ---
diff -up xf86-video-intel-2.4.0/src/i830_video.c.xvfix xf86-video-intel-2.4.0/src/i830_video.c
--- xf86-video-intel-2.4.0/src/i830_video.c.xvfix 2008-07-23 02:14:09.000000000 -0400
+++ xf86-video-intel-2.4.0/src/i830_video.c 2008-08-11 09:14:02.000000000 -0400
@@ -2913,6 +2913,7 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, B
I830StopVideo(pScrn, pPriv, TRUE);
pPriv->current_crtc = NULL;
pPriv->overlayOK = FALSE;
+ pPriv->current_crtc = NULL;
pPriv->oneLineMode = FALSE;
}
}
intel-2.5.0-no-gem-legacy-3d.patch:
--- NEW FILE intel-2.5.0-no-gem-legacy-3d.patch ---
diff -up xf86-video-intel-2.5.99.1/src/i830_memory.c.nogem xf86-video-intel-2.5.99.1/src/i830_memory.c
--- xf86-video-intel-2.5.99.1/src/i830_memory.c.nogem 2008-12-03 15:46:41.000000000 +1000
+++ xf86-video-intel-2.5.99.1/src/i830_memory.c 2008-12-21 08:30:45.000000000 +1000
@@ -522,6 +522,8 @@ i830_allocator_init(ScrnInfoPtr pScrn, u
i830_free_memory(pScrn, pI830->memory_manager);
pI830->memory_manager = NULL;
}
+ } else {
+ pI830->allocate_classic_textures = TRUE;
}
#endif /* XF86DRI */
intel-2.5.0-no-legacy-3d.patch:
--- NEW FILE intel-2.5.0-no-legacy-3d.patch ---
diff -up xf86-video-intel-2.5.99.1/src/i830_driver.c.nogem1 xf86-video-intel-2.5.99.1/src/i830_driver.c
--- xf86-video-intel-2.5.99.1/src/i830_driver.c.nogem1 2008-12-15 11:14:01.000000000 +1000
+++ xf86-video-intel-2.5.99.1/src/i830_driver.c 2008-12-21 08:29:58.000000000 +1000
@@ -3098,7 +3098,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr
if (pI830->directRenderingType == DRI_XF86DRI) {
pI830->allocate_classic_textures =
- xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, TRUE);
+ xf86ReturnOptValBool(pI830->Options, OPTION_LEGACY3D, FALSE);
}
#endif
intel-2.6.0-to-170f00.patch:
--- NEW FILE intel-2.6.0-to-170f00.patch ---
diff --git a/configure.ac b/configure.ac
index bb69f72..a6ced67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.6.0,
+ 2.6.99.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
@@ -105,8 +105,6 @@ if test x$DRI != xno; then
[have_sarea_h="yes"], [have_sarea_h="no"])
AC_CHECK_FILE([${sdkdir}/dristruct.h],
[have_dristruct_h="yes"], [have_dristruct_h="no"])
- AC_CHECK_FILE([${sdkdir}/damage.h],
- [have_damage_h="yes"], [have_damage_h="no"])
fi
AC_MSG_CHECKING([whether to include DRI support])
if test x$DRI = xauto; then
@@ -209,15 +207,12 @@ if test "x$GCC" = "xyes"; then
-Wnested-externs -fno-strict-aliasing"
fi
-PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.3])
+PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.5])
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
- if test "$have_damage_h" = yes; then
- AC_DEFINE(DAMAGE,1,[Use Damage extension])
- fi
fi
dnl exaGetPixmapDriverPrivate required for DRM_MODE.
diff --git a/man/intel.man b/man/intel.man
index 00aa1be..c7a3c61 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -150,26 +150,6 @@ pool. On systems with a working GEM environment, this can be disabled to
increase the memory pool available to other graphics tasks.
Default for i830 and newer: Enabled.
Default for i810: this option is not used.
-.BI "Option \*qPageFlip\*q \*q" boolean \*q
-Enable support for page flipping. This should improve 3D performance at the
-potential cost of worse performance with mixed 2D/3D. Also note that this gives
-no benefit without corresponding support in the Mesa 3D driver and may not give
-the full benefit without triple buffering (see
-.B "Option \*qTripleBuffer\*q"
-).
-Default for i810: The option is not used.
-Default for i830 and above: Disabled (This option is currently unstable).
-.TP
-.BI "Option \*qTripleBuffer\*q \*q" boolean \*q
-Enable support for triple buffering. This should improve 3D performance at the
-potential cost of worse performance with mixed 2D/3D. Also note that this gives
-no benefit without corresponding support in the Mesa 3D driver and may not give
-any benefit without page flipping either (see
-.B "Option \*qPageFlip\*q"
-).
-Default for i810: The option is not used.
-Default for i830 and above: Disabled.
-.TP
.BI "Option \*qAccelMethod\*q \*q" string \*q
Choose acceleration architecture, either "XAA" or "EXA". XAA is the old
XFree86 based acceleration architecture. EXA is a newer and simpler
@@ -222,12 +202,6 @@ information.
Enable XvMC driver. Current support MPEG2 MC on 915/945 and G33 series.
User should provide absolute path to libIntelXvMC.so in XvMCConfig file.
Default: Disabled.
-.TP
-.BI "Option \*qForceSDVODetect\*q \*q" boolean \*q
-Instead of depending on SDVO detect status bit to initialize SDVO outputs,
-this option trys to ignore that status bit and try to probe on all SDVO
-ports anyway. Try this if some output is not detected on your ADD2 card.
-Use of this option will slow down your startup time. Default: Disabled.
.SH OUTPUT CONFIGURATION
On 830M and better chipsets, the driver supports runtime configuration of
diff --git a/src/bios_reader/bios_reader.c b/src/bios_reader/bios_reader.c
index 717f5bf..db8f364 100644
--- a/src/bios_reader/bios_reader.c
+++ b/src/bios_reader/bios_reader.c
@@ -299,6 +299,9 @@ static void dump_lvds_data(void)
struct bdb_lvds_lfp_data *lvds_data;
int num_entries;
int i;
+ int hdisplay, hsyncstart, hsyncend, htotal;
+ int vdisplay, vsyncstart, vsyncend, vtotal;
+ float clock;
block = find_section(BDB_LVDS_LFP_DATA);
if (!block) {
@@ -322,6 +325,17 @@ static void dump_lvds_data(void)
else
marker = ' ';
+ hdisplay = _H_ACTIVE(timing_data);
+ hsyncstart = hdisplay + _H_SYNC_OFF(timing_data);
+ hsyncend = hsyncstart + _H_SYNC_WIDTH(timing_data);
+ htotal = hdisplay + _H_BLANK(timing_data);
+
+ vdisplay = _V_ACTIVE(timing_data);
+ vsyncstart = vdisplay + _V_SYNC_OFF(timing_data);
+ vsyncend = vsyncstart + _V_SYNC_WIDTH(timing_data);
+ vtotal = vdisplay + _V_BLANK(timing_data);
+ clock = _PIXEL_CLOCK(timing_data) / 1000;
+
printf("%c\tpanel type %02i: %dx%d clock %d\n", marker,
i, lfp_data->fp_timing.x_res, lfp_data->fp_timing.y_res,
_PIXEL_CLOCK(timing_data));
@@ -336,15 +350,69 @@ static void dump_lvds_data(void)
(unsigned long)lfp_data->fp_timing.pp_cycle_reg_val);
printf("\t\t PFIT: 0x%08lx\n",
(unsigned long)lfp_data->fp_timing.pfit_reg_val);
- printf("\t\ttimings: %d %d %d %d %d %d %d %d\n",
- _H_ACTIVE(timing_data),
- _H_BLANK(timing_data),
- _H_SYNC_OFF(timing_data),
- _H_SYNC_WIDTH(timing_data),
- _V_ACTIVE(timing_data),
- _V_BLANK(timing_data),
- _V_SYNC_OFF(timing_data),
- _V_SYNC_WIDTH(timing_data));
+ printf("\t\ttimings: %d %d %d %d %d %d %d %d %.2f (%s)\n",
+ hdisplay, hsyncstart, hsyncend, htotal,
+ vdisplay, vsyncstart, vsyncend, vtotal, clock,
+ (hsyncend > htotal || vsyncend > vtotal) ?
+ "BAD!" : "good");
+ }
+ free(block);
+}
+
+static void dump_driver_feature(void)
+{
+ struct bdb_block *block;
+ struct bdb_driver_feature *feature;
+
+ block = find_section(BDB_DRIVER_FEATURES);
+ if (!block) {
+ printf("No Driver feature data block\n");
+ return;
+ }
+ feature = block->data;
+
+ printf("Driver feature Data Block:\n");
+ printf("\tBoot Device Algorithm: %s\n", feature->boot_dev_algorithm ?
+ "driver default": "os default");
+ printf("\tBlock display switching when DVD active: %s\n",
+ YESNO(feature->block_display_switch));
+ printf("\tAllow display switching when in Full Screen DOS: %s\n",
+ YESNO(feature->allow_display_switch));
+ printf("\tHot Plug DVO: %s\n", YESNO(feature->hotplug_dvo));
+ printf("\tDual View Zoom: %s\n", YESNO(feature->dual_view_zoom));
+ printf("\tDriver INT 15h hook: %s\n", YESNO(feature->int15h_hook));
+ printf("\tEnable Sprite in Clone Mode: %s\n", YESNO(feature->sprite_in_clone));
+ printf("\tUse 00000110h ID for Primary LFP: %s\n", YESNO(feature->primary_lfp_id));
+ printf("\tBoot Mode X: %u\n", feature->boot_mode_x);
+ printf("\tBoot Mode Y: %u\n", feature->boot_mode_y);
+ printf("\tBoot Mode Bpp: %u\n", feature->boot_mode_bpp);
+ printf("\tBoot Mode Refresh: %u\n", feature->boot_mode_refresh);
+ printf("\tEnable LFP as primary: %s\n", YESNO(feature->enable_lfp_primary));
+ printf("\tSelective Mode Pruning: %s\n", YESNO(feature->selective_mode_pruning));
+ printf("\tDual-Frequency Graphics Technology: %s\n", YESNO(feature->dual_frequency));
+ printf("\tDefault Render Clock Frequency: %s\n", feature->render_clock_freq ? "low" : "high");
+ printf("\tNT 4.0 Dual Display Clone Support: %s\n", YESNO(feature->nt_clone_support));
+ printf("\tDefault Power Scheme user interface: %s\n", feature->power_scheme_ui ? "3rd party":"CUI");
+ printf("\tSprite Display Assignment when Overlay is Active in Clone Mode: %s\n",
+ feature->sprite_display_assign ? "primary" : "secondary");
+ printf("\tDisplay Maintain Aspect Scaling via CUI: %s\n", YESNO(feature->cui_aspect_scaling));
+ printf("\tPreserve Aspect Ratio: %s\n", YESNO(feature->preserve_aspect_ratio));
+ printf("\tEnable SDVO device power down: %s\n", YESNO(feature->sdvo_device_power_down));
+ printf("\tCRT hotplug: %s\n", YESNO(feature->crt_hotplug));
+ printf("\tLVDS config: ");
+ switch (feature->lvds_config) {
+ case BDB_DRIVER_NO_LVDS:
+ printf("No LVDS\n");
+ break;
+ case BDB_DRIVER_INTER_LVDS:
+ printf("Integrated LVDS\n");
+ break;
+ case BDB_DRIVER_SDVO_LVDS:
+ printf("SDVO LVDS\n");
+ break;
+ case BDB_DRIVER_ALL_LVDS:
+ printf("Both Integrated LVDS and SDVO LVDS\n");
+ break;
}
free(block);
}
@@ -423,5 +491,7 @@ int main(int argc, char **argv)
dump_lvds_data();
dump_lvds_ptr_data();
+ dump_driver_feature();
[...6617 lines suppressed...]
- uxa_print_composite_fallback (op, pSrc, pMask, pDst);
-#endif
+ if (uxa_screen->fallback_debug)
+ uxa_print_composite_fallback (op, pSrc, pMask, pDst);
uxa_check_composite (op, pSrc, pMask, pDst, xSrc, ySrc,
xMask, yMask, xDst, yDst, width, height);
diff --git a/uxa/uxa-unaccel.c b/uxa/uxa-unaccel.c
index aba12e8..8f86468 100644
--- a/uxa/uxa-unaccel.c
+++ b/uxa/uxa-unaccel.c
@@ -68,18 +68,18 @@ uxa_finish_access_gc(GCPtr pGC)
uxa_finish_access(&pGC->stipple->drawable);
}
-#if DEBUG_TRACE_FALL
char
uxa_drawable_location(DrawablePtr pDrawable)
{
return uxa_drawable_is_offscreen(pDrawable) ? 's' : 'm';
}
-#endif /* DEBUG_TRACE_FALL */
void
uxa_check_fill_spans (DrawablePtr pDrawable, GCPtr pGC, int nspans,
DDXPointPtr ppt, int *pwidth, int fSorted)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
if (uxa_prepare_access_gc (pGC)) {
@@ -94,6 +94,8 @@ void
uxa_check_set_spans (DrawablePtr pDrawable, GCPtr pGC, char *psrc,
DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
fbSetSpans (pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted);
@@ -106,6 +108,8 @@ uxa_check_put_image (DrawablePtr pDrawable, GCPtr pGC, int depth,
int x, int y, int w, int h, int leftPad, int format,
char *bits)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
fbPutImage (pDrawable, pGC, depth, x, y, w, h, leftPad, format, bits);
@@ -117,6 +121,7 @@ RegionPtr
uxa_check_copy_area (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
int srcx, int srcy, int w, int h, int dstx, int dsty)
{
+ ScreenPtr screen = pSrc->pScreen;
RegionPtr ret = NULL;
UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
@@ -136,6 +141,7 @@ uxa_check_copy_plane (DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
int srcx, int srcy, int w, int h, int dstx, int dsty,
unsigned long bitPlane)
{
+ ScreenPtr screen = pSrc->pScreen;
RegionPtr ret = NULL;
UXA_FALLBACK(("from %p to %p (%c,%c)\n", pSrc, pDst,
@@ -155,6 +161,8 @@ void
uxa_check_poly_point (DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
DDXPointPtr pptInit)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
fbPolyPoint (pDrawable, pGC, mode, npt, pptInit);
@@ -166,6 +174,8 @@ void
uxa_check_poly_lines (DrawablePtr pDrawable, GCPtr pGC,
int mode, int npt, DDXPointPtr ppt)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c), width %d, mode %d, count %d\n",
pDrawable, uxa_drawable_location(pDrawable),
pGC->lineWidth, mode, npt));
@@ -188,6 +198,8 @@ void
uxa_check_poly_segment (DrawablePtr pDrawable, GCPtr pGC,
int nsegInit, xSegment *pSegInit)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c) width %d, count %d\n", pDrawable,
uxa_drawable_location(pDrawable), pGC->lineWidth, nsegInit));
if (pGC->lineWidth == 0) {
@@ -208,6 +220,8 @@ void
uxa_check_poly_arc (DrawablePtr pDrawable, GCPtr pGC,
int narcs, xArc *pArcs)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
/* Disable this as fbPolyArc can call miZeroPolyArc which in turn
@@ -234,6 +248,8 @@ void
uxa_check_poly_fill_rect (DrawablePtr pDrawable, GCPtr pGC,
int nrect, xRectangle *prect)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
@@ -250,6 +266,8 @@ uxa_check_image_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
CharInfoPtr *ppci, pointer pglyphBase)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c)\n", pDrawable,
uxa_drawable_location(pDrawable)));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
@@ -266,6 +284,8 @@ uxa_check_poly_glyph_blt (DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
CharInfoPtr *ppci, pointer pglyphBase)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,
uxa_drawable_location(pDrawable), pGC->fillStyle, pGC->alu));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RW)) {
@@ -282,6 +302,8 @@ uxa_check_push_pixels (GCPtr pGC, PixmapPtr pBitmap,
DrawablePtr pDrawable,
int w, int h, int x, int y)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("from %p to %p (%c,%c)\n", pBitmap, pDrawable,
uxa_drawable_location(&pBitmap->drawable),
uxa_drawable_location(pDrawable)));
@@ -305,6 +327,8 @@ uxa_check_get_spans (DrawablePtr pDrawable,
int nspans,
char *pdstStart)
{
+ ScreenPtr screen = pDrawable->pScreen;
+
UXA_FALLBACK(("from %p (%c)\n", pDrawable, uxa_drawable_location(pDrawable)));
if (uxa_prepare_access (pDrawable, UXA_ACCESS_RO)) {
fbGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
@@ -326,6 +350,8 @@ uxa_check_composite (CARD8 op,
CARD16 width,
CARD16 height)
{
+ ScreenPtr screen = pDst->pDrawable->pScreen;
+
UXA_FALLBACK(("from picts %p/%p to pict %p\n",
pSrc, pMask, pDst));
@@ -366,7 +392,9 @@ uxa_check_add_traps (PicturePtr pPicture,
int ntrap,
xTrap *traps)
{
- UXA_FALLBACK(("to pict %p (%c)\n",
+ ScreenPtr screen = pPicture->pDrawable->pScreen;
+
+ UXA_FALLBACK(("to pict %p (%c)\n", pPicture,
uxa_drawable_location(pPicture->pDrawable)));
if (uxa_prepare_access(pPicture->pDrawable, UXA_ACCESS_RW)) {
fbAddTraps (pPicture, x_off, y_off, ntrap, traps);
diff --git a/uxa/uxa.c b/uxa/uxa.c
index 4aeb5e4..0de408c 100644
--- a/uxa/uxa.c
+++ b/uxa/uxa.c
@@ -346,6 +346,14 @@ uxa_xorg_enable_disable_fb_access (int index, Bool enable)
uxa_screen->SavedEnableDisableFBAccess(index, enable);
}
+void
+uxa_set_fallback_debug (ScreenPtr screen, Bool enable)
+{
+ uxa_screen_t *uxa_screen = uxa_get_screen(screen);
+
+ uxa_screen->fallback_debug = enable;
+}
+
/**
* uxa_close_screen() unwraps its wrapped screen functions and tears down UXA's
* screen private, before calling down to the next CloseSccreen.
diff --git a/uxa/uxa.h b/uxa/uxa.h
index f1c1cfa..8f6f896 100644
--- a/uxa/uxa.h
+++ b/uxa/uxa.h
@@ -517,6 +517,9 @@ uxa_driver_fini(ScreenPtr pScreen);
CARD32
uxa_get_pixmap_first_pixel (PixmapPtr pPixmap);
+void
+uxa_set_fallback_debug (ScreenPtr screen, Bool enable);
+
/**
* Returns TRUE if the given planemask covers all the significant bits in the
* pixel values for pDrawable.
--- NEW FILE intel.xinf ---
alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* intel # i815
alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* intel # 845G
alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* intel # 865G
alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* intel # 915G
alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* intel # E7221G ("915G")
alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* intel # 915GM
alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* intel # 945G
alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* intel # 945GM
alias pcivideo:v00008086d000027AEsv*sd*bc*sc*i* intel # 945GME
alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* intel # 946GZ, really a 965
alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* intel # 965G1
alias pcivideo:v00008086d00002992sv*sd*bc*sc*i* intel # 965Q
alias pcivideo:v00008086d000029A2sv*sd*bc*sc*i* intel # 965G
alias pcivideo:v00008086d000029B2sv*sd*bc*sc*i* intel # Q35
alias pcivideo:v00008086d000029C2sv*sd*bc*sc*i* intel # G33
alias pcivideo:v00008086d000029D2sv*sd*bc*sc*i* intel # Q33
alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel # 965GM
alias pcivideo:v00008086d00002A12sv*sd*bc*sc*i* intel # 965GME
alias pcivideo:v00008086d00002A42sv*sd*bc*sc*i* intel # GM45
alias pcivideo:v00008086d00002e02sv*sd*bc*sc*i* intel # IGD_E_G
alias pcivideo:v00008086d00002e12sv*sd*bc*sc*i* intel # Q45
alias pcivideo:v00008086d00002e22sv*sd*bc*sc*i* intel # G45
alias pcivideo:v00008086d00002e32sv*sd*bc*sc*i* intel # G41
alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* intel # i830
alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* intel # 855GM
alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* intel # i810
alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* intel # i810 DC100
alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* intel # i810E
kill-svideo.patch:
--- NEW FILE kill-svideo.patch ---
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d50e640..d6c7cd3 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -412,6 +412,18 @@ drmmode_output_detect(xf86OutputPtr output)
drmmode_output->mode_output =
drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
+ switch (drmmode_output->mode_output->connector_type) {
+ case DRM_MODE_CONNECTOR_SVIDEO:
+ /* FIXME: KMS svideo detection is flaky an causes X to
+ * come up in 1024x768 when it tries to pick a clone
+ * mode that fits both the panel and the tv out. Once
+ * KMS learns how to detect svideo better we can
+ * remove this. */
+ return DRM_MODE_DISCONNECTED;
+ default:
+ break;
+ }
+
switch (drmmode_output->mode_output->connection) {
case DRM_MODE_CONNECTED:
status = XF86OutputStatusConnected;
--- NEW FILE xorg-x11-drv-intel.spec ---
%define legacyname xorg-x11-drv-i810
%define legacyver 2.6.0-8
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
%define batchbuffer_version 2.2.0-219-gc9676d0
Summary: Xorg X11 Intel video driver(s)
Name: xorg-x11-drv-intel
Version: 2.6.0
Release: 8%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
# Update git snapshot by saying make dist distdir=$(git-describe) from
# the intel-batchbuffer branch.
#Source1: xf86-video-intel-%{batchbuffer_version}.tar.bz2
Source2: intel.xinf
Patch1: intel-2.6.0-to-170f00.patch
Patch3: intel-2.1.1-fix-xv-reset.patch
Patch5: intel-2.5.0-no-legacy-3d.patch
Patch6: intel-2.5.0-no-gem-legacy-3d.patch
Patch7: kill-svideo.patch
Patch8: copy-fb.patch
ExclusiveArch: %{ix86} x86_64 ia64
BuildRequires: autoconf automake libtool
BuildRequires: xorg-x11-server-devel >= 1.4.99.1
BuildRequires: libXvMC-devel
BuildRequires: mesa-libGL-devel >= 6.5-9
BuildRequires: libdrm-devel >= 2.4.3
BuildRequires: kernel-headers
Requires: hwdata
Requires: xorg-x11-server-Xorg >= 1.4.99.1
Conflicts: kudzu < 1.2.42-1
Provides: %{legacyname} = %{legacyver}
Obsoletes: %{legacyname} < %{legacyver}
%description
X.Org X11 Intel video driver.
%package devel
Summary: Xorg X11 Intel video driver XvMC development package
Group: Development/System
Requires: %{name} = %{version}-%{release}
Provides: xorg-x11-drv-intel-devel = %{version}-%{release}
Provides: %{legacyname}-devel = %{legacyver}
Obsoletes: %{legacyname}-devel < %{legacyver}
%description devel
X.Org X11 Intel video driver XvMC development package.
%prep
%setup -q -n xf86-video-intel-%{version}
%patch1 -p1 -b .master
%patch3 -p1 -b .xvfix
%patch5 -p1 -b .nolegacy3d
%patch6 -p1 -b .nogem3d
%patch7 -p1 -b .svideo
%patch8 -p1 -b .copy-fb
%build
autoreconf -vi
%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
make
# Build the wrapper driver that lets us load either intel_master or
# intel_batchbuffer driver as just 'intel'
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{driverdir}/i810_drv.so
%{driverdir}/intel_drv.so
%{driverdir}/ch7xxx.so
%{driverdir}/sil164.so
%{driverdir}/ch7017.so
%{driverdir}/ivch.so
%{driverdir}/tfp410.so
%{_datadir}/hwdata/videoaliases/intel.xinf
%{_libdir}/libI810XvMC.so.1*
%{_libdir}/libIntelXvMC.so.1*
%{_mandir}/man4/i*
%files devel
%defattr(-,root,root,-)
%{_libdir}/libI810XvMC.so
%{_libdir}/libIntelXvMC.so
%changelog
* Tue Feb 24 2009 Adam Jackson <ajax at redhat.com> 2.6.0-8
- Rename to xorg-x11-drv-intel
* Tue Feb 24 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-7
- Update to git master, pull in patches to kill svideo and copy fb contents.
* Wed Feb 18 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-6
- Update to git master again, fixes Xv and xgamma.
* Fri Feb 13 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-5
- Add patch.
* Fri Feb 13 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-4
- Update snapshot to pull in KMS framebuffer resize.
* Sun Feb 08 2009 Adam Jackson <ajax at redhat.com> 2.6.0-3
- Bump libdrm BR. (#480299)
* Thu Jan 29 2009 Kristian Høgsberg <krh at hinata> - 2.6.0-2
- Update to 66bc44 from git master.
* Tue Jan 20 2009 Kristian Høgsberg <krh at kabuto.bos.redhat.com> 2.6.0-1
- Update to 2.6.0.
* Mon Dec 29 2008 Dave Airlie <airlied at redhat.com> 2.5.99.1-0.3
- enable KMS code in driver
* Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 2.5.99.1-0.2
- rebuild for new server API
* Sun Dec 21 2008 Dave Airlie <airlied at redhat.com> 2.5.99.1-0.1
- intel rebase to upstream release + master fixes
* Mon Nov 10 2008 Adam Jackson <ajax at redhat.com> 2.5.0-3
- intel-2.4.2-dell-quirk.patch: No LVDS on Dell Studio Hybrid.
* Fri Oct 31 2008 Dave Airlie <airlied at redhat.com> 2.5.0-2
- disable legacy 3D allocation now we have GEM.
* Tue Oct 21 2008 Dave Airlie <airlied at redhat.com> 2.5.0-1
- rebase to Intel 2.5.0 release
* Tue Oct 14 2008 Dave Airlie <airlied at redhat.com> 2.4.2-12
- intel-2.4.2-cantiga-fix.patch - hopefully fix cantiga
* Tue Oct 14 2008 Adam Jackson <ajax at redhat.com> 2.4.2-11
- intel-2.4.2-macmini-fix.patch: Fix a segfault on Mac Mini.
* Tue Oct 14 2008 Dave Airlie <airlied at redhat.com> 2.4.2-10
- rebase to latest upstream master
* Wed Oct 01 2008 Dave Airlie <airlied at redhat.com> 2.4.2-9
- rebase to upstream for new libdrm interfaces
* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 2.4.2-8
- Remove the fb size hack, since there is a fix in the server now.
* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 2.4.2-7
- Do the fb size hack a different terrible way.
* Tue Sep 09 2008 Dave Airlie <airlied at redhat.com> 2.4.2-6
- fix typo in drmmode display.c
* Mon Sep 08 2008 Adam Jackson <ajax at redhat.com> 2.4.2-5
- intel-2.4.2-fb-size.patch: Yet more lame heuristics to preallocate a
usable framebuffer for laptops. (#458864)
* Mon Sep 08 2008 Dave Airlie <airlied at redhat.com> 2.4.2-4
- Add patch from fd.o bug 17341 to fix problems on intel EXA
* Wed Sep 03 2008 Dave Airlie <airlied at redhat.com> 2.4.2-3
- intel-fix-irq.patch - Don't die on irq handler failure
- I think krh DRI2 patches broke it.
* Thu Aug 28 2008 Dave Airlie <airlied at redhat.com> 2.4.2-2
- upgrade to git head - brings in modesetting + GEM bits - fix flip
* Tue Aug 26 2008 Adam Jackson <ajax at redhat.com> 2.4.2-1
- intel 2.4.2.
* Tue Aug 12 2008 Adam Jackson <ajax at redhat.com> 2.4.0-2
- Fix module loading. D'oh.
* Mon Aug 11 2008 Adam Jackson <ajax at redhat.com> 2.4.0-1
- intel 2.4.0.
- Switch back to EXA by default. Let's see if it works this time.
* Tue Apr 8 2008 Bill Nottingham <notting at redhat.com> - 2.2.1-20
- disable framebuffer compression by default (fdo #13326)
* Wed Apr 2 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-19
- Rebase batchbuffer driver to pull in fix for EAGAIN handling around
batchbuffer submit ioctl.
* Wed Apr 2 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-18
- Tweak intel-stub.c and batchbuffer branch to read options from
server flags section too.
* Tue Apr 1 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-17
- Add new snapshot of the batchbuffer driver to go with the DRI2 changes.
- Add "DRI2" as a server layout options to enable batchbuffer and DRI2.
* Tue Apr 01 2008 Adam Jackson <ajax at redhat.com> 2.2.1-16
- intel-stub.c: Remember the i810 users! (#439845)
* Tue Mar 25 2008 Jeremy Katz <katzj at redhat.com> - 2.2.1-15
- Add jbarnes's backlight test patch
* Tue Mar 18 2008 Dave Airlie <airlied at redhat.com> 2.2.1-14
- make XAA default for now so installer can be run on 965 hw
* Tue Mar 18 2008 Dave Airlie <airlied at redhat.com> 2.2.1-13
- fix modesetting for normal DRI codepath
* Fri Mar 14 2008 Dave Airlie <airlied at redhat.com> 2.2.1-12
- fix modesetting vt switch to not hit the non-existant ring
* Wed Mar 12 2008 Dave Airlie <airlied at redhat.com> 2.2.1-11
- fall intel master driver back to non-TTM mode avoids compiz fail
* Mon Mar 10 2008 Dave Airlie <airlied at redhat.com> 2.2.1-10
- quirk Motion Computing M1200
* Fri Mar 07 2008 Dave Airlie <airlied at redhat.com> 2.2.1-9
- update modesetting patch to include 965 video + fix for memory
space leak
* Fri Mar 07 2008 Dave Airlie <airlied at redhat.com> 2.2.1-8
- fixup pciaccess version check and autoconf and fallout
* Fri Mar 07 2008 Dave Airlie <airlied at redhat.com> 2.2.1-7
- re-run autoconf to build modesetting with batchbuffer
* Thu Mar 06 2008 Dave Airlie <airlied at redhat.com> 2.2.1-6
- fix modesetting to start on i965 chips
* Thu Mar 06 2008 Dave Airlie <airlied at redhat.com> 2.2.1-5
- Bump to include modesetting driver - and make stub auto pick
batchbuffer branch if modesetting enabled
* Mon Mar 3 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-4
- Bump intel-batchbuffer to latest snapshot, rebuild against new server ABI.
* Mon Mar 03 2008 Dave Airlie <airlied at redhat.com> 2.2.1-3
- update for new server abi
* Thu Feb 28 2008 Adam Jackson <ajax at redhat.com> 2.2.1-2
- intel-2.1.1-efi.patch: Fix SDVO I2C on Mac Mini in EFI mode.
* Wed Feb 27 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-1
- Bump to 2.2.1, include build of the intel-batchbuffer branch.
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.0-4
- Autorebuild for GCC 4.3
* Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.2.0-3
- Rebuild for new server ABI.
- intel-2.2.0-alloca.patch: Fix use of {DE,}ALLOCATE_LOCAL.
* Mon Dec 10 2007 Dave Airlie <airlied at redhat.com> 2.2.0-2
- hook up ch7017 (bz#408471)
* Tue Nov 27 2007 Adam Jackson <ajax at redhat.com> 2.2.0-1
- xf86-video-intel 2.2.0
* Tue Nov 13 2007 Adam Jackson <ajax at redhat.com> 2.1.99-1
- xf86-video-intel 2.1.99.
- Drop the i810 driver. Time to move on.
- Require xserver 1.4.99.1
* Wed Oct 17 2007 Dave Airlie <airlied at redhat.com> 2.1.1-7
- intel-2.1.1-fix-xv-compiz.patch - update to not crash is we can't get RAM
* Wed Oct 17 2007 Dave Airlie <airlied at redhat.com> 2.1.1-6
- intel-2.1.1-fix-xv-compiz.patch - Real dirty hack to allocate 4MB of RAM
for textured Xv to use as an offscreen pixmap so xv actually works under
compiz - granted it may be unusably slow but at least stuff shows up.
* Mon Oct 15 2007 Dave Airlie <airlied at redhat.com> 2.1.1-5
- intel-2.1.1-fix-vt-switch.patch - Only restore paletter regs on enabled pipes
- intel-2.1.1-fix-xv-reset.patch - Reset XV after mode switch
* Fri Oct 05 2007 Dave Airlie <airlied at redhat.com> 2.1.1-4
- intel-2.1.1-quirk-update.patch - update quirks from master
* Mon Aug 20 2007 Adam Jackson <ajax at redhat.com> 2.1.1-3
- i810.xinf: Flip everything over to -intel by default now. Still install
i810 driver just in case.
* Wed Aug 15 2007 Dave Airlie <airlied at redhat.com> 2.1.1-2
- intel-2.1.1-fix-texoffset-start.patch - shouldn't set texoffsetstart when not using EXA
* Tue Aug 14 2007 Dave Airlie <airlied at redhat.com> 2.1.1-1
- xf86-video-intel 2.1.1.
* Tue Jul 03 2007 Adam Jackson <ajax at redhat.com> 2.1.0-1
- xf86-video-intel 2.1.0.
* Mon Jun 18 2007 Adam Jackson <ajax at redhat.com> 2.0.0-5
- Update Requires and BuildRequires.
* Wed Jun 06 2007 Adam Jackson <ajax at redhat.com> 2.0.0-4
- Update to git master. Many Xv and DVO fixes. Adds support for 945GME,
965GME, G33, Q33, and Q35 chips.
* Mon May 14 2007 Adam Jackson <ajax at redhat.com> 2.0.0-3
- intel-2.0-vblank-power-savings.patch: Disable vblank interrupts when no
DRI clients are active, for better battery life.
* Tue May 01 2007 Adam Jackson <ajax at redhat.com> 2.0.0-2
- Rebuild for final RANDR 1.2 ABI. Fixes segfault at startup. (#238575)
* Mon Apr 23 2007 Adam Jackson <ajax at redhat.com> 2.0.0-1
- xf86-video-intel 2.0.0. Change the version number to match, why not.
- Add a Virtual provides for xorg-x11-drv-intel, since we should probably
rename this at some point.
* Tue Apr 10 2007 Adam Jackson <ajax at redhat.com> 1.6.5-19
- i810.xinf: Move all 965 and 945 chips onto the new driver, as well as
915GM.
* Thu Apr 05 2007 Adam Jackson <ajax at redhat.com> 1.6.5-18
- i810.xinf: More intel whitelisting (#214011, #234877)
* Wed Apr 04 2007 Adam Jackson <ajax at redhat.com> 1.6.5-17
- xf86-video-intel-1.9.94 (RC4). Adds support for 965GM.
- i810.xinf: Point 965GM support at the intel driver since it's not present
in old i810.
* Fri Mar 30 2007 Adam Jackson <ajax at redhat.com> 1.6.5-16
- xf86-video-intel-1.9.93 (RC3).
* Tue Mar 27 2007 Jeremy Katz <katzj at redhat.com> - 1.6.5-15
- fix typo with 945GM pci id from my laptop
* Thu Mar 22 2007 Adam Jackson <ajax at redhat.com> 1.6.5-14
- xf86-video-intel 1.9.92 (RC2).
* Mon Mar 05 2007 Adam Jackson <ajax at redhat.com> 1.6.5-13
- Updated modesetting driver to one that will actually work with a 1.3 server.
* Tue Feb 27 2007 Adam Jackson <ajax at redhat.com> 1.6.5-12
- Nuke %%with_dri, since the arch list exactly matched the ExclusiveArch list
- Remove ivch and ch7017 from the install since they aren't hooked up to the
code anywhere
- Disown the module
* Tue Jan 30 2007 Jeremy Katz <katzj at redhat.com> - 1.6.5-11
- update modesetting driver to git snapshot from today
* Tue Nov 7 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-10
- i965-xv-hang-fix.patch: Backport Xv hang fix for G965.
* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 1.6.5-9
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Fri Sep 22 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-8.fc6
- Change 'Requires: kudzu >= foo' to 'Conflicts: kudzu < foo' since we don't
actually require kudzu to run.
* Fri Sep 15 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-7.fc6
- i810.xinf: Whitelist Apple 945GM machines and Aopen Mini PC onto intel(4)
* Tue Sep 12 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-6.fc6
- i810-1.6.5-to-git-20060911.patch: Backport post-1.6.5 fixes from git.
- i810-match-server-sync-ranges.patch: Make a terrible heuristic in the
driver match the corresponding terrible heuristic in the server.
* Mon Aug 28 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-5.fc6
- intel-945gm-lfp-blacklist.patch: Tweak the Apple blacklist to (hopefully)
correctly distinguish between Mac Mini and Macbook Pro.
* Mon Aug 21 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-4.fc6
- i810.xinf: PCI IDs for i965.
* Thu Aug 17 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-3.fc6
- i810.xinf: Uppercase PCI IDs.
* Fri Aug 10 2006 Adam Jackson <ajackson at redhat.com> 1.6.5-2.fc6
- Update i810 to 1.6.5, should fix DRI.
- Add kuzdu requires.
- i810.xinf: Start whitelisting devices over to intel.
* Wed Aug 9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-3.fc6
- intel-driver-rename.patch: Fix the driver name in more places so it'll,
you know, load.
* Wed Aug 9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-2.fc6
- intel-945gm-lfp-blacklist.patch: At anholt's suggestion, remove the other
LFP special casing in favor of the blacklist.
* Wed Aug 9 2006 Adam Jackson <ajackson at redhat.com> 1.6.4-1.fc6
- Admit defeat, kinda. Package both i810 stable and modesetting drivers.
The modesetting driver is installed as intel_drv.so instead of i810_drv.so,
and is selected with Driver "intel" in xorg.conf. Individual devices will
whitelist over to "intel" until that branch gets merged into head.
- Update the stable branch driver to 1.6.4 from upstream, adds i965 support.
- intel-945gm-lfp-blacklist.patch: Blacklist LFP detection on machines where
the BIOS is known to lie.
* Tue Aug 8 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-14.20060808modeset.fc6
- Today's snapshot: I2C bus creation fix.
* Wed Aug 2 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-13.20060717modeset.fc6
- intel-prune-by-edid-pixclock.patch: Honor the EDID-reported maximum pixel
clock when computing the modes list.
- intel-virtual-sizing-bogon.patch: Don't interpret the size of the display
in centimeters as the size of the display in pixels.
* Mon Jul 24 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-12.20060717modeset.fc6
- Disable spread-spectrum LVDS, various crash and hang fixes, saner output
probing.
* Thu Jul 13 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-11.20060713modeset.fc6
- Update again for a mode comparison bugfix.
* Thu Jul 13 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-10.20060713modeset.fc6
- Update to today's git; crash fixes, better pre-915 support, slightly better
autoconfigurability.
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.6.0-9.20060707modeset.1.fc6
- rebuild
* Tue Jul 11 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-9.20060707modeset
- Fix Revision number to match naming policy.
* Tue Jul 11 2006 Kristian Høgsberg <krh at redhat.com> 1.6.0-8.modeset20060707
- Add back modesetting changes.
* Mon Jul 10 2006 Kristian Høgsberg <krh at redhat.com> 1.6.0-7
- Roll back modesetting changes and build for fc5 aiglx repo.
* Fri Jul 7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6.modeset20060707
- Snapshot of the git modesetting branch.
* Fri Jul 7 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-6
- Update i810.xinf to include entries for E7221 and 945GM.
* Fri Jun 23 2006 Mike A. Harris <mharris at redhat.com> 1.6.0-5
- Add with_dri macro to spec file, and conditionalize build time DRI support
* Fri May 26 2006 Mike A. Harris <mharris at redhat.com> 1.6.0-4
- Added "BuildRequires: libdrm >= 2.0-1" for (#192334), and updated sdk dep
to pick up proto-devel as well.
* Tue May 23 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-3
- Rebuild for 7.1 ABI fix.
* Tue Apr 11 2006 Kristian Høgsberg <krh at redhat.com> 1.6.0-2
- Bump for fc5-bling build.
* Sun Apr 09 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-1
- Update to 1.6.0 from 7.1RC1.
* Tue Apr 04 2006 Kristian Høgsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
- Add patch to add missing #include's, specifically assert.h.
* Wed Mar 22 2006 Kristian Høgsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322
- Update to CVS snapshot of 20060322.
* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.4.1.3-3.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Sat Feb 04 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-3
- Added 8086:2772 mapping to i810.xinf for bug (#178451)
* Fri Feb 03 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-2
- Added 8086:2592 mapping to i810.xinf for bug (#172884)
* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-1
- Updated xorg-x11-drv-i810 to version 1.4.1.3 from X11R7.0
* Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.4.1.2-1
- Updated xorg-x11-drv-i810 to version 1.4.1.2 from X11R7 RC4
- Removed 'x' suffix from manpage dirs to match RC4 upstream.
* Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 1.4.1-1
- Updated xorg-x11-drv-i810 to version 1.4.1 from X11R7 RC2
* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 1.4.0.1-1
- Updated xorg-x11-drv-i810 to version 1.4.0.1 from X11R7 RC1
- Fix *.la file removal.
- Added 'devel' subpackage for XvMC .so
- Added 'BuildRequires: libXvMC-devel' for XvMC drivers.
* Mon Oct 03 2005 Mike A. Harris <mharris at redhat.com> 1.4.0-1
- Update BuildRoot to use Fedora Packaging Guidelines.
- Deglob file manifest.
- Limit "ExclusiveArch" to x86, x86_64, ia64
* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 1.4.0-0
- Initial spec file for i810 video driver generated automatically
by my xorg-driverspecgen script.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Feb 2009 16:05:58 -0000 1.1
+++ .cvsignore 24 Feb 2009 20:51:11 -0000 1.2
@@ -0,0 +1 @@
+xf86-video-intel-2.6.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Feb 2009 16:05:58 -0000 1.1
+++ sources 24 Feb 2009 20:51:11 -0000 1.2
@@ -0,0 +1 @@
+70f23db0f5178f63b4d688e6fc4a43de xf86-video-intel-2.6.0.tar.bz2
More information about the scm-commits
mailing list