From cb33133ef354b77a8cf06b16ce95a0babbe8bc6f Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Tue, 29 Apr 2008 12:36:04 -0700 Subject: i915: fix off by one in VGA save/restore of AR & CR regs Turns out it's important to save/restore AR14 in particular. --- shared-core/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shared-core/i915_drv.h') diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 412a2594..aad74b1c 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -237,10 +237,10 @@ typedef struct drm_i915_private { u8 saveSR[8]; u8 saveGR[25]; u8 saveAR_INDEX; - u8 saveAR[20]; + u8 saveAR[21]; u8 saveDACMASK; u8 saveDACDATA[256*3]; /* 256 3-byte colors */ - u8 saveCR[36]; + u8 saveCR[37]; } drm_i915_private_t; enum intel_chip_family { -- cgit v1.2.3 From 8cd045079e21093437b99cb150b97403e945d2c2 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Fri, 23 May 2008 14:36:05 -0400 Subject: [FreeBSD] Add vblank-rework support and get drivers building. The i915 driver now works again. --- shared-core/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shared-core/i915_drv.h') diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index aad74b1c..b216c814 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -148,11 +148,11 @@ typedef struct drm_i915_private { DRM_SPINTYPE swaps_lock; drm_i915_vbl_swap_t vbl_swaps; unsigned int swaps_pending; - +#if defined(DRI2) /* DRI2 sarea */ struct drm_buffer_object *sarea_bo; struct drm_bo_kmap_obj sarea_kmap; - +#endif /* Register state */ u8 saveLBB; u32 saveDSPACNTR; -- cgit v1.2.3 From e45f95a03b7242115030a74ab27b142bc5c004c4 Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Tue, 27 May 2008 14:55:01 -0700 Subject: [i915] Fix typo in (unused) START_ADDR definition. --- shared-core/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-core/i915_drv.h') diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index b216c814..3c7dd4bc 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -600,7 +600,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define HEAD_WRAP_ONE 0x00200000 #define HEAD_ADDR 0x001FFFFC #define RING_START 0x08 -#define START_ADDR 0x0xFFFFF000 +#define START_ADDR 0xFFFFF000 #define RING_LEN 0x0C #define RING_NR_PAGES 0x001FF000 #define RING_REPORT_MASK 0x00000006 -- cgit v1.2.3 From 0c8a8db1b6c97dd0fad18bd72a1bc56e2a673a10 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 28 May 2008 10:28:13 +1000 Subject: i915: fix BSD bh, DRI2 not uses anywhere else --- shared-core/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-core/i915_drv.h') diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 3c7dd4bc..6421f689 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -148,7 +148,7 @@ typedef struct drm_i915_private { DRM_SPINTYPE swaps_lock; drm_i915_vbl_swap_t vbl_swaps; unsigned int swaps_pending; -#if defined(DRI2) +#if defined(I915_HAVE_BUFFER) /* DRI2 sarea */ struct drm_buffer_object *sarea_bo; struct drm_bo_kmap_obj sarea_kmap; -- cgit v1.2.3