xf86-video-intel: 10 commits - src/common.h src/drmmode_display.c src/i810_driver.c src/i830_3d.c src/i830_accel.c src/i830_batchbuffer.c src/i830_batchbuffer.h src/i830_bios.c src/i830_bios.h src/i830_display.h src/i830_dri.c src/i830_driver.c src/i830.h src/i830_hwmc.c src/i830_memory.c src/i830_render.c src/i830_ring.h src/i830_uxa.c src/i830_video.c src/i830_video.h src/i915_3d.c src/i915_hwmc.c src/i915_render.c src/i915_video.c src/i965_hwmc.c src/i965_render.c src/i965_video.c
Eric Anholt
anholt at kemper.freedesktop.org
Thu Oct 8 15:36:20 PDT 2009
src/common.h | 6
src/drmmode_display.c | 88 ++---
src/i810_driver.c | 2
src/i830.h | 152 ++++-----
src/i830_3d.c | 4
src/i830_accel.c | 48 +-
src/i830_batchbuffer.c | 94 ++---
src/i830_batchbuffer.h | 114 +++----
src/i830_bios.c | 90 ++---
src/i830_bios.h | 2
src/i830_display.h | 10
src/i830_dri.c | 177 +++++------
src/i830_driver.c | 788 ++++++++++++++++++++++++-------------------------
src/i830_hwmc.c | 64 +--
src/i830_memory.c | 375 +++++++++--------------
src/i830_render.c | 348 ++++++++++-----------
src/i830_ring.h | 56 +--
src/i830_uxa.c | 262 ++++++++--------
src/i830_video.c | 643 ++++++++++++++++++++-------------------
src/i830_video.h | 21 -
src/i915_3d.c | 4
src/i915_hwmc.c | 214 ++++++-------
src/i915_render.c | 386 ++++++++++++------------
src/i915_video.c | 87 ++---
src/i965_hwmc.c | 30 -
src/i965_render.c | 408 ++++++++++++-------------
src/i965_video.c | 271 ++++++++--------
27 files changed, 2341 insertions(+), 2403 deletions(-)
New commits:
commit 8b2d2ff0d026eea445a071102a62d782f3bbec78
Author: Eric Anholt <eric at anholt.net>
Date: Wed Oct 7 16:12:25 2009 -0700
Clean up more i830_memory.c madness.
It was cooking up insane alignment values for buffers that new libdrm was
justifiably complaining about, but it turns out we don't need the alignment
values anywhere because the only case they're needed, they're computed
entirely by the kernel. Also, the XVMC code was passing a completely unused
flag in.
diff --git a/src/i830.h b/src/i830.h
index 07b6c8d..7a64f00 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -93,12 +93,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
#define ALWAYS_SYNC 0
#define ALWAYS_FLUSH 0
-enum tile_format {
- TILE_NONE,
- TILE_XMAJOR,
- TILE_YMAJOR
-};
-
#define PITCH_NONE 0
/** Record of a linear allocation in the aperture. */
@@ -115,7 +109,7 @@ struct _i830_memory {
*/
unsigned long size;
- enum tile_format tiling;
+ uint32_t tiling_mode;
/** Pitch value in bytes for tiled surfaces */
unsigned int pitch;
@@ -130,7 +124,6 @@ struct _i830_memory {
/** @} */
dri_bo *bo;
- uint32_t alignment;
uint32_t gem_name;
};
@@ -351,8 +344,7 @@ Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size);
void i830_allocator_fini(ScrnInfoPtr scrn);
i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
unsigned long size, unsigned long pitch,
- unsigned long alignment, int flags,
- enum tile_format tile_format);
+ int flags, uint32_t tile_format);
void i830_describe_allocations(ScrnInfoPtr scrn, int verbosity,
const char *prefix);
void i830_reset_allocations(ScrnInfoPtr scrn);
@@ -376,7 +368,7 @@ int i830_pad_drawable_width(int width, int cpp);
Bool i830_bind_all_memory(ScrnInfoPtr scrn);
unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size);
unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch,
- int format);
+ uint32_t tiling_mode);
void i830_set_max_gtt_map_size(ScrnInfoPtr scrn);
i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn);
@@ -486,7 +478,6 @@ extern const int I830CopyROP[16];
/* Flags for memory allocation function */
#define NEED_PHYSICAL_ADDR 0x00000001
-#define ALIGN_BOTH_ENDS 0x00000002
#define ALLOW_SHARING 0x00000010
#define DISABLE_REUSE 0x00000020
diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
index c365dd5..3471524 100644
--- a/src/i830_hwmc.c
+++ b/src/i830_hwmc.c
@@ -147,7 +147,7 @@ Bool intel_xvmc_init_batch(ScrnInfoPtr scrn)
if (!i830_allocate_xvmc_buffer(scrn, "[XvMC] batch buffer",
&(xvmc_driver->batch), size,
- ALIGN_BOTH_ENDS))
+ 0))
return FALSE;
if (drmAddMap(intel->drmSubFD,
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 957f598..f32abc2 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -122,12 +122,13 @@ unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long siz
* calculate that here.
*/
unsigned long
-i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch, int format)
+i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch,
+ uint32_t tiling_mode)
{
unsigned long i;
- unsigned long tile_width = (format == I915_TILING_Y) ? 128 : 512;
+ unsigned long tile_width = (tiling_mode == I915_TILING_Y) ? 128 : 512;
- if (format == TILE_NONE)
+ if (tiling_mode == I915_TILING_NONE)
return pitch;
/* 965 is flexible */
@@ -140,18 +141,6 @@ i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch, int forma
return i;
}
-/**
- * On some chips, pitch width has to be a power of two tile width, so
- * calculate that here.
- */
-static unsigned long i830_get_fence_alignment(intel_screen_private *intel, unsigned long size)
-{
- if (IS_I965G(intel))
- return 4096;
- else
- return i830_get_fence_size(intel, size);
-}
-
static Bool
i830_check_display_stride(ScrnInfoPtr scrn, int stride, Bool tiling)
{
@@ -298,22 +287,53 @@ void i830_allocator_fini(ScrnInfoPtr scrn)
intel->memory_list = NULL;
}
-static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr scrn, const char *name,
- unsigned long size,
- unsigned long pitch,
- unsigned long align, int flags,
- enum tile_format tile_format)
+/* Allocates video memory at the given size, pitch, alignment and tile format.
+ *
+ * The memory will be bound automatically when the driver is in control of the
+ * VT. When the kernel memory manager is available and compatible with flags
+ * (that is, flags doesn't say that the allocation must include a physical
+ * address), that will be used for the allocation.
+ *
+ * flags:
+ * - NEED_PHYSICAL_ADDR: Allocates the memory physically contiguous, and return
+ * the bus address for that memory.
+ * - NEED_NON-STOLEN: don't allow any part of the memory allocation to lie
+ * within stolen memory
+ * - NEED_LIFETIME_FIXED: don't allow the buffer object to move throughout
+ * the entire Screen lifetime. This means not using buffer objects, which
+ * get their offsets chosen at each EnterVT time.
+ */
+i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
+ unsigned long size, unsigned long pitch,
+ int flags, uint32_t tiling_mode)
{
- intel_screen_private *intel = intel_get_screen_private(scrn);
i830_memory *mem;
- uint32_t bo_tiling_mode = I915_TILING_NONE;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ uint32_t requested_tiling_mode = tiling_mode;
int ret;
+ /* Manage tile alignment and size constraints */
+ if (tiling_mode != I915_TILING_NONE) {
+ /* Only allocate page-sized increments. */
+ size = ALIGN(size, GTT_PAGE_SIZE);
+
+ /* Check for maximum tiled region size */
+ if (IS_I9XX(intel)) {
+ if (size > MB(128))
+ return NULL;
+ } else {
+ if (size > MB(64))
+ return NULL;
+ }
+
+ /* round to size necessary for the fence register to work */
+ size = i830_get_fence_size(intel, size);
+ }
+
assert((flags & NEED_PHYSICAL_ADDR) == 0);
/* Only allocate page-sized increments. */
size = ALIGN(size, GTT_PAGE_SIZE);
- align = i830_get_fence_alignment(intel, size);
mem = xcalloc(1, sizeof(*mem));
if (mem == NULL)
@@ -325,7 +345,7 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr scrn, const char *name,
return NULL;
}
- mem->bo = dri_bo_alloc(intel->bufmgr, name, size, align);
+ mem->bo = dri_bo_alloc(intel->bufmgr, name, size, GTT_PAGE_SIZE);
if (!mem->bo) {
xfree(mem->name);
@@ -337,32 +357,15 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr scrn, const char *name,
mem->offset = -1;
mem->end = -1;
mem->size = size;
- mem->alignment = align;
- mem->tiling = tile_format;
mem->pitch = pitch;
- switch (tile_format) {
- case TILE_XMAJOR:
- bo_tiling_mode = I915_TILING_X;
- break;
- case TILE_YMAJOR:
- bo_tiling_mode = I915_TILING_Y;
- break;
- case TILE_NONE:
- default:
- bo_tiling_mode = I915_TILING_NONE;
- break;
- }
-
- ret = drm_intel_bo_set_tiling(mem->bo, &bo_tiling_mode, pitch);
- if (ret != 0
- || (bo_tiling_mode == I915_TILING_NONE
- && tile_format != TILE_NONE)) {
+ ret = drm_intel_bo_set_tiling(mem->bo, &tiling_mode, pitch);
+ if (ret != 0 || tiling_mode != requested_tiling_mode) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to set tiling on %s: %s\n", mem->name,
ret == 0 ? "rejected by kernel" : strerror(errno));
- mem->tiling = TILE_NONE;
}
+ mem->tiling_mode = tiling_mode;
if (flags & DISABLE_REUSE)
drm_intel_bo_disable_reuse(mem->bo);
@@ -377,57 +380,6 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr scrn, const char *name,
return mem;
}
-/* Allocates video memory at the given size, pitch, alignment and tile format.
- *
- * The memory will be bound automatically when the driver is in control of the
- * VT. When the kernel memory manager is available and compatible with flags
- * (that is, flags doesn't say that the allocation must include a physical
- * address), that will be used for the allocation.
- *
- * flags:
- * - NEED_PHYSICAL_ADDR: Allocates the memory physically contiguous, and return
- * the bus address for that memory.
- * - ALIGN_BOTH_ENDS: after choosing the alignment, align the end offset to
- * @alignment as well.
- * - NEED_NON-STOLEN: don't allow any part of the memory allocation to lie
- * within stolen memory
- * - NEED_LIFETIME_FIXED: don't allow the buffer object to move throughout
- * the entire Screen lifetime. This means not using buffer objects, which
- * get their offsets chosen at each EnterVT time.
- */
-i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
- unsigned long size, unsigned long pitch,
- unsigned long alignment, int flags,
- enum tile_format tile_format)
-{
- i830_memory *mem;
- intel_screen_private *intel = intel_get_screen_private(scrn);
-
- /* Manage tile alignment and size constraints */
- if (tile_format != TILE_NONE) {
- /* Only allocate page-sized increments. */
- size = ALIGN(size, GTT_PAGE_SIZE);
-
- /* Check for maximum tiled region size */
- if (IS_I9XX(intel)) {
- if (size > MB(128))
- return NULL;
- } else {
- if (size > MB(64))
- return NULL;
- }
-
- /* round to size necessary for the fence register to work */
- size = i830_get_fence_size(intel, size);
- alignment = i830_get_fence_alignment(intel, size);
- }
-
- return i830_allocate_memory_bo(scrn, name, size,
- pitch, alignment, flags, tile_format);
-
- return mem;
-}
-
void
i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix)
{
@@ -453,9 +405,9 @@ i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix)
char phys_suffix[32] = "";
char *tile_suffix = "";
- if (mem->tiling == TILE_XMAJOR)
+ if (mem->tiling_mode == I915_TILING_X)
tile_suffix = " X tiled";
- else if (mem->tiling == TILE_YMAJOR)
+ else if (mem->tiling_mode == I915_TILING_Y)
tile_suffix = " Y tiled";
xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
@@ -472,9 +424,9 @@ i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix)
for (mem = intel->bo_list; mem != NULL; mem = mem->next) {
char *tile_suffix = "";
- if (mem->tiling == TILE_XMAJOR)
+ if (mem->tiling_mode == I915_TILING_X)
tile_suffix = " X tiled";
- else if (mem->tiling == TILE_YMAJOR)
+ else if (mem->tiling_mode == I915_TILING_Y)
tile_suffix = " Y tiled";
xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
@@ -527,11 +479,10 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn)
intel_screen_private *intel = intel_get_screen_private(scrn);
unsigned int pitch = scrn->displayWidth * intel->cpp;
unsigned long minspace;
- int align;
long size, fb_height;
int flags;
i830_memory *front_buffer = NULL;
- enum tile_format tile_format = TILE_NONE;
+ uint32_t tiling_mode;
flags = ALLOW_SHARING | DISABLE_REUSE;
@@ -548,30 +499,21 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn)
size = ROUND_TO_PAGE(pitch * fb_height);
- if (intel->tiling)
- tile_format = TILE_XMAJOR;
-
- if (!IsTileable(scrn, pitch))
- tile_format = TILE_NONE;
+ if (intel->tiling && IsTileable(scrn, pitch))
+ tiling_mode = I915_TILING_X;
+ else
+ tiling_mode = I915_TILING_NONE;
- if (!i830_check_display_stride(scrn, pitch, tile_format != TILE_NONE)) {
+ if (!i830_check_display_stride(scrn, pitch,
+ tiling_mode != I915_TILING_NONE)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Front buffer stride %d kB "
"exceed display limit\n", pitch / 1024);
return NULL;
}
- /* Attempt to allocate it tiled first if we have page flipping on. */
- if (tile_format != TILE_NONE) {
- /* XXX: probably not the case on 965 */
- if (IS_I9XX(intel))
- align = MB(1);
- else
- align = KB(512);
- } else
- align = KB(64);
front_buffer = i830_allocate_memory(scrn, "front buffer", size,
- pitch, align, flags, tile_format);
+ pitch, flags, tiling_mode);
if (front_buffer == NULL) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
@@ -599,8 +541,7 @@ static Bool i830_allocate_cursor_buffers(ScrnInfoPtr scrn)
intel->cursor_mem_argb[i] =
i830_allocate_memory(scrn, "ARGB cursor",
HWCURSOR_SIZE_ARGB, PITCH_NONE,
- GTT_PAGE_SIZE, DISABLE_REUSE,
- TILE_NONE);
+ DISABLE_REUSE, I915_TILING_NONE);
if (!intel->cursor_mem_argb[i])
return FALSE;
@@ -667,7 +608,7 @@ Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name,
int flags)
{
*buffer = i830_allocate_memory(scrn, name, size, PITCH_NONE,
- GTT_PAGE_SIZE, flags, TILE_NONE);
+ flags, I915_TILING_NONE);
if (!*buffer) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index e1a45b5..8be52f2 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -316,7 +316,7 @@ static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr scrn,
I915XvMCContextPriv * ctxpriv)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
- int flags = ALIGN_BOTH_ENDS;
+ int flags = 0;
/* on 915G/GM, load indirect can only use physical address...sigh */
if (IS_I915G(intel) || IS_I915GM(intel))
@@ -354,7 +354,7 @@ static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr scrn,
if (!i830_allocate_xvmc_buffer(scrn, "[XvMC]Correction Data Buffer",
&(ctxpriv->mcCorrdata), 512 * 1024,
- ALIGN_BOTH_ENDS)) {
+ 0)) {
return FALSE;
}
@@ -595,7 +595,7 @@ static int i915_xvmc_create_surface(ScrnInfoPtr scrn, XvMCSurfacePtr pSurf,
if (!i830_allocate_xvmc_buffer(scrn, "XvMC surface",
&(sfpriv->surface), bufsize,
- ALIGN_BOTH_ENDS)) {
+ 0)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915 : Failed to allocate XvMC surface space!\n");
xfree(sfpriv);
@@ -687,7 +687,7 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr scrn, XvMCSubpicturePtr pSubp,
if (!i830_allocate_xvmc_buffer(scrn, "XvMC surface",
&(sfpriv->surface), bufsize,
- ALIGN_BOTH_ENDS)) {
+ 0)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] I915XvMCCreateSurface: Failed to allocate XvMC surface space!\n");
xfree(sfpriv);
commit d525a0e993a59e118ab1e8519b3d73465f8f0169
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 19:05:24 2009 -0700
Rename pScreen to screen.
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 1e9c22a..6069382 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -83,8 +83,8 @@ static DRI2BufferPtr
I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments,
int count)
{
- ScreenPtr pScreen = drawable->pScreen;
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScreenPtr screen = drawable->screen;
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2BufferPtr buffers;
dri_bo *bo;
@@ -130,11 +130,11 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments,
if (!intel->tiling)
hint = 0;
- pixmap = (*pScreen->CreatePixmap) (pScreen,
- drawable->width,
- drawable->height,
- drawable->depth,
- hint);
+ pixmap = screen->CreatePixmap(screen,
+ drawable->width,
+ drawable->height,
+ drawable->depth,
+ hint);
}
@@ -165,8 +165,8 @@ static DRI2Buffer2Ptr
I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
unsigned int format)
{
- ScreenPtr pScreen = drawable->pScreen;
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScreenPtr screen = drawable->pScreen;
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2Buffer2Ptr buffer;
dri_bo *bo;
@@ -207,12 +207,12 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
if (!intel->tiling)
hint = 0;
- pixmap = (*pScreen->CreatePixmap) (pScreen,
- drawable->width,
- drawable->height,
- (format !=
- 0) ? format : drawable->depth,
- hint);
+ pixmap = screen->CreatePixmap(screen,
+ drawable->width,
+ drawable->height,
+ (format != 0) ? format :
+ drawable->depth,
+ hint);
}
@@ -240,13 +240,13 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
static void
I830DRI2DestroyBuffers(DrawablePtr drawable, DRI2BufferPtr buffers, int count)
{
- ScreenPtr pScreen = drawable->pScreen;
+ ScreenPtr screen = drawable->pScreen;
I830DRI2BufferPrivatePtr private;
int i;
for (i = 0; i < count; i++) {
private = buffers[i].driverPrivate;
- (*pScreen->DestroyPixmap) (private->pixmap);
+ screen->DestroyPixmap(private->pixmap);
}
if (buffers) {
@@ -261,9 +261,9 @@ static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer)
{
if (buffer) {
I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
- ScreenPtr pScreen = drawable->pScreen;
+ ScreenPtr screen = drawable->pScreen;
- (*pScreen->DestroyPixmap) (private->pixmap);
+ screen->DestroyPixmap(private->pixmap);
xfree(private);
xfree(buffer);
@@ -278,8 +278,8 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
{
I830DRI2BufferPrivatePtr srcPrivate = sourceBuffer->driverPrivate;
I830DRI2BufferPrivatePtr dstPrivate = destBuffer->driverPrivate;
- ScreenPtr pScreen = drawable->pScreen;
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScreenPtr screen = drawable->pScreen;
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
? drawable : &srcPrivate->pixmap->drawable;
@@ -288,9 +288,9 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
RegionPtr pCopyClip;
GCPtr gc;
- gc = GetScratchGC(drawable->depth, pScreen);
- pCopyClip = REGION_CREATE(pScreen, NULL, 0);
- REGION_COPY(pScreen, pCopyClip, pRegion);
+ gc = GetScratchGC(drawable->depth, screen);
+ pCopyClip = REGION_CREATE(screen, NULL, 0);
+ REGION_COPY(screen, pCopyClip, pRegion);
(*gc->funcs->ChangeClip) (gc, CT_REGION, pCopyClip, 0);
ValidateGC(dst, gc);
@@ -363,9 +363,9 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
}
-Bool I830DRI2ScreenInit(ScreenPtr pScreen)
+Bool I830DRI2ScreenInit(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2InfoRec info;
char *p;
@@ -434,14 +434,14 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
info.CopyRegion = I830DRI2CopyRegion;
- return DRI2ScreenInit(pScreen, &info);
+ return DRI2ScreenInit(screen, &info);
}
-void I830DRI2CloseScreen(ScreenPtr pScreen)
+void I830DRI2CloseScreen(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
- DRI2CloseScreen(pScreen);
+ DRI2CloseScreen(screen);
intel->directRenderingType = DRI_NONE;
}
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 898a0f0..47bc4df 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -189,11 +189,11 @@ static OptionInfoRec I830Options[] = {
/* *INDENT-ON* */
static void i830AdjustFrame(int scrnIndex, int x, int y, int flags);
-static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen);
static Bool I830EnterVT(int scrnIndex, int flags);
/* temporary */
-extern void xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y);
+extern void xf86SetCursor(ScreenPtr screen, CursorPtr pCurs, int x, int y);
#ifdef I830DEBUG
void
@@ -329,16 +329,16 @@ I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices,
* have already been created, but the first EnterVT happens before
* CreateScreenResources.
*/
-static Bool i830CreateScreenResources(ScreenPtr pScreen)
+static Bool i830CreateScreenResources(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
- pScreen->CreateScreenResources = intel->CreateScreenResources;
- if (!(*pScreen->CreateScreenResources) (pScreen))
+ screen->CreateScreenResources = intel->CreateScreenResources;
+ if (!(*screen->CreateScreenResources) (screen))
return FALSE;
- i830_uxa_create_screen_resources(pScreen);
+ i830_uxa_create_screen_resources(screen);
return TRUE;
}
@@ -950,16 +950,16 @@ void IntelEmitInvarientState(ScrnInfoPtr scrn)
static void
I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
{
- ScreenPtr pScreen = screenInfo.screens[i];
+ ScreenPtr screen = screenInfo.screens[i];
ScrnInfoPtr scrn = xf86Screens[i];
intel_screen_private *intel = intel_get_screen_private(scrn);
- pScreen->BlockHandler = intel->BlockHandler;
+ screen->BlockHandler = intel->BlockHandler;
- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+ (*screen->BlockHandler) (i, blockData, pTimeout, pReadmask);
- intel->BlockHandler = pScreen->BlockHandler;
- pScreen->BlockHandler = I830BlockHandler;
+ intel->BlockHandler = screen->BlockHandler;
+ screen->BlockHandler = I830BlockHandler;
if (scrn->vtSema) {
Bool flushed = FALSE;
@@ -981,7 +981,7 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
intel->need_mi_flush = FALSE;
}
- i830_uxa_block_handler(pScreen);
+ i830_uxa_block_handler(screen);
I830VideoBlockHandler(i, blockData, pTimeout, pReadmask);
}
@@ -1145,9 +1145,9 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc)
}
static Bool
-I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];;
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];;
intel_screen_private *intel = intel_get_screen_private(scrn);;
VisualPtr visual;
MessageType from;
@@ -1204,7 +1204,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
#ifdef DRI2
if (intel->directRenderingType == DRI_NONE
- && I830DRI2ScreenInit(pScreen))
+ && I830DRI2ScreenInit(screen))
intel->directRenderingType = DRI_DRI2;
#endif
@@ -1272,8 +1272,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
*/
scrn->fbOffset = intel->front_buffer->offset;
- DPRINTF(PFX, "assert( if(!fbScreenInit(pScreen, ...) )\n");
- if (!fbScreenInit(pScreen, NULL,
+ DPRINTF(PFX, "assert( if(!fbScreenInit(screen, ...) )\n");
+ if (!fbScreenInit(screen, NULL,
scrn->virtualX, scrn->virtualY,
scrn->xDpi, scrn->yDpi,
scrn->displayWidth, scrn->bitsPerPixel))
@@ -1281,8 +1281,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (scrn->bitsPerPixel > 8) {
/* Fixup RGB ordering */
- visual = pScreen->visuals + pScreen->numVisuals;
- while (--visual >= pScreen->visuals) {
+ visual = screen->visuals + screen->numVisuals;
+ while (--visual >= screen->visuals) {
if ((visual->class | DynamicClass) == DirectColor) {
visual->offsetRed = scrn->offset.red;
visual->offsetGreen = scrn->offset.green;
@@ -1294,11 +1294,11 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
}
- fbPictureInit(pScreen, NULL, 0);
+ fbPictureInit(screen, NULL, 0);
- xf86SetBlackWhitePixels(pScreen);
+ xf86SetBlackWhitePixels(screen);
- if (!I830AccelInit(pScreen)) {
+ if (!I830AccelInit(screen)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Hardware acceleration initialization failed\n");
return FALSE;
@@ -1311,14 +1311,14 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
else
intel->batch_flush_notify = i830_batch_flush_notify;
- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
- miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+ miInitializeBackingStore(screen);
+ xf86SetBackingStore(screen);
+ xf86SetSilkenMouse(screen);
+ miDCInitialize(screen, xf86GetPointerScreenFuncs());
xf86DrvMsg(scrn->scrnIndex, X_INFO, "Initializing HW Cursor\n");
- if (!xf86_cursors_init(pScreen, I810_CURSOR_X, I810_CURSOR_Y,
+ if (!xf86_cursors_init(screen, I810_CURSOR_X, I810_CURSOR_Y,
(HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |
HARDWARE_CURSOR_INVERT_MASK |
@@ -1338,30 +1338,30 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!I830EnterVT(scrnIndex, 0))
return FALSE;
- intel->BlockHandler = pScreen->BlockHandler;
- pScreen->BlockHandler = I830BlockHandler;
+ intel->BlockHandler = screen->BlockHandler;
+ screen->BlockHandler = I830BlockHandler;
- pScreen->SaveScreen = xf86SaveScreen;
- intel->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = I830CloseScreen;
- intel->CreateScreenResources = pScreen->CreateScreenResources;
- pScreen->CreateScreenResources = i830CreateScreenResources;
+ screen->SaveScreen = xf86SaveScreen;
+ intel->CloseScreen = screen->CloseScreen;
+ screen->CloseScreen = I830CloseScreen;
+ intel->CreateScreenResources = screen->CreateScreenResources;
+ screen->CreateScreenResources = i830CreateScreenResources;
- if (!xf86CrtcScreenInit(pScreen))
+ if (!xf86CrtcScreenInit(screen))
return FALSE;
- DPRINTF(PFX, "assert( if(!miCreateDefColormap(pScreen)) )\n");
- if (!miCreateDefColormap(pScreen))
+ DPRINTF(PFX, "assert( if(!miCreateDefColormap(screen)) )\n");
+ if (!miCreateDefColormap(screen))
return FALSE;
- DPRINTF(PFX, "assert( if(!xf86HandleColormaps(pScreen, ...)) )\n");
- if (!xf86HandleColormaps(pScreen, 256, 8, I830LoadPalette, NULL,
+ DPRINTF(PFX, "assert( if(!xf86HandleColormaps(screen, ...)) )\n");
+ if (!xf86HandleColormaps(screen, 256, 8, I830LoadPalette, NULL,
CMAP_RELOAD_ON_MODE_SWITCH |
CMAP_PALETTED_TRUECOLOR)) {
return FALSE;
}
- xf86DPMSInit(pScreen, xf86DPMSSet, 0);
+ xf86DPMSInit(screen, xf86DPMSSet, 0);
#ifdef INTEL_XVMC
intel->XvMCEnabled = FALSE;
@@ -1373,7 +1373,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
#endif
/* Init video */
if (intel->XvEnabled)
- I830InitVideo(pScreen);
+ I830InitVideo(screen);
/* Setup 3D engine, needed for rotation too */
IntelEmitInvarientState(scrn);
@@ -1503,7 +1503,7 @@ static Bool I830SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
return xf86SetSingleMode(scrn, mode, RR_Rotate_0);
}
-static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
+static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen)
{
ScrnInfoPtr scrn = xf86Screens[scrnIndex];
intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -1513,29 +1513,29 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
}
if (intel->uxa_driver) {
- uxa_driver_fini(pScreen);
+ uxa_driver_fini(screen);
xfree(intel->uxa_driver);
intel->uxa_driver = NULL;
}
if (intel->front_buffer) {
- i830_set_pixmap_bo(pScreen->GetScreenPixmap(pScreen), NULL);
+ i830_set_pixmap_bo(screen->GetScreenPixmap(screen), NULL);
i830_free_memory(scrn, intel->front_buffer);
intel->front_buffer = NULL;
}
- xf86_cursors_fini(pScreen);
+ xf86_cursors_fini(screen);
i830_allocator_fini(scrn);
i965_free_video(scrn);
- pScreen->CloseScreen = intel->CloseScreen;
- (*pScreen->CloseScreen) (scrnIndex, pScreen);
+ screen->CloseScreen = intel->CloseScreen;
+ (*screen->CloseScreen) (scrnIndex, screen);
if (intel->directRenderingOpen
&& intel->directRenderingType == DRI_DRI2) {
intel->directRenderingOpen = FALSE;
- I830DRI2CloseScreen(pScreen);
+ I830DRI2CloseScreen(screen);
}
xf86GARTCloseScreen(scrnIndex);
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index 03d4b17..f4743d0 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -644,22 +644,22 @@ static Bool i830_uxa_destroy_pixmap(PixmapPtr pixmap)
return TRUE;
}
-void i830_uxa_create_screen_resources(ScreenPtr pScreen)
+void i830_uxa_create_screen_resources(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
dri_bo *bo = intel->front_buffer->bo;
if (bo != NULL) {
- PixmapPtr pixmap = pScreen->GetScreenPixmap(pScreen);
+ PixmapPtr pixmap = screen->GetScreenPixmap(screen);
i830_uxa_set_pixmap_bo(pixmap, bo);
dri_bo_reference(bo);
}
}
-Bool i830_uxa_init(ScreenPtr pScreen)
+Bool i830_uxa_init(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
if (!dixRequestPrivate(&uxa_pixmap_index, 0))
@@ -708,17 +708,17 @@ Bool i830_uxa_init(ScreenPtr pScreen)
intel->uxa_driver->finish_access = i830_uxa_finish_access;
intel->uxa_driver->pixmap_is_offscreen = i830_uxa_pixmap_is_offscreen;
- if (!uxa_driver_init(pScreen, intel->uxa_driver)) {
+ if (!uxa_driver_init(screen, intel->uxa_driver)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"UXA initialization failed\n");
xfree(intel->uxa_driver);
return FALSE;
}
- pScreen->CreatePixmap = i830_uxa_create_pixmap;
- pScreen->DestroyPixmap = i830_uxa_destroy_pixmap;
+ screen->CreatePixmap = i830_uxa_create_pixmap;
+ screen->DestroyPixmap = i830_uxa_destroy_pixmap;
- uxa_set_fallback_debug(pScreen, intel->fallback_debug);
+ uxa_set_fallback_debug(screen, intel->fallback_debug);
return TRUE;
}
diff --git a/src/i830_video.c b/src/i830_video.c
index 7c1890d..76055cf 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -366,9 +366,9 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
#endif
}
-void I830InitVideo(ScreenPtr pScreen)
+void I830InitVideo(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
@@ -401,7 +401,7 @@ void I830InitVideo(ScreenPtr pScreen)
*/
if (scrn->bitsPerPixel >= 16 && (IS_I9XX(intel) || IS_I965G(intel)) &&
!(!IS_I965G(intel) && scrn->displayWidth > 2048)) {
- texturedAdaptor = I830SetupImageVideoTextured(pScreen);
+ texturedAdaptor = I830SetupImageVideoTextured(screen);
if (texturedAdaptor != NULL) {
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Set up textured video\n");
@@ -415,7 +415,7 @@ void I830InitVideo(ScreenPtr pScreen)
if (!OVERLAY_NOEXIST(intel) && scrn->bitsPerPixel != 8) {
intel->use_drmmode_overlay = drmmode_has_overlay(scrn);
if (intel->use_drmmode_overlay) {
- overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
+ overlayAdaptor = I830SetupImageVideoOverlay(screen);
if (overlayAdaptor != NULL) {
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Set up overlay video\n");
@@ -439,12 +439,12 @@ void I830InitVideo(ScreenPtr pScreen)
if (intel_xvmc_probe(scrn)) {
if (texturedAdaptor)
xvmc_status =
- intel_xvmc_driver_init(pScreen, texturedAdaptor);
+ intel_xvmc_driver_init(screen, texturedAdaptor);
}
#endif
if (num_adaptors) {
- xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+ xf86XVScreenInit(screen, adaptors, num_adaptors);
} else {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Disabling Xv because no adaptors could be initialized.\n");
@@ -453,7 +453,7 @@ void I830InitVideo(ScreenPtr pScreen)
#ifdef INTEL_XVMC
if (xvmc_status)
- intel_xvmc_screen_init(pScreen);
+ intel_xvmc_screen_init(screen);
#endif
xfree(adaptors);
}
@@ -464,9 +464,9 @@ void I830InitVideo(ScreenPtr pScreen)
#define PFIT_AUTOSCALE_RATIO 0x61238
#define PFIT_PROGRAMMED_SCALE_RATIO 0x61234
-static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
+static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
XF86VideoAdaptorPtr adapt;
intel_adaptor_private *adaptor_priv;
@@ -549,7 +549,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
adaptor_priv->rotation = RR_Rotate_0;
/* gotta uninit this someplace */
- REGION_NULL(pScreen, &adaptor_priv->clip);
+ REGION_NULL(screen, &adaptor_priv->clip);
intel->adaptor = adapt;
@@ -588,7 +588,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
return adapt;
}
-static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
+static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr screen)
{
XF86VideoAdaptorPtr adapt;
XF86AttributePtr attrs;
@@ -653,7 +653,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
adaptor_priv->SyncToVblank = 1;
/* gotta uninit this someplace, XXX: shouldn't be necessary for textured */
- REGION_NULL(pScreen, &adaptor_priv->clip);
+ REGION_NULL(screen, &adaptor_priv->clip);
adapt->pPortPrivates[i].ptr = (pointer) (adaptor_priv);
}
@@ -1320,9 +1320,9 @@ i830_clip_video_helper(ScrnInfoPtr scrn,
/* For textured video, we don't actually want to clip at all. */
if (crtc && !adaptor_priv->textured) {
- REGION_INIT(pScreen, &crtc_region_local, &crtc_box, 1);
+ REGION_INIT(screen, &crtc_region_local, &crtc_box, 1);
crtc_region = &crtc_region_local;
- REGION_INTERSECT(pScreen, crtc_region, crtc_region,
+ REGION_INTERSECT(screen, crtc_region, crtc_region,
reg);
}
*crtc_ret = crtc;
@@ -1330,24 +1330,24 @@ i830_clip_video_helper(ScrnInfoPtr scrn,
ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb,
crtc_region, width, height);
if (crtc_region != reg)
- REGION_UNINIT(pScreen, &crtc_region_local);
+ REGION_UNINIT(screen, &crtc_region_local);
return ret;
}
static void
-i830_fill_colorkey(ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
+i830_fill_colorkey(ScreenPtr screen, uint32_t key, RegionPtr clipboxes)
{
- DrawablePtr root = &WindowTable[pScreen->myNum]->drawable;
+ DrawablePtr root = &WindowTable[screen->myNum]->drawable;
XID pval[2];
BoxPtr pbox = REGION_RECTS(clipboxes);
int i, nbox = REGION_NUM_RECTS(clipboxes);
xRectangle *rects;
GCPtr gc;
- if (!xf86Screens[pScreen->myNum]->vtSema)
+ if (!xf86Screens[screen->myNum]->vtSema)
return;
- gc = GetScratchGC(root->depth, pScreen);
+ gc = GetScratchGC(root->depth, screen);
pval[0] = key;
pval[1] = IncludeInferiors;
(void)ChangeGC(gc, GCForeground | GCSubwindowMode, pval);
@@ -1604,7 +1604,7 @@ I830PutImage(ScrnInfoPtr scrn,
{
intel_screen_private *intel = intel_get_screen_private(scrn);
intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
- ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
+ ScreenPtr screen = screenInfo.screens[scrn->scrnIndex];
PixmapPtr pixmap = get_drawable_pixmap(drawable);
INT32 x1, x2, y1, y2;
int dstPitch;
@@ -1672,7 +1672,7 @@ I830PutImage(ScrnInfoPtr scrn,
/* update cliplist */
if (!REGION_EQUAL(scrn->pScreen, &adaptor_priv->clip, clipBoxes)) {
REGION_COPY(scrn->pScreen, &adaptor_priv->clip, clipBoxes);
- i830_fill_colorkey(pScreen, adaptor_priv->colorKey, clipBoxes);
+ i830_fill_colorkey(screen, adaptor_priv->colorKey, clipBoxes);
}
} else {
if (crtc && adaptor_priv->SyncToVblank != 0) {
commit b6262dcd2754f7e87f27979dcad145133ee3b945
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 19:00:41 2009 -0700
Rename pGC to gc.
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 0cc36ea..1e9c22a 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -286,13 +286,13 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
? drawable : &dstPrivate->pixmap->drawable;
RegionPtr pCopyClip;
- GCPtr pGC;
+ GCPtr gc;
- pGC = GetScratchGC(drawable->depth, pScreen);
+ gc = GetScratchGC(drawable->depth, pScreen);
pCopyClip = REGION_CREATE(pScreen, NULL, 0);
REGION_COPY(pScreen, pCopyClip, pRegion);
- (*pGC->funcs->ChangeClip) (pGC, CT_REGION, pCopyClip, 0);
- ValidateGC(dst, pGC);
+ (*gc->funcs->ChangeClip) (gc, CT_REGION, pCopyClip, 0);
+ ValidateGC(dst, gc);
/* Wait for the scanline to be outside the region to be copied */
if (pixmap_is_scanout(get_drawable_pixmap(dst))
@@ -303,7 +303,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
int pipe = -1, event, load_scan_lines_pipe;
xf86CrtcPtr crtc;
- box = REGION_EXTENTS(unused, pGC->pCompositeClip);
+ box = REGION_EXTENTS(unused, gc->pCompositeClip);
crtc = i830_covering_crtc(scrn, box, NULL, &crtcbox);
/* Make sure the CRTC is valid and this is the real front buffer */
@@ -339,12 +339,12 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
}
}
- (*pGC->ops->CopyArea) (src, dst,
- pGC,
+ (*gc->ops->CopyArea) (src, dst,
+ gc,
0, 0,
drawable->width, drawable->height,
0, 0);
- FreeScratchGC(pGC);
+ FreeScratchGC(gc);
/* Emit a flush of the rendering cache, or on the 965 and beyond
* rendering results may not hit the framebuffer until significantly
commit fdcfeb822d15cbfe6fccceab002b75458dca3264
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 18:57:22 2009 -0700
Rename pDraw to plain old drawable.
diff --git a/src/i830_dri.c b/src/i830_dri.c
index ea3d444..0cc36ea 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -80,9 +80,10 @@ typedef struct {
#ifndef USE_DRI2_1_1_0
static DRI2BufferPtr
-I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
+I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments,
+ int count)
{
- ScreenPtr pScreen = pDraw->pScreen;
+ ScreenPtr pScreen = drawable->pScreen;
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2BufferPtr buffers;
@@ -103,7 +104,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
pDepthPixmap = NULL;
for (i = 0; i < count; i++) {
if (attachments[i] == DRI2BufferFrontLeft) {
- pixmap = get_drawable_pixmap(pDraw);
+ pixmap = get_drawable_pixmap(drawable);
pixmap->refcnt++;
} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
pixmap = pDepthPixmap;
@@ -130,9 +131,10 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
hint = 0;
pixmap = (*pScreen->CreatePixmap) (pScreen,
- pDraw->width,
- pDraw->height,
- pDraw->depth, hint);
+ drawable->width,
+ drawable->height,
+ drawable->depth,
+ hint);
}
@@ -160,10 +162,10 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
#else
static DRI2Buffer2Ptr
-I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
+I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
unsigned int format)
{
- ScreenPtr pScreen = pDraw->pScreen;
+ ScreenPtr pScreen = drawable->pScreen;
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2Buffer2Ptr buffer;
@@ -181,7 +183,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
}
if (attachment == DRI2BufferFrontLeft) {
- pixmap = get_drawable_pixmap(pDraw);
+ pixmap = get_drawable_pixmap(drawable);
pixmap->refcnt++;
} else {
unsigned int hint = 0;
@@ -206,10 +208,10 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
hint = 0;
pixmap = (*pScreen->CreatePixmap) (pScreen,
- pDraw->width,
- pDraw->height,
+ drawable->width,
+ drawable->height,
(format !=
- 0) ? format : pDraw->depth,
+ 0) ? format : drawable->depth,
hint);
}
@@ -236,9 +238,9 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
#ifndef USE_DRI2_1_1_0
static void
-I830DRI2DestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
+I830DRI2DestroyBuffers(DrawablePtr drawable, DRI2BufferPtr buffers, int count)
{
- ScreenPtr pScreen = pDraw->pScreen;
+ ScreenPtr pScreen = drawable->pScreen;
I830DRI2BufferPrivatePtr private;
int i;
@@ -255,11 +257,11 @@ I830DRI2DestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
#else
-static void I830DRI2DestroyBuffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer)
+static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer)
{
if (buffer) {
I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
- ScreenPtr pScreen = pDraw->pScreen;
+ ScreenPtr pScreen = drawable->pScreen;
(*pScreen->DestroyPixmap) (private->pixmap);
@@ -271,22 +273,22 @@ static void I830DRI2DestroyBuffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer)
#endif
static void
-I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
+I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
DRI2BufferPtr destBuffer, DRI2BufferPtr sourceBuffer)
{
I830DRI2BufferPrivatePtr srcPrivate = sourceBuffer->driverPrivate;
I830DRI2BufferPrivatePtr dstPrivate = destBuffer->driverPrivate;
- ScreenPtr pScreen = pDraw->pScreen;
+ ScreenPtr pScreen = drawable->pScreen;
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
- ? pDraw : &srcPrivate->pixmap->drawable;
+ ? drawable : &srcPrivate->pixmap->drawable;
DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
- ? pDraw : &dstPrivate->pixmap->drawable;
+ ? drawable : &dstPrivate->pixmap->drawable;
RegionPtr pCopyClip;
GCPtr pGC;
- pGC = GetScratchGC(pDraw->depth, pScreen);
+ pGC = GetScratchGC(drawable->depth, pScreen);
pCopyClip = REGION_CREATE(pScreen, NULL, 0);
REGION_COPY(pScreen, pCopyClip, pRegion);
(*pGC->funcs->ChangeClip) (pGC, CT_REGION, pCopyClip, 0);
@@ -338,7 +340,10 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
}
(*pGC->ops->CopyArea) (src, dst,
- pGC, 0, 0, pDraw->width, pDraw->height, 0, 0);
+ pGC,
+ 0, 0,
+ drawable->width, drawable->height,
+ 0, 0);
FreeScratchGC(pGC);
/* Emit a flush of the rendering cache, or on the 965 and beyond
diff --git a/src/i830_video.c b/src/i830_video.c
index 0ca03e9..7c1890d 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1588,7 +1588,7 @@ i830_copy_video_data(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv,
* (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
+ * drawable is some 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
@@ -1599,12 +1599,13 @@ I830PutImage(ScrnInfoPtr scrn,
short drw_w, short drw_h,
int id, unsigned char *buf,
short width, short height,
- Bool sync, RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
+ Bool sync, RegionPtr clipBoxes, pointer data,
+ DrawablePtr drawable)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
- PixmapPtr pixmap = get_drawable_pixmap(pDraw);;
+ PixmapPtr pixmap = get_drawable_pixmap(drawable);
INT32 x1, x2, y1, y2;
int dstPitch;
int dstPitch2 = 0;
@@ -1699,7 +1700,7 @@ I830PutImage(ScrnInfoPtr scrn,
pixmap);
}
- DamageDamageRegion(pDraw, clipBoxes);
+ DamageDamageRegion(drawable, clipBoxes);
}
adaptor_priv->videoStatus = CLIENT_VIDEO_ON;
commit 7bbf4ac7137ed0e4ec0a75806a396c12f102e779
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 18:50:54 2009 -0700
Rename the xv pPriv to adaptor_priv to reflect whose private it is.
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 11a75f4..90e5e16 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -98,9 +98,9 @@ void i830_debug_sync(ScrnInfoPtr scrn)
* from the FbInit() function in the SVGA driver, or before ScreenInit
* in a monolithic server.
*/
-Bool I830AccelInit(ScreenPtr pScreen)
+Bool I830AccelInit(ScreenPtr screen)
{
- ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[screen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
/* Limits are described in the BLT engine chapter under Graphics Data Size
@@ -153,5 +153,5 @@ Bool I830AccelInit(ScreenPtr pScreen)
intel->accel_max_y = 2048;
}
- return i830_uxa_init(pScreen);
+ return i830_uxa_init(screen);
}
diff --git a/src/i830_video.c b/src/i830_video.c
index fe9b9bb..0ca03e9 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -247,21 +247,21 @@ static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn)
{
#ifdef DRM_MODE_OVERLAY_LANDED
intel_screen_private *intel = intel_get_screen_private(scrn);
- I830PortPrivPtr pPriv = GET_PORT_PRIVATE(scrn);
+ intel_adaptor_private *adaptor_priv = GET_PORT_PRIVATE(scrn);
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;
+ attrs.brightness = adaptor_priv->brightness;
+ attrs.contrast = adaptor_priv->contrast;
+ attrs.saturation = adaptor_priv->saturation;
+ attrs.color_key = adaptor_priv->colorKey;
+ attrs.gamma0 = adaptor_priv->gamma0;
+ attrs.gamma1 = adaptor_priv->gamma1;
+ attrs.gamma2 = adaptor_priv->gamma2;
+ attrs.gamma3 = adaptor_priv->gamma3;
+ attrs.gamma4 = adaptor_priv->gamma4;
+ attrs.gamma5 = adaptor_priv->gamma5;
ret = drmCommandWriteRead(p830->drmSubFD, DRM_I915_OVERLAY_ATTRS,
&attrs, sizeof(attrs));
@@ -297,7 +297,7 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
{
#ifdef DRM_MODE_OVERLAY_LANDED
intel_screen_private *intel = intel_get_screen_private(scrn);
- I830PortPrivPtr pPriv = GET_PORT_PRIVATE(scrn);
+ intel_adaptor_private *adaptor_priv = GET_PORT_PRIVATE(scrn);
struct drm_intel_overlay_put_image request;
int ret;
int planar = is_planar_fourcc(id);
@@ -305,7 +305,7 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
request.flags = I915_OVERLAY_ENABLE;
- request.bo_handle = pPriv->buf->handle;
+ request.bo_handle = adaptor_priv->buf->handle;
if (planar) {
request.stride_Y = dstPitch * 2;
request.stride_UV = dstPitch;
@@ -313,9 +313,9 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
request.stride_Y = dstPitch;
request.stride_UV = 0;
}
- request.offset_Y = pPriv->YBufOffset;
- request.offset_U = pPriv->UBufOffset;
- request.offset_V = pPriv->VBufOffset;
+ request.offset_Y = adaptor_priv->YBufOffset;
+ request.offset_U = adaptor_priv->UBufOffset;
+ request.offset_V = adaptor_priv->VBufOffset;
OVERLAY_DEBUG("off_Y: %i, off_U: %i, off_V: %i\n", request.offset_Y,
request.offset_U, request.offset_V);
@@ -352,9 +352,9 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
&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;
+ drm_intel_bo_disable_reuse(adaptor_priv->buf);
+ drm_intel_bo_unreference(adaptor_priv->buf);
+ adaptor_priv->buf = NULL;
if (ret != 0) {
OVERLAY_DEBUG("overlay put-image ioctl failed: %i\n", ret);
@@ -469,13 +469,13 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
XF86VideoAdaptorPtr adapt;
- I830PortPrivPtr pPriv;
+ intel_adaptor_private *adaptor_priv;
XF86AttributePtr att;
OVERLAY_DEBUG("I830SetupImageVideoOverlay\n");
if (!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
- sizeof(I830PortPrivRec) + sizeof(DevUnion))))
+ sizeof(intel_adaptor_private) + sizeof(DevUnion))))
return NULL;
adapt->type = XvWindowMask | XvInputMask | XvImageMask;
@@ -493,9 +493,9 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
adapt->nPorts = 1;
adapt->pPortPrivates = (DevUnion *) (&adapt[1]);
- pPriv = (I830PortPrivPtr) (&adapt->pPortPrivates[1]);
+ adaptor_priv = (intel_adaptor_private *)&adapt->pPortPrivates[1];
- adapt->pPortPrivates[0].ptr = (pointer) (pPriv);
+ adapt->pPortPrivates[0].ptr = (pointer) (adaptor_priv);
adapt->nAttributes = NUM_ATTRIBUTES;
adapt->nAttributes += CLONE_ATTRIBUTES;
if (IS_I9XX(intel))
@@ -528,43 +528,43 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
adapt->PutImage = I830PutImage;
adapt->QueryImageAttributes = I830QueryImageAttributes;
- pPriv->textured = FALSE;
- pPriv->colorKey = intel->colorKey & ((1 << scrn->depth) - 1);
- pPriv->videoStatus = 0;
- pPriv->brightness = -19; /* (255/219) * -16 */
- pPriv->contrast = 75; /* 255/219 * 64 */
- pPriv->saturation = 146; /* 128/112 * 128 */
- pPriv->current_crtc = NULL;
- pPriv->desired_crtc = NULL;
- pPriv->buf = NULL;
- 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->rotation = RR_Rotate_0;
+ adaptor_priv->textured = FALSE;
+ adaptor_priv->colorKey = intel->colorKey & ((1 << scrn->depth) - 1);
+ adaptor_priv->videoStatus = 0;
+ adaptor_priv->brightness = -19; /* (255/219) * -16 */
+ adaptor_priv->contrast = 75; /* 255/219 * 64 */
+ adaptor_priv->saturation = 146; /* 128/112 * 128 */
+ adaptor_priv->current_crtc = NULL;
+ adaptor_priv->desired_crtc = NULL;
+ adaptor_priv->buf = NULL;
+ adaptor_priv->oldBuf = NULL;
+ adaptor_priv->oldBuf_pinned = FALSE;
+ adaptor_priv->gamma5 = 0xc0c0c0;
+ adaptor_priv->gamma4 = 0x808080;
+ adaptor_priv->gamma3 = 0x404040;
+ adaptor_priv->gamma2 = 0x202020;
+ adaptor_priv->gamma1 = 0x101010;
+ adaptor_priv->gamma0 = 0x080808;
+
+ adaptor_priv->rotation = RR_Rotate_0;
/* gotta uninit this someplace */
- REGION_NULL(pScreen, &pPriv->clip);
+ REGION_NULL(pScreen, &adaptor_priv->clip);
intel->adaptor = adapt;
/* With LFP's we need to detect whether we're in One Line Mode, which
* essentially means a resolution greater than 1024x768, and fix up
* the scaler accordingly. */
- pPriv->scaleRatio = 0x10000;
- pPriv->oneLineMode = FALSE;
+ adaptor_priv->scaleRatio = 0x10000;
+ adaptor_priv->oneLineMode = FALSE;
/*
- * Initialise pPriv->overlayOK. Set it to TRUE here so that a warning will
- * be generated if i830_crtc_dpms_video() sets it to FALSE during mode
- * setup.
+ * Initialise adaptor_priv->overlayOK. Set it to TRUE here so that a
+ * warning will be generated if i830_crtc_dpms_video() sets it to
+ * FALSE during mode setup.
*/
- pPriv->overlayOK = TRUE;
+ adaptor_priv->overlayOK = TRUE;
xvColorKey = MAKE_ATOM("XV_COLORKEY");
xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
@@ -592,7 +592,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
{
XF86VideoAdaptorPtr adapt;
XF86AttributePtr attrs;
- I830PortPrivPtr portPrivs;
+ intel_adaptor_private *adaptor_privs;
DevUnion *devUnions;
int nports = 16, i;
int nAttributes;
@@ -602,13 +602,13 @@ static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
nAttributes = NUM_TEXTURED_ATTRIBUTES;
adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec));
- portPrivs = xcalloc(nports, sizeof(I830PortPrivRec));
+ adaptor_privs = xcalloc(nports, sizeof(intel_adaptor_private));
devUnions = xcalloc(nports, sizeof(DevUnion));
attrs = xcalloc(nAttributes, sizeof(XF86AttributeRec));
- if (adapt == NULL || portPrivs == NULL || devUnions == NULL ||
+ if (adapt == NULL || adaptor_privs == NULL || devUnions == NULL ||
attrs == NULL) {
xfree(adapt);
- xfree(portPrivs);
+ xfree(adaptor_privs);
xfree(devUnions);
xfree(attrs);
return NULL;
@@ -641,21 +641,21 @@ static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
adapt->QueryImageAttributes = I830QueryImageAttributes;
for (i = 0; i < nports; i++) {
- I830PortPrivPtr pPriv = &portPrivs[i];
+ intel_adaptor_private *adaptor_priv = &adaptor_privs[i];
- pPriv->textured = TRUE;
- pPriv->videoStatus = 0;
- pPriv->buf = NULL;
- pPriv->oldBuf = NULL;
- pPriv->oldBuf_pinned = FALSE;
+ adaptor_priv->textured = TRUE;
+ adaptor_priv->videoStatus = 0;
+ adaptor_priv->buf = NULL;
+ adaptor_priv->oldBuf = NULL;
+ adaptor_priv->oldBuf_pinned = FALSE;
- pPriv->rotation = RR_Rotate_0;
- pPriv->SyncToVblank = 1;
+ adaptor_priv->rotation = RR_Rotate_0;
+ adaptor_priv->SyncToVblank = 1;
/* gotta uninit this someplace, XXX: shouldn't be necessary for textured */
- REGION_NULL(pScreen, &pPriv->clip);
+ REGION_NULL(pScreen, &adaptor_priv->clip);
- adapt->pPortPrivates[i].ptr = (pointer) (pPriv);
+ adapt->pPortPrivates[i].ptr = (pointer) (adaptor_priv);
}
xvSyncToVblank = MAKE_ATOM("XV_SYNC_TO_VBLANK");
@@ -663,43 +663,43 @@ static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
return adapt;
}
-static void i830_free_video_buffers(I830PortPrivPtr pPriv)
+static void i830_free_video_buffers(intel_adaptor_private *adaptor_priv)
{
- if (pPriv->buf) {
- drm_intel_bo_unreference(pPriv->buf);
- pPriv->buf = NULL;
+ if (adaptor_priv->buf) {
+ drm_intel_bo_unreference(adaptor_priv->buf);
+ adaptor_priv->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;
+ if (adaptor_priv->oldBuf) {
+ if (adaptor_priv->oldBuf_pinned)
+ drm_intel_bo_unpin(adaptor_priv->oldBuf);
+ drm_intel_bo_unreference(adaptor_priv->oldBuf);
+ adaptor_priv->oldBuf = NULL;
+ adaptor_priv->oldBuf_pinned = FALSE;
}
}
static void I830StopVideo(ScrnInfoPtr scrn, pointer data, Bool shutdown)
{
- I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+ intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
- if (pPriv->textured)
+ if (adaptor_priv->textured)
return;
OVERLAY_DEBUG("I830StopVideo\n");
- REGION_EMPTY(scrn->pScreen, &pPriv->clip);
+ REGION_EMPTY(scrn->pScreen, &adaptor_priv->clip);
if (shutdown) {
- if (pPriv->videoStatus & CLIENT_VIDEO_ON)
+ if (adaptor_priv->videoStatus & CLIENT_VIDEO_ON)
drmmode_overlay_off(scrn);
- i830_free_video_buffers(pPriv);
- pPriv->videoStatus = 0;
+ i830_free_video_buffers(adaptor_priv);
+ adaptor_priv->videoStatus = 0;
} else {
- if (pPriv->videoStatus & CLIENT_VIDEO_ON) {
- pPriv->videoStatus |= OFF_TIMER;
- pPriv->offTime = currentTime.milliseconds + OFF_DELAY;
+ if (adaptor_priv->videoStatus & CLIENT_VIDEO_ON) {
+ adaptor_priv->videoStatus |= OFF_TIMER;
+ adaptor_priv->offTime = currentTime.milliseconds + OFF_DELAY;
}
}
@@ -709,22 +709,22 @@ static int
I830SetPortAttributeTextured(ScrnInfoPtr scrn,
Atom attribute, INT32 value, pointer data)
{
- I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+ intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
if (attribute == xvBrightness) {
if ((value < -128) || (value > 127))
return BadValue;
- pPriv->brightness = value;
+ adaptor_priv->brightness = value;
return Success;
} else if (attribute == xvContrast) {
if ((value < 0) || (value > 255))
return BadValue;
- pPriv->contrast = value;
+ adaptor_priv->contrast = value;
return Success;
} else if (attribute == xvSyncToVblank) {
if ((value < -1) || (value > 1))
return BadValue;
- pPriv->SyncToVblank = value;
+ adaptor_priv->SyncToVblank = value;
return Success;
} else {
return BadMatch;
@@ -735,48 +735,48 @@ static int
I830SetPortAttributeOverlay(ScrnInfoPtr scrn,
Atom attribute, INT32 value, pointer data)
{
- I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+ intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
intel_screen_private *intel = intel_get_screen_private(scrn);
if (attribute == xvBrightness) {
if ((value < -128) || (value > 127))
return BadValue;
- pPriv->brightness = value;
+ adaptor_priv->brightness = value;
OVERLAY_DEBUG("BRIGHTNESS\n");
} else if (attribute == xvContrast) {
if ((value < 0) || (value > 255))
return BadValue;
- pPriv->contrast = value;
+ adaptor_priv->contrast = value;
OVERLAY_DEBUG("CONTRAST\n");
} else if (attribute == xvSaturation) {
if ((value < 0) || (value > 1023))
return BadValue;
- pPriv->saturation = value;
+ adaptor_priv->saturation = value;
} else if (attribute == xvPipe) {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
if ((value < -1) || (value > xf86_config->num_crtc))
return BadValue;
if (value < 0)
- pPriv->desired_crtc = NULL;
+ adaptor_priv->desired_crtc = NULL;
else
- pPriv->desired_crtc = xf86_config->crtc[value];
+ adaptor_priv->desired_crtc = xf86_config->crtc[value];
/*
* Leave this to be updated at the next frame
*/
} else if (attribute == xvGamma0 && (IS_I9XX(intel))) {
- pPriv->gamma0 = value;
+ adaptor_priv->gamma0 = value;
} else if (attribute == xvGamma1 && (IS_I9XX(intel))) {
- pPriv->gamma1 = value;
+ adaptor_priv->gamma1 = value;
} else if (attribute == xvGamma2 && (IS_I9XX(intel))) {
- pPriv->gamma2 = value;
+ adaptor_priv->gamma2 = value;
} else if (attribute == xvGamma3 && (IS_I9XX(intel))) {
- pPriv->gamma3 = value;
+ adaptor_priv->gamma3 = value;
} else if (attribute == xvGamma4 && (IS_I9XX(intel))) {
- pPriv->gamma4 = value;
+ adaptor_priv->gamma4 = value;
} else if (attribute == xvGamma5 && (IS_I9XX(intel))) {
- pPriv->gamma5 = value;
+ adaptor_priv->gamma5 = value;
} else if (attribute == xvColorKey) {
- pPriv->colorKey = value;
+ adaptor_priv->colorKey = value;
OVERLAY_DEBUG("COLORKEY\n");
} else
return BadMatch;
@@ -794,7 +794,7 @@ I830SetPortAttributeOverlay(ScrnInfoPtr scrn,
drmmode_overlay_update_attrs(scrn);
if (attribute == xvColorKey)
- REGION_EMPTY(scrn->pScreen, &pPriv->clip);
+ REGION_EMPTY(scrn->pScreen, &adaptor_priv->clip);
return Success;
}
@@ -804,39 +804,39 @@ I830GetPortAttribute(ScrnInfoPtr scrn,
Atom attribute, INT32 * value, pointer data)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
- I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+ intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
if (attribute == xvBrightness) {
- *value = pPriv->brightness;
+ *value = adaptor_priv->brightness;
} else if (attribute == xvContrast) {
- *value = pPriv->contrast;
+ *value = adaptor_priv->contrast;
} else if (attribute == xvSaturation) {
- *value = pPriv->saturation;
+ *value = adaptor_priv->saturation;
} else if (attribute == xvPipe) {
int c;
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
for (c = 0; c < xf86_config->num_crtc; c++)
- if (xf86_config->crtc[c] == pPriv->desired_crtc)
+ if (xf86_config->crtc[c] == adaptor_priv->desired_crtc)
break;
if (c == xf86_config->num_crtc)
c = -1;
*value = c;
} else if (attribute == xvGamma0 && (IS_I9XX(intel))) {
- *value = pPriv->gamma0;
+ *value = adaptor_priv->gamma0;
} else if (attribute == xvGamma1 && (IS_I9XX(intel))) {
- *value = pPriv->gamma1;
+ *value = adaptor_priv->gamma1;
} else if (attribute == xvGamma2 && (IS_I9XX(intel))) {
- *value = pPriv->gamma2;
+ *value = adaptor_priv->gamma2;
} else if (attribute == xvGamma3 && (IS_I9XX(intel))) {
- *value = pPriv->gamma3;
+ *value = adaptor_priv->gamma3;
} else if (attribute == xvGamma4 && (IS_I9XX(intel))) {
- *value = pPriv->gamma4;
+ *value = adaptor_priv->gamma4;
} else if (attribute == xvGamma5 && (IS_I9XX(intel))) {
- *value = pPriv->gamma5;
+ *value = adaptor_priv->gamma5;
} else if (attribute == xvColorKey) {
- *value = pPriv->colorKey;
+ *value = adaptor_priv->colorKey;
} else if (attribute == xvSyncToVblank) {
- *value = pPriv->SyncToVblank;
+ *value = adaptor_priv->SyncToVblank;
} else
return BadMatch;
@@ -860,7 +860,7 @@ I830QueryBestSize(ScrnInfoPtr scrn,
}
static void
-I830CopyPackedData(I830PortPrivPtr pPriv,
+I830CopyPackedData(intel_adaptor_private *adaptor_priv,
unsigned char *buf,
int srcPitch, int dstPitch, int top, int left, int h, int w)
{
@@ -876,12 +876,12 @@ I830CopyPackedData(I830PortPrivPtr pPriv,
src = buf + (top * srcPitch) + (left << 1);
- drm_intel_bo_map(pPriv->buf, TRUE);
- dst_base = pPriv->buf->virtual;
+ drm_intel_bo_map(adaptor_priv->buf, TRUE);
+ dst_base = adaptor_priv->buf->virtual;
- dst = dst_base + pPriv->YBufOffset;
+ dst = dst_base + adaptor_priv->YBufOffset;
- switch (pPriv->rotation) {
+ switch (adaptor_priv->rotation) {
case RR_Rotate_0:
w <<= 1;
for (i = 0; i < h; i++) {
@@ -967,7 +967,7 @@ I830CopyPackedData(I830PortPrivPtr pPriv,
break;
}
- drm_intel_bo_unmap(pPriv->buf);
+ drm_intel_bo_unmap(adaptor_priv->buf);
}
static void i830_memcpy_plane(unsigned char *dst, unsigned char *src,
@@ -1021,7 +1021,7 @@ static void i830_memcpy_plane(unsigned char *dst, unsigned char *src,
}
static void
-I830CopyPlanarData(I830PortPrivPtr pPriv,
+I830CopyPlanarData(intel_adaptor_private *adaptor_priv,
unsigned char *buf, int srcPitch,
int srcPitch2, int dstPitch, int srcH, int top, int left,
int h, int w, int id)
@@ -1042,13 +1042,13 @@ I830CopyPlanarData(I830PortPrivPtr pPriv,
(unsigned long)src1 - (unsigned long)buf);
#endif
- drm_intel_bo_map(pPriv->buf, TRUE);
- dst_base = pPriv->buf->virtual;
+ drm_intel_bo_map(adaptor_priv->buf, TRUE);
+ dst_base = adaptor_priv->buf->virtual;
- dst1 = dst_base + pPriv->YBufOffset;
+ dst1 = dst_base + adaptor_priv->YBufOffset;
i830_memcpy_plane(dst1, src1, h, w, dstPitch2, srcPitch,
- pPriv->rotation);
+ adaptor_priv->rotation);
/* Copy V data for YV12, or U data for I420 */
src2 = buf + /* start of YUV data */
@@ -1061,12 +1061,12 @@ I830CopyPlanarData(I830PortPrivPtr pPriv,
(unsigned long)src2 - (unsigned long)buf);
#endif
if (id == FOURCC_I420)
- dst2 = dst_base + pPriv->UBufOffset;
+ dst2 = dst_base + adaptor_priv->UBufOffset;
else
- dst2 = dst_base + pPriv->VBufOffset;
+ dst2 = dst_base + adaptor_priv->VBufOffset;
i830_memcpy_plane(dst2, src2, h / 2, w / 2,
- dstPitch, srcPitch2, pPriv->rotation);
+ dstPitch, srcPitch2, adaptor_priv->rotation);
/* Copy U data for YV12, or V data for I420 */
src3 = buf + /* start of YUV data */
@@ -1079,14 +1079,14 @@ I830CopyPlanarData(I830PortPrivPtr pPriv,
(unsigned long)src3 - (unsigned long)buf);
#endif
if (id == FOURCC_I420)
- dst3 = dst_base + pPriv->VBufOffset;
+ dst3 = dst_base + adaptor_priv->VBufOffset;
else
- dst3 = dst_base + pPriv->UBufOffset;
+ dst3 = dst_base + adaptor_priv->UBufOffset;
i830_memcpy_plane(dst3, src3, h / 2, w / 2,
- dstPitch, srcPitch2, pPriv->rotation);
+ dstPitch, srcPitch2, adaptor_priv->rotation);
- drm_intel_bo_unmap(pPriv->buf);
+ drm_intel_bo_unmap(adaptor_priv->buf);
}
typedef struct {
@@ -1255,7 +1255,7 @@ i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
short drw_h)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
- I830PortPrivPtr pPriv = intel->adaptor->pPortPrivates[0].ptr;
+ intel_adaptor_private *adaptor_priv = intel->adaptor->pPortPrivates[0].ptr;
int tmp;
OVERLAY_DEBUG("I830DisplayVideo: %dx%d (pitch %d)\n", width, height,
@@ -1269,7 +1269,7 @@ i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
* If the video isn't visible on any CRTC, turn it off
*/
if (!crtc) {
- pPriv->current_crtc = NULL;
+ adaptor_priv->current_crtc = NULL;
drmmode_overlay_off(scrn);
return TRUE;
@@ -1296,7 +1296,7 @@ i830_display_overlay(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
static Bool
i830_clip_video_helper(ScrnInfoPtr scrn,
- I830PortPrivPtr pPriv,
+ intel_adaptor_private *adaptor_priv,
xf86CrtcPtr * crtc_ret,
BoxPtr dst,
INT32 * xa,
@@ -1315,11 +1315,11 @@ i830_clip_video_helper(ScrnInfoPtr scrn,
if (crtc_ret) {
BoxRec crtc_box;
xf86CrtcPtr crtc = i830_covering_crtc(scrn, dst,
- pPriv->desired_crtc,
+ adaptor_priv->desired_crtc,
&crtc_box);
/* For textured video, we don't actually want to clip at all. */
- if (crtc && !pPriv->textured) {
+ if (crtc && !adaptor_priv->textured) {
REGION_INIT(pScreen, &crtc_region_local, &crtc_box, 1);
crtc_region = &crtc_region_local;
REGION_INTERSECT(pScreen, crtc_region, crtc_region,
@@ -1410,24 +1410,24 @@ i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pixmap,
}
static Bool
-i830_setup_video_buffer(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
+i830_setup_video_buffer(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv,
int alloc_size, int id)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
/* 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;
+ if (adaptor_priv->buf && adaptor_priv->buf->size < alloc_size) {
+ drm_intel_bo_unreference(adaptor_priv->buf);
+ adaptor_priv->buf = NULL;
}
- if (xvmc_passthrough(id, pPriv->rotation)) {
- i830_free_video_buffers(pPriv);
+ if (xvmc_passthrough(id, adaptor_priv->rotation)) {
+ i830_free_video_buffers(adaptor_priv);
} else {
- if (pPriv->buf == NULL) {
- pPriv->buf = drm_intel_bo_alloc(intel->bufmgr,
+ if (adaptor_priv->buf == NULL) {
+ adaptor_priv->buf = drm_intel_bo_alloc(intel->bufmgr,
"xv buffer", alloc_size,
4096);
- if (pPriv->buf == NULL)
+ if (adaptor_priv->buf == NULL)
return FALSE;
}
}
@@ -1436,7 +1436,7 @@ i830_setup_video_buffer(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
}
static void
-i830_dst_pitch_and_size(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, short width,
+i830_dst_pitch_and_size(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv, short width,
short height, int *dstPitch, int *dstPitch2, int *size,
int id)
{
@@ -1446,7 +1446,7 @@ i830_dst_pitch_and_size(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, short width,
/* Only needs to be DWORD-aligned for textured on i915, but overlay has
* stricter requirements.
*/
- if (pPriv->textured) {
+ if (adaptor_priv->textured) {
pitchAlignMask = 3;
#ifdef INTEL_XVMC
/* for i915 xvmc, hw requires at least 1kb aligned surface */
@@ -1466,7 +1466,7 @@ i830_dst_pitch_and_size(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, short width,
switch (id) {
case FOURCC_YV12:
case FOURCC_I420:
- if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+ if (adaptor_priv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
*dstPitch =
((height / 2) + pitchAlignMask) & ~pitchAlignMask;
*size = *dstPitch * width * 3;
@@ -1479,7 +1479,7 @@ i830_dst_pitch_and_size(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, short width,
case FOURCC_UYVY:
case FOURCC_YUY2:
- if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+ if (adaptor_priv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
*dstPitch =
((height << 1) + pitchAlignMask) & ~pitchAlignMask;
*size = *dstPitch * width;
@@ -1508,7 +1508,7 @@ i830_dst_pitch_and_size(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, short width,
}
static Bool
-i830_copy_video_data(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
+i830_copy_video_data(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv,
short width, short height, int *dstPitch, int *dstPitch2,
INT32 x1, INT32 y1, INT32 x2, INT32 y2,
int id, unsigned char *buf)
@@ -1524,33 +1524,33 @@ i830_copy_video_data(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
srcPitch = width << 1;
}
- i830_dst_pitch_and_size(scrn, pPriv, width, height, dstPitch,
+ i830_dst_pitch_and_size(scrn, adaptor_priv, width, height, dstPitch,
dstPitch2, &size, id);
- if (!i830_setup_video_buffer(scrn, pPriv, size, id))
+ if (!i830_setup_video_buffer(scrn, adaptor_priv, size, id))
return FALSE;
/* fixup pointers */
#ifdef INTEL_XVMC
if (id == FOURCC_XVMC && IS_I915(intel)) {
- pPriv->YBufOffset = (uint32_t) ((uintptr_t) buf);
- pPriv->VBufOffset = pPriv->YBufOffset + (*dstPitch2 * height);
- pPriv->UBufOffset =
- pPriv->VBufOffset + (*dstPitch * height / 2);
+ adaptor_priv->YBufOffset = (uint32_t) ((uintptr_t) buf);
+ adaptor_priv->VBufOffset = adaptor_priv->YBufOffset + (*dstPitch2 * height);
+ adaptor_priv->UBufOffset =
+ adaptor_priv->VBufOffset + (*dstPitch * height / 2);
} else {
#endif
- pPriv->YBufOffset = 0;
+ adaptor_priv->YBufOffset = 0;
- if (pPriv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
- pPriv->UBufOffset =
- pPriv->YBufOffset + (*dstPitch * 2 * width);
- pPriv->VBufOffset =
- pPriv->UBufOffset + (*dstPitch * width / 2);
+ if (adaptor_priv->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
+ adaptor_priv->UBufOffset =
+ adaptor_priv->YBufOffset + (*dstPitch * 2 * width);
+ adaptor_priv->VBufOffset =
+ adaptor_priv->UBufOffset + (*dstPitch * width / 2);
} else {
- pPriv->UBufOffset =
- pPriv->YBufOffset + (*dstPitch * 2 * height);
- pPriv->VBufOffset =
- pPriv->UBufOffset + (*dstPitch * height / 2);
+ adaptor_priv->UBufOffset =
+ adaptor_priv->YBufOffset + (*dstPitch * 2 * height);
+ adaptor_priv->VBufOffset =
+ adaptor_priv->UBufOffset + (*dstPitch * height / 2);
}
#ifdef INTEL_XVMC
}
@@ -1562,16 +1562,16 @@ i830_copy_video_data(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
if (is_planar_fourcc(id)) {
- if (!xvmc_passthrough(id, pPriv->rotation)) {
+ if (!xvmc_passthrough(id, adaptor_priv->rotation)) {
top &= ~1;
nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
- I830CopyPlanarData(pPriv, buf, srcPitch, srcPitch2,
+ I830CopyPlanarData(adaptor_priv, buf, srcPitch, srcPitch2,
*dstPitch, height, top, left, nlines,
npixels, id);
}
} else {
nlines = ((y2 + 0xffff) >> 16) - top;
- I830CopyPackedData(pPriv, buf, srcPitch, *dstPitch, top, left,
+ I830CopyPackedData(adaptor_priv, buf, srcPitch, *dstPitch, top, left,
nlines, npixels);
}
@@ -1602,7 +1602,7 @@ I830PutImage(ScrnInfoPtr scrn,
Bool sync, RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
- I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
+ intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
PixmapPtr pixmap = get_drawable_pixmap(pDraw);;
INT32 x1, x2, y1, y2;
@@ -1617,7 +1617,7 @@ I830PutImage(ScrnInfoPtr scrn,
drw_y, drw_w, drw_h, width, height);
#endif
- if (!pPriv->textured) {
+ if (!adaptor_priv->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. */
@@ -1640,16 +1640,16 @@ I830PutImage(ScrnInfoPtr scrn,
dstBox.y2 = drw_y + drw_h;
if (!i830_clip_video_helper(scrn,
- pPriv,
+ adaptor_priv,
&crtc,
&dstBox, &x1, &x2, &y1, &y2, clipBoxes,
width, height))
return Success;
- if (!pPriv->textured) {
+ if (!adaptor_priv->textured) {
/* texture video handles rotation differently. */
if (crtc)
- pPriv->rotation = crtc->rotation;
+ adaptor_priv->rotation = crtc->rotation;
else {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Fail to clip video to any crtc!\n");
@@ -1657,42 +1657,42 @@ I830PutImage(ScrnInfoPtr scrn,
}
}
- if (!i830_copy_video_data(scrn, pPriv, width, height,
+ if (!i830_copy_video_data(scrn, adaptor_priv, width, height,
&dstPitch, &dstPitch2,
x1, y1, x2, y2, id, buf))
return BadAlloc;
- if (!pPriv->textured) {
+ if (!adaptor_priv->textured) {
if (!i830_display_overlay
(scrn, crtc, id, width, height, dstPitch, x1, y1, x2, y2,
&dstBox, src_w, src_h, drw_w, drw_h))
return BadAlloc;
/* update cliplist */
- if (!REGION_EQUAL(scrn->pScreen, &pPriv->clip, clipBoxes)) {
- REGION_COPY(scrn->pScreen, &pPriv->clip, clipBoxes);
- i830_fill_colorkey(pScreen, pPriv->colorKey, clipBoxes);
+ if (!REGION_EQUAL(scrn->pScreen, &adaptor_priv->clip, clipBoxes)) {
+ REGION_COPY(scrn->pScreen, &adaptor_priv->clip, clipBoxes);
+ i830_fill_colorkey(pScreen, adaptor_priv->colorKey, clipBoxes);
}
} else {
- if (crtc && pPriv->SyncToVblank != 0) {
+ if (crtc && adaptor_priv->SyncToVblank != 0) {
i830_wait_for_scanline(scrn, pixmap, crtc, clipBoxes);
}
if (IS_I965G(intel)) {
- if (xvmc_passthrough(id, pPriv->rotation)) {
+ if (xvmc_passthrough(id, adaptor_priv->rotation)) {
/* XXX: KMS */
- pPriv->YBufOffset = (uintptr_t) buf;
- pPriv->UBufOffset =
- pPriv->YBufOffset + height * width;
- pPriv->VBufOffset =
- pPriv->UBufOffset + height * width / 4;
+ adaptor_priv->YBufOffset = (uintptr_t) buf;
+ adaptor_priv->UBufOffset =
+ adaptor_priv->YBufOffset + height * width;
+ adaptor_priv->VBufOffset =
+ adaptor_priv->UBufOffset + height * width / 4;
}
- I965DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
+ I965DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes,
width, height, dstPitch, x1,
y1, x2, y2, src_w, src_h,
drw_w, drw_h, pixmap);
} else {
- I915DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
+ I915DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes,
width, height, dstPitch,
dstPitch2, x1, y1, x2, y2,
src_w, src_h, drw_w, drw_h,
@@ -1702,7 +1702,7 @@ I830PutImage(ScrnInfoPtr scrn,
DamageDamageRegion(pDraw, clipBoxes);
}
- pPriv->videoStatus = CLIENT_VIDEO_ON;
+ adaptor_priv->videoStatus = CLIENT_VIDEO_ON;
return Success;
}
@@ -1799,34 +1799,34 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
{
ScrnInfoPtr scrn = xf86Screens[i];
intel_screen_private *intel = intel_get_screen_private(scrn);
- I830PortPrivPtr pPriv;
+ intel_adaptor_private *adaptor_priv;
/* no overlay */
if (intel->adaptor == NULL)
return;
- pPriv = GET_PORT_PRIVATE(scrn);
+ adaptor_priv = intel_get_adaptor_private(scrn);
- if (pPriv->videoStatus & TIMER_MASK) {
+ if (adaptor_priv->videoStatus & TIMER_MASK) {
#if 1
Time now = currentTime.milliseconds;
#else
UpdateCurrentTime();
#endif
- if (pPriv->videoStatus & OFF_TIMER) {
- if (pPriv->offTime < now) {
+ if (adaptor_priv->videoStatus & OFF_TIMER) {
+ if (adaptor_priv->offTime < now) {
/* Turn off the overlay */
OVERLAY_DEBUG("BLOCKHANDLER\n");
drmmode_overlay_off(scrn);
- pPriv->videoStatus = FREE_TIMER;
- pPriv->freeTime = now + FREE_DELAY;
+ adaptor_priv->videoStatus = FREE_TIMER;
+ adaptor_priv->freeTime = now + FREE_DELAY;
}
} else { /* FREE_TIMER */
- if (pPriv->freeTime < now) {
- i830_free_video_buffers(pPriv);
- pPriv->videoStatus = 0;
+ if (adaptor_priv->freeTime < now) {
+ i830_free_video_buffers(adaptor_priv);
+ adaptor_priv->videoStatus = 0;
}
}
}
diff --git a/src/i830_video.h b/src/i830_video.h
index f2b5178..f3e9ed9 100644
--- a/src/i830_video.h
+++ b/src/i830_video.h
@@ -63,19 +63,24 @@ typedef struct {
Rotation rotation; /* should remove intel->rotation later */
int SyncToVblank; /* -1: auto, 0: off, 1: on */
-} I830PortPrivRec, *I830PortPrivPtr;
+} intel_adaptor_private;
-#define GET_PORT_PRIVATE(scrn) \
- (I830PortPrivPtr)((intel_get_screen_private(scrn))->adaptor->pPortPrivates[0].ptr)
+static inline intel_adaptor_private *
+intel_get_adaptor_private(ScrnInfoPtr scrn)
+{
+ return intel_get_screen_private(scrn)->adaptor->pPortPrivates[0].ptr;
+}
-void I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
+void I915DisplayVideoTextured(ScrnInfoPtr scrn,
+ intel_adaptor_private *adaptor_priv,
int id, RegionPtr dstRegion, short width,
short height, int video_pitch, int video_pitch2,
int x1, int y1, int x2, int y2,
short src_w, short src_h,
short drw_w, short drw_h, PixmapPtr pixmap);
-void I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
+void I965DisplayVideoTextured(ScrnInfoPtr scrn,
+ intel_adaptor_private *adaptor_priv,
int id, RegionPtr dstRegion, short width,
short height, int video_pitch,
int x1, int y1, int x2, int y2,
diff --git a/src/i915_video.c b/src/i915_video.c
index 19c5756..34ad8f9 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -40,7 +40,8 @@
#include "i915_3d.h"
void
-I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
+I915DisplayVideoTextured(ScrnInfoPtr scrn,
+ intel_adaptor_private *adaptor_priv, int id,
RegionPtr dstRegion,
short width, short height, int video_pitch,
int video_pitch2, int x1, int y1, int x2, int y2,
@@ -142,8 +143,8 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH(_3DSTATE_PIXEL_SHADER_CONSTANTS | 4);
OUT_BATCH(0x0000001); /* constant 0 */
/* constant 0: brightness/contrast */
- OUT_BATCH_F(pPriv->brightness / 128.0);
- OUT_BATCH_F(pPriv->contrast / 255.0);
+ OUT_BATCH_F(adaptor_priv->brightness / 128.0);
+ OUT_BATCH_F(adaptor_priv->contrast / 255.0);
OUT_BATCH_F(0.0);
OUT_BATCH_F(0.0);
@@ -162,11 +163,12 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
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->YBufOffset);
+ if (adaptor_priv->buf)
+ OUT_RELOC(adaptor_priv->buf,
+ I915_GEM_DOMAIN_SAMPLER, 0,
+ adaptor_priv->YBufOffset);
else
- OUT_BATCH(pPriv->YBufOffset);
+ OUT_BATCH(adaptor_priv->YBufOffset);
ms3 = MAPSURF_422 | MS3_USE_FENCE_REGS;
switch (id) {
@@ -188,7 +190,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
i915_fs_dcl(FS_S0);
i915_fs_dcl(FS_T0);
i915_fs_texld(FS_OC, FS_S0, FS_T0);
- if (pPriv->brightness != 0) {
+ if (adaptor_priv->brightness != 0) {
i915_fs_add(FS_OC,
i915_fs_operand_reg(FS_OC),
i915_fs_operand(FS_C0, X, X, X,
@@ -242,8 +244,8 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH_F(0.0);
OUT_BATCH_F(0.0);
/* constant 4: brightness/contrast */
- OUT_BATCH_F(pPriv->brightness / 128.0);
- OUT_BATCH_F(pPriv->contrast / 255.0);
+ OUT_BATCH_F(adaptor_priv->brightness / 128.0);
+ OUT_BATCH_F(adaptor_priv->contrast / 255.0);
OUT_BATCH_F(0.0);
OUT_BATCH_F(0.0);
@@ -283,11 +285,12 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH(_3DSTATE_MAP_STATE | 9);
OUT_BATCH(0x00000007);
- if (pPriv->buf)
- OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER,
- 0, pPriv->YBufOffset);
+ if (adaptor_priv->buf)
+ OUT_RELOC(adaptor_priv->buf,
+ I915_GEM_DOMAIN_SAMPLER, 0,
+ adaptor_priv->YBufOffset);
else
- OUT_BATCH(pPriv->YBufOffset);
+ OUT_BATCH(adaptor_priv->YBufOffset);
ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS;
ms3 |= (height - 1) << MS3_HEIGHT_SHIFT;
@@ -304,11 +307,12 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH(((video_pitch * 2 / 4) -
1) << MS4_PITCH_SHIFT);
- if (pPriv->buf)
- OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER,
- 0, pPriv->UBufOffset);
+ if (adaptor_priv->buf)
+ OUT_RELOC(adaptor_priv->buf,
+ I915_GEM_DOMAIN_SAMPLER, 0,
+ adaptor_priv->UBufOffset);
else
- OUT_BATCH(pPriv->UBufOffset);
+ OUT_BATCH(adaptor_priv->UBufOffset);
ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS;
ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT;
@@ -316,11 +320,12 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH(ms3);
OUT_BATCH(((video_pitch / 4) - 1) << MS4_PITCH_SHIFT);
- if (pPriv->buf)
- OUT_RELOC(pPriv->buf, I915_GEM_DOMAIN_SAMPLER,
- 0, pPriv->VBufOffset);
+ if (adaptor_priv->buf)
+ OUT_RELOC(adaptor_priv->buf,
+ I915_GEM_DOMAIN_SAMPLER, 0,
+ adaptor_priv->VBufOffset);
else
- OUT_BATCH(pPriv->VBufOffset);
+ OUT_BATCH(adaptor_priv->VBufOffset);
ms3 = MAPSURF_8BIT | MT_8BIT_I8 | MS3_USE_FENCE_REGS;
ms3 |= (height / 2 - 1) << MS3_HEIGHT_SHIFT;
@@ -375,7 +380,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
i915_fs_mov_masked(FS_OC, MASK_W,
i915_fs_operand_one());
- if (pPriv->brightness != 0) {
+ if (adaptor_priv->brightness != 0) {
i915_fs_add(FS_OC,
i915_fs_operand_reg(FS_OC),
i915_fs_operand(FS_C4, X, X, X,
diff --git a/src/i965_video.c b/src/i965_video.c
index f9aacc7..0fc10a7 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -977,7 +977,8 @@ i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * bind_bo, int n_src_surf)
}
void
-I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
+I965DisplayVideoTextured(ScrnInfoPtr scrn,
+ intel_adaptor_private *adaptor_priv, int id,
RegionPtr dstRegion,
short width, short height, int video_pitch,
int x1, int y1, int x2, int y2,
@@ -1008,12 +1009,12 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
ErrorF("INST_PM 0x%08x\n", INREG(INST_PM));
#endif
- 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;
+ src_surf_base[0] = adaptor_priv->YBufOffset;
+ src_surf_base[1] = adaptor_priv->YBufOffset;
+ src_surf_base[2] = adaptor_priv->VBufOffset;
+ src_surf_base[3] = adaptor_priv->VBufOffset;
+ src_surf_base[4] = adaptor_priv->UBufOffset;
+ src_surf_base[5] = adaptor_priv->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]);
@@ -1059,18 +1060,14 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
return;
for (src_surf = 0; src_surf < n_src_surf; src_surf++) {
- drm_intel_bo *surf_bo = i965_create_src_surface_state(scrn,
- pPriv->
- buf,
- src_surf_base
- [src_surf],
- src_width
- [src_surf],
- src_height
- [src_surf],
- src_pitch
- [src_surf],
- src_surf_format);
+ drm_intel_bo *surf_bo =
+ i965_create_src_surface_state(scrn,
+ adaptor_priv->buf,
+ src_surf_base[src_surf],
+ src_width[src_surf],
+ src_height[src_surf],
+ src_pitch[src_surf],
+ src_surf_format);
if (!surf_bo) {
int q;
for (q = 0; q < src_surf + 1; q++)
commit f309d475241260cf60567100511d5f7c6c487a29
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 18:38:53 2009 -0700
Call pPixmaps plain old pixmaps.
diff --git a/src/i830.h b/src/i830.h
index 442ad10..07b6c8d 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -314,7 +314,7 @@ intel_get_screen_private(ScrnInfoPtr scrn)
#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
#define MIN(a,b) ((a) < (b) ? (a) : (b))
-unsigned long intel_get_pixmap_pitch(PixmapPtr pPix);
+unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap);
/* Batchbuffer support macros and functions */
#include "i830_batchbuffer.h"
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 1a7c61f..11a75f4 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -48,9 +48,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "i830_ring.h"
#include "i915_drm.h"
-unsigned long intel_get_pixmap_pitch(PixmapPtr pPix)
+unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap)
{
- return (unsigned long)pPix->devKind;
+ return (unsigned long)pixmap->devKind;
}
void I830Sync(ScrnInfoPtr scrn)
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index f351a1a..274e82f 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -93,11 +93,11 @@ intel_batch_emit_reloc(intel_screen_private *intel,
}
static inline void
-intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pPixmap,
+intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pixmap,
uint32_t read_domains, uint32_t write_domain,
uint32_t delta)
{
- dri_bo *bo = i830_get_pixmap_bo(pPixmap);
+ dri_bo *bo = i830_get_pixmap_bo(pixmap);
assert(intel->batch_ptr != NULL);
assert(intel_batch_space(intel) >= 4);
intel_batch_emit_reloc(intel, bo, read_domains, write_domain, delta);
@@ -108,8 +108,8 @@ intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pPixmap,
#define OUT_RELOC(bo, read_domains, write_domains, delta) \
intel_batch_emit_reloc (intel, bo, read_domains, write_domains, delta)
-#define OUT_RELOC_PIXMAP(pPixmap, reads, write, delta) \
- intel_batch_emit_reloc_pixmap(intel, pPixmap, reads, write, delta)
+#define OUT_RELOC_PIXMAP(pixmap, reads, write, delta) \
+ intel_batch_emit_reloc_pixmap(intel, pixmap, reads, write, delta)
union intfloat {
float f;
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 1c5ebbe..ea3d444 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -74,7 +74,7 @@ extern XF86ModuleData dri2ModuleData;
#endif
typedef struct {
- PixmapPtr pPixmap;
+ PixmapPtr pixmap;
unsigned int attachment;
} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
@@ -89,7 +89,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
dri_bo *bo;
int i;
I830DRI2BufferPrivatePtr privates;
- PixmapPtr pPixmap, pDepthPixmap;
+ PixmapPtr pixmap, pDepthPixmap;
buffers = xcalloc(count, sizeof *buffers);
if (buffers == NULL)
@@ -103,11 +103,11 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
pDepthPixmap = NULL;
for (i = 0; i < count; i++) {
if (attachments[i] == DRI2BufferFrontLeft) {
- pPixmap = get_drawable_pixmap(pDraw);
- pPixmap->refcnt++;
+ pixmap = get_drawable_pixmap(pDraw);
+ pixmap->refcnt++;
} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
- pPixmap = pDepthPixmap;
- pPixmap->refcnt++;
+ pixmap = pDepthPixmap;
+ pixmap->refcnt++;
} else {
unsigned int hint = 0;
@@ -129,7 +129,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
if (!intel->tiling)
hint = 0;
- pPixmap = (*pScreen->CreatePixmap) (pScreen,
+ pixmap = (*pScreen->CreatePixmap) (pScreen,
pDraw->width,
pDraw->height,
pDraw->depth, hint);
@@ -137,17 +137,17 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
}
if (attachments[i] == DRI2BufferDepth)
- pDepthPixmap = pPixmap;
+ pDepthPixmap = pixmap;
buffers[i].attachment = attachments[i];
- buffers[i].pitch = pPixmap->devKind;
- buffers[i].cpp = pPixmap->drawable.bitsPerPixel / 8;
+ buffers[i].pitch = pixmap->devKind;
+ buffers[i].cpp = pixmap->drawable.bitsPerPixel / 8;
buffers[i].driverPrivate = &privates[i];
buffers[i].flags = 0; /* not tiled */
- privates[i].pPixmap = pPixmap;
+ privates[i].pixmap = pixmap;
privates[i].attachment = attachments[i];
- bo = i830_get_pixmap_bo(pPixmap);
+ bo = i830_get_pixmap_bo(pixmap);
if (dri_bo_flink(bo, &buffers[i].name) != 0) {
/* failed to name buffer */
}
@@ -169,7 +169,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
DRI2Buffer2Ptr buffer;
dri_bo *bo;
I830DRI2BufferPrivatePtr privates;
- PixmapPtr pPixmap;
+ PixmapPtr pixmap;
buffer = xcalloc(1, sizeof *buffer);
if (buffer == NULL)
@@ -181,8 +181,8 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
}
if (attachment == DRI2BufferFrontLeft) {
- pPixmap = get_drawable_pixmap(pDraw);
- pPixmap->refcnt++;
+ pixmap = get_drawable_pixmap(pDraw);
+ pixmap->refcnt++;
} else {
unsigned int hint = 0;
@@ -205,7 +205,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
if (!intel->tiling)
hint = 0;
- pPixmap = (*pScreen->CreatePixmap) (pScreen,
+ pixmap = (*pScreen->CreatePixmap) (pScreen,
pDraw->width,
pDraw->height,
(format !=
@@ -215,15 +215,15 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
}
buffer->attachment = attachment;
- buffer->pitch = pPixmap->devKind;
- buffer->cpp = pPixmap->drawable.bitsPerPixel / 8;
+ buffer->pitch = pixmap->devKind;
+ buffer->cpp = pixmap->drawable.bitsPerPixel / 8;
buffer->driverPrivate = privates;
buffer->format = format;
buffer->flags = 0; /* not tiled */
- privates->pPixmap = pPixmap;
+ privates->pixmap = pixmap;
privates->attachment = attachment;
- bo = i830_get_pixmap_bo(pPixmap);
+ bo = i830_get_pixmap_bo(pixmap);
if (dri_bo_flink(bo, &buffer->name) != 0) {
/* failed to name buffer */
}
@@ -244,7 +244,7 @@ I830DRI2DestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
for (i = 0; i < count; i++) {
private = buffers[i].driverPrivate;
- (*pScreen->DestroyPixmap) (private->pPixmap);
+ (*pScreen->DestroyPixmap) (private->pixmap);
}
if (buffers) {
@@ -261,7 +261,7 @@ static void I830DRI2DestroyBuffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer)
I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
ScreenPtr pScreen = pDraw->pScreen;
- (*pScreen->DestroyPixmap) (private->pPixmap);
+ (*pScreen->DestroyPixmap) (private->pixmap);
xfree(private);
xfree(buffer);
@@ -280,9 +280,9 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
- ? pDraw : &srcPrivate->pPixmap->drawable;
+ ? pDraw : &srcPrivate->pixmap->drawable;
DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
- ? pDraw : &dstPrivate->pPixmap->drawable;
+ ? pDraw : &dstPrivate->pixmap->drawable;
RegionPtr pCopyClip;
GCPtr pGC;
diff --git a/src/i830_render.c b/src/i830_render.c
index d37e19d..a7fac17 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -267,7 +267,7 @@ static uint32_t i8xx_get_card_format(PicturePtr picture)
FatalError("Unsupported format type %d\n", picture->format);
}
-static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
+static void i830_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit)
{
ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
@@ -276,9 +276,9 @@ static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
uint32_t wrap_mode;
uint32_t texcoordtype;
- pitch = intel_get_pixmap_pitch(pPix);
- intel->scale_units[unit][0] = pPix->drawable.width;
- intel->scale_units[unit][1] = pPix->drawable.height;
+ pitch = intel_get_pixmap_pitch(pixmap);
+ intel->scale_units[unit][0] = pixmap->drawable.width;
+ intel->scale_units[unit][1] = pixmap->drawable.height;
intel->transform[unit] = picture->transform;
if (i830_transform_is_affine(intel->transform[unit]))
@@ -321,9 +321,9 @@ static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
filter |= (MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT);
{
- if (pPix->drawable.bitsPerPixel == 8)
+ if (pixmap->drawable.bitsPerPixel == 8)
format |= MAPSURF_8BIT;
- else if (pPix->drawable.bitsPerPixel == 16)
+ else if (pixmap->drawable.bitsPerPixel == 16)
format |= MAPSURF_16BIT;
else
format |= MAPSURF_32BIT;
@@ -331,10 +331,10 @@ static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
BEGIN_BATCH(10);
OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 |
LOAD_TEXTURE_MAP(unit) | 4);
- OUT_RELOC_PIXMAP(pPix, I915_GEM_DOMAIN_SAMPLER, 0,
+ OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_SAMPLER, 0,
TM0S0_USE_FENCE);
- OUT_BATCH(((pPix->drawable.height -
- 1) << TM0S1_HEIGHT_SHIFT) | ((pPix->drawable.width -
+ OUT_BATCH(((pixmap->drawable.height -
+ 1) << TM0S1_HEIGHT_SHIFT) | ((pixmap->drawable.width -
1) <<
TM0S1_WIDTH_SHIFT) |
format);
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index a453c33..03d4b17 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -86,13 +86,13 @@ static int uxa_pixmap_index;
* buffer. At the point where we are tiling some pixmaps managed by the
* general allocator, we should move this to using pixmap privates.
*/
-Bool i830_pixmap_tiled(PixmapPtr pPixmap)
+Bool i830_pixmap_tiled(PixmapPtr pixmap)
{
dri_bo *bo;
uint32_t tiling_mode, swizzle_mode;
int ret;
- bo = i830_get_pixmap_bo(pPixmap);
+ bo = i830_get_pixmap_bo(pixmap);
assert(bo != NULL);
ret = drm_intel_bo_get_tiling(bo, &tiling_mode, &swizzle_mode);
@@ -142,37 +142,37 @@ static int i830_pixmap_pitch_is_aligned(PixmapPtr pixmap)
* Sets up hardware state for a series of solid fills.
*/
static Bool
-i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
+i830_uxa_prepare_solid(PixmapPtr pixmap, int alu, Pixel planemask, Pixel fg)
{
- ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
unsigned long pitch;
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
- i830_get_pixmap_bo(pPixmap),
+ i830_get_pixmap_bo(pixmap),
};
- if (!UXA_PM_IS_SOLID(&pPixmap->drawable, planemask))
+ if (!UXA_PM_IS_SOLID(&pixmap->drawable, planemask))
I830FALLBACK("planemask is not solid");
- if (pPixmap->drawable.bitsPerPixel == 24)
+ if (pixmap->drawable.bitsPerPixel == 24)
I830FALLBACK("solid 24bpp unsupported!\n");
- if (pPixmap->drawable.bitsPerPixel < 8)
+ if (pixmap->drawable.bitsPerPixel < 8)
I830FALLBACK("under 8bpp pixmaps unsupported\n");
- i830_exa_check_pitch_2d(pPixmap);
+ i830_exa_check_pitch_2d(pixmap);
- pitch = i830_pixmap_pitch(pPixmap);
+ pitch = i830_pixmap_pitch(pixmap);
- if (!i830_pixmap_pitch_is_aligned(pPixmap))
+ if (!i830_pixmap_pitch_is_aligned(pixmap))
I830FALLBACK("pixmap pitch not aligned");
if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
intel->BR[13] = (I830PatternROP[alu] & 0xff) << 16;
- switch (pPixmap->drawable.bitsPerPixel) {
+ switch (pixmap->drawable.bitsPerPixel) {
case 8:
break;
case 16:
@@ -188,25 +188,25 @@ i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
return TRUE;
}
-static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
+static void i830_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2)
{
- ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
unsigned long pitch;
uint32_t cmd;
- pitch = i830_pixmap_pitch(pPixmap);
+ pitch = i830_pixmap_pitch(pixmap);
{
BEGIN_BATCH(6);
cmd = XY_COLOR_BLT_CMD;
- if (pPixmap->drawable.bitsPerPixel == 32)
+ if (pixmap->drawable.bitsPerPixel == 32)
cmd |=
XY_COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB;
- if (IS_I965G(intel) && i830_pixmap_tiled(pPixmap)) {
+ if (IS_I965G(intel) && i830_pixmap_tiled(pixmap)) {
assert((pitch % 512) == 0);
pitch >>= 2;
cmd |= XY_COLOR_BLT_TILED;
@@ -217,16 +217,16 @@ static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
OUT_BATCH(intel->BR[13] | pitch);
OUT_BATCH((y1 << 16) | (x1 & 0xffff));
OUT_BATCH((y2 << 16) | (x2 & 0xffff));
- OUT_RELOC_PIXMAP(pPixmap, I915_GEM_DOMAIN_RENDER,
+ OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER, 0);
OUT_BATCH(intel->BR[16]);
ADVANCE_BATCH();
}
}
-static void i830_uxa_done_solid(PixmapPtr pPixmap)
+static void i830_uxa_done_solid(PixmapPtr pixmap)
{
- ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
i830_debug_sync(scrn);
}
diff --git a/src/i830_video.c b/src/i830_video.c
index 329070d..fe9b9bb 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1369,7 +1369,7 @@ i830_fill_colorkey(ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
}
static void
-i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pPixmap,
+i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pixmap,
xf86CrtcPtr crtc, RegionPtr clipBoxes)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -1377,7 +1377,7 @@ i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pPixmap,
pixman_box16_t box_in_crtc_coordinates;
int pipe = -1, event, load_scan_lines_pipe;
- if (pixmap_is_scanout(pPixmap))
+ if (pixmap_is_scanout(pixmap))
pipe = i830_crtc_to_pipe(crtc);
if (pipe >= 0) {
@@ -1604,7 +1604,7 @@ I830PutImage(ScrnInfoPtr scrn,
intel_screen_private *intel = intel_get_screen_private(scrn);
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
- PixmapPtr pPixmap = get_drawable_pixmap(pDraw);;
+ PixmapPtr pixmap = get_drawable_pixmap(pDraw);;
INT32 x1, x2, y1, y2;
int dstPitch;
int dstPitch2 = 0;
@@ -1675,7 +1675,7 @@ I830PutImage(ScrnInfoPtr scrn,
}
} else {
if (crtc && pPriv->SyncToVblank != 0) {
- i830_wait_for_scanline(scrn, pPixmap, crtc, clipBoxes);
+ i830_wait_for_scanline(scrn, pixmap, crtc, clipBoxes);
}
if (IS_I965G(intel)) {
@@ -1690,13 +1690,13 @@ I830PutImage(ScrnInfoPtr scrn,
I965DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
width, height, dstPitch, x1,
y1, x2, y2, src_w, src_h,
- drw_w, drw_h, pPixmap);
+ drw_w, drw_h, pixmap);
} else {
I915DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
width, height, dstPitch,
dstPitch2, x1, y1, x2, y2,
src_w, src_h, drw_w, drw_h,
- pPixmap);
+ pixmap);
}
DamageDamageRegion(pDraw, clipBoxes);
diff --git a/src/i830_video.h b/src/i830_video.h
index 40aeb57..f2b5178 100644
--- a/src/i830_video.h
+++ b/src/i830_video.h
@@ -73,14 +73,14 @@ void I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
short height, int video_pitch, int video_pitch2,
int x1, int y1, int x2, int y2,
short src_w, short src_h,
- short drw_w, short drw_h, PixmapPtr pPixmap);
+ short drw_w, short drw_h, PixmapPtr pixmap);
void I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
int id, RegionPtr dstRegion, short width,
short height, int video_pitch,
int x1, int y1, int x2, int y2,
short src_w, short src_h,
- short drw_w, short drw_h, PixmapPtr pPixmap);
+ short drw_w, short drw_h, PixmapPtr pixmap);
void I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask);
diff --git a/src/i915_render.c b/src/i915_render.c
index 7aad162..0a9c1e0 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -237,7 +237,7 @@ i915_check_composite(int op, PicturePtr source_picture, PicturePtr mask_picture,
return TRUE;
}
-static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
+static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit)
{
ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -245,11 +245,11 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
int w, h, i;
uint32_t wrap_mode;
- pitch = intel_get_pixmap_pitch(pPix);
+ pitch = intel_get_pixmap_pitch(pixmap);
w = picture->pDrawable->width;
h = picture->pDrawable->height;
- intel->scale_units[unit][0] = pPix->drawable.width;
- intel->scale_units[unit][1] = pPix->drawable.height;
+ intel->scale_units[unit][0] = pixmap->drawable.width;
+ intel->scale_units[unit][1] = pixmap->drawable.height;
for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
i++) {
@@ -295,8 +295,8 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
intel->mapstate[unit * 3 + 0] = 0;
intel->mapstate[unit * 3 + 1] = format |
MS3_USE_FENCE_REGS |
- ((pPix->drawable.height - 1) << MS3_HEIGHT_SHIFT) |
- ((pPix->drawable.width - 1) << MS3_WIDTH_SHIFT);
+ ((pixmap->drawable.height - 1) << MS3_HEIGHT_SHIFT) |
+ ((pixmap->drawable.width - 1) << MS3_WIDTH_SHIFT);
intel->mapstate[unit * 3 + 2] = ((pitch / 4) - 1) << MS4_PITCH_SHIFT;
intel->samplerstate[unit * 3 + 0] = (MIPFILTER_NONE <<
diff --git a/src/i915_video.c b/src/i915_video.c
index 2b805e4..19c5756 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -45,7 +45,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
short width, short height, int video_pitch,
int video_pitch2, int x1, int y1, int x2, int y2,
short src_w, short src_h, short drw_w, short drw_h,
- PixmapPtr pPixmap)
+ PixmapPtr pixmap)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t format, ms3, s5;
@@ -83,12 +83,12 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
/* draw rect -- just clipping */
OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
- OUT_BATCH(DRAW_DITHER_OFS_X(pPixmap->drawable.x & 3) |
- DRAW_DITHER_OFS_Y(pPixmap->drawable.y & 3));
+ OUT_BATCH(DRAW_DITHER_OFS_X(pixmap->drawable.x & 3) |
+ DRAW_DITHER_OFS_Y(pixmap->drawable.y & 3));
OUT_BATCH(0x00000000); /* ymin, xmin */
/* ymax, xmax */
- OUT_BATCH((pPixmap->drawable.width - 1) |
- (pPixmap->drawable.height - 1) << 16);
+ OUT_BATCH((pixmap->drawable.width - 1) |
+ (pixmap->drawable.height - 1) << 16);
OUT_BATCH(0x00000000); /* yorigin, xorigin */
OUT_BATCH(MI_NOOP);
@@ -130,8 +130,8 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
/* front buffer, pitch, offset */
OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
OUT_BATCH(BUF_3D_ID_COLOR_BACK | BUF_3D_USE_FENCE |
- BUF_3D_PITCH(intel_get_pixmap_pitch(pPixmap)));
- OUT_RELOC_PIXMAP(pPixmap, I915_GEM_DOMAIN_RENDER,
+ BUF_3D_PITCH(intel_get_pixmap_pitch(pixmap)));
+ OUT_RELOC_PIXMAP(pixmap, I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER, 0);
ADVANCE_BATCH();
@@ -396,8 +396,8 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
* (in screen coordinates) to the backing pixmap.
*/
#ifdef COMPOSITE
- pix_xoff = -pPixmap->screen_x + pPixmap->drawable.x;
- pix_yoff = -pPixmap->screen_y + pPixmap->drawable.y;
+ pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
+ pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
#else
pix_xoff = 0;
pix_yoff = 0;
diff --git a/src/i965_render.c b/src/i965_render.c
index 9ad9d2b..f0aaa3d 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1021,12 +1021,12 @@ static sampler_state_extend_t sampler_state_extend_from_picture(int repeat_type)
*/
static void
i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
- PicturePtr picture, PixmapPtr pPixmap,
+ PicturePtr picture, PixmapPtr pixmap,
Bool is_dst)
{
struct brw_surface_state_padded *ss;
struct brw_surface_state local_ss;
- dri_bo *pixmap_bo = i830_get_pixmap_bo(pPixmap);
+ dri_bo *pixmap_bo = i830_get_pixmap_bo(pixmap);
ss = (struct brw_surface_state_padded *)ss_bo->virtual + ss_index;
@@ -1060,11 +1060,11 @@ i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
local_ss.ss2.mip_count = 0;
local_ss.ss2.render_target_rotation = 0;
- local_ss.ss2.height = pPixmap->drawable.height - 1;
- local_ss.ss2.width = pPixmap->drawable.width - 1;
- local_ss.ss3.pitch = intel_get_pixmap_pitch(pPixmap) - 1;
+ local_ss.ss2.height = pixmap->drawable.height - 1;
+ local_ss.ss2.width = pixmap->drawable.width - 1;
+ local_ss.ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1;
local_ss.ss3.tile_walk = 0; /* Tiled X */
- local_ss.ss3.tiled_surface = i830_pixmap_tiled(pPixmap) ? 1 : 0;
+ local_ss.ss3.tiled_surface = i830_pixmap_tiled(pixmap) ? 1 : 0;
memcpy(ss, &local_ss, sizeof(local_ss));
diff --git a/src/i965_video.c b/src/i965_video.c
index d313e6c..f9aacc7 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -982,7 +982,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
short width, short height, int video_pitch,
int x1, int y1, int x2, int y2,
short src_w, short src_h,
- short drw_w, short drw_h, PixmapPtr pPixmap)
+ short drw_w, short drw_h, PixmapPtr pixmap)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
BoxPtr pbox;
@@ -1054,7 +1054,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
*/
/* Upload kernels */
- surf_bos[0] = i965_create_dst_surface_state(scrn, pPixmap);
+ surf_bos[0] = i965_create_dst_surface_state(scrn, pixmap);
if (!surf_bos[0])
return;
@@ -1145,8 +1145,8 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
* coordinates) to the backing pixmap.
*/
#ifdef COMPOSITE
- pix_xoff = -pPixmap->screen_x + pPixmap->drawable.x;
- pix_yoff = -pPixmap->screen_y + pPixmap->drawable.y;
+ pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
+ pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
#else
pix_xoff = 0;
pix_yoff = 0;
commit da0f6616ad63f1581cf91a98104e5287aa44e7ce
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 18:37:05 2009 -0700
de-pCamelHungarian the Render pictures and pixmaps.
diff --git a/src/i830.h b/src/i830.h
index a505cb5..442ad10 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -230,7 +230,6 @@ typedef struct intel_screen_private {
uxa_driver_t *uxa_driver;
Bool need_flush;
- PixmapPtr pSrcPixmap;
int accel_pixmap_pitch_alignment;
int accel_pixmap_offset_alignment;
int accel_max_x;
@@ -383,23 +382,23 @@ void i830_set_max_gtt_map_size(ScrnInfoPtr scrn);
i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn);
/* i830_render.c */
-Bool i830_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
- PicturePtr pDst);
-Bool i830_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
- PicturePtr pDst, PixmapPtr pSrcPixmap,
- PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
+Bool i830_check_composite(int op, PicturePtr sourcec, PicturePtr mask,
+ PicturePtr dest);
+Bool i830_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
+ PicturePtr dest, PixmapPtr sourcecPixmap,
+ PixmapPtr maskPixmap, PixmapPtr destPixmap);
Bool i830_transform_is_affine(PictTransformPtr t);
-void i830_composite(PixmapPtr pDst, int srcX, int srcY,
+void i830_composite(PixmapPtr dest, int srcX, int srcY,
int maskX, int maskY, int dstX, int dstY, int w, int h);
-void i830_done_composite(PixmapPtr pDst);
+void i830_done_composite(PixmapPtr dest);
/* i915_render.c */
-Bool i915_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
- PicturePtr pDst);
-Bool i915_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
- PicturePtr pDst, PixmapPtr pSrcPixmap,
- PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
-void i915_composite(PixmapPtr pDst, int srcX, int srcY,
+Bool i915_check_composite(int op, PicturePtr sourcec, PicturePtr mask,
+ PicturePtr dest);
+Bool i915_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
+ PicturePtr dest, PixmapPtr sourcecPixmap,
+ PixmapPtr maskPixmap, PixmapPtr destPixmap);
+void i915_composite(PixmapPtr dest, int srcX, int srcY,
int maskX, int maskY, int dstX, int dstY, int w, int h);
void i915_batch_flush_notify(ScrnInfoPtr scrn);
void i830_batch_flush_notify(ScrnInfoPtr scrn);
@@ -407,12 +406,12 @@ void i830_batch_flush_notify(ScrnInfoPtr scrn);
unsigned int gen4_render_state_size(ScrnInfoPtr scrn);
void gen4_render_state_init(ScrnInfoPtr scrn);
void gen4_render_state_cleanup(ScrnInfoPtr scrn);
-Bool i965_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
- PicturePtr pDst);
-Bool i965_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
- PicturePtr pDst, PixmapPtr pSrcPixmap,
- PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
-void i965_composite(PixmapPtr pDst, int srcX, int srcY,
+Bool i965_check_composite(int op, PicturePtr sourcec, PicturePtr mask,
+ PicturePtr dest);
+Bool i965_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
+ PicturePtr dest, PixmapPtr sourcecPixmap,
+ PixmapPtr maskPixmap, PixmapPtr destPixmap);
+void i965_composite(PixmapPtr dest, int srcX, int srcY,
int maskX, int maskY, int dstX, int dstY, int w, int h);
void i965_batch_flush_notify(ScrnInfoPtr scrn);
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 9e51b8c..1c5ebbe 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -272,10 +272,10 @@ static void I830DRI2DestroyBuffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer)
static void
I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
- DRI2BufferPtr pDstBuffer, DRI2BufferPtr pSrcBuffer)
+ DRI2BufferPtr destBuffer, DRI2BufferPtr sourceBuffer)
{
- I830DRI2BufferPrivatePtr srcPrivate = pSrcBuffer->driverPrivate;
- I830DRI2BufferPrivatePtr dstPrivate = pDstBuffer->driverPrivate;
+ I830DRI2BufferPrivatePtr srcPrivate = sourceBuffer->driverPrivate;
+ I830DRI2BufferPrivatePtr dstPrivate = destBuffer->driverPrivate;
ScreenPtr pScreen = pDraw->pScreen;
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
diff --git a/src/i830_render.c b/src/i830_render.c
index d463b53..d37e19d 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -141,9 +141,9 @@ static struct formatinfo i830_tex_formats[] = {
{PICT_a8, MT_8BIT_A8},
};
-static Bool i830_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
+static Bool i830_get_dest_format(PicturePtr dest_picture, uint32_t * dst_format)
{
- switch (pDstPicture->format) {
+ switch (dest_picture->format) {
case PICT_a8r8g8b8:
case PICT_x8r8g8b8:
*dst_format = COLR_BUF_ARGB8888;
@@ -167,16 +167,16 @@ static Bool i830_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
ScrnInfoPtr scrn;
scrn =
- xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ xf86Screens[dest_picture->pDrawable->pScreen->myNum];
I830FALLBACK("Unsupported dest format 0x%x\n",
- (int)pDstPicture->format);
+ (int)dest_picture->format);
}
}
*dst_format |= DSTORG_HORT_BIAS(0x8) | DSTORG_VERT_BIAS(0x8);
return TRUE;
}
-static Bool i830_get_blend_cntl(ScrnInfoPtr scrn, int op, PicturePtr pMask,
+static Bool i830_get_blend_cntl(ScrnInfoPtr scrn, int op, PicturePtr mask,
uint32_t dst_format, uint32_t * blendctl)
{
uint32_t sblend, dblend;
@@ -207,7 +207,7 @@ static Bool i830_get_blend_cntl(ScrnInfoPtr scrn, int op, PicturePtr pMask,
* where the source blend factor is 0, and the source blend value is the
* mask channels multiplied by the source picture's alpha.
*/
- if (pMask && pMask->componentAlpha && PICT_FORMAT_RGB(pMask->format)
+ if (mask && mask->componentAlpha && PICT_FORMAT_RGB(mask->format)
&& i830_blend_op[op].src_alpha) {
if (dblend == BLENDFACTOR_SRC_ALPHA) {
dblend = BLENDFACTOR_SRC_COLR;
@@ -222,55 +222,55 @@ static Bool i830_get_blend_cntl(ScrnInfoPtr scrn, int op, PicturePtr pMask,
return TRUE;
}
-static Bool i830_check_composite_texture(ScrnInfoPtr scrn, PicturePtr pPict,
+static Bool i830_check_composite_texture(ScrnInfoPtr scrn, PicturePtr picture,
int unit)
{
- if (pPict->repeatType > RepeatReflect)
+ if (picture->repeatType > RepeatReflect)
I830FALLBACK("Unsupported picture repeat %d\n",
- pPict->repeatType);
+ picture->repeatType);
- if (pPict->filter != PictFilterNearest &&
- pPict->filter != PictFilterBilinear) {
- I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ if (picture->filter != PictFilterNearest &&
+ picture->filter != PictFilterBilinear) {
+ I830FALLBACK("Unsupported filter 0x%x\n", picture->filter);
}
- if (pPict->pDrawable) {
+ if (picture->pDrawable) {
int w, h, i;
- w = pPict->pDrawable->width;
- h = pPict->pDrawable->height;
+ w = picture->pDrawable->width;
+ h = picture->pDrawable->height;
if ((w > 2048) || (h > 2048))
I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
for (i = 0;
i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
i++) {
- if (i830_tex_formats[i].fmt == pPict->format)
+ if (i830_tex_formats[i].fmt == picture->format)
break;
}
if (i == sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]))
I830FALLBACK("Unsupported picture format 0x%x\n",
- (int)pPict->format);
+ (int)picture->format);
}
return TRUE;
}
-static uint32_t i8xx_get_card_format(PicturePtr pPict)
+static uint32_t i8xx_get_card_format(PicturePtr picture)
{
int i;
for (i = 0; i < sizeof(i830_tex_formats) / sizeof(i830_tex_formats[0]);
i++) {
- if (i830_tex_formats[i].fmt == pPict->format)
+ if (i830_tex_formats[i].fmt == picture->format)
return i830_tex_formats[i].card_fmt;
}
- FatalError("Unsupported format type %d\n", pPict->format);
+ FatalError("Unsupported format type %d\n", picture->format);
}
-static void i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
+static void i830_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
{
- ScrnInfoPtr scrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t format, pitch, filter;
uint32_t wrap_mode;
@@ -279,16 +279,16 @@ static void i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
pitch = intel_get_pixmap_pitch(pPix);
intel->scale_units[unit][0] = pPix->drawable.width;
intel->scale_units[unit][1] = pPix->drawable.height;
- intel->transform[unit] = pPict->transform;
+ intel->transform[unit] = picture->transform;
if (i830_transform_is_affine(intel->transform[unit]))
texcoordtype = TEXCOORDTYPE_CARTESIAN;
else
texcoordtype = TEXCOORDTYPE_HOMOGENEOUS;
- format = i8xx_get_card_format(pPict);
+ format = i8xx_get_card_format(picture);
- switch (pPict->repeatType) {
+ switch (picture->repeatType) {
case RepeatNone:
wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
break;
@@ -302,10 +302,10 @@ static void i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
wrap_mode = TEXCOORDMODE_MIRROR;
break;
default:
- FatalError("Unknown repeat type %d\n", pPict->repeatType);
+ FatalError("Unknown repeat type %d\n", picture->repeatType);
}
- switch (pPict->filter) {
+ switch (picture->filter) {
case PictFilterNearest:
filter = ((FILTER_NEAREST << TM0S3_MAG_FILTER_SHIFT) |
(FILTER_NEAREST << TM0S3_MIN_FILTER_SHIFT));
@@ -316,7 +316,7 @@ static void i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
break;
default:
filter = 0;
- FatalError("Bad filter 0x%x\n", pPict->filter);
+ FatalError("Bad filter 0x%x\n", picture->filter);
}
filter |= (MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT);
@@ -368,18 +368,18 @@ static void i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
}
Bool
-i830_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
- PicturePtr pDstPicture)
+i830_check_composite(int op, PicturePtr source_picture, PicturePtr mask_picture,
+ PicturePtr dest_picture)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
uint32_t tmp1;
/* Check for unsupported compositing operations. */
if (op >= sizeof(i830_blend_op) / sizeof(i830_blend_op[0]))
I830FALLBACK("Unsupported Composite op 0x%x\n", op);
- if (pMaskPicture != NULL && pMaskPicture->componentAlpha &&
- PICT_FORMAT_RGB(pMaskPicture->format)) {
+ if (mask_picture != NULL && mask_picture->componentAlpha &&
+ PICT_FORMAT_RGB(mask_picture->format)) {
/* Check if it's component alpha that relies on a source alpha and on
* the source value. We can only get one of those into the single
* source value that we get to blend with.
@@ -391,49 +391,49 @@ i830_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
"alpha and source value blending.\n");
}
- if (!i830_check_composite_texture(scrn, pSrcPicture, 0))
+ if (!i830_check_composite_texture(scrn, source_picture, 0))
I830FALLBACK("Check Src picture texture\n");
- if (pMaskPicture != NULL
- && !i830_check_composite_texture(scrn, pMaskPicture, 1))
+ if (mask_picture != NULL
+ && !i830_check_composite_texture(scrn, mask_picture, 1))
I830FALLBACK("Check Mask picture texture\n");
- if (!i830_get_dest_format(pDstPicture, &tmp1))
+ if (!i830_get_dest_format(dest_picture, &tmp1))
I830FALLBACK("Get Color buffer format\n");
return TRUE;
}
Bool
-i830_prepare_composite(int op, PicturePtr pSrcPicture,
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+i830_prepare_composite(int op, PicturePtr source_picture,
+ PicturePtr mask_picture, PicturePtr dest_picture,
+ PixmapPtr source, PixmapPtr mask, PixmapPtr dest)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
- intel->render_source_picture = pSrcPicture;
- intel->render_source = pSrc;
- intel->render_mask_picture = pMaskPicture;
- intel->render_mask = pMask;
- intel->render_dest_picture = pDstPicture;
- intel->render_dest = pDst;
+ intel->render_source_picture = source_picture;
+ intel->render_source = source;
+ intel->render_mask_picture = mask_picture;
+ intel->render_mask = mask;
+ intel->render_dest_picture = dest_picture;
+ intel->render_dest = dest;
- i830_exa_check_pitch_3d(pSrc);
- if (pMask)
- i830_exa_check_pitch_3d(pMask);
- i830_exa_check_pitch_3d(pDst);
+ i830_exa_check_pitch_3d(source);
+ if (mask)
+ i830_exa_check_pitch_3d(mask);
+ i830_exa_check_pitch_3d(dest);
- if (!i830_get_dest_format(pDstPicture, &intel->render_dest_format))
+ if (!i830_get_dest_format(dest_picture, &intel->render_dest_format))
return FALSE;
intel->dst_coord_adjust = 0;
intel->src_coord_adjust = 0;
intel->mask_coord_adjust = 0;
- if (pSrcPicture->filter == PictFilterNearest)
+ if (source_picture->filter == PictFilterNearest)
intel->src_coord_adjust = 0.375;
- if (pMask != NULL) {
+ if (mask != NULL) {
intel->mask_coord_adjust = 0;
- if (pMaskPicture->filter == PictFilterNearest)
+ if (mask_picture->filter == PictFilterNearest)
intel->mask_coord_adjust = 0.375;
} else {
intel->transform[1] = NULL;
@@ -465,17 +465,17 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
TB0A_OUTPUT_WRITE_CURRENT;
/* Get the source picture's channels into TBx_ARG1 */
- if ((pMaskPicture != NULL &&
- pMaskPicture->componentAlpha &&
- PICT_FORMAT_RGB(pMaskPicture->format) &&
+ if ((mask_picture != NULL &&
+ mask_picture->componentAlpha &&
+ PICT_FORMAT_RGB(mask_picture->format) &&
i830_blend_op[op].src_alpha)
- || pDstPicture->format == PICT_a8) {
+ || dest_picture->format == PICT_a8) {
/* Producing source alpha value, so the first set of channels
* is src.A instead of src.X. We also do this if the destination
* is a8, in which case src.G is what's written, and the other
* channels are ignored.
*/
- if (PICT_FORMAT_A(pSrcPicture->format) != 0) {
+ if (PICT_FORMAT_A(source_picture->format) != 0) {
ablend |= TB0A_ARG1_SEL_TEXEL0;
cblend |=
TB0C_ARG1_SEL_TEXEL0 |
@@ -485,30 +485,30 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
cblend |= TB0C_ARG1_SEL_ONE;
}
} else {
- if (PICT_FORMAT_A(pSrcPicture->format) != 0) {
+ if (PICT_FORMAT_A(source_picture->format) != 0) {
ablend |= TB0A_ARG1_SEL_TEXEL0;
} else {
ablend |= TB0A_ARG1_SEL_ONE;
}
- if (PICT_FORMAT_RGB(pSrcPicture->format) != 0)
+ if (PICT_FORMAT_RGB(source_picture->format) != 0)
cblend |= TB0C_ARG1_SEL_TEXEL0;
else
cblend |= TB0C_ARG1_SEL_ONE | TB0C_ARG1_INVERT; /* 0.0 */
}
- if (pMask) {
- if (pDstPicture->format != PICT_a8 &&
- (pMaskPicture->componentAlpha &&
- PICT_FORMAT_RGB(pMaskPicture->format))) {
+ if (mask) {
+ if (dest_picture->format != PICT_a8 &&
+ (mask_picture->componentAlpha &&
+ PICT_FORMAT_RGB(mask_picture->format))) {
cblend |= TB0C_ARG2_SEL_TEXEL1;
} else {
- if (PICT_FORMAT_A(pMaskPicture->format) != 0)
+ if (PICT_FORMAT_A(mask_picture->format) != 0)
cblend |= TB0C_ARG2_SEL_TEXEL1 |
TB0C_ARG2_REPLICATE_ALPHA;
else
cblend |= TB0C_ARG2_SEL_ONE;
}
- if (PICT_FORMAT_A(pMaskPicture->format) != 0)
+ if (PICT_FORMAT_A(mask_picture->format) != 0)
ablend |= TB0A_ARG2_SEL_TEXEL1;
else
ablend |= TB0A_ARG2_SEL_ONE;
@@ -518,7 +518,7 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
}
if (!i830_get_blend_cntl
- (scrn, op, pMaskPicture, pDstPicture->format, &blendctl)) {
+ (scrn, op, mask_picture, dest_picture->format, &blendctl)) {
return FALSE;
}
@@ -617,12 +617,12 @@ static void i830_emit_composite_state(ScrnInfoPtr scrn)
* This function is no longer shared between i830 and i915 generation code.
*/
static void
-i830_emit_composite_primitive(PixmapPtr pDst,
+i830_emit_composite_primitive(PixmapPtr dest,
int srcX, int srcY,
int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
Bool is_affine_src, is_affine_mask = TRUE;
int per_vertex, num_floats;
@@ -801,10 +801,10 @@ i830_emit_composite_primitive(PixmapPtr pDst,
* Do a single rectangle composite operation.
*/
void
-i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
+i830_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
intel_batch_start_atomic(scrn, 58 + /* invarient */
@@ -815,7 +815,7 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
if (intel->needs_render_state_emit)
i830_emit_composite_state(scrn);
- i830_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX,
+ i830_emit_composite_primitive(dest, srcX, srcY, maskX, maskY, dstX,
dstY, w, h);
intel_batch_end_atomic(scrn);
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index f94b2c9..a453c33 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -236,34 +236,34 @@ static void i830_uxa_done_solid(PixmapPtr pPixmap)
* - support planemask using FULL_BLT_CMD?
*/
static Bool
-i830_uxa_prepare_copy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
+i830_uxa_prepare_copy(PixmapPtr source, PixmapPtr dest, int xdir,
int ydir, int alu, Pixel planemask)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
- i830_get_pixmap_bo(pSrcPixmap),
- i830_get_pixmap_bo(pDstPixmap),
+ i830_get_pixmap_bo(source),
+ i830_get_pixmap_bo(dest),
};
- if (!UXA_PM_IS_SOLID(&pSrcPixmap->drawable, planemask))
+ if (!UXA_PM_IS_SOLID(&source->drawable, planemask))
I830FALLBACK("planemask is not solid");
- if (pDstPixmap->drawable.bitsPerPixel < 8)
+ if (dest->drawable.bitsPerPixel < 8)
I830FALLBACK("under 8bpp pixmaps unsupported\n");
if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
- i830_exa_check_pitch_2d(pSrcPixmap);
- i830_exa_check_pitch_2d(pDstPixmap);
+ i830_exa_check_pitch_2d(source);
+ i830_exa_check_pitch_2d(dest);
- intel->pSrcPixmap = pSrcPixmap;
+ intel->render_source = source;
intel->BR[13] = I830CopyROP[alu] << 16;
- switch (pSrcPixmap->drawable.bitsPerPixel) {
+ switch (source->drawable.bitsPerPixel) {
case 8:
break;
case 16:
@@ -277,10 +277,10 @@ i830_uxa_prepare_copy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
}
static void
-i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
+i830_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1,
int dst_y1, int w, int h)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t cmd;
int dst_x2, dst_y2;
@@ -289,27 +289,27 @@ i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
dst_x2 = dst_x1 + w;
dst_y2 = dst_y1 + h;
- dst_pitch = i830_pixmap_pitch(pDstPixmap);
- src_pitch = i830_pixmap_pitch(intel->pSrcPixmap);
+ dst_pitch = i830_pixmap_pitch(dest);
+ src_pitch = i830_pixmap_pitch(intel->render_source);
{
BEGIN_BATCH(8);
cmd = XY_SRC_COPY_BLT_CMD;
- if (pDstPixmap->drawable.bitsPerPixel == 32)
+ if (dest->drawable.bitsPerPixel == 32)
cmd |=
XY_SRC_COPY_BLT_WRITE_ALPHA |
XY_SRC_COPY_BLT_WRITE_RGB;
if (IS_I965G(intel)) {
- if (i830_pixmap_tiled(pDstPixmap)) {
+ if (i830_pixmap_tiled(dest)) {
assert((dst_pitch % 512) == 0);
dst_pitch >>= 2;
cmd |= XY_SRC_COPY_BLT_DST_TILED;
}
- if (i830_pixmap_tiled(intel->pSrcPixmap)) {
+ if (i830_pixmap_tiled(intel->render_source)) {
assert((src_pitch % 512) == 0);
src_pitch >>= 2;
cmd |= XY_SRC_COPY_BLT_SRC_TILED;
@@ -321,20 +321,20 @@ i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
OUT_BATCH(intel->BR[13] | dst_pitch);
OUT_BATCH((dst_y1 << 16) | (dst_x1 & 0xffff));
OUT_BATCH((dst_y2 << 16) | (dst_x2 & 0xffff));
- OUT_RELOC_PIXMAP(pDstPixmap, I915_GEM_DOMAIN_RENDER,
+ OUT_RELOC_PIXMAP(dest, I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER, 0);
OUT_BATCH((src_y1 << 16) | (src_x1 & 0xffff));
OUT_BATCH(src_pitch);
- OUT_RELOC_PIXMAP(intel->pSrcPixmap, I915_GEM_DOMAIN_RENDER, 0,
+ OUT_RELOC_PIXMAP(intel->render_source, I915_GEM_DOMAIN_RENDER, 0,
0);
ADVANCE_BATCH();
}
}
-static void i830_uxa_done_copy(PixmapPtr pDstPixmap)
+static void i830_uxa_done_copy(PixmapPtr dest)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
i830_debug_sync(scrn);
}
@@ -344,9 +344,9 @@ static void i830_uxa_done_copy(PixmapPtr pDstPixmap)
*
* This is shared between i830 through i965.
*/
-void i830_done_composite(PixmapPtr pDst)
+void i830_done_composite(PixmapPtr dest)
{
- ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
i830_debug_sync(scrn);
}
diff --git a/src/i915_render.c b/src/i915_render.c
index 3382b64..7aad162 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -89,7 +89,7 @@ static struct formatinfo i915_tex_formats[] = {
{PICT_a8, MAPSURF_8BIT | MT_8BIT_A8},
};
-static uint32_t i915_get_blend_cntl(int op, PicturePtr pMask,
+static uint32_t i915_get_blend_cntl(int op, PicturePtr mask,
uint32_t dst_format)
{
uint32_t sblend, dblend;
@@ -122,7 +122,7 @@ static uint32_t i915_get_blend_cntl(int op, PicturePtr pMask,
* where the source blend factor is 0, and the source blend value is the
* mask channels multiplied by the source picture's alpha.
*/
- if (pMask && pMask->componentAlpha && PICT_FORMAT_RGB(pMask->format) &&
+ if (mask && mask->componentAlpha && PICT_FORMAT_RGB(mask->format) &&
i915_blend_op[op].src_alpha) {
if (dblend == BLENDFACT_SRC_ALPHA) {
dblend = BLENDFACT_SRC_COLR;
@@ -135,9 +135,9 @@ static uint32_t i915_get_blend_cntl(int op, PicturePtr pMask,
(dblend << S6_CBUF_DST_BLEND_FACT_SHIFT);
}
-static Bool i915_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
+static Bool i915_get_dest_format(PicturePtr dest_picture, uint32_t * dst_format)
{
- switch (pDstPicture->format) {
+ switch (dest_picture->format) {
case PICT_a8r8g8b8:
case PICT_x8r8g8b8:
*dst_format = COLR_BUF_ARGB8888;
@@ -161,59 +161,59 @@ static Bool i915_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
ScrnInfoPtr scrn;
scrn =
- xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ xf86Screens[dest_picture->pDrawable->pScreen->myNum];
I830FALLBACK("Unsupported dest format 0x%x\n",
- (int)pDstPicture->format);
+ (int)dest_picture->format);
}
}
return TRUE;
}
-static Bool i915_check_composite_texture(ScrnInfoPtr scrn, PicturePtr pPict,
+static Bool i915_check_composite_texture(ScrnInfoPtr scrn, PicturePtr picture,
int unit)
{
- if (pPict->repeatType > RepeatReflect)
+ if (picture->repeatType > RepeatReflect)
I830FALLBACK("Unsupported picture repeat %d\n",
- pPict->repeatType);
+ picture->repeatType);
- if (pPict->filter != PictFilterNearest &&
- pPict->filter != PictFilterBilinear)
- I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ if (picture->filter != PictFilterNearest &&
+ picture->filter != PictFilterBilinear)
+ I830FALLBACK("Unsupported filter 0x%x\n", picture->filter);
- if (pPict->pDrawable) {
+ if (picture->pDrawable) {
int w, h, i;
- w = pPict->pDrawable->width;
- h = pPict->pDrawable->height;
+ w = picture->pDrawable->width;
+ h = picture->pDrawable->height;
if ((w > 2048) || (h > 2048))
I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
for (i = 0;
i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
i++) {
- if (i915_tex_formats[i].fmt == pPict->format)
+ if (i915_tex_formats[i].fmt == picture->format)
break;
}
if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
I830FALLBACK("Unsupported picture format 0x%x\n",
- (int)pPict->format);
+ (int)picture->format);
}
return TRUE;
}
Bool
-i915_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
- PicturePtr pDstPicture)
+i915_check_composite(int op, PicturePtr source_picture, PicturePtr mask_picture,
+ PicturePtr dest_picture)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
uint32_t tmp1;
/* Check for unsupported compositing operations. */
if (op >= sizeof(i915_blend_op) / sizeof(i915_blend_op[0]))
I830FALLBACK("Unsupported Composite op 0x%x\n", op);
- if (pMaskPicture != NULL && pMaskPicture->componentAlpha &&
- PICT_FORMAT_RGB(pMaskPicture->format)) {
+ if (mask_picture != NULL && mask_picture->componentAlpha &&
+ PICT_FORMAT_RGB(mask_picture->format)) {
/* Check if it's component alpha that relies on a source alpha
* and on the source value. We can only get one of those
* into the single source value that we get to blend with.
@@ -225,42 +225,42 @@ i915_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
"blending.\n");
}
- if (!i915_check_composite_texture(scrn, pSrcPicture, 0))
+ if (!i915_check_composite_texture(scrn, source_picture, 0))
I830FALLBACK("Check Src picture texture\n");
- if (pMaskPicture != NULL
- && !i915_check_composite_texture(scrn, pMaskPicture, 1))
+ if (mask_picture != NULL
+ && !i915_check_composite_texture(scrn, mask_picture, 1))
I830FALLBACK("Check Mask picture texture\n");
- if (!i915_get_dest_format(pDstPicture, &tmp1))
+ if (!i915_get_dest_format(dest_picture, &tmp1))
I830FALLBACK("Get Color buffer format\n");
return TRUE;
}
-static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
+static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pPix, int unit)
{
- ScrnInfoPtr scrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t format, pitch, filter;
int w, h, i;
uint32_t wrap_mode;
pitch = intel_get_pixmap_pitch(pPix);
- w = pPict->pDrawable->width;
- h = pPict->pDrawable->height;
+ w = picture->pDrawable->width;
+ h = picture->pDrawable->height;
intel->scale_units[unit][0] = pPix->drawable.width;
intel->scale_units[unit][1] = pPix->drawable.height;
for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
i++) {
- if (i915_tex_formats[i].fmt == pPict->format)
+ if (i915_tex_formats[i].fmt == picture->format)
break;
}
if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
I830FALLBACK("unknown texture format\n");
format = i915_tex_formats[i].card_fmt;
- switch (pPict->repeatType) {
+ switch (picture->repeatType) {
case RepeatNone:
wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
break;
@@ -274,10 +274,10 @@ static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
wrap_mode = TEXCOORDMODE_MIRROR;
break;
default:
- FatalError("Unknown repeat type %d\n", pPict->repeatType);
+ FatalError("Unknown repeat type %d\n", picture->repeatType);
}
- switch (pPict->filter) {
+ switch (picture->filter) {
case PictFilterNearest:
filter = (FILTER_NEAREST << SS2_MAG_FILTER_SHIFT) |
(FILTER_NEAREST << SS2_MIN_FILTER_SHIFT);
@@ -288,7 +288,7 @@ static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
break;
default:
filter = 0;
- I830FALLBACK("Bad filter 0x%x\n", pPict->filter);
+ I830FALLBACK("Bad filter 0x%x\n", picture->filter);
}
/* offset filled in at emit time */
@@ -310,57 +310,57 @@ static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
intel->samplerstate[unit * 3 + 1] |= unit << SS3_TEXTUREMAP_INDEX_SHIFT;
intel->samplerstate[unit * 3 + 2] = 0x00000000; /* border color */
- intel->transform[unit] = pPict->transform;
+ intel->transform[unit] = picture->transform;
return TRUE;
}
Bool
-i915_prepare_composite(int op, PicturePtr pSrcPicture,
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+i915_prepare_composite(int op, PicturePtr source_picture,
+ PicturePtr mask_picture, PicturePtr dest_picture,
+ PixmapPtr source, PixmapPtr mask, PixmapPtr dest)
{
- ScrnInfoPtr scrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[source_picture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
- i830_get_pixmap_bo(pSrc),
- pMask ? i830_get_pixmap_bo(pMask) : NULL,
- i830_get_pixmap_bo(pDst),
+ i830_get_pixmap_bo(source),
+ mask ? i830_get_pixmap_bo(mask) : NULL,
+ i830_get_pixmap_bo(dest),
};
- intel->render_source_picture = pSrcPicture;
- intel->render_source = pSrc;
- intel->render_mask_picture = pMaskPicture;
- intel->render_mask = pMask;
- intel->render_dest_picture = pDstPicture;
- intel->render_dest = pDst;
+ intel->render_source_picture = source_picture;
+ intel->render_source = source;
+ intel->render_mask_picture = mask_picture;
+ intel->render_mask = mask;
+ intel->render_dest_picture = dest_picture;
+ intel->render_dest = dest;
- i830_exa_check_pitch_3d(pSrc);
- if (pMask)
- i830_exa_check_pitch_3d(pMask);
- i830_exa_check_pitch_3d(pDst);
+ i830_exa_check_pitch_3d(source);
+ if (mask)
+ i830_exa_check_pitch_3d(mask);
+ i830_exa_check_pitch_3d(dest);
- if (!i915_get_dest_format(pDstPicture,
+ if (!i915_get_dest_format(dest_picture,
&intel->i915_render_state.dst_format))
return FALSE;
if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
- if (!i915_texture_setup(pSrcPicture, pSrc, 0))
+ if (!i915_texture_setup(source_picture, source, 0))
I830FALLBACK("fail to setup src texture\n");
intel->dst_coord_adjust = 0;
intel->src_coord_adjust = 0;
intel->mask_coord_adjust = 0;
- if (pSrcPicture->filter == PictFilterNearest)
+ if (source_picture->filter == PictFilterNearest)
intel->dst_coord_adjust = -0.125;
- if (pMask != NULL) {
- if (!i915_texture_setup(pMaskPicture, pMask, 1))
+ if (mask != NULL) {
+ if (!i915_texture_setup(mask_picture, mask, 1))
I830FALLBACK("fail to setup mask texture\n");
- if (pMaskPicture->filter == PictFilterNearest)
+ if (mask_picture->filter == PictFilterNearest)
intel->dst_coord_adjust = -0.125;
} else {
intel->transform[1] = NULL;
@@ -378,12 +378,12 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
int op = intel->i915_render_state.op;
- PicturePtr pSrcPicture = intel->render_source_picture;
- PicturePtr pMaskPicture = intel->render_mask_picture;
- PicturePtr pDstPicture = intel->render_dest_picture;
- PixmapPtr pSrc = intel->render_source;
- PixmapPtr pMask = intel->render_mask;
- PixmapPtr pDst = intel->render_dest;
+ PicturePtr source_picture = intel->render_source_picture;
+ PicturePtr mask_picture = intel->render_mask_picture;
+ PicturePtr dest_picture = intel->render_dest_picture;
+ PixmapPtr source = intel->render_source;
+ PixmapPtr mask = intel->render_mask;
+ PixmapPtr dest = intel->render_dest;
uint32_t dst_format = intel->i915_render_state.dst_format, dst_pitch;
uint32_t blendctl;
int out_reg = FS_OC;
@@ -395,16 +395,16 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_RENDER;
- dst_pitch = intel_get_pixmap_pitch(pDst);
+ dst_pitch = intel_get_pixmap_pitch(dest);
is_affine_src = i830_transform_is_affine(intel->transform[0]);
is_affine_mask = i830_transform_is_affine(intel->transform[1]);
- if (pMask == NULL) {
+ if (mask == NULL) {
BEGIN_BATCH(10);
OUT_BATCH(_3DSTATE_MAP_STATE | 3);
OUT_BATCH(0x00000001); /* map 0 */
- OUT_RELOC_PIXMAP(pSrc, I915_GEM_DOMAIN_SAMPLER, 0, 0);
+ OUT_RELOC_PIXMAP(source, I915_GEM_DOMAIN_SAMPLER, 0, 0);
OUT_BATCH(intel->mapstate[1]);
OUT_BATCH(intel->mapstate[2]);
@@ -418,10 +418,10 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
BEGIN_BATCH(16);
OUT_BATCH(_3DSTATE_MAP_STATE | 6);
OUT_BATCH(0x00000003); /* map 0,1 */
- OUT_RELOC_PIXMAP(pSrc, I915_GEM_DOMAIN_SAMPLER, 0, 0);
+ OUT_RELOC_PIXMAP(source, I915_GEM_DOMAIN_SAMPLER, 0, 0);
OUT_BATCH(intel->mapstate[1]);
OUT_BATCH(intel->mapstate[2]);
- OUT_RELOC_PIXMAP(pMask, I915_GEM_DOMAIN_SAMPLER, 0, 0);
+ OUT_RELOC_PIXMAP(mask, I915_GEM_DOMAIN_SAMPLER, 0, 0);
OUT_BATCH(intel->mapstate[4]);
OUT_BATCH(intel->mapstate[5]);
@@ -442,7 +442,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
OUT_BATCH(BUF_3D_ID_COLOR_BACK | BUF_3D_USE_FENCE |
BUF_3D_PITCH(dst_pitch));
- OUT_RELOC_PIXMAP(pDst, I915_GEM_DOMAIN_RENDER,
+ OUT_RELOC_PIXMAP(dest, I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER, 0);
OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
@@ -453,7 +453,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
ss2 = S2_TEXCOORD_FMT(0,
is_affine_src ? TEXCOORDFMT_2D :
TEXCOORDFMT_4D);
- if (pMask)
+ if (mask)
ss2 |= S2_TEXCOORD_FMT(1,
is_affine_mask ? TEXCOORDFMT_2D :
TEXCOORDFMT_4D);
@@ -469,7 +469,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
OUT_BATCH((1 << S4_POINT_WIDTH_SHIFT) | S4_LINE_WIDTH_ONE |
S4_CULLMODE_NONE | S4_VFMT_XY);
blendctl =
- i915_get_blend_cntl(op, pMaskPicture, pDstPicture->format);
+ i915_get_blend_cntl(op, mask_picture, dest_picture->format);
OUT_BATCH(0x00000000); /* Disable stencil buffer */
OUT_BATCH(S6_CBUF_BLEND_ENABLE | S6_COLOR_WRITE_ENABLE |
(BLENDFUNC_ADD << S6_CBUF_BLEND_FUNC_SHIFT) |
@@ -479,8 +479,8 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
OUT_BATCH(0x00000000);
OUT_BATCH(0x00000000); /* ymin, xmin */
- OUT_BATCH(DRAW_YMAX(pDst->drawable.height - 1) |
- DRAW_XMAX(pDst->drawable.width - 1));
+ OUT_BATCH(DRAW_YMAX(dest->drawable.height - 1) |
+ DRAW_XMAX(dest->drawable.width - 1));
/* yorig, xorig (relate to color buffer?) */
OUT_BATCH(0x00000000);
OUT_BATCH(MI_NOOP);
@@ -496,13 +496,13 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
* S then T ordering is necessary.
*/
i915_fs_dcl(FS_S0);
- if (pMask)
+ if (mask)
i915_fs_dcl(FS_S1);
i915_fs_dcl(FS_T0);
- if (pMask)
+ if (mask)
i915_fs_dcl(FS_T1);
- /* Load the pSrcPicture texel */
+ /* Load the source_picture texel */
if (is_affine_src) {
i915_fs_texld(FS_R0, FS_S0, FS_T0);
} else {
@@ -510,14 +510,14 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
}
/* If the texture lacks an alpha channel, force the alpha to 1. */
- if (PICT_FORMAT_A(pSrcPicture->format) == 0)
+ if (PICT_FORMAT_A(source_picture->format) == 0)
i915_fs_mov_masked(FS_R0, MASK_W, i915_fs_operand_one());
- if (!pMask) {
+ if (!mask) {
/* No mask, so move to output color */
i915_fs_mov(out_reg, i915_fs_operand_reg(FS_R0));
} else {
- /* Load the pMaskPicture texel */
+ /* Load the mask_picture texel */
if (is_affine_mask) {
i915_fs_texld(FS_R1, FS_S1, FS_T1);
} else {
@@ -525,7 +525,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
}
/* If the texture lacks an alpha channel, force the alpha to 1.
*/
- if (PICT_FORMAT_A(pMaskPicture->format) == 0)
+ if (PICT_FORMAT_A(mask_picture->format) == 0)
i915_fs_mov_masked(FS_R1, MASK_W,
i915_fs_operand_one());
@@ -539,8 +539,8 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
* source alpha is unused. Otherwise, we provide the non-CA
* source value (src.X * mask.A).
*/
- if (pMaskPicture->componentAlpha &&
- PICT_FORMAT_RGB(pMaskPicture->format)) {
+ if (mask_picture->componentAlpha &&
+ PICT_FORMAT_RGB(mask_picture->format)) {
if (i915_blend_op[op].src_alpha) {
i915_fs_mul(out_reg,
i915_fs_operand(FS_R0, W, W, W, W),
@@ -565,12 +565,12 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
* This function is no longer shared between i830 and i915 generation code.
*/
static void
-i915_emit_composite_primitive(PixmapPtr pDst,
+i915_emit_composite_primitive(PixmapPtr dest,
int srcX, int srcY,
int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
Bool is_affine_src, is_affine_mask = TRUE;
int per_vertex, num_floats;
@@ -752,10 +752,10 @@ i915_emit_composite_primitive(PixmapPtr pDst,
}
void
-i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
+i915_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
intel_batch_start_atomic(scrn, 150);
@@ -763,7 +763,7 @@ i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
if (intel->needs_render_state_emit)
i915_emit_composite_setup(scrn);
- i915_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX,
+ i915_emit_composite_primitive(dest, srcX, srcY, maskX, maskY, dstX,
dstY, w, h);
intel_batch_end_atomic(scrn);
diff --git a/src/i965_render.c b/src/i965_render.c
index b253dc9..9ad9d2b 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -117,7 +117,7 @@ static struct formatinfo i965_tex_formats[] = {
{PICT_a8, BRW_SURFACEFORMAT_A8_UNORM},
};
-static void i965_get_blend_cntl(int op, PicturePtr pMask, uint32_t dst_format,
+static void i965_get_blend_cntl(int op, PicturePtr mask, uint32_t dst_format,
uint32_t * sblend, uint32_t * dblend)
{
@@ -138,7 +138,7 @@ static void i965_get_blend_cntl(int op, PicturePtr pMask, uint32_t dst_format,
* the source blend factor is 0, and the source blend value is the mask
* channels multiplied by the source picture's alpha.
*/
- if (pMask && pMask->componentAlpha && PICT_FORMAT_RGB(pMask->format)
+ if (mask && mask->componentAlpha && PICT_FORMAT_RGB(mask->format)
&& i965_blend_op[op].src_alpha) {
if (*dblend == BRW_BLENDFACTOR_SRC_ALPHA) {
*dblend = BRW_BLENDFACTOR_SRC_COLOR;
@@ -149,11 +149,11 @@ static void i965_get_blend_cntl(int op, PicturePtr pMask, uint32_t dst_format,
}
-static Bool i965_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
+static Bool i965_get_dest_format(PicturePtr dest_picture, uint32_t * dst_format)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
- switch (pDstPicture->format) {
+ switch (dest_picture->format) {
case PICT_a8r8g8b8:
case PICT_x8r8g8b8:
*dst_format = BRW_SURFACEFORMAT_B8G8R8A8_UNORM;
@@ -176,59 +176,59 @@ static Bool i965_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
break;
default:
I830FALLBACK("Unsupported dest format 0x%x\n",
- (int)pDstPicture->format);
+ (int)dest_picture->format);
}
return TRUE;
}
-static Bool i965_check_composite_texture(ScrnInfoPtr scrn, PicturePtr pPict,
+static Bool i965_check_composite_texture(ScrnInfoPtr scrn, PicturePtr picture,
int unit)
{
- if (pPict->repeatType > RepeatReflect)
+ if (picture->repeatType > RepeatReflect)
I830FALLBACK("extended repeat (%d) not supported\n",
- pPict->repeatType);
+ picture->repeatType);
- if (pPict->filter != PictFilterNearest &&
- pPict->filter != PictFilterBilinear) {
- I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
+ if (picture->filter != PictFilterNearest &&
+ picture->filter != PictFilterBilinear) {
+ I830FALLBACK("Unsupported filter 0x%x\n", picture->filter);
}
- if (pPict->pDrawable) {
+ if (picture->pDrawable) {
int w, h, i;
- w = pPict->pDrawable->width;
- h = pPict->pDrawable->height;
+ w = picture->pDrawable->width;
+ h = picture->pDrawable->height;
if ((w > 8192) || (h > 8192))
I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
for (i = 0;
i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
i++) {
- if (i965_tex_formats[i].fmt == pPict->format)
+ if (i965_tex_formats[i].fmt == picture->format)
break;
}
if (i == sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]))
I830FALLBACK("Unsupported picture format 0x%x\n",
- (int)pPict->format);
+ (int)picture->format);
}
return TRUE;
}
Bool
-i965_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
- PicturePtr pDstPicture)
+i965_check_composite(int op, PicturePtr source_picture, PicturePtr mask_picture,
+ PicturePtr dest_picture)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
uint32_t tmp1;
/* Check for unsupported compositing operations. */
if (op >= sizeof(i965_blend_op) / sizeof(i965_blend_op[0]))
I830FALLBACK("Unsupported Composite op 0x%x\n", op);
- if (pMaskPicture && pMaskPicture->componentAlpha &&
- PICT_FORMAT_RGB(pMaskPicture->format)) {
+ if (mask_picture && mask_picture->componentAlpha &&
+ PICT_FORMAT_RGB(mask_picture->format)) {
/* Check if it's component alpha that relies on a source alpha and on
* the source value. We can only get one of those into the single
* source value that we get to blend with.
@@ -241,13 +241,13 @@ i965_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
}
}
- if (!i965_check_composite_texture(scrn, pSrcPicture, 0))
+ if (!i965_check_composite_texture(scrn, source_picture, 0))
I830FALLBACK("Check Src picture texture\n");
- if (pMaskPicture != NULL
- && !i965_check_composite_texture(scrn, pMaskPicture, 1))
+ if (mask_picture != NULL
+ && !i965_check_composite_texture(scrn, mask_picture, 1))
I830FALLBACK("Check Mask picture texture\n");
- if (!i965_get_dest_format(pDstPicture, &tmp1))
+ if (!i965_get_dest_format(dest_picture, &tmp1))
I830FALLBACK("Get Color buffer format\n");
return TRUE;
@@ -973,13 +973,13 @@ static drm_intel_bo *gen4_create_cc_unit_state(ScrnInfoPtr scrn)
return cc_state_bo;
}
-static uint32_t i965_get_card_format(PicturePtr pPict)
+static uint32_t i965_get_card_format(PicturePtr picture)
{
int i;
for (i = 0; i < sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]);
i++) {
- if (i965_tex_formats[i].fmt == pPict->format)
+ if (i965_tex_formats[i].fmt == picture->format)
break;
}
assert(i != sizeof(i965_tex_formats) / sizeof(i965_tex_formats[0]));
@@ -1021,7 +1021,7 @@ static sampler_state_extend_t sampler_state_extend_from_picture(int repeat_type)
*/
static void
i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
- PicturePtr pPicture, PixmapPtr pPixmap,
+ PicturePtr picture, PixmapPtr pPixmap,
Bool is_dst)
{
struct brw_surface_state_padded *ss;
@@ -1039,11 +1039,11 @@ i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
uint32_t dst_format = 0;
Bool ret = TRUE;
- ret = i965_get_dest_format(pPicture, &dst_format);
+ ret = i965_get_dest_format(picture, &dst_format);
assert(ret == TRUE);
local_ss.ss0.surface_format = dst_format;
} else {
- local_ss.ss0.surface_format = i965_get_card_format(pPicture);
+ local_ss.ss0.surface_format = i965_get_card_format(picture);
}
local_ss.ss0.data_return_format = BRW_SURFACERETURNFORMAT_FLOAT32;
@@ -1092,10 +1092,10 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
int op = composite_op->op;
- PicturePtr pMaskPicture = intel->render_mask_picture;
- PicturePtr pDstPicture = intel->render_dest_picture;
- PixmapPtr pMask = intel->render_mask;
- PixmapPtr pDst = intel->render_dest;
+ PicturePtr mask_picture = intel->render_mask_picture;
+ PicturePtr dest_picture = intel->render_dest_picture;
+ PixmapPtr mask = intel->render_mask;
+ PixmapPtr dest = intel->render_dest;
sampler_state_filter_t src_filter = composite_op->src_filter;
sampler_state_filter_t mask_filter = composite_op->mask_filter;
sampler_state_extend_t src_extend = composite_op->src_extend;
@@ -1125,7 +1125,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
urb_cs_start = urb_sf_start + urb_sf_size;
urb_cs_size = URB_CS_ENTRIES * URB_CS_ENTRY_SIZE;
- i965_get_blend_cntl(op, pMaskPicture, pDstPicture->format,
+ i965_get_blend_cntl(op, mask_picture, dest_picture->format,
&src_blend, &dst_blend);
/* Begin the long sequence of commands needed to set up the 3D
@@ -1218,7 +1218,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
*/
OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2);
OUT_BATCH(0x00000000); /* ymin, xmin */
- OUT_BATCH(DRAW_YMAX(pDst->drawable.height - 1) | DRAW_XMAX(pDst->drawable.width - 1)); /* ymax, xmax */
+ OUT_BATCH(DRAW_YMAX(dest->drawable.height - 1) | DRAW_XMAX(dest->drawable.width - 1)); /* ymax, xmax */
OUT_BATCH(0x00000000); /* yorigin, xorigin */
/* skip the depth buffer */
@@ -1232,7 +1232,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
OUT_BATCH(BRW_GS_DISABLE); /* disable GS, resulting in passthrough */
OUT_BATCH(BRW_CLIP_DISABLE); /* disable CLIP, resulting in passthrough */
- if (pMask) {
+ if (mask) {
OUT_RELOC(render_state->sf_mask_state_bo,
I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
} else {
@@ -1281,7 +1281,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
/*
* number of extra parameters per vertex
*/
- int nelem = pMask ? 2 : 1;
+ int nelem = mask ? 2 : 1;
/*
* size of extra parameters:
* 3 for homogenous (xyzw)
@@ -1302,7 +1302,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
}
if (IS_IGDNG(intel)) {
- BEGIN_BATCH(pMask ? 9 : 7);
+ BEGIN_BATCH(mask ? 9 : 7);
/*
* The reason to add this extra vertex element in the header is that
* IGDNG has different vertex header definition and origin method to
@@ -1332,7 +1332,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
(BRW_VFCOMPONENT_STORE_0 <<
VE1_VFCOMPONENT_3_SHIFT));
} else {
- BEGIN_BATCH(pMask ? 7 : 5);
+ BEGIN_BATCH(mask ? 7 : 5);
/* Set up our vertex elements, sourced from the single vertex buffer.
* that will be set up later.
*/
@@ -1379,7 +1379,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
else
OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_0_SHIFT) | (BRW_VFCOMPONENT_STORE_SRC << VE1_VFCOMPONENT_1_SHIFT) | (w_component << VE1_VFCOMPONENT_2_SHIFT) | (BRW_VFCOMPONENT_STORE_1_FLT << VE1_VFCOMPONENT_3_SHIFT) | ((4 + 4) << VE1_DESTINATION_ELEMENT_OFFSET_SHIFT)); /* VUE offset in dwords */
/* u1, v1, w1 */
- if (pMask) {
+ if (mask) {
OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) | VE0_VALID | (src_format << VE0_FORMAT_SHIFT) | (((2 + selem) * 4) << VE0_OFFSET_SHIFT)); /* vb offset in bytes */
if (IS_IGDNG(intel))
@@ -1429,11 +1429,11 @@ static Bool i965_composite_check_aperture(ScrnInfoPtr scrn)
}
Bool
-i965_prepare_composite(int op, PicturePtr pSrcPicture,
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+i965_prepare_composite(int op, PicturePtr source_picture,
+ PicturePtr mask_picture, PicturePtr dest_picture,
+ PixmapPtr source, PixmapPtr mask, PixmapPtr dest)
{
- ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
@@ -1441,23 +1441,23 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
drm_intel_bo *binding_table_bo, *surface_state_bo;
if (composite_op->src_filter < 0)
- I830FALLBACK("Bad src filter 0x%x\n", pSrcPicture->filter);
+ I830FALLBACK("Bad src filter 0x%x\n", source_picture->filter);
composite_op->src_extend =
- sampler_state_extend_from_picture(pSrcPicture->repeatType);
+ sampler_state_extend_from_picture(source_picture->repeatType);
if (composite_op->src_extend < 0)
- I830FALLBACK("Bad src repeat 0x%x\n", pSrcPicture->repeatType);
+ I830FALLBACK("Bad src repeat 0x%x\n", source_picture->repeatType);
- if (pMaskPicture) {
+ if (mask_picture) {
composite_op->mask_filter =
- sampler_state_filter_from_picture(pMaskPicture->filter);
+ sampler_state_filter_from_picture(mask_picture->filter);
if (composite_op->mask_filter < 0)
I830FALLBACK("Bad mask filter 0x%x\n",
- pMaskPicture->filter);
+ mask_picture->filter);
composite_op->mask_extend =
- sampler_state_extend_from_picture(pMaskPicture->repeatType);
+ sampler_state_extend_from_picture(mask_picture->repeatType);
if (composite_op->mask_extend < 0)
I830FALLBACK("Bad mask repeat 0x%x\n",
- pMaskPicture->repeatType);
+ mask_picture->repeatType);
} else {
composite_op->mask_filter = SAMPLER_STATE_FILTER_NEAREST;
composite_op->mask_extend = SAMPLER_STATE_EXTEND_NONE;
@@ -1473,14 +1473,14 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
}
/* Set up the state buffer for the destination surface */
i965_set_picture_surface_state(surface_state_bo, 0,
- pDstPicture, pDst, TRUE);
+ dest_picture, dest, TRUE);
/* Set up the source surface state buffer */
i965_set_picture_surface_state(surface_state_bo, 1,
- pSrcPicture, pSrc, FALSE);
- if (pMask) {
+ source_picture, source, FALSE);
+ if (mask) {
/* Set up the mask surface state buffer */
i965_set_picture_surface_state(surface_state_bo, 2,
- pMaskPicture, pMask, FALSE);
+ mask_picture, mask, FALSE);
}
dri_bo_unmap(surface_state_bo);
@@ -1508,7 +1508,7 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
sizeof(brw_surface_state_padded),
I915_GEM_DOMAIN_INSTRUCTION, 0);
- if (pMask) {
+ if (mask) {
binding_table[2] = intel_emit_reloc(binding_table_bo,
2 * sizeof(uint32_t),
surface_state_bo,
@@ -1525,38 +1525,38 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
drm_intel_bo_unreference(surface_state_bo);
composite_op->op = op;
- intel->render_source_picture = pSrcPicture;
- intel->render_mask_picture = pMaskPicture;
- intel->render_dest_picture = pDstPicture;
- intel->render_source = pSrc;
- intel->render_mask = pMask;
- intel->render_dest = pDst;
+ intel->render_source_picture = source_picture;
+ intel->render_mask_picture = mask_picture;
+ intel->render_dest_picture = dest_picture;
+ intel->render_source = source;
+ intel->render_mask = mask;
+ intel->render_dest = dest;
drm_intel_bo_unreference(composite_op->binding_table_bo);
composite_op->binding_table_bo = binding_table_bo;
composite_op->src_filter =
- sampler_state_filter_from_picture(pSrcPicture->filter);
+ sampler_state_filter_from_picture(source_picture->filter);
- intel->scale_units[0][0] = pSrc->drawable.width;
- intel->scale_units[0][1] = pSrc->drawable.height;
+ intel->scale_units[0][0] = source->drawable.width;
+ intel->scale_units[0][1] = source->drawable.height;
- intel->transform[0] = pSrcPicture->transform;
+ intel->transform[0] = source_picture->transform;
composite_op->is_affine = i830_transform_is_affine(intel->transform[0]);
- if (!pMask) {
+ if (!mask) {
intel->transform[1] = NULL;
intel->scale_units[1][0] = -1;
intel->scale_units[1][1] = -1;
} else {
- intel->transform[1] = pMaskPicture->transform;
- intel->scale_units[1][0] = pMask->drawable.width;
- intel->scale_units[1][1] = pMask->drawable.height;
+ intel->transform[1] = mask_picture->transform;
+ intel->scale_units[1][0] = mask->drawable.width;
+ intel->scale_units[1][1] = mask->drawable.height;
composite_op->is_affine |=
i830_transform_is_affine(intel->transform[1]);
}
- if (pMask) {
- if (pMaskPicture->componentAlpha &&
- PICT_FORMAT_RGB(pMaskPicture->format)) {
+ if (mask) {
+ if (mask_picture->componentAlpha &&
+ PICT_FORMAT_RGB(mask_picture->format)) {
if (i965_blend_op[op].src_alpha) {
if (composite_op->is_affine)
composite_op->wm_kernel =
@@ -1626,10 +1626,10 @@ static drm_intel_bo *i965_get_vb_space(ScrnInfoPtr scrn)
}
void
-i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
+i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
Bool has_mask;
commit 050a141b7bc94b459061615124b7686a9c331e01
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 18:30:57 2009 -0700
Share several render fields between render implementations.
Also, start settling on the cairo naming for things: source, mask, and dest.
diff --git a/src/i830.h b/src/i830.h
index 05f12d1..a505cb5 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -265,11 +265,12 @@ typedef struct intel_screen_private {
float src_coord_adjust;
float mask_coord_adjust;
- /* i830 render accel state */
- PixmapPtr render_src, render_mask, render_dst;
- PicturePtr render_src_picture, render_mask_picture, render_dst_picture;
- uint32_t render_dst_format;
+ PixmapPtr render_source, render_mask, render_dest;
+ PicturePtr render_source_picture, render_mask_picture, render_dest_picture;
Bool needs_render_state_emit;
+
+ /* i830 render accel state */
+ uint32_t render_dest_format;
uint32_t cblend, ablend, s8_blendctl;
/* i915 render accel state */
@@ -279,7 +280,6 @@ typedef struct intel_screen_private {
struct {
int op;
uint32_t dst_format;
- Bool needs_emit;
} i915_render_state;
/* 965 render acceleration state */
diff --git a/src/i830_render.c b/src/i830_render.c
index c4b264d..d463b53 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -411,19 +411,19 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
intel_screen_private *intel = intel_get_screen_private(scrn);
- intel->render_src_picture = pSrcPicture;
- intel->render_src = pSrc;
+ intel->render_source_picture = pSrcPicture;
+ intel->render_source = pSrc;
intel->render_mask_picture = pMaskPicture;
intel->render_mask = pMask;
- intel->render_dst_picture = pDstPicture;
- intel->render_dst = pDst;
+ intel->render_dest_picture = pDstPicture;
+ intel->render_dest = pDst;
i830_exa_check_pitch_3d(pSrc);
if (pMask)
i830_exa_check_pitch_3d(pMask);
i830_exa_check_pitch_3d(pDst);
- if (!i830_get_dest_format(pDstPicture, &intel->render_dst_format))
+ if (!i830_get_dest_format(pDstPicture, &intel->render_dest_format))
return FALSE;
intel->dst_coord_adjust = 0;
@@ -549,18 +549,18 @@ static void i830_emit_composite_state(ScrnInfoPtr scrn)
OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
OUT_BATCH(BUF_3D_ID_COLOR_BACK | BUF_3D_USE_FENCE |
- BUF_3D_PITCH(intel_get_pixmap_pitch(intel->render_dst)));
- OUT_RELOC_PIXMAP(intel->render_dst,
+ BUF_3D_PITCH(intel_get_pixmap_pitch(intel->render_dest)));
+ OUT_RELOC_PIXMAP(intel->render_dest,
I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
- OUT_BATCH(intel->render_dst_format);
+ OUT_BATCH(intel->render_dest_format);
OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
OUT_BATCH(0);
OUT_BATCH(0); /* ymin, xmin */
- OUT_BATCH(DRAW_YMAX(intel->render_dst->drawable.height - 1) |
- DRAW_XMAX(intel->render_dst->drawable.width - 1));
+ OUT_BATCH(DRAW_YMAX(intel->render_dest->drawable.height - 1) |
+ DRAW_XMAX(intel->render_dest->drawable.width - 1));
OUT_BATCH(0); /* yorig, xorig */
OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
@@ -590,7 +590,7 @@ static void i830_emit_composite_state(ScrnInfoPtr scrn)
DISABLE_STENCIL_WRITE | ENABLE_TEX_CACHE |
DISABLE_DITHER | ENABLE_COLOR_WRITE | DISABLE_DEPTH_WRITE);
- if (i830_transform_is_affine(intel->render_src_picture->transform))
+ if (i830_transform_is_affine(intel->render_source_picture->transform))
texcoordfmt |= (TEXCOORDFMT_2D << 0);
else
texcoordfmt |= (TEXCOORDFMT_3D << 0);
@@ -605,7 +605,7 @@ static void i830_emit_composite_state(ScrnInfoPtr scrn)
ADVANCE_BATCH();
- i830_texture_setup(intel->render_src_picture, intel->render_src, 0);
+ i830_texture_setup(intel->render_source_picture, intel->render_source, 0);
if (intel->render_mask) {
i830_texture_setup(intel->render_mask_picture,
intel->render_mask, 1);
diff --git a/src/i915_render.c b/src/i915_render.c
index 2616481..3382b64 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -329,12 +329,12 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
i830_get_pixmap_bo(pDst),
};
- intel->render_src_picture = pSrcPicture;
- intel->render_src = pSrc;
+ intel->render_source_picture = pSrcPicture;
+ intel->render_source = pSrc;
intel->render_mask_picture = pMaskPicture;
intel->render_mask = pMask;
- intel->render_dst_picture = pDstPicture;
- intel->render_dst = pDst;
+ intel->render_dest_picture = pDstPicture;
+ intel->render_dest = pDst;
i830_exa_check_pitch_3d(pSrc);
if (pMask)
@@ -369,7 +369,7 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
}
intel->i915_render_state.op = op;
- intel->i915_render_state.needs_emit = TRUE;
+ intel->needs_render_state_emit = TRUE;
return TRUE;
}
@@ -378,19 +378,19 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
int op = intel->i915_render_state.op;
- PicturePtr pSrcPicture = intel->render_src_picture;
+ PicturePtr pSrcPicture = intel->render_source_picture;
PicturePtr pMaskPicture = intel->render_mask_picture;
- PicturePtr pDstPicture = intel->render_dst_picture;
- PixmapPtr pSrc = intel->render_src;
+ PicturePtr pDstPicture = intel->render_dest_picture;
+ PixmapPtr pSrc = intel->render_source;
PixmapPtr pMask = intel->render_mask;
- PixmapPtr pDst = intel->render_dst;
+ PixmapPtr pDst = intel->render_dest;
uint32_t dst_format = intel->i915_render_state.dst_format, dst_pitch;
uint32_t blendctl;
int out_reg = FS_OC;
FS_LOCALS(20);
Bool is_affine_src, is_affine_mask;
- intel->i915_render_state.needs_emit = FALSE;
+ intel->needs_render_state_emit = FALSE;
IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_RENDER;
@@ -760,7 +760,7 @@ i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
intel_batch_start_atomic(scrn, 150);
- if (intel->i915_render_state.needs_emit)
+ if (intel->needs_render_state_emit)
i915_emit_composite_setup(scrn);
i915_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX,
@@ -773,5 +773,5 @@ void i915_batch_flush_notify(ScrnInfoPtr scrn)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
- intel->i915_render_state.needs_emit = TRUE;
+ intel->needs_render_state_emit = TRUE;
}
diff --git a/src/i965_render.c b/src/i965_render.c
index 17ae558..b253dc9 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -581,12 +581,6 @@ typedef float gen4_vertex_buffer[VERTEX_BUFFER_SIZE];
typedef struct gen4_composite_op {
int op;
- PicturePtr source_picture;
- PicturePtr mask_picture;
- PicturePtr dest_picture;
- PixmapPtr source;
- PixmapPtr mask;
- PixmapPtr dest;
drm_intel_bo *binding_table_bo;
sampler_state_filter_t src_filter;
sampler_state_filter_t mask_filter;
@@ -616,8 +610,6 @@ struct gen4_render_state {
int vb_offset;
int vertex_size;
-
- Bool needs_state_emit;
};
/**
@@ -1100,10 +1092,10 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
int op = composite_op->op;
- PicturePtr pMaskPicture = composite_op->mask_picture;
- PicturePtr pDstPicture = composite_op->dest_picture;
- PixmapPtr pMask = composite_op->mask;
- PixmapPtr pDst = composite_op->dest;
+ PicturePtr pMaskPicture = intel->render_mask_picture;
+ PicturePtr pDstPicture = intel->render_dest_picture;
+ PixmapPtr pMask = intel->render_mask;
+ PixmapPtr pDst = intel->render_dest;
sampler_state_filter_t src_filter = composite_op->src_filter;
sampler_state_filter_t mask_filter = composite_op->mask_filter;
sampler_state_extend_t src_extend = composite_op->src_extend;
@@ -1117,7 +1109,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
uint32_t src_blend, dst_blend;
dri_bo *binding_table_bo = composite_op->binding_table_bo;
- render_state->needs_state_emit = FALSE;
+ intel->needs_render_state_emit = FALSE;
IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_RENDER;
@@ -1533,12 +1525,12 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
drm_intel_bo_unreference(surface_state_bo);
composite_op->op = op;
- composite_op->source_picture = pSrcPicture;
- composite_op->mask_picture = pMaskPicture;
- composite_op->dest_picture = pDstPicture;
- composite_op->source = pSrc;
- composite_op->mask = pMask;
- composite_op->dest = pDst;
+ intel->render_source_picture = pSrcPicture;
+ intel->render_mask_picture = pMaskPicture;
+ intel->render_dest_picture = pDstPicture;
+ intel->render_source = pSrc;
+ intel->render_mask = pMask;
+ intel->render_dest = pDst;
drm_intel_bo_unreference(composite_op->binding_table_bo);
composite_op->binding_table_bo = binding_table_bo;
composite_op->src_filter =
@@ -1602,7 +1594,7 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
("Couldn't fit render operation in aperture\n");
}
- render_state->needs_state_emit = TRUE;
+ intel->needs_render_state_emit = TRUE;
return TRUE;
}
@@ -1770,7 +1762,7 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
intel_batch_flush(scrn, FALSE);
intel_batch_start_atomic(scrn, 200);
- if (render_state->needs_state_emit)
+ if (intel->needs_render_state_emit)
i965_emit_composite_state(scrn);
BEGIN_BATCH(12);
@@ -1821,7 +1813,7 @@ void i965_batch_flush_notify(ScrnInfoPtr scrn)
render_state->vertex_buffer_bo = NULL;
}
- render_state->needs_state_emit = TRUE;
+ intel->needs_render_state_emit = TRUE;
}
/**
commit af27a3a0a5645c6f41f583611bd0f2559dc7cb2f
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 18:24:50 2009 -0700
Rename the xf86 screen private from pScrn to scrn.
diff --git a/src/common.h b/src/common.h
index 505fcb2..5bc79e5 100644
--- a/src/common.h
+++ b/src/common.h
@@ -78,7 +78,7 @@ I830DPRINTF_stub(const char *filename, int line, const char *function,
#ifndef REG_DUMPER
/* I830 hooks for the I810 driver setup/probe. */
extern const OptionInfoRec *I830AvailableOptions(int chipid, int busid);
-extern void I830InitpScrn(ScrnInfoPtr pScrn);
+extern void intel_init_scrn(ScrnInfoPtr scrn);
/* Symbol lists shared by the i810 and i830 parts. */
extern int I830EntityIndex;
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 7358cad..ba1e751 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -298,8 +298,8 @@ static Bool
drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
Rotation rotation, int x, int y)
{
- ScrnInfoPtr pScrn = crtc->scrn;
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = crtc->scrn;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
@@ -312,12 +312,12 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
int i;
int fb_id;
drmModeModeInfo kmode;
- unsigned int pitch = pScrn->displayWidth * intel->cpp;
+ unsigned int pitch = scrn->displayWidth * intel->cpp;
if (drmmode->fb_id == 0) {
ret = drmModeAddFB(drmmode->fd,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->depth, pScrn->bitsPerPixel,
+ scrn->virtualX, scrn->virtualY,
+ scrn->depth, scrn->bitsPerPixel,
pitch, intel->front_buffer->bo->handle,
&drmmode->fb_id);
if (ret < 0) {
@@ -390,10 +390,10 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
drmmode_output_dpms(output, DPMSModeOn);
}
- i830_set_max_gtt_map_size(pScrn);
+ i830_set_max_gtt_map_size(scrn);
- if (pScrn->pScreen)
- xf86_reload_cursors(pScrn->pScreen);
+ if (scrn->pScreen)
+ xf86_reload_cursors(scrn->pScreen);
done:
if (!ret) {
crtc->x = saved_x;
@@ -458,8 +458,8 @@ drmmode_show_cursor (xf86CrtcPtr crtc)
static void *
drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
{
- ScrnInfoPtr pScrn = crtc->scrn;
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = crtc->scrn;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
int size, ret;
@@ -494,7 +494,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
static PixmapPtr
drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
{
- ScrnInfoPtr pScrn = crtc->scrn;
+ ScrnInfoPtr scrn = crtc->scrn;
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
unsigned long rotate_pitch;
@@ -503,7 +503,7 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
if (!data) {
data = drmmode_crtc_shadow_allocate (crtc, width, height);
if (!data) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Couldn't allocate shadow pixmap for rotated CRTC\n");
return NULL;
}
@@ -511,15 +511,15 @@ drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
rotate_pitch =
i830_pad_drawable_width(width, drmmode->cpp) * drmmode->cpp;
- rotate_pixmap = GetScratchPixmapHeader(pScrn->pScreen,
+ rotate_pixmap = GetScratchPixmapHeader(scrn->pScreen,
width, height,
- pScrn->depth,
- pScrn->bitsPerPixel,
+ scrn->depth,
+ scrn->bitsPerPixel,
rotate_pitch,
NULL);
if (rotate_pixmap == NULL) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Couldn't allocate shadow pixmap for rotated CRTC\n");
return NULL;
}
@@ -580,12 +580,12 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
static void
-drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+drmmode_crtc_init(ScrnInfoPtr scrn, drmmode_ptr drmmode, int num)
{
xf86CrtcPtr crtc;
drmmode_crtc_private_ptr drmmode_crtc;
- crtc = xf86CrtcCreate(pScrn, &drmmode_crtc_funcs);
+ crtc = xf86CrtcCreate(scrn, &drmmode_crtc_funcs);
if (crtc == NULL)
return;
@@ -1226,7 +1226,7 @@ static const char *output_names[] = { "None",
static void
-drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+drmmode_output_init(ScrnInfoPtr scrn, drmmode_ptr drmmode, int num)
{
xf86OutputPtr output;
drmModeConnectorPtr koutput;
@@ -1248,7 +1248,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
snprintf(name, 32, "%s%d", output_names[koutput->connector_type],
koutput->connector_type_id);
- output = xf86OutputCreate (pScrn, &drmmode_output_funcs, name);
+ output = xf86OutputCreate (scrn, &drmmode_output_funcs, name);
if (!output) {
drmModeFreeEncoder(kencoder);
drmModeFreeConnector(koutput);
@@ -1272,7 +1272,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
drmmode_output->private_data = xcalloc(
sizeof(struct fixed_panel_lvds), 1);
if (!drmmode_output->private_data)
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Can't allocate private memory for LVDS.\n");
}
drmmode_output->output_id = drmmode->mode_res->connectors[num];
@@ -1374,7 +1374,7 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
drmmode_xf86crtc_resize
};
-Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+Bool drmmode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
{
xf86CrtcConfigPtr xf86_config;
drmmode_ptr drmmode;
@@ -1384,26 +1384,26 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
drmmode->fd = fd;
drmmode->fb_id = 0;
- xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
- xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CrtcConfigInit(scrn, &drmmode_xf86crtc_config_funcs);
+ xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
drmmode->cpp = cpp;
drmmode->mode_res = drmModeGetResources(drmmode->fd);
if (!drmmode->mode_res) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"failed to get resources: %s\n", strerror(errno));
return FALSE;
}
- xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
+ xf86CrtcSetSizeRange(scrn, 320, 200, drmmode->mode_res->max_width,
drmmode->mode_res->max_height);
for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
- drmmode_crtc_init(pScrn, drmmode, i);
+ drmmode_crtc_init(scrn, drmmode, i);
for (i = 0; i < drmmode->mode_res->count_connectors; i++)
- drmmode_output_init(pScrn, drmmode, i);
+ drmmode_output_init(scrn, drmmode, i);
- xf86InitialConfiguration(pScrn, TRUE);
+ xf86InitialConfiguration(scrn, TRUE);
return TRUE;
}
diff --git a/src/i810_driver.c b/src/i810_driver.c
index bb3bad8..68e45bb 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -476,7 +476,7 @@ static Bool intel_pci_probe (DriverPtr driver,
break;
#endif
default:
- I830InitpScrn(scrn);
+ intel_init_scrn(scrn);
break;
}
}
diff --git a/src/i830.h b/src/i830.h
index e6eb4b9..05f12d1 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -74,7 +74,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Bool i830_uxa_init(ScreenPtr pScreen);
void i830_uxa_create_screen_resources(ScreenPtr pScreen);
void i830_uxa_block_handler(ScreenPtr pScreen);
-Bool i830_get_aperture_space(ScrnInfoPtr pScrn, drm_intel_bo ** bo_table,
+Bool i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
int num_bos);
dri_bo *i830_get_pixmap_bo(PixmapPtr pixmap);
@@ -226,7 +226,7 @@ typedef struct intel_screen_private {
CloseScreenProcPtr CloseScreen;
- void (*batch_flush_notify) (ScrnInfoPtr pScrn);
+ void (*batch_flush_notify) (ScrnInfoPtr scrn);
uxa_driver_t *uxa_driver;
Bool need_flush;
@@ -321,23 +321,23 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pPix);
#include "i830_batchbuffer.h"
/* I830 specific functions */
-extern void I830Sync(ScrnInfoPtr pScrn);
-extern void IntelEmitInvarientState(ScrnInfoPtr pScrn);
-extern void I830EmitInvarientState(ScrnInfoPtr pScrn);
-extern void I915EmitInvarientState(ScrnInfoPtr pScrn);
+extern void I830Sync(ScrnInfoPtr scrn);
+extern void IntelEmitInvarientState(ScrnInfoPtr scrn);
+extern void I830EmitInvarientState(ScrnInfoPtr scrn);
+extern void I915EmitInvarientState(ScrnInfoPtr scrn);
-extern void I830EmitFlush(ScrnInfoPtr pScrn);
+extern void I830EmitFlush(ScrnInfoPtr scrn);
extern void I830InitVideo(ScreenPtr pScreen);
-extern xf86CrtcPtr i830_covering_crtc(ScrnInfoPtr pScrn, BoxPtr box,
+extern xf86CrtcPtr i830_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
xf86CrtcPtr desired, BoxPtr crtc_box_ret);
-extern xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr pScrn, int pipe);
+extern xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr scrn, int pipe);
Bool I830DRI2ScreenInit(ScreenPtr pScreen);
void I830DRI2CloseScreen(ScreenPtr pScreen);
-extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+extern Bool drmmode_pre_init(ScrnInfoPtr scrn, int fd, int cpp);
extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr * bufmgr,
xf86CrtcPtr crtc);
extern int drmmode_output_dpms_status(xf86OutputPtr output);
@@ -348,25 +348,25 @@ extern Bool i830_crtc_on(xf86CrtcPtr crtc);
extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
extern Bool I830AccelInit(ScreenPtr pScreen);
-Bool i830_allocator_init(ScrnInfoPtr pScrn, unsigned long size);
-void i830_allocator_fini(ScrnInfoPtr pScrn);
-i830_memory *i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
+Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size);
+void i830_allocator_fini(ScrnInfoPtr scrn);
+i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
unsigned long size, unsigned long pitch,
unsigned long alignment, int flags,
enum tile_format tile_format);
-void i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity,
+void i830_describe_allocations(ScrnInfoPtr scrn, int verbosity,
const char *prefix);
-void i830_reset_allocations(ScrnInfoPtr pScrn);
-void i830_free_3d_memory(ScrnInfoPtr pScrn);
-void i830_free_memory(ScrnInfoPtr pScrn, i830_memory * mem);
-Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn);
-Bool i830_allocate_3d_memory(ScrnInfoPtr pScrn);
-void i830_init_bufmgr(ScrnInfoPtr pScrn);
+void i830_reset_allocations(ScrnInfoPtr scrn);
+void i830_free_3d_memory(ScrnInfoPtr scrn);
+void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem);
+Bool i830_allocate_2d_memory(ScrnInfoPtr scrn);
+Bool i830_allocate_3d_memory(ScrnInfoPtr scrn);
+void i830_init_bufmgr(ScrnInfoPtr scrn);
#ifdef INTEL_XVMC
-Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
+Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name,
i830_memory ** buffer, unsigned long size,
int flags);
-void i830_free_xvmc_buffer(ScrnInfoPtr pScrn, i830_memory * buffer);
+void i830_free_xvmc_buffer(ScrnInfoPtr scrn, i830_memory * buffer);
#endif
Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp);
@@ -374,13 +374,13 @@ Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp);
int i830_pad_drawable_width(int width, int cpp);
/* i830_memory.c */
-Bool i830_bind_all_memory(ScrnInfoPtr pScrn);
+Bool i830_bind_all_memory(ScrnInfoPtr scrn);
unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size);
unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch,
int format);
-void i830_set_max_gtt_map_size(ScrnInfoPtr pScrn);
+void i830_set_max_gtt_map_size(ScrnInfoPtr scrn);
-i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn);
+i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn);
/* i830_render.c */
Bool i830_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
@@ -401,12 +401,12 @@ Bool i915_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
PixmapPtr pMaskPixmap, PixmapPtr pDstPixmap);
void i915_composite(PixmapPtr pDst, int srcX, int srcY,
int maskX, int maskY, int dstX, int dstY, int w, int h);
-void i915_batch_flush_notify(ScrnInfoPtr pScrn);
+void i915_batch_flush_notify(ScrnInfoPtr scrn);
void i830_batch_flush_notify(ScrnInfoPtr scrn);
/* i965_render.c */
-unsigned int gen4_render_state_size(ScrnInfoPtr pScrn);
-void gen4_render_state_init(ScrnInfoPtr pScrn);
-void gen4_render_state_cleanup(ScrnInfoPtr pScrn);
+unsigned int gen4_render_state_size(ScrnInfoPtr scrn);
+void gen4_render_state_init(ScrnInfoPtr scrn);
+void gen4_render_state_cleanup(ScrnInfoPtr scrn);
Bool i965_check_composite(int op, PicturePtr pSrc, PicturePtr pMask,
PicturePtr pDst);
Bool i965_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
@@ -415,7 +415,7 @@ Bool i965_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMask,
void i965_composite(PixmapPtr pDst, int srcX, int srcY,
int maskX, int maskY, int dstX, int dstY, int w, int h);
-void i965_batch_flush_notify(ScrnInfoPtr pScrn);
+void i965_batch_flush_notify(ScrnInfoPtr scrn);
Bool
i830_get_transformed_coordinates(int x, int y, PictTransformPtr transform,
@@ -429,8 +429,8 @@ void i830_enter_render(ScrnInfoPtr);
#define I830FALLBACK(s, arg...) \
do { \
- if (intel_get_screen_private(pScrn)->fallback_debug) { \
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, \
+ if (intel_get_screen_private(scrn)->fallback_debug) { \
+ xf86DrvMsg(scrn->scrnIndex, X_INFO, \
"fallback: " s "\n", ##arg); \
} \
return FALSE; \
diff --git a/src/i830_3d.c b/src/i830_3d.c
index 28527dc..c95a0b1 100644
--- a/src/i830_3d.c
+++ b/src/i830_3d.c
@@ -34,9 +34,9 @@
#include "i830_reg.h"
-void I830EmitInvarientState(ScrnInfoPtr pScrn)
+void I830EmitInvarientState(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
BEGIN_BATCH(58);
diff --git a/src/i830_accel.c b/src/i830_accel.c
index f9cbda8..1a7c61f 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -53,25 +53,25 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pPix)
return (unsigned long)pPix->devKind;
}
-void I830Sync(ScrnInfoPtr pScrn)
+void I830Sync(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
ErrorF("I830Sync\n");
- if (!pScrn->vtSema || !intel->batch_bo)
+ if (!scrn->vtSema || !intel->batch_bo)
return;
- I830EmitFlush(pScrn);
+ I830EmitFlush(scrn);
- intel_batch_flush(pScrn, TRUE);
- intel_batch_wait_last(pScrn);
+ intel_batch_flush(scrn, TRUE);
+ intel_batch_wait_last(scrn);
}
-void I830EmitFlush(ScrnInfoPtr pScrn)
+void I830EmitFlush(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
if (IS_I965G(intel))
@@ -100,8 +100,8 @@ void i830_debug_sync(ScrnInfoPtr scrn)
*/
Bool I830AccelInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* Limits are described in the BLT engine chapter under Graphics Data Size
* Limitations, and the descriptions of SURFACE_STATE, 3DSTATE_BUFFER_INFO,
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 553eeb3..f662dfc 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -39,9 +39,9 @@
#include "i830_ring.h"
#include "i915_drm.h"
-static void intel_next_batch(ScrnInfoPtr pScrn)
+static void intel_next_batch(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* The 865 has issues with larger-than-page-sized batch buffers. */
if (IS_I865G(intel))
@@ -64,19 +64,19 @@ static void intel_next_batch(ScrnInfoPtr pScrn)
intel->last_3d = LAST_3D_OTHER;
}
-void intel_batch_init(ScrnInfoPtr pScrn)
+void intel_batch_init(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
intel->batch_emit_start = 0;
intel->batch_emitting = 0;
- intel_next_batch(pScrn);
+ intel_next_batch(scrn);
}
-void intel_batch_teardown(ScrnInfoPtr pScrn)
+void intel_batch_teardown(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (intel->batch_ptr != NULL) {
dri_bo_unmap(intel->batch_bo);
@@ -90,9 +90,9 @@ void intel_batch_teardown(ScrnInfoPtr pScrn)
}
}
-void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed)
+void intel_batch_flush(ScrnInfoPtr scrn, Bool flushed)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int ret;
if (intel->batch_used == 0)
@@ -126,7 +126,7 @@ void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed)
intel->last_batch_bo = intel->batch_bo;
intel->batch_bo = NULL;
- intel_next_batch(pScrn);
+ intel_next_batch(scrn);
/* Mark that we need to flush whatever potential rendering we've done in the
* blockhandler. We could set this less often, but it's probably not worth
@@ -135,7 +135,7 @@ void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed)
intel->need_mi_flush = TRUE;
if (intel->batch_flush_notify)
- intel->batch_flush_notify(pScrn);
+ intel->batch_flush_notify(scrn);
}
/** Waits on the last emitted batchbuffer to be completed. */
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index cd8e026..f351a1a 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -32,10 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define BATCH_RESERVED 16
-void intel_batch_init(ScrnInfoPtr pScrn);
-void intel_batch_teardown(ScrnInfoPtr pScrn);
-void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed);
-void intel_batch_wait_last(ScrnInfoPtr pScrn);
+void intel_batch_init(ScrnInfoPtr scrn);
+void intel_batch_teardown(ScrnInfoPtr scrn);
+void intel_batch_flush(ScrnInfoPtr scrn, Bool flushed);
+void intel_batch_wait_last(ScrnInfoPtr scrn);
static inline int intel_batch_space(intel_screen_private *intel)
{
@@ -43,27 +43,27 @@ static inline int intel_batch_space(intel_screen_private *intel)
}
static inline void
-intel_batch_require_space(ScrnInfoPtr pScrn, intel_screen_private *intel, GLuint sz)
+intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, GLuint sz)
{
assert(sz < intel->batch_bo->size - 8);
if (intel_batch_space(intel) < sz)
- intel_batch_flush(pScrn, FALSE);
+ intel_batch_flush(scrn, FALSE);
}
-static inline void intel_batch_start_atomic(ScrnInfoPtr pScrn, unsigned int sz)
+static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, unsigned int sz)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
assert(!intel->in_batch_atomic);
- intel_batch_require_space(pScrn, intel, sz * 4);
+ intel_batch_require_space(scrn, intel, sz * 4);
intel->in_batch_atomic = TRUE;
intel->batch_atomic_limit = intel->batch_used + sz * 4;
}
-static inline void intel_batch_end_atomic(ScrnInfoPtr pScrn)
+static inline void intel_batch_end_atomic(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
assert(intel->in_batch_atomic);
assert(intel->batch_used <= intel->batch_atomic_limit);
@@ -127,7 +127,7 @@ do { \
if (intel->batch_emitting != 0) \
FatalError("%s: BEGIN_BATCH called without closing " \
"ADVANCE_BATCH\n", __FUNCTION__); \
- intel_batch_require_space(pScrn, intel, (n) * 4); \
+ intel_batch_require_space(scrn, intel, (n) * 4); \
intel->batch_emitting = (n) * 4; \
intel->batch_emit_start = intel->batch_used; \
} while (0)
@@ -151,7 +151,7 @@ do { \
if ((intel->batch_emitting > 8) && \
(I810_DEBUG & DEBUG_ALWAYS_SYNC)) { \
/* Note: not actually syncing, just flushing each batch. */ \
- intel_batch_flush(pScrn, FALSE); \
+ intel_batch_flush(scrn, FALSE); \
} \
intel->batch_emitting = 0; \
} while (0)
diff --git a/src/i830_bios.c b/src/i830_bios.c
index f1f1644..dd73b57 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -242,7 +242,7 @@ static void parse_driver_feature(intel_screen_private *intel, struct bdb_header
}
static
-void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
+void parse_sdvo_mapping(ScrnInfoPtr scrn, struct bdb_header *bdb)
{
unsigned int block_size;
uint16_t *block_ptr;
@@ -250,11 +250,11 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
struct child_device_config *child;
int i, child_device_num, count;
struct sdvo_device_mapping *p_mapping;
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
defs = find_section(bdb, BDB_GENERAL_DEFINITIONS);
if (!defs) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"can't find the general definition blocks\n");
return;
}
@@ -275,11 +275,11 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
if (child->dvo_port != DEVICE_PORT_DVOB &&
child->dvo_port != DEVICE_PORT_DVOC) {
/* skip the incorrect sdvo port */
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Incorrect SDVO port\n");
continue;
}
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"the SDVO device with slave addr %x "
"is found on DVO %x port\n",
child->slave_addr, child->dvo_port);
@@ -292,7 +292,7 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
p_mapping->initialized = 1;
p_mapping->slave_addr = child->slave_addr;
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"One DVO port is shared by two slave "
"address. Maybe it can't be handled\n");
}
@@ -303,7 +303,7 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
* of course its mapping info won't be added.
*/
if (child->slave2_addr) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Two DVO ports uses the same slave address."
"Maybe it can't be handled by SDVO driver\n");
}
@@ -315,7 +315,7 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
}
/* If the count is zero, it indicates that no sdvo device is found */
if (!count)
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"No SDVO device is found in VBT\n");
return;
@@ -333,9 +333,9 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
*
* Returns 0 on success, nonzero on failure.
*/
-int i830_bios_init(ScrnInfoPtr pScrn)
+int i830_bios_init(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct vbt_header *vbt;
struct bdb_header *bdb;
int vbt_off, bdb_off;
@@ -346,7 +346,7 @@ int i830_bios_init(ScrnInfoPtr pScrn)
size = intel->PciInfo->rom_size;
if (size == 0) {
size = INTEL_VBIOS_SIZE;
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"libpciaccess reported 0 rom size, guessing %dkB\n",
size / 1024);
}
@@ -356,7 +356,7 @@ int i830_bios_init(ScrnInfoPtr pScrn)
ret = pci_device_read_rom(intel->PciInfo, bios);
if (ret != 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"libpciaccess failed to read %dkB video BIOS: %s\n",
size / 1024, strerror(-ret));
xfree(bios);
@@ -365,7 +365,7 @@ int i830_bios_init(ScrnInfoPtr pScrn)
vbt_off = INTEL_BIOS_16(0x1a);
if (vbt_off >= size) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Bad VBT offset: 0x%x\n",
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Bad VBT offset: 0x%x\n",
vbt_off);
xfree(bios);
return -1;
@@ -374,7 +374,7 @@ int i830_bios_init(ScrnInfoPtr pScrn)
vbt = (struct vbt_header *)(bios + vbt_off);
if (memcmp(vbt->signature, "$VBT", 4) != 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Bad VBT signature\n");
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Bad VBT signature\n");
xfree(bios);
return -1;
}
@@ -386,7 +386,7 @@ int i830_bios_init(ScrnInfoPtr pScrn)
parse_general_features(intel, bdb);
parse_panel_data(intel, bdb);
parse_driver_feature(intel, bdb);
- parse_sdvo_mapping(pScrn, bdb);
+ parse_sdvo_mapping(scrn, bdb);
xfree(bios);
diff --git a/src/i830_bios.h b/src/i830_bios.h
index f43911e..436426d 100644
--- a/src/i830_bios.h
+++ b/src/i830_bios.h
@@ -491,7 +491,7 @@ struct bdb_sdvo_lvds_options {
} __attribute__ ((packed));
#ifndef REG_DUMPER
-int i830_bios_init(ScrnInfoPtr pScrn);
+int i830_bios_init(ScrnInfoPtr scrn);
#endif
/*
diff --git a/src/i830_display.h b/src/i830_display.h
index d9b56e9..d8961f0 100644
--- a/src/i830_display.h
+++ b/src/i830_display.h
@@ -29,14 +29,14 @@
/* i830_display.c */
void i830PipeSetBase(xf86CrtcPtr crtc, int x, int y);
-void i830WaitForVblank(ScrnInfoPtr pScrn);
-void i830DescribeOutputConfiguration(ScrnInfoPtr pScrn);
-void i830_set_new_crtc_bo(ScrnInfoPtr pScrn);
+void i830WaitForVblank(ScrnInfoPtr scrn);
+void i830DescribeOutputConfiguration(ScrnInfoPtr scrn);
+void i830_set_new_crtc_bo(ScrnInfoPtr scrn);
xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output, DisplayModePtr mode,
int *dpms_mode);
void i830ReleaseLoadDetectPipe(xf86OutputPtr output, int dpms_mode);
-void i830_crtc_init(ScrnInfoPtr pScrn, int pipe);
-DisplayModePtr i830_crtc_mode_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc);
+void i830_crtc_init(ScrnInfoPtr scrn, int pipe);
+DisplayModePtr i830_crtc_mode_get(ScrnInfoPtr scrn, xf86CrtcPtr crtc);
void i830_output_prepare(xf86OutputPtr output);
void i830_output_commit(xf86OutputPtr output);
diff --git a/src/i830_dri.c b/src/i830_dri.c
index fe738b8..9e51b8c 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -83,8 +83,8 @@ static DRI2BufferPtr
I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
{
ScreenPtr pScreen = pDraw->pScreen;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2BufferPtr buffers;
dri_bo *bo;
int i;
@@ -164,8 +164,8 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
unsigned int format)
{
ScreenPtr pScreen = pDraw->pScreen;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2Buffer2Ptr buffer;
dri_bo *bo;
I830DRI2BufferPrivatePtr privates;
@@ -277,8 +277,8 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
I830DRI2BufferPrivatePtr srcPrivate = pSrcBuffer->driverPrivate;
I830DRI2BufferPrivatePtr dstPrivate = pDstBuffer->driverPrivate;
ScreenPtr pScreen = pDraw->pScreen;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
? pDraw : &srcPrivate->pPixmap->drawable;
DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
@@ -302,7 +302,7 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
xf86CrtcPtr crtc;
box = REGION_EXTENTS(unused, pGC->pCompositeClip);
- crtc = i830_covering_crtc(pScrn, box, NULL, &crtcbox);
+ crtc = i830_covering_crtc(scrn, box, NULL, &crtcbox);
/* Make sure the CRTC is valid and this is the real front buffer */
if (crtc != NULL && !crtc->rotatedData) {
@@ -345,14 +345,14 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
* rendering results may not hit the framebuffer until significantly
* later.
*/
- I830EmitFlush(pScrn);
+ I830EmitFlush(scrn);
intel->need_mi_flush = FALSE;
/* We can't rely on getting into the block handler before the DRI
* client gets to run again so flush now. */
- intel_batch_flush(pScrn, TRUE);
+ intel_batch_flush(scrn, TRUE);
#if ALWAYS_SYNC
- I830Sync(pScrn);
+ I830Sync(scrn);
#endif
drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
@@ -360,8 +360,8 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
Bool I830DRI2ScreenInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2InfoRec info;
char *p;
int i;
@@ -378,7 +378,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
}
if (dri2_minor < 1) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"DRI2 requires DRI2 module version 1.1.0 or later\n");
return FALSE;
}
@@ -401,7 +401,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
break;
}
if (i == DRM_MAX_MINOR) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"DRI2: failed to open drm device\n");
return FALSE;
}
@@ -434,8 +434,8 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
void I830DRI2CloseScreen(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
DRI2CloseScreen(pScreen);
intel->directRenderingType = DRI_NONE;
diff --git a/src/i830_driver.c b/src/i830_driver.c
index dbf6c11..898a0f0 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -224,36 +224,36 @@ const OptionInfoRec *I830AvailableOptions(int chipid, int busid)
return NULL;
}
-static Bool I830GetRec(ScrnInfoPtr pScrn)
+static Bool I830GetRec(ScrnInfoPtr scrn)
{
intel_screen_private *intel;
- if (pScrn->driverPrivate)
+ if (scrn->driverPrivate)
return TRUE;
- intel = pScrn->driverPrivate = xnfcalloc(sizeof(intel_screen_private), 1);
+ intel = scrn->driverPrivate = xnfcalloc(sizeof(intel_screen_private), 1);
return TRUE;
}
-static void I830FreeRec(ScrnInfoPtr pScrn)
+static void I830FreeRec(ScrnInfoPtr scrn)
{
intel_screen_private *intel;
- if (!pScrn)
+ if (!scrn)
return;
- if (!pScrn->driverPrivate)
+ if (!scrn->driverPrivate)
return;
- intel = intel_get_screen_private(pScrn);
+ intel = intel_get_screen_private(scrn);
- xfree(pScrn->driverPrivate);
- pScrn->driverPrivate = NULL;
+ xfree(scrn->driverPrivate);
+ scrn->driverPrivate = NULL;
}
static void
-I830LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices,
LOCO * colors, VisualPtr pVisual)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
int i, j, index;
int p;
uint16_t lut_r[256], lut_g[256], lut_b[256];
@@ -271,7 +271,7 @@ I830LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
lut_b[i] = intel_crtc->lut_b[i] << 8;
}
- switch (pScrn->depth) {
+ switch (scrn->depth) {
case 15:
for (i = 0; i < numColors; i++) {
index = indices[i];
@@ -331,8 +331,8 @@ I830LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
*/
static Bool i830CreateScreenResources(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
pScreen->CreateScreenResources = intel->CreateScreenResources;
if (!(*pScreen->CreateScreenResources) (pScreen))
@@ -343,9 +343,9 @@ static Bool i830CreateScreenResources(ScreenPtr pScreen)
return TRUE;
}
-static void PreInitCleanup(ScrnInfoPtr pScrn)
+static void PreInitCleanup(ScrnInfoPtr scrn)
{
- I830FreeRec(pScrn);
+ I830FreeRec(scrn);
}
/*
@@ -466,14 +466,14 @@ static const xf86CrtcConfigFuncsRec i830_xf86crtc_config_funcs = {
* DRM mode setting Linux only at this point... later on we could
* add a wrapper here.
*/
-static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
+static Bool i830_kernel_mode_enabled(ScrnInfoPtr scrn)
{
struct pci_device *PciInfo;
EntityInfoPtr pEnt;
char *busIdString;
int ret;
- pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+ pEnt = xf86GetEntityInfo(scrn->entityList[0]);
PciInfo = xf86GetPciInfoForEntity(pEnt->index);
if (!xf86LoaderCheckSymbol("DRICreatePCIBusID"))
@@ -496,9 +496,9 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
return TRUE;
}
-static void i830_detect_chipset(ScrnInfoPtr pScrn)
+static void i830_detect_chipset(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
MessageType from = X_PROBED;
const char *chipname;
uint32_t capid;
@@ -529,7 +529,7 @@ static void i830_detect_chipset(ScrnInfoPtr pScrn)
chipname = "852GME";
break;
default:
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Unknown 852GM/855GM variant: 0x%x)\n",
intel->variant);
chipname = "852GM/855GM (unknown variant)";
@@ -618,48 +618,48 @@ static void i830_detect_chipset(ScrnInfoPtr pScrn)
chipname = "unknown chipset";
break;
}
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Integrated Graphics Chipset: Intel(R) %s\n", chipname);
/* Set the Chipset and ChipRev, allowing config file entries to override. */
if (intel->pEnt->device->chipset && *intel->pEnt->device->chipset) {
- pScrn->chipset = intel->pEnt->device->chipset;
+ scrn->chipset = intel->pEnt->device->chipset;
from = X_CONFIG;
} else if (intel->pEnt->device->chipID >= 0) {
- pScrn->chipset = (char *)xf86TokenToString(I830Chipsets,
+ scrn->chipset = (char *)xf86TokenToString(I830Chipsets,
intel->pEnt->device->
chipID);
from = X_CONFIG;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
"ChipID override: 0x%04X\n",
intel->pEnt->device->chipID);
DEVICE_ID(intel->PciInfo) = intel->pEnt->device->chipID;
} else {
from = X_PROBED;
- pScrn->chipset = (char *)xf86TokenToString(I830Chipsets,
+ scrn->chipset = (char *)xf86TokenToString(I830Chipsets,
DEVICE_ID(intel->
PciInfo));
}
if (intel->pEnt->device->chipRev >= 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
intel->pEnt->device->chipRev);
}
- xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n",
- (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown i8xx");
+ xf86DrvMsg(scrn->scrnIndex, from, "Chipset: \"%s\"\n",
+ (scrn->chipset != NULL) ? scrn->chipset : "Unknown i8xx");
}
-static Bool I830GetEarlyOptions(ScrnInfoPtr pScrn)
+static Bool I830GetEarlyOptions(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* Process the options */
- xf86CollectOptions(pScrn, NULL);
+ xf86CollectOptions(scrn, NULL);
if (!(intel->Options = xalloc(sizeof(I830Options))))
return FALSE;
memcpy(intel->Options, I830Options, sizeof(I830Options));
- xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, intel->Options);
+ xf86ProcessOptions(scrn->scrnIndex, scrn->options, intel->Options);
intel->fallback_debug = xf86ReturnOptValBool(intel->Options,
OPTION_FALLBACKDEBUG,
@@ -668,15 +668,15 @@ static Bool I830GetEarlyOptions(ScrnInfoPtr pScrn)
return TRUE;
}
-static void i830_check_dri_option(ScrnInfoPtr pScrn)
+static void i830_check_dri_option(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
intel->directRenderingType = DRI_NONE;
if (!xf86ReturnOptValBool(intel->Options, OPTION_DRI, TRUE))
intel->directRenderingType = DRI_DISABLED;
- if (pScrn->depth != 16 && pScrn->depth != 24) {
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ if (scrn->depth != 16 && scrn->depth != 24) {
+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
"DRI is disabled because it "
"runs only at depths 16 and 24.\n");
intel->directRenderingType = DRI_DISABLED;
@@ -749,25 +749,25 @@ static void i830_close_drm_master(ScrnInfoPtr scrn)
}
}
-static Bool I830DrmModeInit(ScrnInfoPtr pScrn)
+static Bool I830DrmModeInit(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- if (drmmode_pre_init(pScrn, intel->drmSubFD, intel->cpp) == FALSE) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ if (drmmode_pre_init(scrn, intel->drmSubFD, intel->cpp) == FALSE) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Kernel modesetting setup failed\n");
- PreInitCleanup(pScrn);
+ PreInitCleanup(scrn);
return FALSE;
}
- i830_init_bufmgr(pScrn);
+ i830_init_bufmgr(scrn);
return TRUE;
}
-static void I830XvInit(ScrnInfoPtr pScrn)
+static void I830XvInit(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
MessageType from = X_PROBED;
intel->XvPreferOverlay =
@@ -781,12 +781,12 @@ static void I830XvInit(ScrnInfoPtr pScrn)
from = X_CONFIG;
} else {
intel->colorKey =
- (1 << pScrn->offset.red) | (1 << pScrn->offset.green) |
- (((pScrn->mask.blue >> pScrn->offset.blue) - 1) <<
- pScrn->offset.blue);
+ (1 << scrn->offset.red) | (1 << scrn->offset.green) |
+ (((scrn->mask.blue >> scrn->offset.blue) - 1) <<
+ scrn->offset.blue);
from = X_DEFAULT;
}
- xf86DrvMsg(pScrn->scrnIndex, from, "video overlay key set to 0x%x\n",
+ xf86DrvMsg(scrn->scrnIndex, from, "video overlay key set to 0x%x\n",
intel->colorKey);
}
@@ -803,7 +803,7 @@ static void I830XvInit(ScrnInfoPtr pScrn)
* As a result, we want to set up that server initialization once rather
* that doing it per generation.
*/
-static Bool I830PreInit(ScrnInfoPtr pScrn, int flags)
+static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
{
intel_screen_private *intel;
rgb defaultWeight = { 0, 0, 0 };
@@ -812,106 +812,106 @@ static Bool I830PreInit(ScrnInfoPtr pScrn, int flags)
Gamma zeros = { 0.0, 0.0, 0.0 };
int drm_mode_setting;
- if (pScrn->numEntities != 1)
+ if (scrn->numEntities != 1)
return FALSE;
- drm_mode_setting = i830_kernel_mode_enabled(pScrn);
+ drm_mode_setting = i830_kernel_mode_enabled(scrn);
if (!drm_mode_setting) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"No kernel modesetting driver detected.\n");
return FALSE;
}
- pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+ pEnt = xf86GetEntityInfo(scrn->entityList[0]);
if (flags & PROBE_DETECT)
return TRUE;
/* Allocate driverPrivate */
- if (!I830GetRec(pScrn))
+ if (!I830GetRec(scrn))
return FALSE;
- intel = intel_get_screen_private(pScrn);
+ intel = intel_get_screen_private(scrn);
intel->pEnt = pEnt;
- pScrn->displayWidth = 640; /* default it */
+ scrn->displayWidth = 640; /* default it */
if (intel->pEnt->location.type != BUS_PCI)
return FALSE;
intel->PciInfo = xf86GetPciInfoForEntity(intel->pEnt->index);
- if (!i830_open_drm_master(pScrn))
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ if (!i830_open_drm_master(scrn))
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to become DRM master.\n");
- pScrn->monitor = pScrn->confScreen->monitor;
- pScrn->progClock = TRUE;
- pScrn->rgbBits = 8;
+ scrn->monitor = scrn->confScreen->monitor;
+ scrn->progClock = TRUE;
+ scrn->rgbBits = 8;
flags24 = Support32bppFb | PreferConvert24to32 | SupportConvert24to32;
- if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24))
+ if (!xf86SetDepthBpp(scrn, 0, 0, 0, flags24))
return FALSE;
- switch (pScrn->depth) {
+ switch (scrn->depth) {
case 8:
case 15:
case 16:
case 24:
break;
default:
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Given depth (%d) is not supported by I830 driver\n",
- pScrn->depth);
+ scrn->depth);
return FALSE;
}
- xf86PrintDepthBpp(pScrn);
+ xf86PrintDepthBpp(scrn);
- if (!xf86SetWeight(pScrn, defaultWeight, defaultWeight))
+ if (!xf86SetWeight(scrn, defaultWeight, defaultWeight))
return FALSE;
- if (!xf86SetDefaultVisual(pScrn, -1))
+ if (!xf86SetDefaultVisual(scrn, -1))
return FALSE;
- intel->cpp = pScrn->bitsPerPixel / 8;
+ intel->cpp = scrn->bitsPerPixel / 8;
- if (!I830GetEarlyOptions(pScrn))
+ if (!I830GetEarlyOptions(scrn))
return FALSE;
- i830_detect_chipset(pScrn);
+ i830_detect_chipset(scrn);
- i830_check_dri_option(pScrn);
+ i830_check_dri_option(scrn);
- I830XvInit(pScrn);
+ I830XvInit(scrn);
- if (!I830DrmModeInit(pScrn))
+ if (!I830DrmModeInit(scrn))
return FALSE;
- if (!xf86SetGamma(pScrn, zeros)) {
- PreInitCleanup(pScrn);
+ if (!xf86SetGamma(scrn, zeros)) {
+ PreInitCleanup(scrn);
return FALSE;
}
- if (pScrn->modes == NULL) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No modes.\n");
- PreInitCleanup(pScrn);
+ if (scrn->modes == NULL) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR, "No modes.\n");
+ PreInitCleanup(scrn);
return FALSE;
}
- pScrn->currentMode = pScrn->modes;
+ scrn->currentMode = scrn->modes;
/* Set display resolution */
- xf86SetDpi(pScrn, 0, 0);
+ xf86SetDpi(scrn, 0, 0);
/* Load the required sub modules */
- if (!xf86LoadSubModule(pScrn, "fb")) {
- PreInitCleanup(pScrn);
+ if (!xf86LoadSubModule(scrn, "fb")) {
+ PreInitCleanup(scrn);
return FALSE;
}
/* Load the dri2 module if requested. */
if (xf86ReturnOptValBool(intel->Options, OPTION_DRI, FALSE) &&
intel->directRenderingType != DRI_DISABLED) {
- xf86LoadSubModule(pScrn, "dri2");
+ xf86LoadSubModule(scrn, "dri2");
}
return TRUE;
@@ -929,9 +929,9 @@ enum pipe {
* function is also responsible for marking the state as clobbered for DRI
* clients.
*/
-void IntelEmitInvarientState(ScrnInfoPtr pScrn)
+void IntelEmitInvarientState(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* If we've emitted our state since the last clobber by another client,
* skip it.
@@ -941,9 +941,9 @@ void IntelEmitInvarientState(ScrnInfoPtr pScrn)
if (!IS_I965G(intel)) {
if (IS_I9XX(intel))
- I915EmitInvarientState(pScrn);
+ I915EmitInvarientState(scrn);
else
- I830EmitInvarientState(pScrn);
+ I830EmitInvarientState(scrn);
}
}
@@ -951,8 +951,8 @@ static void
I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[i];
- ScrnInfoPtr pScrn = xf86Screens[i];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[i];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
pScreen->BlockHandler = intel->BlockHandler;
@@ -961,7 +961,7 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
intel->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = I830BlockHandler;
- if (pScrn->vtSema) {
+ if (scrn->vtSema) {
Bool flushed = FALSE;
/* Emit a flush of the rendering cache, or on the 965 and beyond
* rendering results may not hit the framebuffer until significantly
@@ -969,13 +969,13 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
*/
if (intel->need_mi_flush || intel->batch_used) {
flushed = TRUE;
- I830EmitFlush(pScrn);
+ I830EmitFlush(scrn);
}
/* Flush the batch, so that any rendering is executed in a timely
* fashion.
*/
- intel_batch_flush(pScrn, flushed);
+ intel_batch_flush(scrn, flushed);
drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
intel->need_mi_flush = FALSE;
@@ -986,10 +986,10 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
I830VideoBlockHandler(i, blockData, pTimeout, pReadmask);
}
-static void i830_fixup_mtrrs(ScrnInfoPtr pScrn)
+static void i830_fixup_mtrrs(ScrnInfoPtr scrn)
{
#ifdef HAS_MTRR_SUPPORT
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int fd;
struct mtrr_gentry gentry;
struct mtrr_sentry sentry;
@@ -1011,7 +1011,7 @@ static void i830_fixup_mtrrs(ScrnInfoPtr pScrn)
if (gentry.base == intel->LinearAddr &&
gentry.size < intel->FbMapSize) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Removing bad MTRR range (base 0x%lx, size 0x%x)\n",
gentry.base, gentry.size);
@@ -1020,7 +1020,7 @@ static void i830_fixup_mtrrs(ScrnInfoPtr pScrn)
sentry.type = gentry.type;
if (ioctl(fd, MTRRIOC_DEL_ENTRY, &sentry) == -1) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to remove bad MTRR range\n");
}
}
@@ -1030,24 +1030,24 @@ static void i830_fixup_mtrrs(ScrnInfoPtr pScrn)
#endif
}
-static Bool i830_try_memory_allocation(ScrnInfoPtr pScrn)
+static Bool i830_try_memory_allocation(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
Bool tiled = intel->tiling;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Attempting memory allocation with %stiled buffers.\n",
tiled ? "" : "un");
- if (!i830_allocate_2d_memory(pScrn))
+ if (!i830_allocate_2d_memory(scrn))
goto failed;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%siled allocation successful.\n",
+ xf86DrvMsg(scrn->scrnIndex, X_INFO, "%siled allocation successful.\n",
tiled ? "T" : "Unt");
return TRUE;
failed:
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%siled allocation failed.\n",
+ xf86DrvMsg(scrn->scrnIndex, X_INFO, "%siled allocation failed.\n",
tiled ? "T" : "Unt");
return FALSE;
}
@@ -1061,47 +1061,47 @@ failed:
* 3) And if all else fails, disable DRI and try just 2D allocations.
* 4) Give up and fail ScreenInit.
*/
-static Bool i830_memory_init(ScrnInfoPtr pScrn)
+static Bool i830_memory_init(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
- int savedDisplayWidth = pScrn->displayWidth;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ int savedDisplayWidth = scrn->displayWidth;
Bool tiled = FALSE;
- tiled = i830_tiled_width(intel, &pScrn->displayWidth, intel->cpp);
+ tiled = i830_tiled_width(intel, &scrn->displayWidth, intel->cpp);
/* Set up our video memory allocator for the chosen videoRam */
- if (!i830_allocator_init(pScrn, pScrn->videoRam * KB(1))) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ if (!i830_allocator_init(scrn, scrn->videoRam * KB(1))) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Couldn't initialize video memory allocator\n");
- PreInitCleanup(pScrn);
+ PreInitCleanup(scrn);
return FALSE;
}
- xf86DrvMsg(pScrn->scrnIndex,
+ xf86DrvMsg(scrn->scrnIndex,
intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
- "VideoRam: %d KB\n", pScrn->videoRam);
+ "VideoRam: %d KB\n", scrn->videoRam);
/* Tiled first if we got a good displayWidth */
if (tiled) {
- if (i830_try_memory_allocation(pScrn))
+ if (i830_try_memory_allocation(scrn))
return TRUE;
else {
- i830_reset_allocations(pScrn);
+ i830_reset_allocations(scrn);
intel->tiling = FALSE;
}
}
/* If tiling fails we have to disable FBC */
- pScrn->displayWidth = savedDisplayWidth;
+ scrn->displayWidth = savedDisplayWidth;
- if (i830_try_memory_allocation(pScrn))
+ if (i830_try_memory_allocation(scrn))
return TRUE;
return FALSE;
}
-void i830_init_bufmgr(ScrnInfoPtr pScrn)
+void i830_init_bufmgr(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int batch_size;
if (intel->bufmgr)
@@ -1119,8 +1119,8 @@ void i830_init_bufmgr(ScrnInfoPtr pScrn)
Bool i830_crtc_on(xf86CrtcPtr crtc)
{
- ScrnInfoPtr pScrn = crtc->scrn;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ ScrnInfoPtr scrn = crtc->scrn;
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
int i, active_outputs = 0;
/* Kernel manages CRTC status based out output config */
@@ -1138,8 +1138,8 @@ Bool i830_crtc_on(xf86CrtcPtr crtc)
int i830_crtc_to_pipe(xf86CrtcPtr crtc)
{
- ScrnInfoPtr pScrn = crtc->scrn;
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = crtc->scrn;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
}
@@ -1147,15 +1147,15 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc)
static Bool
I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];;
- intel_screen_private *intel = intel_get_screen_private(pScrn);;
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];;
+ intel_screen_private *intel = intel_get_screen_private(scrn);;
VisualPtr visual;
MessageType from;
struct pci_device *const device = intel->PciInfo;
int fb_bar = IS_I9XX(intel) ? 2 : 0;
- pScrn->displayWidth =
- i830_pad_drawable_width(pScrn->virtualX, intel->cpp);
+ scrn->displayWidth =
+ i830_pad_drawable_width(scrn->virtualX, intel->cpp);
/*
* The "VideoRam" config file parameter specifies the maximum amount of
@@ -1171,11 +1171,11 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
*/
if (intel->pEnt->device->videoRam == 0) {
from = X_DEFAULT;
- pScrn->videoRam = intel->FbMapSize / KB(1);
+ scrn->videoRam = intel->FbMapSize / KB(1);
} else {
#if 0
from = X_CONFIG;
- pScrn->videoRam = intel->pEnt->device->videoRam;
+ scrn->videoRam = intel->pEnt->device->videoRam;
#else
/* Disable VideoRam configuration, at least for now. Previously,
* VideoRam was necessary to avoid overly low limits on allocated
@@ -1185,22 +1185,22 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
* obsolete.
*/
from = X_DEFAULT;
- pScrn->videoRam = intel->FbMapSize / KB(1);
+ scrn->videoRam = intel->FbMapSize / KB(1);
- if (pScrn->videoRam != intel->pEnt->device->videoRam) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ if (scrn->videoRam != intel->pEnt->device->videoRam) {
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"VideoRam configuration found, which is no longer "
"recommended.\n");
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Continuing with default %dkB VideoRam instead of %d "
"kB.\n",
- pScrn->videoRam,
+ scrn->videoRam,
intel->pEnt->device->videoRam);
}
#endif
}
- pScrn->videoRam = device->regions[fb_bar].size / 1024;
+ scrn->videoRam = device->regions[fb_bar].size / 1024;
#ifdef DRI2
if (intel->directRenderingType == DRI_NONE
@@ -1231,9 +1231,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
intel->swapbuffers_wait = FALSE;
}
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Tiling %sabled\n",
+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Tiling %sabled\n",
intel->tiling ? "en" : "dis");
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "SwapBuffers wait %sabled\n",
+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "SwapBuffers wait %sabled\n",
intel->swapbuffers_wait ? "en" : "dis");
intel->last_3d = LAST_3D_OTHER;
@@ -1245,51 +1245,51 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
*/
intel->XvEnabled = TRUE;
- if (!i830_memory_init(pScrn)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ if (!i830_memory_init(scrn)) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Couldn't allocate video memory\n");
return FALSE;
}
- i830_fixup_mtrrs(pScrn);
+ i830_fixup_mtrrs(scrn);
miClearVisualTypes();
- if (!miSetVisualTypes(pScrn->depth,
- miGetDefaultVisualMask(pScrn->depth),
- pScrn->rgbBits, pScrn->defaultVisual))
+ if (!miSetVisualTypes(scrn->depth,
+ miGetDefaultVisualMask(scrn->depth),
+ scrn->rgbBits, scrn->defaultVisual))
return FALSE;
if (!miSetPixmapDepths())
return FALSE;
DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");
- if (pScrn->virtualX > pScrn->displayWidth)
- pScrn->displayWidth = pScrn->virtualX;
+ if (scrn->virtualX > scrn->displayWidth)
+ scrn->displayWidth = scrn->virtualX;
/* If the front buffer is not a BO, we need to
* set the initial framebuffer pixmap to point at
* it
*/
- pScrn->fbOffset = intel->front_buffer->offset;
+ scrn->fbOffset = intel->front_buffer->offset;
DPRINTF(PFX, "assert( if(!fbScreenInit(pScreen, ...) )\n");
if (!fbScreenInit(pScreen, NULL,
- pScrn->virtualX, pScrn->virtualY,
- pScrn->xDpi, pScrn->yDpi,
- pScrn->displayWidth, pScrn->bitsPerPixel))
+ scrn->virtualX, scrn->virtualY,
+ scrn->xDpi, scrn->yDpi,
+ scrn->displayWidth, scrn->bitsPerPixel))
return FALSE;
- if (pScrn->bitsPerPixel > 8) {
+ if (scrn->bitsPerPixel > 8) {
/* Fixup RGB ordering */
visual = pScreen->visuals + pScreen->numVisuals;
while (--visual >= pScreen->visuals) {
if ((visual->class | DynamicClass) == DirectColor) {
- visual->offsetRed = pScrn->offset.red;
- visual->offsetGreen = pScrn->offset.green;
- visual->offsetBlue = pScrn->offset.blue;
- visual->redMask = pScrn->mask.red;
- visual->greenMask = pScrn->mask.green;
- visual->blueMask = pScrn->mask.blue;
+ visual->offsetRed = scrn->offset.red;
+ visual->offsetGreen = scrn->offset.green;
+ visual->offsetBlue = scrn->offset.blue;
+ visual->redMask = scrn->mask.red;
+ visual->greenMask = scrn->mask.green;
+ visual->blueMask = scrn->mask.blue;
}
}
}
@@ -1299,7 +1299,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86SetBlackWhitePixels(pScreen);
if (!I830AccelInit(pScreen)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Hardware acceleration initialization failed\n");
return FALSE;
}
@@ -1316,7 +1316,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86SetSilkenMouse(pScreen);
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing HW Cursor\n");
+ xf86DrvMsg(scrn->scrnIndex, X_INFO, "Initializing HW Cursor\n");
if (!xf86_cursors_init(pScreen, I810_CURSOR_X, I810_CURSOR_Y,
(HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
@@ -1327,13 +1327,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
HARDWARE_CURSOR_UPDATE_UNHIDDEN |
HARDWARE_CURSOR_ARGB))) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Hardware cursor initialization failed\n");
}
/* Must force it before EnterVT, so we are in control of VT and
* later memory should be bound when allocating, e.g rotate_mem */
- pScrn->vtSema = TRUE;
+ scrn->vtSema = TRUE;
if (!I830EnterVT(scrnIndex, 0))
return FALSE;
@@ -1368,7 +1368,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
from = ((intel->directRenderingType == DRI_DRI2) &&
xf86GetOptValBool(intel->Options, OPTION_XVMC,
&intel->XvMCEnabled) ? X_CONFIG : X_DEFAULT);
- xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
+ xf86DrvMsg(scrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
intel->XvMCEnabled ? "en" : "dis");
#endif
/* Init video */
@@ -1376,31 +1376,31 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
I830InitVideo(pScreen);
/* Setup 3D engine, needed for rotation too */
- IntelEmitInvarientState(pScrn);
+ IntelEmitInvarientState(scrn);
#if defined(DRI2)
switch (intel->directRenderingType) {
case DRI_DRI2:
intel->directRenderingOpen = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"direct rendering: DRI2 Enabled\n");
break;
case DRI_DISABLED:
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"direct rendering: Disabled\n");
break;
case DRI_NONE:
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"direct rendering: Failed\n");
break;
}
#else
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"direct rendering: Not available\n");
#endif
if (serverGeneration == 1)
- xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
+ xf86ShowUnusedOptions(scrn->scrnIndex, scrn->options);
intel->suspended = FALSE;
@@ -1413,14 +1413,14 @@ static void i830AdjustFrame(int scrnIndex, int x, int y, int flags)
static void I830FreeScreen(int scrnIndex, int flags)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr scrn = xf86Screens[scrnIndex];
#ifdef INTEL_XVMC
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (intel && intel->XvMCEnabled)
intel_xvmc_finish(xf86Screens[scrnIndex]);
#endif
- i830_close_drm_master(pScrn);
+ i830_close_drm_master(scrn);
I830FreeRec(xf86Screens[scrnIndex]);
if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
@@ -1429,26 +1429,26 @@ static void I830FreeScreen(int scrnIndex, int flags)
static void I830LeaveVT(int scrnIndex, int flags)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int ret;
DPRINTF(PFX, "Leave VT\n");
- xf86RotateFreeShadow(pScrn);
+ xf86RotateFreeShadow(scrn);
- xf86_hide_cursors(pScrn);
+ xf86_hide_cursors(scrn);
- I830Sync(pScrn);
+ I830Sync(scrn);
- intel_batch_teardown(pScrn);
+ intel_batch_teardown(scrn);
if (IS_I965G(intel))
- gen4_render_state_cleanup(pScrn);
+ gen4_render_state_cleanup(scrn);
ret = drmDropMaster(intel->drmSubFD);
if (ret)
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"drmDropMaster failed: %s\n", strerror(errno));
}
@@ -1457,8 +1457,8 @@ static void I830LeaveVT(int scrnIndex, int flags)
*/
static Bool I830EnterVT(int scrnIndex, int flags)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int ret;
DPRINTF(PFX, "Enter VT\n");
@@ -1466,49 +1466,49 @@ static Bool I830EnterVT(int scrnIndex, int flags)
ret = drmSetMaster(intel->drmSubFD);
if (ret) {
if (errno == EINVAL) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"drmSetMaster failed: 2.6.29 or newer kernel required for "
"multi-server DRI\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"drmSetMaster failed: %s\n",
strerror(errno));
}
}
- if (!i830_bind_all_memory(pScrn))
+ if (!i830_bind_all_memory(scrn))
return FALSE;
- i830_describe_allocations(pScrn, 1, "");
+ i830_describe_allocations(scrn, 1, "");
- intel_batch_init(pScrn);
+ intel_batch_init(scrn);
if (IS_I965G(intel))
- gen4_render_state_init(pScrn);
+ gen4_render_state_init(scrn);
- if (!xf86SetDesiredModes(pScrn))
+ if (!xf86SetDesiredModes(scrn))
return FALSE;
/* Mark 3D state as being clobbered and setup the basics */
intel->last_3d = LAST_3D_OTHER;
- IntelEmitInvarientState(pScrn);
+ IntelEmitInvarientState(scrn);
return TRUE;
}
static Bool I830SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ScrnInfoPtr scrn = xf86Screens[scrnIndex];
- return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
+ return xf86SetSingleMode(scrn, mode, RR_Rotate_0);
}
static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- if (pScrn->vtSema == TRUE) {
+ if (scrn->vtSema == TRUE) {
I830LeaveVT(scrnIndex, 0);
}
@@ -1519,15 +1519,15 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
}
if (intel->front_buffer) {
i830_set_pixmap_bo(pScreen->GetScreenPixmap(pScreen), NULL);
- i830_free_memory(pScrn, intel->front_buffer);
+ i830_free_memory(scrn, intel->front_buffer);
intel->front_buffer = NULL;
}
xf86_cursors_fini(pScreen);
- i830_allocator_fini(pScrn);
+ i830_allocator_fini(scrn);
- i965_free_video(pScrn);
+ i965_free_video(scrn);
pScreen->CloseScreen = intel->CloseScreen;
(*pScreen->CloseScreen) (scrnIndex, pScreen);
@@ -1540,7 +1540,7 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
xf86GARTCloseScreen(scrnIndex);
- pScrn->vtSema = FALSE;
+ scrn->vtSema = FALSE;
return TRUE;
}
@@ -1572,8 +1572,8 @@ I830ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
*/
static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
{
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[scrnIndex];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
DPRINTF(PFX, "Enter VT, event %d, undo: %s\n", event,
BOOLTOSTRING(undo));
@@ -1585,12 +1585,12 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
case XF86_APM_SYS_STANDBY:
case XF86_APM_USER_STANDBY:
if (!undo && !intel->suspended) {
- pScrn->LeaveVT(scrnIndex, 0);
+ scrn->LeaveVT(scrnIndex, 0);
intel->suspended = TRUE;
sleep(SUSPEND_SLEEP);
} else if (undo && intel->suspended) {
sleep(RESUME_SLEEP);
- pScrn->EnterVT(scrnIndex, 0);
+ scrn->EnterVT(scrnIndex, 0);
intel->suspended = FALSE;
}
break;
@@ -1599,7 +1599,7 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
case XF86_APM_CRITICAL_RESUME:
if (intel->suspended) {
sleep(RESUME_SLEEP);
- pScrn->EnterVT(scrnIndex, 0);
+ scrn->EnterVT(scrnIndex, 0);
intel->suspended = FALSE;
/*
* Turn the screen saver off when resuming. This seems to be
@@ -1625,9 +1625,9 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
return TRUE;
}
-xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr pScrn, int pipe)
+xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr scrn, int pipe)
{
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
int c;
for (c = 0; c < config->num_crtc; c++) {
@@ -1641,15 +1641,15 @@ xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr pScrn, int pipe)
return NULL;
}
-void I830InitpScrn(ScrnInfoPtr pScrn)
+void intel_init_scrn(ScrnInfoPtr scrn)
{
- pScrn->PreInit = I830PreInit;
- pScrn->ScreenInit = I830ScreenInit;
- pScrn->SwitchMode = I830SwitchMode;
- pScrn->AdjustFrame = i830AdjustFrame;
- pScrn->EnterVT = I830EnterVT;
- pScrn->LeaveVT = I830LeaveVT;
- pScrn->FreeScreen = I830FreeScreen;
- pScrn->ValidMode = I830ValidMode;
- pScrn->PMEvent = I830PMEvent;
+ scrn->PreInit = I830PreInit;
+ scrn->ScreenInit = I830ScreenInit;
+ scrn->SwitchMode = I830SwitchMode;
+ scrn->AdjustFrame = i830AdjustFrame;
+ scrn->EnterVT = I830EnterVT;
+ scrn->LeaveVT = I830LeaveVT;
+ scrn->FreeScreen = I830FreeScreen;
+ scrn->ValidMode = I830ValidMode;
+ scrn->PMEvent = I830PMEvent;
}
diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
index 1233e0a..c365dd5 100644
--- a/src/i830_hwmc.c
+++ b/src/i830_hwmc.c
@@ -47,9 +47,9 @@ static Bool intel_xvmc_set_driver(struct intel_xvmc_driver *d)
/* check chip type and load xvmc driver */
/* This must be first called! */
-Bool intel_xvmc_probe(ScrnInfoPtr pScrn)
+Bool intel_xvmc_probe(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
Bool ret = FALSE;
if (!intel->XvMCEnabled)
@@ -73,17 +73,17 @@ Bool intel_xvmc_probe(ScrnInfoPtr pScrn)
return TRUE;
}
-void intel_xvmc_finish(ScrnInfoPtr pScrn)
+void intel_xvmc_finish(ScrnInfoPtr scrn)
{
if (!xvmc_driver)
return;
- (*xvmc_driver->fini) (pScrn);
+ (*xvmc_driver->fini) (scrn);
}
Bool intel_xvmc_driver_init(ScreenPtr pScreen, XF86VideoAdaptorPtr xv_adaptor)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct drm_i915_setparam sp;
int ret;
@@ -92,7 +92,7 @@ Bool intel_xvmc_driver_init(ScreenPtr pScreen, XF86VideoAdaptorPtr xv_adaptor)
return FALSE;
}
- if (!(*xvmc_driver->init) (pScrn, xv_adaptor)) {
+ if (!(*xvmc_driver->init) (scrn, xv_adaptor)) {
ErrorF("XvMC driver initialize failed.\n");
return FALSE;
}
@@ -110,21 +110,21 @@ Bool intel_xvmc_driver_init(ScreenPtr pScreen, XF86VideoAdaptorPtr xv_adaptor)
Bool intel_xvmc_screen_init(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
char buf[64];
if (!xvmc_driver)
return FALSE;
if (xf86XvMCScreenInit(pScreen, 1, &xvmc_driver->adaptor)) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"[XvMC] %s driver initialized.\n",
xvmc_driver->name);
} else {
- intel_xvmc_finish(pScrn);
+ intel_xvmc_finish(scrn);
intel->XvMCEnabled = FALSE;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"[XvMC] Failed to initialize XvMC.\n");
return FALSE;
}
@@ -140,12 +140,12 @@ Bool intel_xvmc_screen_init(ScreenPtr pScreen)
return TRUE;
}
-Bool intel_xvmc_init_batch(ScrnInfoPtr pScrn)
+Bool intel_xvmc_init_batch(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int size = KB(64);
- if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC] batch buffer",
+ if (!i830_allocate_xvmc_buffer(scrn, "[XvMC] batch buffer",
&(xvmc_driver->batch), size,
ALIGN_BOTH_ENDS))
return FALSE;
@@ -155,23 +155,23 @@ Bool intel_xvmc_init_batch(ScrnInfoPtr pScrn)
intel->LinearAddr),
xvmc_driver->batch->size, DRM_AGP, 0,
&xvmc_driver->batch_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(batchbuffer_handle) failed!\n");
return FALSE;
}
return TRUE;
}
-void intel_xvmc_fini_batch(ScrnInfoPtr pScrn)
+void intel_xvmc_fini_batch(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (xvmc_driver->batch_handle) {
drmRmMap(intel->drmSubFD, xvmc_driver->batch_handle);
xvmc_driver->batch_handle = 0;
}
if (xvmc_driver->batch) {
- i830_free_xvmc_buffer(pScrn, xvmc_driver->batch);
+ i830_free_xvmc_buffer(scrn, xvmc_driver->batch);
xvmc_driver->batch = NULL;
}
}
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 1730a7c..957f598 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -153,9 +153,9 @@ static unsigned long i830_get_fence_alignment(intel_screen_private *intel, unsig
}
static Bool
-i830_check_display_stride(ScrnInfoPtr pScrn, int stride, Bool tiling)
+i830_check_display_stride(ScrnInfoPtr scrn, int stride, Bool tiling)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int limit = KB(32);
/* 8xx spec has always 8K limit, but tests show larger limit in
@@ -175,13 +175,13 @@ i830_check_display_stride(ScrnInfoPtr pScrn, int stride, Bool tiling)
return FALSE;
}
-void i830_free_memory(ScrnInfoPtr pScrn, i830_memory * mem)
+void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem)
{
if (mem == NULL)
return;
if (mem->bo != NULL) {
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
dri_bo_unreference(mem->bo);
if (intel->bo_list == mem) {
intel->bo_list = mem->next;
@@ -210,21 +210,21 @@ void i830_free_memory(ScrnInfoPtr pScrn, i830_memory * mem)
/* Resets the state of the aperture allocator, freeing all memory that had
* been allocated.
*/
-void i830_reset_allocations(ScrnInfoPtr pScrn)
+void i830_reset_allocations(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int p;
/* While there is any memory between the start and end markers, free it. */
while (intel->memory_list->next->next != NULL) {
i830_memory *mem = intel->memory_list->next;
- i830_free_memory(pScrn, mem);
+ i830_free_memory(scrn, mem);
}
/* Free any allocations in buffer objects */
while (intel->bo_list != NULL)
- i830_free_memory(pScrn, intel->bo_list);
+ i830_free_memory(scrn, intel->bo_list);
/* Null out the pointers for all the allocations we just freed. This is
* kind of gross, but at least it's just one place now.
@@ -244,9 +244,9 @@ void i830_reset_allocations(ScrnInfoPtr pScrn)
* static allocations. Some of these exist because of the need for physical
* addresses to reference.
*/
-Bool i830_allocator_init(ScrnInfoPtr pScrn, unsigned long size)
+Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
i830_memory *start, *end;
start = xcalloc(1, sizeof(*start));
@@ -285,12 +285,12 @@ Bool i830_allocator_init(ScrnInfoPtr pScrn, unsigned long size)
return TRUE;
}
-void i830_allocator_fini(ScrnInfoPtr pScrn)
+void i830_allocator_fini(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* Free most of the allocations */
- i830_reset_allocations(pScrn);
+ i830_reset_allocations(scrn);
/* Free the start/end markers */
free(intel->memory_list->next);
@@ -298,13 +298,13 @@ void i830_allocator_fini(ScrnInfoPtr pScrn)
intel->memory_list = NULL;
}
-static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
+static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr scrn, const char *name,
unsigned long size,
unsigned long pitch,
unsigned long align, int flags,
enum tile_format tile_format)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
i830_memory *mem;
uint32_t bo_tiling_mode = I915_TILING_NONE;
int ret;
@@ -358,7 +358,7 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
if (ret != 0
|| (bo_tiling_mode == I915_TILING_NONE
&& tile_format != TILE_NONE)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to set tiling on %s: %s\n", mem->name,
ret == 0 ? "rejected by kernel" : strerror(errno));
mem->tiling = TILE_NONE;
@@ -395,13 +395,13 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
* the entire Screen lifetime. This means not using buffer objects, which
* get their offsets chosen at each EnterVT time.
*/
-i830_memory *i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
+i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
unsigned long size, unsigned long pitch,
unsigned long alignment, int flags,
enum tile_format tile_format)
{
i830_memory *mem;
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* Manage tile alignment and size constraints */
if (tile_format != TILE_NONE) {
@@ -422,31 +422,31 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
alignment = i830_get_fence_alignment(intel, size);
}
- return i830_allocate_memory_bo(pScrn, name, size,
+ return i830_allocate_memory_bo(scrn, name, size,
pitch, alignment, flags, tile_format);
return mem;
}
void
-i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
+i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
i830_memory *mem;
if (intel->memory_list == NULL) {
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
+ xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
"%sMemory allocator not initialized\n", prefix);
return;
}
if (intel->memory_list->next->next == NULL) {
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
+ xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
"%sNo memory allocations\n", prefix);
return;
}
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
+ xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
"%sFixed memory allocation layout:\n", prefix);
for (mem = intel->memory_list->next; mem->next != NULL; mem = mem->next) {
@@ -458,16 +458,16 @@ i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
else if (mem->tiling == TILE_YMAJOR)
tile_suffix = " Y tiled";
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
+ xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
"%s0x%08lx-0x%08lx: %s (%ld kB%s)%s\n", prefix,
mem->offset, mem->end - 1, mem->name,
mem->size / 1024, phys_suffix, tile_suffix);
}
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
+ xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
"%s0x%08lx: end of aperture\n",
prefix, intel->FbMapSize);
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
+ xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
"%sBO memory allocation layout:\n", prefix);
for (mem = intel->bo_list; mem != NULL; mem = mem->next) {
char *tile_suffix = "";
@@ -477,15 +477,15 @@ i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
else if (mem->tiling == TILE_YMAJOR)
tile_suffix = " Y tiled";
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
+ xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
"%sunpinned : %s (%ld kB)%s\n", prefix,
mem->name, mem->size / 1024, tile_suffix);
}
}
-static Bool IsTileable(ScrnInfoPtr pScrn, int pitch)
+static Bool IsTileable(ScrnInfoPtr scrn, int pitch)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (IS_I965G(intel)) {
if (pitch / 512 * 512 == pitch && pitch <= KB(128))
@@ -522,10 +522,10 @@ static Bool IsTileable(ScrnInfoPtr pScrn, int pitch)
* Used once for each X screen, so once with RandR 1.2 and twice with classic
* dualhead.
*/
-i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn)
+i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
- unsigned int pitch = pScrn->displayWidth * intel->cpp;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ unsigned int pitch = scrn->displayWidth * intel->cpp;
unsigned long minspace;
int align;
long size, fb_height;
@@ -538,24 +538,24 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn)
/* We'll allocate the fb such that the root window will fit regardless of
* rotation.
*/
- fb_height = pScrn->virtualY;
+ fb_height = scrn->virtualY;
/* Calculate how much framebuffer memory to allocate. For the
* initial allocation, calculate a reasonable minimum. This is
* enough for the virtual screen size.
*/
- minspace = pitch * pScrn->virtualY;
+ minspace = pitch * scrn->virtualY;
size = ROUND_TO_PAGE(pitch * fb_height);
if (intel->tiling)
tile_format = TILE_XMAJOR;
- if (!IsTileable(pScrn, pitch))
+ if (!IsTileable(scrn, pitch))
tile_format = TILE_NONE;
- if (!i830_check_display_stride(pScrn, pitch, tile_format != TILE_NONE)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ if (!i830_check_display_stride(scrn, pitch, tile_format != TILE_NONE)) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Front buffer stride %d kB "
"exceed display limit\n", pitch / 1024);
return NULL;
@@ -570,24 +570,24 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn)
align = KB(512);
} else
align = KB(64);
- front_buffer = i830_allocate_memory(pScrn, "front buffer", size,
+ front_buffer = i830_allocate_memory(scrn, "front buffer", size,
pitch, align, flags, tile_format);
if (front_buffer == NULL) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to allocate framebuffer.\n");
return NULL;
}
- i830_set_max_gtt_map_size(pScrn);
+ i830_set_max_gtt_map_size(scrn);
return front_buffer;
}
-static Bool i830_allocate_cursor_buffers(ScrnInfoPtr pScrn)
+static Bool i830_allocate_cursor_buffers(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
int i;
/*
@@ -597,7 +597,7 @@ static Bool i830_allocate_cursor_buffers(ScrnInfoPtr pScrn)
*/
for (i = 0; i < xf86_config->num_crtc; i++) {
intel->cursor_mem_argb[i] =
- i830_allocate_memory(pScrn, "ARGB cursor",
+ i830_allocate_memory(scrn, "ARGB cursor",
HWCURSOR_SIZE_ARGB, PITCH_NONE,
GTT_PAGE_SIZE, DISABLE_REUSE,
TILE_NONE);
@@ -612,18 +612,18 @@ static Bool i830_allocate_cursor_buffers(ScrnInfoPtr pScrn)
* Allocate memory for 2D operation. This includes the (front) framebuffer,
* ring buffer, scratch memory, HW cursor.
*/
-Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn)
+Bool i830_allocate_2d_memory(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* Next, allocate other fixed-size allocations we have. */
- if (!i830_allocate_cursor_buffers(pScrn)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ if (!i830_allocate_cursor_buffers(scrn)) {
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to allocate HW cursor space.\n");
return FALSE;
}
- intel->front_buffer = i830_allocate_framebuffer(pScrn);
+ intel->front_buffer = i830_allocate_framebuffer(scrn);
if (intel->front_buffer == NULL)
return FALSE;
@@ -637,23 +637,23 @@ Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn)
* intel points to the same allocation list, but the bind_memory will just
* no-op then.
*/
-Bool i830_bind_all_memory(ScrnInfoPtr pScrn)
+Bool i830_bind_all_memory(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (intel->memory_list == NULL)
return TRUE;
int i;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
for (i = 0; i < xf86_config->num_crtc; i++)
drmmode_crtc_set_cursor_bo(xf86_config->crtc[i],
intel->cursor_mem_argb[i]->bo);
- i830_set_max_gtt_map_size(pScrn);
+ i830_set_max_gtt_map_size(scrn);
if (intel->front_buffer)
- pScrn->fbOffset = intel->front_buffer->offset;
+ scrn->fbOffset = intel->front_buffer->offset;
return TRUE;
}
@@ -662,23 +662,23 @@ Bool i830_bind_all_memory(ScrnInfoPtr pScrn)
/*
* Allocate memory for MC compensation
*/
-Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
+Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name,
i830_memory ** buffer, unsigned long size,
int flags)
{
- *buffer = i830_allocate_memory(pScrn, name, size, PITCH_NONE,
+ *buffer = i830_allocate_memory(scrn, name, size, PITCH_NONE,
GTT_PAGE_SIZE, flags, TILE_NONE);
if (!*buffer) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to allocate memory for %s.\n", name);
return FALSE;
}
if ((*buffer)->bo) {
if (drm_intel_bo_pin((*buffer)->bo, GTT_PAGE_SIZE)) {
- i830_free_memory(pScrn, *buffer);
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ i830_free_memory(scrn, *buffer);
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to bind XvMC buffer bo!\n");
return FALSE;
}
@@ -689,19 +689,19 @@ Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
return TRUE;
}
-void i830_free_xvmc_buffer(ScrnInfoPtr pScrn, i830_memory * buffer)
+void i830_free_xvmc_buffer(ScrnInfoPtr scrn, i830_memory * buffer)
{
if (buffer->bo)
drm_intel_bo_unpin(buffer->bo);
- i830_free_memory(pScrn, buffer);
+ i830_free_memory(scrn, buffer);
}
#endif
-void i830_set_max_gtt_map_size(ScrnInfoPtr pScrn)
+void i830_set_max_gtt_map_size(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct drm_i915_gem_get_aperture aperture;
int ret;
diff --git a/src/i830_render.c b/src/i830_render.c
index 4969e0b..c4b264d 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -164,9 +164,9 @@ static Bool i830_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
break;
default:
{
- ScrnInfoPtr pScrn;
+ ScrnInfoPtr scrn;
- pScrn =
+ scrn =
xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
I830FALLBACK("Unsupported dest format 0x%x\n",
(int)pDstPicture->format);
@@ -176,7 +176,7 @@ static Bool i830_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
return TRUE;
}
-static Bool i830_get_blend_cntl(ScrnInfoPtr pScrn, int op, PicturePtr pMask,
+static Bool i830_get_blend_cntl(ScrnInfoPtr scrn, int op, PicturePtr pMask,
uint32_t dst_format, uint32_t * blendctl)
{
uint32_t sblend, dblend;
@@ -222,7 +222,7 @@ static Bool i830_get_blend_cntl(ScrnInfoPtr pScrn, int op, PicturePtr pMask,
return TRUE;
}
-static Bool i830_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict,
+static Bool i830_check_composite_texture(ScrnInfoPtr scrn, PicturePtr pPict,
int unit)
{
if (pPict->repeatType > RepeatReflect)
@@ -270,8 +270,8 @@ static uint32_t i8xx_get_card_format(PicturePtr pPict)
static void i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
{
- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t format, pitch, filter;
uint32_t wrap_mode;
uint32_t texcoordtype;
@@ -371,7 +371,7 @@ Bool
i830_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
PicturePtr pDstPicture)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
uint32_t tmp1;
/* Check for unsupported compositing operations. */
@@ -391,10 +391,10 @@ i830_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
"alpha and source value blending.\n");
}
- if (!i830_check_composite_texture(pScrn, pSrcPicture, 0))
+ if (!i830_check_composite_texture(scrn, pSrcPicture, 0))
I830FALLBACK("Check Src picture texture\n");
if (pMaskPicture != NULL
- && !i830_check_composite_texture(pScrn, pMaskPicture, 1))
+ && !i830_check_composite_texture(scrn, pMaskPicture, 1))
I830FALLBACK("Check Mask picture texture\n");
if (!i830_get_dest_format(pDstPicture, &tmp1))
@@ -408,8 +408,8 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
PicturePtr pMaskPicture, PicturePtr pDstPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
intel->render_src_picture = pSrcPicture;
intel->render_src = pSrc;
@@ -518,7 +518,7 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
}
if (!i830_get_blend_cntl
- (pScrn, op, pMaskPicture, pDstPicture->format, &blendctl)) {
+ (scrn, op, pMaskPicture, pDstPicture->format, &blendctl)) {
return FALSE;
}
@@ -527,22 +527,22 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
intel->s8_blendctl = blendctl;
}
- i830_debug_sync(pScrn);
+ i830_debug_sync(scrn);
intel->needs_render_state_emit = TRUE;
return TRUE;
}
-static void i830_emit_composite_state(ScrnInfoPtr pScrn)
+static void i830_emit_composite_state(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t vf2;
uint32_t texcoordfmt = 0;
intel->needs_render_state_emit = FALSE;
- IntelEmitInvarientState(pScrn);
+ IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_RENDER;
BEGIN_BATCH(21);
@@ -622,8 +622,8 @@ i830_emit_composite_primitive(PixmapPtr pDst,
int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
Bool is_affine_src, is_affine_mask = TRUE;
int per_vertex, num_floats;
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
@@ -804,23 +804,23 @@ void
i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- intel_batch_start_atomic(pScrn, 58 + /* invarient */
+ intel_batch_start_atomic(scrn, 58 + /* invarient */
22 + /* setup */
20 + /* 2 * setup_texture */
1 + 30 /* verts */ );
if (intel->needs_render_state_emit)
- i830_emit_composite_state(pScrn);
+ i830_emit_composite_state(scrn);
i830_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX,
dstY, w, h);
- intel_batch_end_atomic(pScrn);
+ intel_batch_end_atomic(scrn);
- i830_debug_sync(pScrn);
+ i830_debug_sync(scrn);
}
void i830_batch_flush_notify(ScrnInfoPtr scrn)
diff --git a/src/i830_ring.h b/src/i830_ring.h
index efa61c6..994b6d2 100644
--- a/src/i830_ring.h
+++ b/src/i830_ring.h
@@ -76,12 +76,12 @@ do { \
FatalError("%s: BEGIN_LP_RING called without closing " \
"ADVANCE_LP_RING\n", __FUNCTION__); \
if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \
- i830_wait_ring_idle(pScrn); \
+ i830_wait_ring_idle(scrn); \
intel->ring_emitting = (n) * 4; \
if ((n) & 1) \
intel->ring_emitting += 4; \
if (intel->ring.space < intel->ring_emitting) \
- WaitRingFunc(pScrn, intel->ring_emitting, 0); \
+ WaitRingFunc(scrn, intel->ring_emitting, 0); \
intel->ring_next = intel->ring.tail; \
if (I810_DEBUG & DEBUG_VERBOSE_RING) \
ErrorF( "BEGIN_LP_RING %d in %s\n", n, FUNCTION_NAME); \
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index f28731f..f94b2c9 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -105,17 +105,17 @@ Bool i830_pixmap_tiled(PixmapPtr pPixmap)
}
Bool
-i830_get_aperture_space(ScrnInfoPtr pScrn, drm_intel_bo ** bo_table,
+i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
int num_bos)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (intel->batch_bo == NULL)
I830FALLBACK("VT inactive\n");
bo_table[0] = intel->batch_bo;
if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) != 0) {
- intel_batch_flush(pScrn, FALSE);
+ intel_batch_flush(scrn, FALSE);
bo_table[0] = intel->batch_bo;
if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) !=
0)
@@ -131,8 +131,8 @@ static unsigned long i830_pixmap_pitch(PixmapPtr pixmap)
static int i830_pixmap_pitch_is_aligned(PixmapPtr pixmap)
{
- ScrnInfoPtr pScrn = xf86Screens[pixmap->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
return i830_pixmap_pitch(pixmap) %
intel->accel_pixmap_pitch_alignment == 0;
@@ -144,8 +144,8 @@ static int i830_pixmap_pitch_is_aligned(PixmapPtr pixmap)
static Bool
i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
{
- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
unsigned long pitch;
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
@@ -168,7 +168,7 @@ i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
if (!i830_pixmap_pitch_is_aligned(pPixmap))
I830FALLBACK("pixmap pitch not aligned");
- if (!i830_get_aperture_space(pScrn, bo_table, ARRAY_SIZE(bo_table)))
+ if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
intel->BR[13] = (I830PatternROP[alu] & 0xff) << 16;
@@ -190,8 +190,8 @@ i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
{
- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
unsigned long pitch;
uint32_t cmd;
@@ -226,9 +226,9 @@ static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
static void i830_uxa_done_solid(PixmapPtr pPixmap)
{
- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
- i830_debug_sync(pScrn);
+ i830_debug_sync(scrn);
}
/**
@@ -239,8 +239,8 @@ static Bool
i830_uxa_prepare_copy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
int ydir, int alu, Pixel planemask)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
i830_get_pixmap_bo(pSrcPixmap),
@@ -253,7 +253,7 @@ i830_uxa_prepare_copy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
if (pDstPixmap->drawable.bitsPerPixel < 8)
I830FALLBACK("under 8bpp pixmaps unsupported\n");
- if (!i830_get_aperture_space(pScrn, bo_table, ARRAY_SIZE(bo_table)))
+ if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
i830_exa_check_pitch_2d(pSrcPixmap);
@@ -280,8 +280,8 @@ static void
i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
int dst_y1, int w, int h)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t cmd;
int dst_x2, dst_y2;
unsigned int dst_pitch, src_pitch;
@@ -334,9 +334,9 @@ i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
static void i830_uxa_done_copy(PixmapPtr pDstPixmap)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
- i830_debug_sync(pScrn);
+ i830_debug_sync(scrn);
}
/**
@@ -346,9 +346,9 @@ static void i830_uxa_done_copy(PixmapPtr pDstPixmap)
*/
void i830_done_composite(PixmapPtr pDst)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
- i830_debug_sync(pScrn);
+ i830_debug_sync(scrn);
}
#define xFixedToFloat(val) \
diff --git a/src/i830_video.c b/src/i830_video.c
index 1667ca0..329070d 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -226,10 +226,10 @@ static void CompareOverlay(intel_screen_private *intel, uint32_t * overlay, int
#endif
/* kernel modesetting overlay functions */
-static Bool drmmode_has_overlay(ScrnInfoPtr pScrn)
+static Bool drmmode_has_overlay(ScrnInfoPtr scrn)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct drm_i915_getparam gp;
int has_overlay = 0;
@@ -243,11 +243,11 @@ static Bool drmmode_has_overlay(ScrnInfoPtr pScrn)
#endif
}
-static void drmmode_overlay_update_attrs(ScrnInfoPtr pScrn)
+static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- intel_screen_private *intel = intel_get_screen_private(pScrn);
- I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ I830PortPrivPtr pPriv = GET_PORT_PRIVATE(scrn);
struct drm_intel_overlay_attrs attrs;
int ret;
@@ -271,10 +271,10 @@ static void drmmode_overlay_update_attrs(ScrnInfoPtr pScrn)
#endif
}
-static void drmmode_overlay_off(ScrnInfoPtr pScrn)
+static void drmmode_overlay_off(ScrnInfoPtr scrn)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct drm_intel_overlay_put_image request;
int ret;
@@ -289,15 +289,15 @@ static void drmmode_overlay_off(ScrnInfoPtr pScrn)
}
static Bool
-drmmode_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
+drmmode_overlay_put_image(ScrnInfoPtr scrn, 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)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- intel_screen_private *intel = intel_get_screen_private(pScrn);
- I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ I830PortPrivPtr pPriv = GET_PORT_PRIVATE(scrn);
struct drm_intel_overlay_put_image request;
int ret;
int planar = is_planar_fourcc(id);
@@ -368,8 +368,8 @@ drmmode_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
void I830InitVideo(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
int num_adaptors;
@@ -377,7 +377,7 @@ void I830InitVideo(ScreenPtr pScreen)
Bool xvmc_status = FALSE;
#endif
- num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors);
+ num_adaptors = xf86XVListGenericAdaptors(scrn, &adaptors);
/* Give our adaptor list enough space for the overlay and/or texture video
* adaptors.
*/
@@ -399,28 +399,28 @@ void I830InitVideo(ScreenPtr pScreen)
/* Set up textured video if we can do it at this depth and we are on
* supported hardware.
*/
- if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(intel) || IS_I965G(intel)) &&
- !(!IS_I965G(intel) && pScrn->displayWidth > 2048)) {
+ if (scrn->bitsPerPixel >= 16 && (IS_I9XX(intel) || IS_I965G(intel)) &&
+ !(!IS_I965G(intel) && scrn->displayWidth > 2048)) {
texturedAdaptor = I830SetupImageVideoTextured(pScreen);
if (texturedAdaptor != NULL) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Set up textured video\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to set up textured video\n");
}
}
/* Set up overlay video if we can do it at this depth. */
- if (!OVERLAY_NOEXIST(intel) && pScrn->bitsPerPixel != 8) {
- intel->use_drmmode_overlay = drmmode_has_overlay(pScrn);
+ if (!OVERLAY_NOEXIST(intel) && scrn->bitsPerPixel != 8) {
+ intel->use_drmmode_overlay = drmmode_has_overlay(scrn);
if (intel->use_drmmode_overlay) {
overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
if (overlayAdaptor != NULL) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Set up overlay video\n");
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to set up overlay video\n");
}
}
@@ -436,7 +436,7 @@ void I830InitVideo(ScreenPtr pScreen)
adaptors[num_adaptors++] = overlayAdaptor;
#ifdef INTEL_XVMC
- if (intel_xvmc_probe(pScrn)) {
+ if (intel_xvmc_probe(scrn)) {
if (texturedAdaptor)
xvmc_status =
intel_xvmc_driver_init(pScreen, texturedAdaptor);
@@ -446,7 +446,7 @@ void I830InitVideo(ScreenPtr pScreen)
if (num_adaptors) {
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
} else {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Disabling Xv because no adaptors could be initialized.\n");
intel->XvEnabled = FALSE;
}
@@ -466,8 +466,8 @@ void I830InitVideo(ScreenPtr pScreen)
static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
XF86VideoAdaptorPtr adapt;
I830PortPrivPtr pPriv;
XF86AttributePtr att;
@@ -529,7 +529,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
adapt->QueryImageAttributes = I830QueryImageAttributes;
pPriv->textured = FALSE;
- pPriv->colorKey = intel->colorKey & ((1 << pScrn->depth) - 1);
+ pPriv->colorKey = intel->colorKey & ((1 << scrn->depth) - 1);
pPriv->videoStatus = 0;
pPriv->brightness = -19; /* (255/219) * -16 */
pPriv->contrast = 75; /* 255/219 * 64 */
@@ -583,7 +583,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
xvGamma5 = MAKE_ATOM("XV_GAMMA5");
}
- drmmode_overlay_update_attrs(pScrn);
+ drmmode_overlay_update_attrs(scrn);
return adapt;
}
@@ -679,7 +679,7 @@ static void i830_free_video_buffers(I830PortPrivPtr pPriv)
}
}
-static void I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+static void I830StopVideo(ScrnInfoPtr scrn, pointer data, Bool shutdown)
{
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
@@ -688,11 +688,11 @@ static void I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
OVERLAY_DEBUG("I830StopVideo\n");
- REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
+ REGION_EMPTY(scrn->pScreen, &pPriv->clip);
if (shutdown) {
if (pPriv->videoStatus & CLIENT_VIDEO_ON)
- drmmode_overlay_off(pScrn);
+ drmmode_overlay_off(scrn);
i830_free_video_buffers(pPriv);
pPriv->videoStatus = 0;
@@ -706,7 +706,7 @@ static void I830StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
}
static int
-I830SetPortAttributeTextured(ScrnInfoPtr pScrn,
+I830SetPortAttributeTextured(ScrnInfoPtr scrn,
Atom attribute, INT32 value, pointer data)
{
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
@@ -732,11 +732,11 @@ I830SetPortAttributeTextured(ScrnInfoPtr pScrn,
}
static int
-I830SetPortAttributeOverlay(ScrnInfoPtr pScrn,
+I830SetPortAttributeOverlay(ScrnInfoPtr scrn,
Atom attribute, INT32 value, pointer data)
{
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (attribute == xvBrightness) {
if ((value < -128) || (value > 127))
@@ -753,7 +753,7 @@ I830SetPortAttributeOverlay(ScrnInfoPtr pScrn,
return BadValue;
pPriv->saturation = value;
} else if (attribute == xvPipe) {
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
if ((value < -1) || (value > xf86_config->num_crtc))
return BadValue;
if (value < 0)
@@ -791,19 +791,19 @@ I830SetPortAttributeOverlay(ScrnInfoPtr pScrn,
OVERLAY_DEBUG("GAMMA\n");
}
- drmmode_overlay_update_attrs(pScrn);
+ drmmode_overlay_update_attrs(scrn);
if (attribute == xvColorKey)
- REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
+ REGION_EMPTY(scrn->pScreen, &pPriv->clip);
return Success;
}
static int
-I830GetPortAttribute(ScrnInfoPtr pScrn,
+I830GetPortAttribute(ScrnInfoPtr scrn,
Atom attribute, INT32 * value, pointer data)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
if (attribute == xvBrightness) {
@@ -814,7 +814,7 @@ I830GetPortAttribute(ScrnInfoPtr pScrn,
*value = pPriv->saturation;
} else if (attribute == xvPipe) {
int c;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
for (c = 0; c < xf86_config->num_crtc; c++)
if (xf86_config->crtc[c] == pPriv->desired_crtc)
break;
@@ -844,7 +844,7 @@ I830GetPortAttribute(ScrnInfoPtr pScrn,
}
static void
-I830QueryBestSize(ScrnInfoPtr pScrn,
+I830QueryBestSize(ScrnInfoPtr scrn,
Bool motion,
short vid_w, short vid_h,
short drw_w, short drw_h,
@@ -1130,10 +1130,10 @@ static int i830_box_area(BoxPtr box)
*/
xf86CrtcPtr
-i830_covering_crtc(ScrnInfoPtr pScrn,
+i830_covering_crtc(ScrnInfoPtr scrn,
BoxPtr box, xf86CrtcPtr desired, BoxPtr crtc_box_ret)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CrtcPtr crtc, best_crtc;
int coverage, best_coverage;
int c;
@@ -1169,7 +1169,7 @@ i830_covering_crtc(ScrnInfoPtr pScrn,
}
static void
-i830_update_dst_box_to_crtc_coords(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
+i830_update_dst_box_to_crtc_coords(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
BoxPtr dstBox)
{
int tmp;
@@ -1188,28 +1188,28 @@ i830_update_dst_box_to_crtc_coords(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
case RR_Rotate_90:
tmp = dstBox->x1;
dstBox->x1 = dstBox->y1 - crtc->x;
- dstBox->y1 = pScrn->virtualX - tmp - crtc->y;
+ dstBox->y1 = scrn->virtualX - tmp - crtc->y;
tmp = dstBox->x2;
dstBox->x2 = dstBox->y2 - crtc->x;
- dstBox->y2 = pScrn->virtualX - tmp - crtc->y;
+ dstBox->y2 = scrn->virtualX - tmp - crtc->y;
tmp = dstBox->y1;
dstBox->y1 = dstBox->y2;
dstBox->y2 = tmp;
break;
case RR_Rotate_180:
tmp = dstBox->x1;
- dstBox->x1 = pScrn->virtualX - dstBox->x2 - crtc->x;
- dstBox->x2 = pScrn->virtualX - tmp - crtc->x;
+ dstBox->x1 = scrn->virtualX - dstBox->x2 - crtc->x;
+ dstBox->x2 = scrn->virtualX - tmp - crtc->x;
tmp = dstBox->y1;
- dstBox->y1 = pScrn->virtualY - dstBox->y2 - crtc->y;
- dstBox->y2 = pScrn->virtualY - tmp - crtc->y;
+ dstBox->y1 = scrn->virtualY - dstBox->y2 - crtc->y;
+ dstBox->y2 = scrn->virtualY - tmp - crtc->y;
break;
case RR_Rotate_270:
tmp = dstBox->x1;
- dstBox->x1 = pScrn->virtualY - dstBox->y1 - crtc->x;
+ dstBox->x1 = scrn->virtualY - dstBox->y1 - crtc->x;
dstBox->y1 = tmp - crtc->y;
tmp = dstBox->x2;
- dstBox->x2 = pScrn->virtualY - dstBox->y2 - crtc->x;
+ dstBox->x2 = scrn->virtualY - dstBox->y2 - crtc->x;
dstBox->y2 = tmp - crtc->y;
tmp = dstBox->x1;
dstBox->x1 = dstBox->x2;
@@ -1248,13 +1248,13 @@ static int xvmc_passthrough(int id, Rotation rotation)
}
static Bool
-i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
+i830_display_overlay(ScrnInfoPtr scrn, 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)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I830PortPrivPtr pPriv = intel->adaptor->pPortPrivates[0].ptr;
int tmp;
@@ -1270,12 +1270,12 @@ i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
*/
if (!crtc) {
pPriv->current_crtc = NULL;
- drmmode_overlay_off(pScrn);
+ drmmode_overlay_off(scrn);
return TRUE;
}
- i830_update_dst_box_to_crtc_coords(pScrn, crtc, dstBox);
+ i830_update_dst_box_to_crtc_coords(scrn, crtc, dstBox);
if (crtc->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
tmp = width;
@@ -1289,13 +1289,13 @@ i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
src_h = tmp;
}
- return drmmode_overlay_put_image(pScrn, crtc, id, width, height,
+ return drmmode_overlay_put_image(scrn, crtc, id, width, height,
dstPitch, x1, y1, x2, y2, dstBox,
src_w, src_h, drw_w, drw_h);
}
static Bool
-i830_clip_video_helper(ScrnInfoPtr pScrn,
+i830_clip_video_helper(ScrnInfoPtr scrn,
I830PortPrivPtr pPriv,
xf86CrtcPtr * crtc_ret,
BoxPtr dst,
@@ -1314,7 +1314,7 @@ i830_clip_video_helper(ScrnInfoPtr pScrn,
*/
if (crtc_ret) {
BoxRec crtc_box;
- xf86CrtcPtr crtc = i830_covering_crtc(pScrn, dst,
+ xf86CrtcPtr crtc = i830_covering_crtc(scrn, dst,
pPriv->desired_crtc,
&crtc_box);
@@ -1369,10 +1369,10 @@ i830_fill_colorkey(ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
}
static void
-i830_wait_for_scanline(ScrnInfoPtr pScrn, PixmapPtr pPixmap,
+i830_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pPixmap,
xf86CrtcPtr crtc, RegionPtr clipBoxes)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
BoxPtr box;
pixman_box16_t box_in_crtc_coordinates;
int pipe = -1, event, load_scan_lines_pipe;
@@ -1410,10 +1410,10 @@ i830_wait_for_scanline(ScrnInfoPtr pScrn, PixmapPtr pPixmap,
}
static Bool
-i830_setup_video_buffer(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+i830_setup_video_buffer(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
int alloc_size, int id)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* 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);
@@ -1436,11 +1436,11 @@ i830_setup_video_buffer(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
}
static void
-i830_dst_pitch_and_size(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, short width,
+i830_dst_pitch_and_size(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, short width,
short height, int *dstPitch, int *dstPitch2, int *size,
int id)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int pitchAlignMask;
/* Only needs to be DWORD-aligned for textured on i915, but overlay has
@@ -1508,12 +1508,12 @@ i830_dst_pitch_and_size(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, short width,
}
static Bool
-i830_copy_video_data(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+i830_copy_video_data(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
short width, short height, int *dstPitch, int *dstPitch2,
INT32 x1, INT32 y1, INT32 x2, INT32 y2,
int id, unsigned char *buf)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int srcPitch = 0, srcPitch2 = 0;
int top, left, npixels, nlines, size;
@@ -1524,10 +1524,10 @@ i830_copy_video_data(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
srcPitch = width << 1;
}
- i830_dst_pitch_and_size(pScrn, pPriv, width, height, dstPitch,
+ i830_dst_pitch_and_size(scrn, pPriv, width, height, dstPitch,
dstPitch2, &size, id);
- if (!i830_setup_video_buffer(pScrn, pPriv, size, id))
+ if (!i830_setup_video_buffer(scrn, pPriv, size, id))
return FALSE;
/* fixup pointers */
@@ -1592,7 +1592,7 @@ i830_copy_video_data(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
* compositing. It's a new argument to the function in the 1.1 server.
*/
static int
-I830PutImage(ScrnInfoPtr pScrn,
+I830PutImage(ScrnInfoPtr scrn,
short src_x, short src_y,
short drw_x, short drw_y,
short src_w, short src_h,
@@ -1601,9 +1601,9 @@ I830PutImage(ScrnInfoPtr pScrn,
short width, short height,
Bool sync, RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
- ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
+ ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
PixmapPtr pPixmap = get_drawable_pixmap(pDraw);;
INT32 x1, x2, y1, y2;
int dstPitch;
@@ -1639,7 +1639,7 @@ I830PutImage(ScrnInfoPtr pScrn,
dstBox.y1 = drw_y;
dstBox.y2 = drw_y + drw_h;
- if (!i830_clip_video_helper(pScrn,
+ if (!i830_clip_video_helper(scrn,
pPriv,
&crtc,
&dstBox, &x1, &x2, &y1, &y2, clipBoxes,
@@ -1651,31 +1651,31 @@ I830PutImage(ScrnInfoPtr pScrn,
if (crtc)
pPriv->rotation = crtc->rotation;
else {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"Fail to clip video to any crtc!\n");
return Success;
}
}
- if (!i830_copy_video_data(pScrn, pPriv, width, height,
+ if (!i830_copy_video_data(scrn, pPriv, width, height,
&dstPitch, &dstPitch2,
x1, y1, x2, y2, id, buf))
return BadAlloc;
if (!pPriv->textured) {
if (!i830_display_overlay
- (pScrn, crtc, id, width, height, dstPitch, x1, y1, x2, y2,
+ (scrn, crtc, id, width, height, dstPitch, x1, y1, x2, y2,
&dstBox, src_w, src_h, drw_w, drw_h))
return BadAlloc;
/* update cliplist */
- if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
- REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
+ if (!REGION_EQUAL(scrn->pScreen, &pPriv->clip, clipBoxes)) {
+ REGION_COPY(scrn->pScreen, &pPriv->clip, clipBoxes);
i830_fill_colorkey(pScreen, pPriv->colorKey, clipBoxes);
}
} else {
if (crtc && pPriv->SyncToVblank != 0) {
- i830_wait_for_scanline(pScrn, pPixmap, crtc, clipBoxes);
+ i830_wait_for_scanline(scrn, pPixmap, crtc, clipBoxes);
}
if (IS_I965G(intel)) {
@@ -1687,12 +1687,12 @@ I830PutImage(ScrnInfoPtr pScrn,
pPriv->VBufOffset =
pPriv->UBufOffset + height * width / 4;
}
- I965DisplayVideoTextured(pScrn, pPriv, id, clipBoxes,
+ I965DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
width, height, dstPitch, x1,
y1, x2, y2, src_w, src_h,
drw_w, drw_h, pPixmap);
} else {
- I915DisplayVideoTextured(pScrn, pPriv, id, clipBoxes,
+ I915DisplayVideoTextured(scrn, pPriv, id, clipBoxes,
width, height, dstPitch,
dstPitch2, x1, y1, x2, y2,
src_w, src_h, drw_w, drw_h,
@@ -1708,12 +1708,12 @@ I830PutImage(ScrnInfoPtr pScrn,
}
static int
-I830QueryImageAttributes(ScrnInfoPtr pScrn,
+I830QueryImageAttributes(ScrnInfoPtr scrn,
int id,
unsigned short *w, unsigned short *h,
int *pitches, int *offsets)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int size, tmp;
#if 0
@@ -1797,15 +1797,15 @@ void
I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask)
{
- ScrnInfoPtr pScrn = xf86Screens[i];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[i];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I830PortPrivPtr pPriv;
/* no overlay */
if (intel->adaptor == NULL)
return;
- pPriv = GET_PORT_PRIVATE(pScrn);
+ pPriv = GET_PORT_PRIVATE(scrn);
if (pPriv->videoStatus & TIMER_MASK) {
#if 1
@@ -1818,7 +1818,7 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
/* Turn off the overlay */
OVERLAY_DEBUG("BLOCKHANDLER\n");
- drmmode_overlay_off(pScrn);
+ drmmode_overlay_off(scrn);
pPriv->videoStatus = FREE_TIMER;
pPriv->freeTime = now + FREE_DELAY;
diff --git a/src/i830_video.h b/src/i830_video.h
index 2905be3..40aeb57 100644
--- a/src/i830_video.h
+++ b/src/i830_video.h
@@ -65,17 +65,17 @@ typedef struct {
int SyncToVblank; /* -1: auto, 0: off, 1: on */
} I830PortPrivRec, *I830PortPrivPtr;
-#define GET_PORT_PRIVATE(pScrn) \
- (I830PortPrivPtr)((intel_get_screen_private(pScrn))->adaptor->pPortPrivates[0].ptr)
+#define GET_PORT_PRIVATE(scrn) \
+ (I830PortPrivPtr)((intel_get_screen_private(scrn))->adaptor->pPortPrivates[0].ptr)
-void I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+void I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
int id, RegionPtr dstRegion, short width,
short height, int video_pitch, int video_pitch2,
int x1, int y1, int x2, int y2,
short src_w, short src_h,
short drw_w, short drw_h, PixmapPtr pPixmap);
-void I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
+void I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv,
int id, RegionPtr dstRegion, short width,
short height, int video_pitch,
int x1, int y1, int x2, int y2,
diff --git a/src/i915_3d.c b/src/i915_3d.c
index 053a94f..e3b5674 100644
--- a/src/i915_3d.c
+++ b/src/i915_3d.c
@@ -34,9 +34,9 @@
#include "i915_reg.h"
-void I915EmitInvarientState(ScrnInfoPtr pScrn)
+void I915EmitInvarientState(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
BEGIN_BATCH(24);
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index 1c1aced..e1a45b5 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -207,17 +207,17 @@ static void cleanupI915XvMC(I915XvMCPtr xvmc)
}
}
-static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
+static Bool i915_map_xvmc_buffers(ScrnInfoPtr scrn,
I915XvMCContextPriv * ctxpriv)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (ctxpriv->mcStaticIndirectState->offset +
intel->LinearAddr),
ctxpriv->mcStaticIndirectState->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->sis_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(sis_handle) failed!\n");
return FALSE;
}
@@ -227,7 +227,7 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
intel->LinearAddr),
ctxpriv->mcSamplerState->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->ssb_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(ssb_handle) failed!\n");
return FALSE;
}
@@ -237,7 +237,7 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
intel->LinearAddr),
ctxpriv->mcMapState->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->msb_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(msb_handle) failed!\n");
return FALSE;
}
@@ -247,7 +247,7 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
intel->LinearAddr),
ctxpriv->mcPixelShaderProgram->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->psp_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(psp_handle) failed!\n");
return FALSE;
}
@@ -257,7 +257,7 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
intel->LinearAddr),
ctxpriv->mcPixelShaderConstants->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->psc_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(psc_handle) failed!\n");
return FALSE;
}
@@ -267,7 +267,7 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
intel->LinearAddr),
ctxpriv->mcCorrdata->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->corrdata_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(corrdata_handle) failed!\n");
return FALSE;
}
@@ -275,10 +275,10 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
return TRUE;
}
-static void i915_unmap_xvmc_buffers(ScrnInfoPtr pScrn,
+static void i915_unmap_xvmc_buffers(ScrnInfoPtr scrn,
I915XvMCContextPriv * ctxpriv)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (ctxpriv->sis_handle) {
drmRmMap(intel->drmSubFD, ctxpriv->sis_handle);
@@ -312,88 +312,88 @@ static void i915_unmap_xvmc_buffers(ScrnInfoPtr pScrn,
}
-static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr pScrn,
+static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr scrn,
I915XvMCContextPriv * ctxpriv)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int flags = ALIGN_BOTH_ENDS;
/* on 915G/GM, load indirect can only use physical address...sigh */
if (IS_I915G(intel) || IS_I915GM(intel))
flags |= NEED_PHYSICAL_ADDR;
- if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Static Indirect State",
+ if (!i830_allocate_xvmc_buffer(scrn, "[XvMC]Static Indirect State",
&(ctxpriv->mcStaticIndirectState),
4 * 1024, flags)) {
return FALSE;
}
- if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Sampler State",
+ if (!i830_allocate_xvmc_buffer(scrn, "[XvMC]Sampler State",
&(ctxpriv->mcSamplerState), 4 * 1024,
flags)) {
return FALSE;
}
- if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Map State",
+ if (!i830_allocate_xvmc_buffer(scrn, "[XvMC]Map State",
&(ctxpriv->mcMapState), 4 * 1024,
flags)) {
return FALSE;
}
- if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Pixel Shader Program",
+ if (!i830_allocate_xvmc_buffer(scrn, "[XvMC]Pixel Shader Program",
&(ctxpriv->mcPixelShaderProgram),
4 * 1024, flags)) {
return FALSE;
}
- if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Pixel Shader Constants",
+ if (!i830_allocate_xvmc_buffer(scrn, "[XvMC]Pixel Shader Constants",
&(ctxpriv->mcPixelShaderConstants),
4 * 1024, flags)) {
return FALSE;
}
- if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Correction Data Buffer",
+ if (!i830_allocate_xvmc_buffer(scrn, "[XvMC]Correction Data Buffer",
&(ctxpriv->mcCorrdata), 512 * 1024,
ALIGN_BOTH_ENDS)) {
return FALSE;
}
if (1)
- i830_describe_allocations(pScrn, 1, "i915_mc: ");
+ i830_describe_allocations(scrn, 1, "i915_mc: ");
return TRUE;
}
-static void i915_free_xvmc_buffers(ScrnInfoPtr pScrn,
+static void i915_free_xvmc_buffers(ScrnInfoPtr scrn,
I915XvMCContextPriv * ctxpriv)
{
if (ctxpriv->mcStaticIndirectState) {
- i830_free_xvmc_buffer(pScrn, ctxpriv->mcStaticIndirectState);
+ i830_free_xvmc_buffer(scrn, ctxpriv->mcStaticIndirectState);
ctxpriv->mcStaticIndirectState = NULL;
}
if (ctxpriv->mcSamplerState) {
- i830_free_xvmc_buffer(pScrn, ctxpriv->mcSamplerState);
+ i830_free_xvmc_buffer(scrn, ctxpriv->mcSamplerState);
ctxpriv->mcSamplerState = NULL;
}
if (ctxpriv->mcMapState) {
- i830_free_xvmc_buffer(pScrn, ctxpriv->mcMapState);
+ i830_free_xvmc_buffer(scrn, ctxpriv->mcMapState);
ctxpriv->mcMapState = NULL;
}
if (ctxpriv->mcPixelShaderProgram) {
- i830_free_xvmc_buffer(pScrn, ctxpriv->mcPixelShaderProgram);
+ i830_free_xvmc_buffer(scrn, ctxpriv->mcPixelShaderProgram);
ctxpriv->mcPixelShaderProgram = NULL;
}
if (ctxpriv->mcPixelShaderConstants) {
- i830_free_xvmc_buffer(pScrn, ctxpriv->mcPixelShaderConstants);
+ i830_free_xvmc_buffer(scrn, ctxpriv->mcPixelShaderConstants);
ctxpriv->mcPixelShaderConstants = NULL;
}
if (ctxpriv->mcCorrdata) {
- i830_free_xvmc_buffer(pScrn, ctxpriv->mcCorrdata);
+ i830_free_xvmc_buffer(scrn, ctxpriv->mcCorrdata);
ctxpriv->mcCorrdata = NULL;
}
@@ -412,10 +412,10 @@ static void i915_free_xvmc_buffers(ScrnInfoPtr pScrn,
*
**************************************************************************/
-static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
+static int i915_xvmc_create_context(ScrnInfoPtr scrn, XvMCContextPtr pContext,
int *num_priv, long **priv)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I915XvMCCreateContextRec *contextRec = NULL;
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
I915XvMCContextPriv *ctxpriv = NULL;
@@ -425,7 +425,7 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
*num_priv = 0;
if (!intel->XvMCEnabled) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: XvMC disabled!\n");
return BadAlloc;
}
@@ -437,7 +437,7 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
if (i == I915_XVMC_MAX_CONTEXTS ||
pXvMC->ncontexts >= I915_XVMC_MAX_CONTEXTS) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: Out of contexts.\n");
return BadAlloc;
}
@@ -458,7 +458,7 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
(I915XvMCContextPriv *) xcalloc(1, sizeof(I915XvMCContextPriv));
if (!ctxpriv) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: Unable to allocate memory!\n");
xfree(*priv);
*priv = NULL;
@@ -466,8 +466,8 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
return BadAlloc;
}
- if (!i915_allocate_xvmc_buffers(pScrn, ctxpriv)) {
- i915_free_xvmc_buffers(pScrn, ctxpriv);
+ if (!i915_allocate_xvmc_buffers(scrn, ctxpriv)) {
+ i915_free_xvmc_buffers(scrn, ctxpriv);
xfree(ctxpriv);
ctxpriv = NULL;
xfree(*priv);
@@ -476,9 +476,9 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
return BadAlloc;
}
- if (!i915_map_xvmc_buffers(pScrn, ctxpriv)) {
- i915_unmap_xvmc_buffers(pScrn, ctxpriv);
- i915_free_xvmc_buffers(pScrn, ctxpriv);
+ if (!i915_map_xvmc_buffers(scrn, ctxpriv)) {
+ i915_unmap_xvmc_buffers(scrn, ctxpriv);
+ i915_free_xvmc_buffers(scrn, ctxpriv);
xfree(ctxpriv);
ctxpriv = NULL;
xfree(*priv);
@@ -536,10 +536,10 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
return Success;
}
-static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
+static int i915_xvmc_create_surface(ScrnInfoPtr scrn, XvMCSurfacePtr pSurf,
int *num_priv, long **priv)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
I915XvMCSurfacePriv *sfpriv = NULL;
I915XvMCCreateSurfaceRec *surfaceRec = NULL;
@@ -548,7 +548,7 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
unsigned long bufsize;
if (!intel->XvMCEnabled) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: XvMC disabled!\n");
return BadAlloc;
}
@@ -563,7 +563,7 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
if (srfno == I915_XVMC_MAX_SURFACES ||
pXvMC->nsurfaces >= I915_XVMC_MAX_SURFACES) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: Too many surfaces !\n");
return BadAlloc;
}
@@ -572,7 +572,7 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
surfaceRec = (I915XvMCCreateSurfaceRec *) * priv;
if (!*priv) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915:Unable to allocate surface priv ret memory!\n");
return BadAlloc;
}
@@ -582,7 +582,7 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
(I915XvMCSurfacePriv *) xcalloc(1, sizeof(I915XvMCSurfacePriv));
if (!sfpriv) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: Unable to allocate surface priv memory!\n");
xfree(*priv);
*priv = NULL;
@@ -593,10 +593,10 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
ctx = pSurf->context;
bufsize = SIZE_YUV420(ctx->width, ctx->height);
- if (!i830_allocate_xvmc_buffer(pScrn, "XvMC surface",
+ if (!i830_allocate_xvmc_buffer(scrn, "XvMC surface",
&(sfpriv->surface), bufsize,
ALIGN_BOTH_ENDS)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915 : Failed to allocate XvMC surface space!\n");
xfree(sfpriv);
xfree(*priv);
@@ -606,15 +606,15 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
}
if (0)
- i830_describe_allocations(pScrn, 1, "");
+ i830_describe_allocations(scrn, 1, "");
if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (sfpriv->surface->offset +
intel->LinearAddr), sfpriv->surface->size,
DRM_AGP, 0, (drmAddress) & sfpriv->surface_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(surface_handle) failed!\n");
- i830_free_xvmc_buffer(pScrn, sfpriv->surface);
+ i830_free_xvmc_buffer(scrn, sfpriv->surface);
xfree(sfpriv);
xfree(*priv);
*priv = NULL;
@@ -634,10 +634,10 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
return Success;
}
-static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
+static int i915_xvmc_create_subpict(ScrnInfoPtr scrn, XvMCSubpicturePtr pSubp,
int *num_priv, long **priv)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
I915XvMCSurfacePriv *sfpriv = NULL;
I915XvMCCreateSurfaceRec *surfaceRec = NULL;
@@ -655,7 +655,7 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
if (srfno == I915_XVMC_MAX_SURFACES ||
pXvMC->nsurfaces >= I915_XVMC_MAX_SURFACES) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: Too many surfaces !\n");
return BadAlloc;
}
@@ -664,7 +664,7 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
surfaceRec = (I915XvMCCreateSurfaceRec *) * priv;
if (!*priv) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: Unable to allocate memory!\n");
return BadAlloc;
}
@@ -674,7 +674,7 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
(I915XvMCSurfacePriv *) xcalloc(1, sizeof(I915XvMCSurfacePriv));
if (!sfpriv) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915: Unable to allocate memory!\n");
xfree(*priv);
*priv = NULL;
@@ -685,10 +685,10 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
ctx = pSubp->context;
bufsize = SIZE_XX44(ctx->width, ctx->height);
- if (!i830_allocate_xvmc_buffer(pScrn, "XvMC surface",
+ if (!i830_allocate_xvmc_buffer(scrn, "XvMC surface",
&(sfpriv->surface), bufsize,
ALIGN_BOTH_ENDS)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] I915XvMCCreateSurface: Failed to allocate XvMC surface space!\n");
xfree(sfpriv);
xfree(*priv);
@@ -701,9 +701,9 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
(drm_handle_t) (sfpriv->surface->offset +
intel->LinearAddr), sfpriv->surface->size,
DRM_AGP, 0, (drmAddress) & sfpriv->surface_handle) < 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(surface_handle) failed!\n");
- i830_free_xvmc_buffer(pScrn, sfpriv->surface);
+ i830_free_xvmc_buffer(scrn, sfpriv->surface);
xfree(sfpriv);
xfree(*priv);
*priv = NULL;
@@ -723,7 +723,7 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
return Success;
}
-static void i915_xvmc_destroy_context(ScrnInfoPtr pScrn,
+static void i915_xvmc_destroy_context(ScrnInfoPtr scrn,
XvMCContextPtr pContext)
{
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
@@ -731,8 +731,8 @@ static void i915_xvmc_destroy_context(ScrnInfoPtr pScrn,
for (i = 0; i < I915_XVMC_MAX_CONTEXTS; i++) {
if (pXvMC->contexts[i] == pContext->context_id) {
- i915_unmap_xvmc_buffers(pScrn, pXvMC->ctxprivs[i]);
- i915_free_xvmc_buffers(pScrn, pXvMC->ctxprivs[i]);
+ i915_unmap_xvmc_buffers(scrn, pXvMC->ctxprivs[i]);
+ i915_free_xvmc_buffers(scrn, pXvMC->ctxprivs[i]);
xfree(pXvMC->ctxprivs[i]);
pXvMC->ctxprivs[i] = 0;
pXvMC->ncontexts--;
@@ -744,9 +744,9 @@ static void i915_xvmc_destroy_context(ScrnInfoPtr pScrn,
return;
}
-static void i915_xvmc_destroy_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf)
+static void i915_xvmc_destroy_surface(ScrnInfoPtr scrn, XvMCSurfacePtr pSurf)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
int i;
@@ -754,7 +754,7 @@ static void i915_xvmc_destroy_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf)
if (pXvMC->surfaces[i] == pSurf->surface_id) {
drmRmMap(intel->drmSubFD,
pXvMC->sfprivs[i]->surface_handle);
- i830_free_xvmc_buffer(pScrn,
+ i830_free_xvmc_buffer(scrn,
pXvMC->sfprivs[i]->surface);
xfree(pXvMC->sfprivs[i]);
pXvMC->nsurfaces--;
@@ -767,10 +767,10 @@ static void i915_xvmc_destroy_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf)
return;
}
-static void i915_xvmc_destroy_subpict(ScrnInfoPtr pScrn,
+static void i915_xvmc_destroy_subpict(ScrnInfoPtr scrn,
XvMCSubpicturePtr pSubp)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
int i;
@@ -778,7 +778,7 @@ static void i915_xvmc_destroy_subpict(ScrnInfoPtr pScrn,
if (pXvMC->surfaces[i] == pSubp->subpicture_id) {
drmRmMap(intel->drmSubFD,
pXvMC->sfprivs[i]->surface_handle);
- i830_free_xvmc_buffer(pScrn,
+ i830_free_xvmc_buffer(scrn,
pXvMC->sfprivs[i]->surface);
xfree(pXvMC->sfprivs[i]);
pXvMC->nsurfaces--;
@@ -791,7 +791,7 @@ static void i915_xvmc_destroy_subpict(ScrnInfoPtr pScrn,
return;
}
-static int i915_xvmc_put_image(ScrnInfoPtr pScrn,
+static int i915_xvmc_put_image(ScrnInfoPtr scrn,
short src_x, short src_y,
short drw_x, short drw_y, short src_w,
short src_h, short drw_w, short drw_h,
@@ -809,7 +809,7 @@ static int i915_xvmc_put_image(ScrnInfoPtr pScrn,
if ((xvmc_cmd->srfNo >= I915_XVMC_MAX_SURFACES) ||
!pXvMC->surfaces[xvmc_cmd->srfNo] ||
!pXvMC->sfprivs[xvmc_cmd->srfNo]) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[XvMC] i915 put image: Invalid parameters!\n");
return 1;
}
@@ -825,25 +825,25 @@ static int i915_xvmc_put_image(ScrnInfoPtr pScrn,
}
ret =
- pXvMC->savePutImage(pScrn, src_x, src_y, drw_x, drw_y, src_w, src_h,
+ pXvMC->savePutImage(scrn, src_x, src_y, drw_x, drw_y, src_w, src_h,
drw_w, drw_h, id, buf, width, height, sync,
clipBoxes, data, pDraw);
return ret;
}
-static Bool i915_xvmc_init(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr XvAdapt)
+static Bool i915_xvmc_init(ScrnInfoPtr scrn, XF86VideoAdaptorPtr XvAdapt)
{
I915XvMCPtr pXvMC;
pXvMC = (I915XvMCPtr) xcalloc(1, sizeof(I915XvMC));
if (!pXvMC) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"[XvMC] alloc driver private failed!\n");
return FALSE;
}
xvmc_driver->devPrivate = (void *)pXvMC;
- if (!intel_xvmc_init_batch(pScrn)) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ if (!intel_xvmc_init_batch(scrn)) {
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"[XvMC] fail to init batch buffer\n");
xfree(pXvMC);
return FALSE;
@@ -856,12 +856,12 @@ static Bool i915_xvmc_init(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr XvAdapt)
return TRUE;
}
-static void i915_xvmc_fini(ScrnInfoPtr pScrn)
+static void i915_xvmc_fini(ScrnInfoPtr scrn)
{
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
cleanupI915XvMC(pXvMC);
- intel_xvmc_fini_batch(pScrn);
+ intel_xvmc_fini_batch(scrn);
xfree(xvmc_driver->devPrivate);
}
diff --git a/src/i915_render.c b/src/i915_render.c
index 389fa9d..2616481 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -158,9 +158,9 @@ static Bool i915_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
break;
default:
{
- ScrnInfoPtr pScrn;
+ ScrnInfoPtr scrn;
- pScrn =
+ scrn =
xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
I830FALLBACK("Unsupported dest format 0x%x\n",
(int)pDstPicture->format);
@@ -169,7 +169,7 @@ static Bool i915_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
return TRUE;
}
-static Bool i915_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict,
+static Bool i915_check_composite_texture(ScrnInfoPtr scrn, PicturePtr pPict,
int unit)
{
if (pPict->repeatType > RepeatReflect)
@@ -206,7 +206,7 @@ Bool
i915_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
PicturePtr pDstPicture)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
uint32_t tmp1;
/* Check for unsupported compositing operations. */
@@ -225,10 +225,10 @@ i915_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
"blending.\n");
}
- if (!i915_check_composite_texture(pScrn, pSrcPicture, 0))
+ if (!i915_check_composite_texture(scrn, pSrcPicture, 0))
I830FALLBACK("Check Src picture texture\n");
if (pMaskPicture != NULL
- && !i915_check_composite_texture(pScrn, pMaskPicture, 1))
+ && !i915_check_composite_texture(scrn, pMaskPicture, 1))
I830FALLBACK("Check Mask picture texture\n");
if (!i915_get_dest_format(pDstPicture, &tmp1))
@@ -239,8 +239,8 @@ i915_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
{
- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t format, pitch, filter;
int w, h, i;
uint32_t wrap_mode;
@@ -320,8 +320,8 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
PicturePtr pMaskPicture, PicturePtr pDstPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
- ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
i830_get_pixmap_bo(pSrc),
@@ -345,7 +345,7 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
&intel->i915_render_state.dst_format))
return FALSE;
- if (!i830_get_aperture_space(pScrn, bo_table, ARRAY_SIZE(bo_table)))
+ if (!i830_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
if (!i915_texture_setup(pSrcPicture, pSrc, 0))
@@ -374,9 +374,9 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
return TRUE;
}
-static void i915_emit_composite_setup(ScrnInfoPtr pScrn)
+static void i915_emit_composite_setup(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int op = intel->i915_render_state.op;
PicturePtr pSrcPicture = intel->render_src_picture;
PicturePtr pMaskPicture = intel->render_mask_picture;
@@ -392,7 +392,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr pScrn)
intel->i915_render_state.needs_emit = FALSE;
- IntelEmitInvarientState(pScrn);
+ IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_RENDER;
dst_pitch = intel_get_pixmap_pitch(pDst);
@@ -570,8 +570,8 @@ i915_emit_composite_primitive(PixmapPtr pDst,
int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
Bool is_affine_src, is_affine_mask = TRUE;
int per_vertex, num_floats;
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
@@ -755,23 +755,23 @@ void
i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- intel_batch_start_atomic(pScrn, 150);
+ intel_batch_start_atomic(scrn, 150);
if (intel->i915_render_state.needs_emit)
- i915_emit_composite_setup(pScrn);
+ i915_emit_composite_setup(scrn);
i915_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX,
dstY, w, h);
- intel_batch_end_atomic(pScrn);
+ intel_batch_end_atomic(scrn);
}
-void i915_batch_flush_notify(ScrnInfoPtr pScrn)
+void i915_batch_flush_notify(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
intel->i915_render_state.needs_emit = TRUE;
}
diff --git a/src/i915_video.c b/src/i915_video.c
index e2080e7..2b805e4 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -40,14 +40,14 @@
#include "i915_3d.h"
void
-I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
+I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
RegionPtr dstRegion,
short width, short height, int video_pitch,
int video_pitch2, int x1, int y1, int x2, int y2,
short src_w, short src_h, short drw_w, short drw_h,
PixmapPtr pPixmap)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
uint32_t format, ms3, s5;
BoxPtr pbox = REGION_RECTS(dstRegion);
int nbox_total = REGION_NUM_RECTS(dstRegion);
@@ -69,9 +69,9 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
nbox_this_time = BOXES_IN_BYTES(BATCH_BYTES(intel));
nbox_total -= nbox_this_time;
- intel_batch_start_atomic(pScrn, 200 + 20 * nbox_this_time);
+ intel_batch_start_atomic(scrn, 200 + 20 * nbox_this_time);
- IntelEmitInvarientState(pScrn);
+ IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_VIDEO;
BEGIN_BATCH(20);
@@ -453,6 +453,6 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
ADVANCE_BATCH();
}
- intel_batch_end_atomic(pScrn);
+ intel_batch_end_atomic(scrn);
}
}
diff --git a/src/i965_hwmc.c b/src/i965_hwmc.c
index 261a270..76acb86 100644
--- a/src/i965_hwmc.c
+++ b/src/i965_hwmc.c
@@ -50,12 +50,12 @@
static PutImageFuncPtr XvPutImage;
-static int create_context(ScrnInfoPtr pScrn,
+static int create_context(ScrnInfoPtr scrn,
XvMCContextPtr context, int *num_privates,
CARD32 ** private)
{
struct i965_xvmc_context *private_context, *context_dup;
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
unsigned int blocknum =
(((context->width + 15) / 16) * ((context->height + 15) / 16));
@@ -85,14 +85,14 @@ static int create_context(ScrnInfoPtr pScrn,
return Success;
}
-static void destroy_context(ScrnInfoPtr pScrn, XvMCContextPtr context)
+static void destroy_context(ScrnInfoPtr scrn, XvMCContextPtr context)
{
struct i965_xvmc_context *private_context;
private_context = context->driver_priv;
Xfree(private_context);
}
-static int create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr surface,
+static int create_surface(ScrnInfoPtr scrn, XvMCSurfacePtr surface,
int *num_priv, CARD32 ** priv)
{
XvMCContextPtr ctx = surface->context;
@@ -131,7 +131,7 @@ static int create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr surface,
return Success;
}
-static void destory_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr surface)
+static void destory_surface(ScrnInfoPtr scrn, XvMCSurfacePtr surface)
{
XvMCContextPtr ctx = surface->context;
struct i965_xvmc_surface *priv_surface = surface->driver_priv;
@@ -140,17 +140,17 @@ static void destory_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr surface)
Xfree(priv_surface);
}
-static int create_subpicture(ScrnInfoPtr pScrn, XvMCSubpicturePtr subpicture,
+static int create_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture,
int *num_priv, CARD32 ** priv)
{
return Success;
}
-static void destroy_subpicture(ScrnInfoPtr pScrn, XvMCSubpicturePtr subpicture)
+static void destroy_subpicture(ScrnInfoPtr scrn, XvMCSubpicturePtr subpicture)
{
}
-static int put_image(ScrnInfoPtr pScrn,
+static int put_image(ScrnInfoPtr scrn,
short src_x, short src_y,
short drw_x, short drw_y, short src_w,
short src_h, short drw_w, short drw_h,
@@ -158,7 +158,7 @@ static int put_image(ScrnInfoPtr pScrn,
short height, Bool sync, RegionPtr clipBoxes, pointer data,
DrawablePtr pDraw)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct intel_xvmc_command *cmd = (struct intel_xvmc_command *)buf;
dri_bo *bo;
@@ -171,7 +171,7 @@ static int put_image(ScrnInfoPtr pScrn,
buf = intel->FbBase + bo->offset;
#endif
}
- XvPutImage(pScrn, src_x, src_y, drw_x, drw_y, src_w, src_h,
+ XvPutImage(scrn, src_x, src_y, drw_x, drw_y, src_w, src_h,
drw_w, drw_h, id, buf, width, height, sync, clipBoxes,
data, pDraw);
diff --git a/src/i965_render.c b/src/i965_render.c
index 9f4b1c0..17ae558 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -151,7 +151,7 @@ static void i965_get_blend_cntl(int op, PicturePtr pMask, uint32_t dst_format,
static Bool i965_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
switch (pDstPicture->format) {
case PICT_a8r8g8b8:
@@ -182,7 +182,7 @@ static Bool i965_get_dest_format(PicturePtr pDstPicture, uint32_t * dst_format)
return TRUE;
}
-static Bool i965_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict,
+static Bool i965_check_composite_texture(ScrnInfoPtr scrn, PicturePtr pPict,
int unit)
{
if (pPict->repeatType > RepeatReflect)
@@ -220,7 +220,7 @@ Bool
i965_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
PicturePtr pDstPicture)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
uint32_t tmp1;
/* Check for unsupported compositing operations. */
@@ -241,10 +241,10 @@ i965_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
}
}
- if (!i965_check_composite_texture(pScrn, pSrcPicture, 0))
+ if (!i965_check_composite_texture(scrn, pSrcPicture, 0))
I830FALLBACK("Check Src picture texture\n");
if (pMaskPicture != NULL
- && !i965_check_composite_texture(pScrn, pMaskPicture, 1))
+ && !i965_check_composite_texture(scrn, pMaskPicture, 1))
I830FALLBACK("Check Mask picture texture\n");
if (!i965_get_dest_format(pDstPicture, &tmp1))
@@ -1094,9 +1094,9 @@ i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
}
}
-static void i965_emit_composite_state(ScrnInfoPtr pScrn)
+static void i965_emit_composite_state(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
int op = composite_op->op;
@@ -1119,7 +1119,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
render_state->needs_state_emit = FALSE;
- IntelEmitInvarientState(pScrn);
+ IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_RENDER;
urb_vs_start = 0;
@@ -1411,9 +1411,9 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
* Returns whether the current set of composite state plus vertex buffer is
* expected to fit in the aperture.
*/
-static Bool i965_composite_check_aperture(ScrnInfoPtr pScrn)
+static Bool i965_composite_check_aperture(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
drm_intel_bo *bo_table[] = {
@@ -1441,8 +1441,8 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
PicturePtr pMaskPicture, PicturePtr pDstPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
- ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
uint32_t *binding_table;
@@ -1595,9 +1595,9 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
composite_op->wm_kernel = WM_KERNEL_NOMASK_PROJECTIVE;
}
- if (!i965_composite_check_aperture(pScrn)) {
- intel_batch_flush(pScrn, FALSE);
- if (!i965_composite_check_aperture(pScrn))
+ if (!i965_composite_check_aperture(scrn)) {
+ intel_batch_flush(scrn, FALSE);
+ if (!i965_composite_check_aperture(scrn))
I830FALLBACK
("Couldn't fit render operation in aperture\n");
}
@@ -1607,9 +1607,9 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
return TRUE;
}
-static drm_intel_bo *i965_get_vb_space(ScrnInfoPtr pScrn)
+static drm_intel_bo *i965_get_vb_space(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
/* If the vertex buffer is too full, then we free the old and a new one
@@ -1637,8 +1637,8 @@ void
i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ ScrnInfoPtr scrn = xf86Screens[pDst->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
Bool has_mask;
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
@@ -1718,7 +1718,7 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
}
}
- vb_bo = i965_get_vb_space(pScrn);
+ vb_bo = i965_get_vb_space(scrn);
if (vb_bo == NULL)
return;
i = 0;
@@ -1766,12 +1766,12 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
assert(i <= VERTEX_BUFFER_SIZE);
drm_intel_bo_subdata(vb_bo, render_state->vb_offset * 4, i * 4, vb);
- if (!i965_composite_check_aperture(pScrn))
- intel_batch_flush(pScrn, FALSE);
+ if (!i965_composite_check_aperture(scrn))
+ intel_batch_flush(scrn, FALSE);
- intel_batch_start_atomic(pScrn, 200);
+ intel_batch_start_atomic(scrn, 200);
if (render_state->needs_state_emit)
- i965_emit_composite_state(pScrn);
+ i965_emit_composite_state(scrn);
BEGIN_BATCH(12);
OUT_BATCH(MI_FLUSH);
@@ -1803,14 +1803,14 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
render_state->vb_offset += i;
drm_intel_bo_unreference(vb_bo);
- intel_batch_end_atomic(pScrn);
+ intel_batch_end_atomic(scrn);
- i830_debug_sync(pScrn);
+ i830_debug_sync(scrn);
}
-void i965_batch_flush_notify(ScrnInfoPtr pScrn)
+void i965_batch_flush_notify(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
/* Once a batch is emitted, we never want to map again any buffer
@@ -1827,9 +1827,9 @@ void i965_batch_flush_notify(ScrnInfoPtr pScrn)
/**
* Called at EnterVT so we can set up our offsets into the state buffer.
*/
-void gen4_render_state_init(ScrnInfoPtr pScrn)
+void gen4_render_state_init(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state;
int i, j, k, l, m;
drm_intel_bo *sf_kernel_bo, *sf_kernel_mask_bo;
@@ -1841,32 +1841,32 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
render_state = intel->gen4_render_state;
render_state->vb_offset = 0;
- render_state->vs_state_bo = gen4_create_vs_unit_state(pScrn);
+ render_state->vs_state_bo = gen4_create_vs_unit_state(scrn);
/* Set up the two SF states (one for blending with a mask, one without) */
if (IS_IGDNG(intel)) {
- sf_kernel_bo = intel_bo_alloc_for_data(pScrn,
+ sf_kernel_bo = intel_bo_alloc_for_data(scrn,
sf_kernel_static_gen5,
sizeof
(sf_kernel_static_gen5),
"sf kernel gen5");
sf_kernel_mask_bo =
- intel_bo_alloc_for_data(pScrn, sf_kernel_mask_static_gen5,
+ intel_bo_alloc_for_data(scrn, sf_kernel_mask_static_gen5,
sizeof(sf_kernel_mask_static_gen5),
"sf mask kernel");
} else {
- sf_kernel_bo = intel_bo_alloc_for_data(pScrn,
+ sf_kernel_bo = intel_bo_alloc_for_data(scrn,
sf_kernel_static,
sizeof(sf_kernel_static),
"sf kernel");
- sf_kernel_mask_bo = intel_bo_alloc_for_data(pScrn,
+ sf_kernel_mask_bo = intel_bo_alloc_for_data(scrn,
sf_kernel_mask_static,
sizeof
(sf_kernel_mask_static),
"sf mask kernel");
}
- render_state->sf_state_bo = gen4_create_sf_state(pScrn, sf_kernel_bo);
- render_state->sf_mask_state_bo = gen4_create_sf_state(pScrn,
+ render_state->sf_state_bo = gen4_create_sf_state(scrn, sf_kernel_bo);
+ render_state->sf_mask_state_bo = gen4_create_sf_state(scrn,
sf_kernel_mask_bo);
drm_intel_bo_unreference(sf_kernel_bo);
drm_intel_bo_unreference(sf_kernel_mask_bo);
@@ -1874,13 +1874,13 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
for (m = 0; m < WM_KERNEL_COUNT; m++) {
if (IS_IGDNG(intel))
render_state->wm_kernel_bo[m] =
- intel_bo_alloc_for_data(pScrn,
+ intel_bo_alloc_for_data(scrn,
wm_kernels_gen5[m].data,
wm_kernels_gen5[m].size,
"WM kernel gen5");
else
render_state->wm_kernel_bo[m] =
- intel_bo_alloc_for_data(pScrn,
+ intel_bo_alloc_for_data(scrn,
wm_kernels[m].data,
wm_kernels[m].size,
"WM kernel");
@@ -1889,7 +1889,7 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
/* Set up the WM states: each filter/extend type for source and mask, per
* kernel.
*/
- border_color_bo = sampler_border_color_create(pScrn);
+ border_color_bo = sampler_border_color_create(scrn);
for (i = 0; i < SAMPLER_STATE_FILTER_COUNT; i++) {
for (j = 0; j < SAMPLER_STATE_EXTEND_COUNT; j++) {
for (k = 0; k < SAMPLER_STATE_FILTER_COUNT; k++) {
@@ -1897,7 +1897,7 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
drm_intel_bo *sampler_state_bo;
sampler_state_bo =
- gen4_create_sampler_state(pScrn,
+ gen4_create_sampler_state(scrn,
i, j,
k, l,
border_color_bo);
@@ -1908,7 +1908,7 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
wm_state_bo[m][i][j]
[k][l] =
gen4_create_wm_state
- (pScrn,
+ (scrn,
wm_kernels_gen5[m].
has_mask,
render_state->
@@ -1919,7 +1919,7 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
wm_state_bo[m][i][j]
[k][l] =
gen4_create_wm_state
- (pScrn,
+ (scrn,
wm_kernels[m].
has_mask,
render_state->
@@ -1934,8 +1934,8 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
}
drm_intel_bo_unreference(border_color_bo);
- render_state->cc_state_bo = gen4_create_cc_unit_state(pScrn);
- render_state->sip_kernel_bo = intel_bo_alloc_for_data(pScrn,
+ render_state->cc_state_bo = gen4_create_cc_unit_state(scrn);
+ render_state->sip_kernel_bo = intel_bo_alloc_for_data(scrn,
sip_kernel_static,
sizeof
(sip_kernel_static),
@@ -1945,9 +1945,9 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
/**
* Called at LeaveVT.
*/
-void gen4_render_state_cleanup(ScrnInfoPtr pScrn)
+void gen4_render_state_cleanup(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_render_state *render_state = intel->gen4_render_state;
int i, j, k, l, m;
gen4_composite_op *composite_op = &render_state->composite_op;
diff --git a/src/i965_video.c b/src/i965_video.c
index b35979b..d313e6c 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -155,13 +155,13 @@ static struct {
BRW_SVG_CTL_SIP, "System Instruction Pointer"}, {
0, 0},};
-static void brw_debug(ScrnInfoPtr pScrn, char *when)
+static void brw_debug(ScrnInfoPtr scrn, char *when)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int i;
uint32_t v;
- I830Sync(pScrn);
+ I830Sync(scrn);
ErrorF("brw_debug: %s\n", when);
for (i = 0; svg_ctl_bits[i].name; i++) {
OUTREG(BRW_SVG_CTL, svg_ctl_bits[i].svg_ctl);
@@ -755,9 +755,9 @@ static drm_intel_bo *i965_create_cc_state(ScrnInfoPtr scrn)
}
static void
-i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
+i965_emit_video_setup(ScrnInfoPtr scrn, drm_intel_bo * bind_bo, int n_src_surf)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int urb_vs_start, urb_vs_size;
int urb_gs_start, urb_gs_size;
int urb_clip_start, urb_clip_size;
@@ -765,7 +765,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
int urb_cs_start, urb_cs_size;
int pipe_ctl;
- IntelEmitInvarientState(pScrn);
+ IntelEmitInvarientState(scrn);
intel->last_3d = LAST_3D_VIDEO;
urb_vs_start = 0;
@@ -786,7 +786,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
OUT_BATCH(MI_NOOP);
ADVANCE_BATCH();
- /* brw_debug (pScrn, "before base address modify"); */
+ /* brw_debug (scrn, "before base address modify"); */
if (IS_IGDNG(intel))
BEGIN_BATCH(14);
else
@@ -837,7 +837,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
OUT_BATCH(MI_NOOP);
ADVANCE_BATCH();
- /* brw_debug (pScrn, "after base address modify"); */
+ /* brw_debug (scrn, "after base address modify"); */
if (IS_IGDNG(intel))
pipe_ctl = BRW_PIPE_CONTROL_NOWRITE;
@@ -875,7 +875,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
*/
OUT_BATCH(BRW_3DSTATE_DRAWING_RECTANGLE | 2); /* XXX 3 for BLC or CTG */
OUT_BATCH(0x00000000); /* ymin, xmin */
- OUT_BATCH((pScrn->virtualX - 1) | (pScrn->virtualY - 1) << 16); /* ymax, xmax */
+ OUT_BATCH((scrn->virtualX - 1) | (scrn->virtualY - 1) << 16); /* ymax, xmax */
OUT_BATCH(0x00000000); /* yorigin, xorigin */
/* skip the depth buffer */
@@ -977,14 +977,14 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
}
void
-I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
+I965DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id,
RegionPtr dstRegion,
short width, short height, int video_pitch,
int x1, int y1, int x2, int y2,
short src_w, short src_h,
short drw_w, short drw_h, PixmapPtr pPixmap)
{
- intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
BoxPtr pbox;
int nbox, dxo, dyo, pix_xoff, pix_yoff;
float src_scale_x, src_scale_y;
@@ -1054,12 +1054,12 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
*/
/* Upload kernels */
- surf_bos[0] = i965_create_dst_surface_state(pScrn, pPixmap);
+ surf_bos[0] = i965_create_dst_surface_state(scrn, pPixmap);
if (!surf_bos[0])
return;
for (src_surf = 0; src_surf < n_src_surf; src_surf++) {
- drm_intel_bo *surf_bo = i965_create_src_surface_state(pScrn,
+ drm_intel_bo *surf_bo = i965_create_src_surface_state(scrn,
pPriv->
buf,
src_surf_base
@@ -1079,7 +1079,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
}
surf_bos[src_surf + 1] = surf_bo;
}
- bind_bo = i965_create_binding_table(pScrn, surf_bos, n_src_surf + 1);
+ bind_bo = i965_create_binding_table(scrn, surf_bos, n_src_surf + 1);
for (i = 0; i < n_src_surf + 1; i++) {
drm_intel_bo_unreference(surf_bos[i]);
surf_bos[i] = NULL;
@@ -1088,10 +1088,10 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
return;
if (intel->video.gen4_sampler_bo == NULL)
- intel->video.gen4_sampler_bo = i965_create_sampler_state(pScrn);
+ intel->video.gen4_sampler_bo = i965_create_sampler_state(scrn);
if (intel->video.gen4_sip_kernel_bo == NULL) {
intel->video.gen4_sip_kernel_bo =
- i965_create_program(pScrn, &sip_kernel_static[0][0],
+ i965_create_program(scrn, &sip_kernel_static[0][0],
sizeof(sip_kernel_static));
if (!intel->video.gen4_sip_kernel_bo) {
drm_intel_bo_unreference(bind_bo);
@@ -1100,14 +1100,14 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
}
if (intel->video.gen4_vs_bo == NULL) {
- intel->video.gen4_vs_bo = i965_create_vs_state(pScrn);
+ intel->video.gen4_vs_bo = i965_create_vs_state(scrn);
if (!intel->video.gen4_vs_bo) {
drm_intel_bo_unreference(bind_bo);
return;
}
}
if (intel->video.gen4_sf_bo == NULL) {
- intel->video.gen4_sf_bo = i965_create_sf_state(pScrn);
+ intel->video.gen4_sf_bo = i965_create_sf_state(scrn);
if (!intel->video.gen4_sf_bo) {
drm_intel_bo_unreference(bind_bo);
return;
@@ -1115,7 +1115,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
}
if (intel->video.gen4_wm_packed_bo == NULL) {
intel->video.gen4_wm_packed_bo =
- i965_create_wm_state(pScrn, intel->video.gen4_sampler_bo,
+ i965_create_wm_state(scrn, intel->video.gen4_sampler_bo,
TRUE);
if (!intel->video.gen4_wm_packed_bo) {
drm_intel_bo_unreference(bind_bo);
@@ -1125,7 +1125,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
if (intel->video.gen4_wm_planar_bo == NULL) {
intel->video.gen4_wm_planar_bo =
- i965_create_wm_state(pScrn, intel->video.gen4_sampler_bo,
+ i965_create_wm_state(scrn, intel->video.gen4_sampler_bo,
FALSE);
if (!intel->video.gen4_wm_planar_bo) {
drm_intel_bo_unreference(bind_bo);
@@ -1134,7 +1134,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
}
if (intel->video.gen4_cc_bo == NULL) {
- intel->video.gen4_cc_bo = i965_create_cc_state(pScrn);
+ intel->video.gen4_cc_bo = i965_create_cc_state(scrn);
if (!intel->video.gen4_cc_bo) {
drm_intel_bo_unreference(bind_bo);
return;
@@ -1208,7 +1208,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
drm_intel_bo_unmap(vb_bo);
if (!IS_IGDNG(intel))
- i965_pre_draw_debug(pScrn);
+ i965_pre_draw_debug(scrn);
/* If this command won't fit in the current batch, flush.
* Assume that it does after being flushed.
@@ -1216,12 +1216,12 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
if (drm_intel_bufmgr_check_aperture_space(bo_table,
ARRAY_SIZE(bo_table))
< 0) {
- intel_batch_flush(pScrn, FALSE);
+ intel_batch_flush(scrn, FALSE);
}
- intel_batch_start_atomic(pScrn, 100);
+ intel_batch_start_atomic(scrn, 100);
- i965_emit_video_setup(pScrn, bind_bo, n_src_surf);
+ i965_emit_video_setup(scrn, bind_bo, n_src_surf);
BEGIN_BATCH(12);
/* Set up the pointer to our vertex buffer */
@@ -1247,12 +1247,12 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH(MI_NOOP);
ADVANCE_BATCH();
- intel_batch_end_atomic(pScrn);
+ intel_batch_end_atomic(scrn);
drm_intel_bo_unreference(vb_bo);
if (!IS_IGDNG(intel))
- i965_post_draw_debug(pScrn);
+ i965_post_draw_debug(scrn);
}
@@ -1260,7 +1260,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
drm_intel_bo_unreference(bind_bo);
#if WATCH_STATS
- /* i830_dump_error_state(pScrn); */
+ /* i830_dump_error_state(scrn); */
#endif
}
commit cc5d3ba3c331c3b1becf2d19277b24144bf34cfa
Author: Eric Anholt <eric at anholt.net>
Date: Tue Oct 6 18:02:38 2009 -0700
Rename the screen private from I830Ptr pI830 to intel_screen_private *intel.
This is the beginning of the campaign to remove some of the absurd use of
Hungarian in the driver. Not that I don't like Hungarian, but I don't need
to know that pI830 is a pPointer.
diff --git a/src/common.h b/src/common.h
index e509a71..505fcb2 100644
--- a/src/common.h
+++ b/src/common.h
@@ -89,7 +89,7 @@ extern void I830DPRINTF_stub(const char *filename, int line,
#ifdef _I830_H_
#define PrintErrorState i830_dump_error_state
#define WaitRingFunc I830WaitLpRing
-#define RecPtr pI830
+#define RecPtr intel
#else
#define PrintErrorState I810PrintErrorState
#define WaitRingFunc I810WaitLpRing
@@ -373,7 +373,7 @@ extern int I810_DEBUG;
/* dsparb controlled by hw only */
#define DSPARB_HWCONTROL(pI810) (IS_G4X(pI810) || IS_IGDNG(pI810))
/* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
-#define SUPPORTS_YTILING(pI810) (IS_I965G(pI830))
+#define SUPPORTS_YTILING(pI810) (IS_I965G(intel))
#define GTT_PAGE_SIZE KB(4)
#define ROUND_TO(x, y) (((x) + (y) - 1) / (y) * (y))
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 00b17dc..7358cad 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -299,7 +299,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
Rotation rotation, int x, int y)
{
ScrnInfoPtr pScrn = crtc->scrn;
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
@@ -312,13 +312,13 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
int i;
int fb_id;
drmModeModeInfo kmode;
- unsigned int pitch = pScrn->displayWidth * pI830->cpp;
+ unsigned int pitch = pScrn->displayWidth * intel->cpp;
if (drmmode->fb_id == 0) {
ret = drmModeAddFB(drmmode->fd,
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
- pitch, pI830->front_buffer->bo->handle,
+ pitch, intel->front_buffer->bo->handle,
&drmmode->fb_id);
if (ret < 0) {
ErrorF("failed to add fb\n");
@@ -459,7 +459,7 @@ static void *
drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
{
ScrnInfoPtr pScrn = crtc->scrn;
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
int size, ret;
@@ -470,7 +470,7 @@ drmmode_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
size = rotate_pitch * height;
drmmode_crtc->rotate_bo =
- drm_intel_bo_alloc(pI830->bufmgr, "rotate", size, 4096);
+ drm_intel_bo_alloc(intel->bufmgr, "rotate", size, 4096);
if (!drmmode_crtc->rotate_bo) {
xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
@@ -1300,7 +1300,7 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
drmmode_crtc_private_ptr
drmmode_crtc = xf86_config->crtc[0]->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
i830_memory *old_front = NULL;
Bool tiled, ret;
ScreenPtr screen = screenInfo.screens[scrn->scrnIndex];
@@ -1310,8 +1310,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
if (scrn->virtualX == width && scrn->virtualY == height)
return TRUE;
- pitch = i830_pad_drawable_width(width, pI830->cpp);
- tiled = i830_tiled_width(pI830, &pitch, pI830->cpp);
+ pitch = i830_pad_drawable_width(width, intel->cpp);
+ tiled = i830_tiled_width(intel, &pitch, intel->cpp);
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Allocate new frame buffer %dx%d stride %d\n",
width, height, pitch);
@@ -1320,26 +1320,26 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
old_height = scrn->virtualY;
old_pitch = scrn->displayWidth;
old_fb_id = drmmode->fb_id;
- old_front = pI830->front_buffer;
+ old_front = intel->front_buffer;
scrn->virtualX = width;
scrn->virtualY = height;
scrn->displayWidth = pitch;
- pI830->front_buffer = i830_allocate_framebuffer(scrn);
- if (!pI830->front_buffer)
+ intel->front_buffer = i830_allocate_framebuffer(scrn);
+ if (!intel->front_buffer)
goto fail;
ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth,
- scrn->bitsPerPixel, pitch * pI830->cpp,
- pI830->front_buffer->bo->handle,
+ scrn->bitsPerPixel, pitch * intel->cpp,
+ intel->front_buffer->bo->handle,
&drmmode->fb_id);
if (ret)
goto fail;
- i830_set_pixmap_bo(screen->GetScreenPixmap(screen), pI830->front_buffer->bo);
+ i830_set_pixmap_bo(screen->GetScreenPixmap(screen), intel->front_buffer->bo);
screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
- width, height, -1, -1, pitch * pI830->cpp, NULL);
+ width, height, -1, -1, pitch * intel->cpp, NULL);
for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i];
@@ -1359,9 +1359,9 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
return TRUE;
fail:
- if (pI830->front_buffer)
- i830_free_memory(scrn, pI830->front_buffer);
- pI830->front_buffer = old_front;
+ if (intel->front_buffer)
+ i830_free_memory(scrn, intel->front_buffer);
+ intel->front_buffer = old_front;
scrn->virtualX = old_width;
scrn->virtualY = old_height;
scrn->displayWidth = old_pitch;
diff --git a/src/i830.h b/src/i830.h
index 9719651..e6eb4b9 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -93,8 +93,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
#define ALWAYS_SYNC 0
#define ALWAYS_FLUSH 0
-typedef struct _I830Rec *I830Ptr;
-
enum tile_format {
TILE_NONE,
TILE_XMAJOR,
@@ -166,7 +164,7 @@ enum dri_type {
DRI_DRI2
};
-typedef struct _I830Rec {
+typedef struct intel_screen_private {
unsigned char *MMIOBase;
int cpp;
@@ -305,9 +303,13 @@ typedef struct _I830Rec {
* User option to print acceleration fallback info to the server log.
*/
Bool fallback_debug;
-} I830Rec;
+} intel_screen_private;
-#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))
+static inline intel_screen_private *
+intel_get_screen_private(ScrnInfoPtr scrn)
+{
+ return (intel_screen_private *)(scrn->driverPrivate);
+}
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
@@ -367,14 +369,14 @@ Bool i830_allocate_xvmc_buffer(ScrnInfoPtr pScrn, const char *name,
void i830_free_xvmc_buffer(ScrnInfoPtr pScrn, i830_memory * buffer);
#endif
-Bool i830_tiled_width(I830Ptr i830, int *width, int cpp);
+Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp);
int i830_pad_drawable_width(int width, int cpp);
/* i830_memory.c */
Bool i830_bind_all_memory(ScrnInfoPtr pScrn);
-unsigned long i830_get_fence_size(I830Ptr pI830, unsigned long size);
-unsigned long i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch,
+unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size);
+unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch,
int format);
void i830_set_max_gtt_map_size(ScrnInfoPtr pScrn);
@@ -427,7 +429,7 @@ void i830_enter_render(ScrnInfoPtr);
#define I830FALLBACK(s, arg...) \
do { \
- if (I830PTR(pScrn)->fallback_debug) { \
+ if (intel_get_screen_private(pScrn)->fallback_debug) { \
xf86DrvMsg(pScrn->scrnIndex, X_INFO, \
"fallback: " s "\n", ##arg); \
} \
@@ -469,10 +471,10 @@ static inline drm_intel_bo *intel_bo_alloc_for_data(ScrnInfoPtr scrn,
unsigned int size,
char *name)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bo;
- bo = drm_intel_bo_alloc(pI830->bufmgr, name, size, 4096);
+ bo = drm_intel_bo_alloc(intel->bufmgr, name, size, 4096);
if (!bo)
return NULL;
drm_intel_bo_subdata(bo, 0, size, data);
diff --git a/src/i830_3d.c b/src/i830_3d.c
index 871b45b..28527dc 100644
--- a/src/i830_3d.c
+++ b/src/i830_3d.c
@@ -36,7 +36,7 @@
void I830EmitInvarientState(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
BEGIN_BATCH(58);
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 51aa6a4..f9cbda8 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -55,12 +55,12 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pPix)
void I830Sync(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
if (I810_DEBUG & (DEBUG_VERBOSE_ACCEL | DEBUG_VERBOSE_SYNC))
ErrorF("I830Sync\n");
- if (!pScrn->vtSema || !pI830->batch_bo)
+ if (!pScrn->vtSema || !intel->batch_bo)
return;
I830EmitFlush(pScrn);
@@ -71,10 +71,10 @@ void I830Sync(ScrnInfoPtr pScrn)
void I830EmitFlush(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
- if (IS_I965G(pI830))
+ if (IS_I965G(intel))
flags = 0;
{
@@ -101,7 +101,7 @@ void i830_debug_sync(ScrnInfoPtr scrn)
Bool I830AccelInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
/* Limits are described in the BLT engine chapter under Graphics Data Size
* Limitations, and the descriptions of SURFACE_STATE, 3DSTATE_BUFFER_INFO,
@@ -141,16 +141,16 @@ Bool I830AccelInit(ScreenPtr pScreen)
* the front, which will have an appropriate pitch/offset already set up,
* so UXA doesn't need to worry.
*/
- if (IS_I965G(pI830)) {
- pI830->accel_pixmap_offset_alignment = 4 * 2;
- pI830->accel_pixmap_pitch_alignment = 64;
- pI830->accel_max_x = 8192;
- pI830->accel_max_y = 8192;
+ if (IS_I965G(intel)) {
+ intel->accel_pixmap_offset_alignment = 4 * 2;
+ intel->accel_pixmap_pitch_alignment = 64;
+ intel->accel_max_x = 8192;
+ intel->accel_max_y = 8192;
} else {
- pI830->accel_pixmap_offset_alignment = 4;
- pI830->accel_pixmap_pitch_alignment = 64;
- pI830->accel_max_x = 2048;
- pI830->accel_max_y = 2048;
+ intel->accel_pixmap_offset_alignment = 4;
+ intel->accel_pixmap_pitch_alignment = 64;
+ intel->accel_max_x = 2048;
+ intel->accel_max_y = 2048;
}
return i830_uxa_init(pScreen);
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 48a2e1e..553eeb3 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -41,79 +41,79 @@
static void intel_next_batch(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
/* The 865 has issues with larger-than-page-sized batch buffers. */
- if (IS_I865G(pI830))
- pI830->batch_bo =
- dri_bo_alloc(pI830->bufmgr, "batch", 4096, 4096);
+ if (IS_I865G(intel))
+ intel->batch_bo =
+ dri_bo_alloc(intel->bufmgr, "batch", 4096, 4096);
else
- pI830->batch_bo =
- dri_bo_alloc(pI830->bufmgr, "batch", 4096 * 4, 4096);
+ intel->batch_bo =
+ dri_bo_alloc(intel->bufmgr, "batch", 4096 * 4, 4096);
- if (dri_bo_map(pI830->batch_bo, 1) != 0)
+ if (dri_bo_map(intel->batch_bo, 1) != 0)
FatalError("Failed to map batchbuffer: %s\n", strerror(errno));
- pI830->batch_used = 0;
- pI830->batch_ptr = pI830->batch_bo->virtual;
+ intel->batch_used = 0;
+ intel->batch_ptr = intel->batch_bo->virtual;
/* If we are using DRI2, we don't know when another client has executed,
* so we have to reinitialize our 3D state per batch.
*/
- if (pI830->directRenderingType == DRI_DRI2)
- pI830->last_3d = LAST_3D_OTHER;
+ if (intel->directRenderingType == DRI_DRI2)
+ intel->last_3d = LAST_3D_OTHER;
}
void intel_batch_init(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- pI830->batch_emit_start = 0;
- pI830->batch_emitting = 0;
+ intel->batch_emit_start = 0;
+ intel->batch_emitting = 0;
intel_next_batch(pScrn);
}
void intel_batch_teardown(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- if (pI830->batch_ptr != NULL) {
- dri_bo_unmap(pI830->batch_bo);
- pI830->batch_ptr = NULL;
+ if (intel->batch_ptr != NULL) {
+ dri_bo_unmap(intel->batch_bo);
+ intel->batch_ptr = NULL;
- dri_bo_unreference(pI830->batch_bo);
- pI830->batch_bo = NULL;
+ dri_bo_unreference(intel->batch_bo);
+ intel->batch_bo = NULL;
- dri_bo_unreference(pI830->last_batch_bo);
- pI830->last_batch_bo = NULL;
+ dri_bo_unreference(intel->last_batch_bo);
+ intel->last_batch_bo = NULL;
}
}
void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int ret;
- if (pI830->batch_used == 0)
+ if (intel->batch_used == 0)
return;
/* Emit a padding dword if we aren't going to be quad-word aligned. */
- if ((pI830->batch_used & 4) == 0) {
- *(uint32_t *) (pI830->batch_ptr + pI830->batch_used) = MI_NOOP;
- pI830->batch_used += 4;
+ if ((intel->batch_used & 4) == 0) {
+ *(uint32_t *) (intel->batch_ptr + intel->batch_used) = MI_NOOP;
+ intel->batch_used += 4;
}
/* Mark the end of the batchbuffer. */
- *(uint32_t *) (pI830->batch_ptr + pI830->batch_used) =
+ *(uint32_t *) (intel->batch_ptr + intel->batch_used) =
MI_BATCH_BUFFER_END;
- pI830->batch_used += 4;
+ intel->batch_used += 4;
- dri_bo_unmap(pI830->batch_bo);
- pI830->batch_ptr = NULL;
+ dri_bo_unmap(intel->batch_bo);
+ intel->batch_ptr = NULL;
ret =
- dri_bo_exec(pI830->batch_bo, pI830->batch_used, NULL, 0,
+ dri_bo_exec(intel->batch_bo, intel->batch_used, NULL, 0,
0xffffffff);
if (ret != 0)
FatalError("Failed to submit batchbuffer: %s\n",
@@ -122,9 +122,9 @@ void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed)
/* Save a ref to the last batch emitted, which we use for syncing
* in debug code.
*/
- dri_bo_unreference(pI830->last_batch_bo);
- pI830->last_batch_bo = pI830->batch_bo;
- pI830->batch_bo = NULL;
+ dri_bo_unreference(intel->last_batch_bo);
+ intel->last_batch_bo = intel->batch_bo;
+ intel->batch_bo = NULL;
intel_next_batch(pScrn);
@@ -132,20 +132,20 @@ void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed)
* blockhandler. We could set this less often, but it's probably not worth
* the work.
*/
- pI830->need_mi_flush = TRUE;
+ intel->need_mi_flush = TRUE;
- if (pI830->batch_flush_notify)
- pI830->batch_flush_notify(pScrn);
+ if (intel->batch_flush_notify)
+ intel->batch_flush_notify(pScrn);
}
/** Waits on the last emitted batchbuffer to be completed. */
void intel_batch_wait_last(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
/* Map it CPU write, which guarantees it's done. This is a completely
* non performance path, so we don't need anything better.
*/
- drm_intel_bo_map(pI830->last_batch_bo, TRUE);
- drm_intel_bo_unmap(pI830->last_batch_bo);
+ drm_intel_bo_map(intel->last_batch_bo, TRUE);
+ drm_intel_bo_unmap(intel->last_batch_bo);
}
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index a00a436..cd8e026 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -37,79 +37,79 @@ void intel_batch_teardown(ScrnInfoPtr pScrn);
void intel_batch_flush(ScrnInfoPtr pScrn, Bool flushed);
void intel_batch_wait_last(ScrnInfoPtr pScrn);
-static inline int intel_batch_space(I830Ptr pI830)
+static inline int intel_batch_space(intel_screen_private *intel)
{
- return (pI830->batch_bo->size - BATCH_RESERVED) - (pI830->batch_used);
+ return (intel->batch_bo->size - BATCH_RESERVED) - (intel->batch_used);
}
static inline void
-intel_batch_require_space(ScrnInfoPtr pScrn, I830Ptr pI830, GLuint sz)
+intel_batch_require_space(ScrnInfoPtr pScrn, intel_screen_private *intel, GLuint sz)
{
- assert(sz < pI830->batch_bo->size - 8);
- if (intel_batch_space(pI830) < sz)
+ assert(sz < intel->batch_bo->size - 8);
+ if (intel_batch_space(intel) < sz)
intel_batch_flush(pScrn, FALSE);
}
static inline void intel_batch_start_atomic(ScrnInfoPtr pScrn, unsigned int sz)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- assert(!pI830->in_batch_atomic);
- intel_batch_require_space(pScrn, pI830, sz * 4);
+ assert(!intel->in_batch_atomic);
+ intel_batch_require_space(pScrn, intel, sz * 4);
- pI830->in_batch_atomic = TRUE;
- pI830->batch_atomic_limit = pI830->batch_used + sz * 4;
+ intel->in_batch_atomic = TRUE;
+ intel->batch_atomic_limit = intel->batch_used + sz * 4;
}
static inline void intel_batch_end_atomic(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- assert(pI830->in_batch_atomic);
- assert(pI830->batch_used <= pI830->batch_atomic_limit);
- pI830->in_batch_atomic = FALSE;
+ assert(intel->in_batch_atomic);
+ assert(intel->batch_used <= intel->batch_atomic_limit);
+ intel->in_batch_atomic = FALSE;
}
-static inline void intel_batch_emit_dword(I830Ptr pI830, uint32_t dword)
+static inline void intel_batch_emit_dword(intel_screen_private *intel, uint32_t dword)
{
- assert(pI830->batch_ptr != NULL);
- assert(intel_batch_space(pI830) >= 4);
- *(uint32_t *) (pI830->batch_ptr + pI830->batch_used) = dword;
- pI830->batch_used += 4;
+ assert(intel->batch_ptr != NULL);
+ assert(intel_batch_space(intel) >= 4);
+ *(uint32_t *) (intel->batch_ptr + intel->batch_used) = dword;
+ intel->batch_used += 4;
}
static inline void
-intel_batch_emit_reloc(I830Ptr pI830,
+intel_batch_emit_reloc(intel_screen_private *intel,
dri_bo * bo,
uint32_t read_domains,
uint32_t write_domains, uint32_t delta)
{
- assert(intel_batch_space(pI830) >= 4);
- *(uint32_t *) (pI830->batch_ptr + pI830->batch_used) =
+ assert(intel_batch_space(intel) >= 4);
+ *(uint32_t *) (intel->batch_ptr + intel->batch_used) =
bo->offset + delta;
- dri_bo_emit_reloc(pI830->batch_bo, read_domains, write_domains, delta,
- pI830->batch_used, bo);
- pI830->batch_used += 4;
+ dri_bo_emit_reloc(intel->batch_bo, read_domains, write_domains, delta,
+ intel->batch_used, bo);
+ intel->batch_used += 4;
}
static inline void
-intel_batch_emit_reloc_pixmap(I830Ptr pI830, PixmapPtr pPixmap,
+intel_batch_emit_reloc_pixmap(intel_screen_private *intel, PixmapPtr pPixmap,
uint32_t read_domains, uint32_t write_domain,
uint32_t delta)
{
dri_bo *bo = i830_get_pixmap_bo(pPixmap);
- assert(pI830->batch_ptr != NULL);
- assert(intel_batch_space(pI830) >= 4);
- intel_batch_emit_reloc(pI830, bo, read_domains, write_domain, delta);
+ assert(intel->batch_ptr != NULL);
+ assert(intel_batch_space(intel) >= 4);
+ intel_batch_emit_reloc(intel, bo, read_domains, write_domain, delta);
}
-#define OUT_BATCH(dword) intel_batch_emit_dword(pI830, dword)
+#define OUT_BATCH(dword) intel_batch_emit_dword(intel, dword)
#define OUT_RELOC(bo, read_domains, write_domains, delta) \
- intel_batch_emit_reloc (pI830, bo, read_domains, write_domains, delta)
+ intel_batch_emit_reloc (intel, bo, read_domains, write_domains, delta)
#define OUT_RELOC_PIXMAP(pPixmap, reads, write, delta) \
- intel_batch_emit_reloc_pixmap(pI830, pPixmap, reads, write, delta)
+ intel_batch_emit_reloc_pixmap(intel, pPixmap, reads, write, delta)
union intfloat {
float f;
@@ -124,36 +124,36 @@ union intfloat {
#define BEGIN_BATCH(n) \
do { \
- if (pI830->batch_emitting != 0) \
+ if (intel->batch_emitting != 0) \
FatalError("%s: BEGIN_BATCH called without closing " \
"ADVANCE_BATCH\n", __FUNCTION__); \
- intel_batch_require_space(pScrn, pI830, (n) * 4); \
- pI830->batch_emitting = (n) * 4; \
- pI830->batch_emit_start = pI830->batch_used; \
+ intel_batch_require_space(pScrn, intel, (n) * 4); \
+ intel->batch_emitting = (n) * 4; \
+ intel->batch_emit_start = intel->batch_used; \
} while (0)
#define ADVANCE_BATCH() do { \
- if (pI830->batch_emitting == 0) \
+ if (intel->batch_emitting == 0) \
FatalError("%s: ADVANCE_BATCH called with no matching " \
"BEGIN_BATCH\n", __FUNCTION__); \
- if (pI830->batch_used > \
- pI830->batch_emit_start + pI830->batch_emitting) \
+ if (intel->batch_used > \
+ intel->batch_emit_start + intel->batch_emitting) \
FatalError("%s: ADVANCE_BATCH: exceeded allocation %d/%d\n ", \
__FUNCTION__, \
- pI830->batch_used - pI830->batch_emit_start, \
- pI830->batch_emitting); \
- if (pI830->batch_used < pI830->batch_emit_start + \
- pI830->batch_emitting) \
+ intel->batch_used - intel->batch_emit_start, \
+ intel->batch_emitting); \
+ if (intel->batch_used < intel->batch_emit_start + \
+ intel->batch_emitting) \
FatalError("%s: ADVANCE_BATCH: under-used allocation %d/%d\n ", \
__FUNCTION__, \
- pI830->batch_used - pI830->batch_emit_start, \
- pI830->batch_emitting); \
- if ((pI830->batch_emitting > 8) && \
+ intel->batch_used - intel->batch_emit_start, \
+ intel->batch_emitting); \
+ if ((intel->batch_emitting > 8) && \
(I810_DEBUG & DEBUG_ALWAYS_SYNC)) { \
/* Note: not actually syncing, just flushing each batch. */ \
intel_batch_flush(pScrn, FALSE); \
} \
- pI830->batch_emitting = 0; \
+ intel->batch_emitting = 0; \
} while (0)
#endif /* _INTEL_BATCHBUFFER_H */
diff --git a/src/i830_bios.c b/src/i830_bios.c
index b843940..f1f1644 100644
--- a/src/i830_bios.c
+++ b/src/i830_bios.c
@@ -108,7 +108,7 @@ fill_detail_timing_data(DisplayModePtr fixed_mode, unsigned char *timing_ptr)
* offsets, such that this parsing fails. Thus, almost any other method for
* detecting the panel mode is preferable.
*/
-static void parse_integrated_panel_data(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_integrated_panel_data(intel_screen_private *intel, struct bdb_header *bdb)
{
struct bdb_lvds_options *lvds_options;
struct bdb_lvds_lfp_data_ptrs *lvds_lfp_data_ptrs;
@@ -120,13 +120,13 @@ static void parse_integrated_panel_data(I830Ptr pI830, struct bdb_header *bdb)
int dvo_offset;
/* Defaults if we can't find VBT info */
- pI830->lvds_dither = 0;
+ intel->lvds_dither = 0;
lvds_options = find_section(bdb, BDB_LVDS_OPTIONS);
if (!lvds_options)
return;
- pI830->lvds_dither = lvds_options->pixel_dither;
+ intel->lvds_dither = lvds_options->pixel_dither;
if (lvds_options->panel_type == 0xff)
return;
@@ -147,7 +147,7 @@ static void parse_integrated_panel_data(I830Ptr pI830, struct bdb_header *bdb)
(lfp_data_size *
lvds_options->panel_type));
timing_ptr = (unsigned char *)entry + dvo_offset;
- if (pI830->skip_panel_detect)
+ if (intel->skip_panel_detect)
return;
fixed_mode = xnfalloc(sizeof(DisplayModeRec));
@@ -157,16 +157,16 @@ static void parse_integrated_panel_data(I830Ptr pI830, struct bdb_header *bdb)
* block, pull the contents out using EDID macros.
*/
fill_detail_timing_data(fixed_mode, timing_ptr);
- pI830->lvds_fixed_mode = fixed_mode;
+ intel->lvds_fixed_mode = fixed_mode;
}
-static void parse_sdvo_panel_data(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_sdvo_panel_data(intel_screen_private *intel, struct bdb_header *bdb)
{
DisplayModePtr fixed_mode;
struct bdb_sdvo_lvds_options *sdvo_lvds_options;
unsigned char *timing_ptr;
- pI830->sdvo_lvds_fixed_mode = NULL;
+ intel->sdvo_lvds_fixed_mode = NULL;
sdvo_lvds_options = find_section(bdb, BDB_SDVO_LVDS_OPTIONS);
if (sdvo_lvds_options == NULL)
@@ -184,47 +184,47 @@ static void parse_sdvo_panel_data(I830Ptr pI830, struct bdb_header *bdb)
fill_detail_timing_data(fixed_mode, timing_ptr +
(sdvo_lvds_options->panel_type *
DET_TIMING_INFO_LEN));
- pI830->sdvo_lvds_fixed_mode = fixed_mode;
+ intel->sdvo_lvds_fixed_mode = fixed_mode;
}
-static void parse_panel_data(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_panel_data(intel_screen_private *intel, struct bdb_header *bdb)
{
- parse_integrated_panel_data(pI830, bdb);
- parse_sdvo_panel_data(pI830, bdb);
+ parse_integrated_panel_data(intel, bdb);
+ parse_sdvo_panel_data(intel, bdb);
}
-static void parse_general_features(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_general_features(intel_screen_private *intel, struct bdb_header *bdb)
{
struct bdb_general_features *general;
/* Set sensible defaults in case we can't find the general block */
- pI830->tv_present = 1;
+ intel->tv_present = 1;
general = find_section(bdb, BDB_GENERAL_FEATURES);
if (!general)
return;
- pI830->tv_present = general->int_tv_support;
- pI830->lvds_use_ssc = general->enable_ssc;
- if (pI830->lvds_use_ssc) {
- if (IS_I85X(pI830))
- pI830->lvds_ssc_freq = general->ssc_freq ? 66 : 48;
+ intel->tv_present = general->int_tv_support;
+ intel->lvds_use_ssc = general->enable_ssc;
+ if (intel->lvds_use_ssc) {
+ if (IS_I85X(intel))
+ intel->lvds_ssc_freq = general->ssc_freq ? 66 : 48;
else
- pI830->lvds_ssc_freq = general->ssc_freq ? 100 : 96;
+ intel->lvds_ssc_freq = general->ssc_freq ? 100 : 96;
}
}
-static void parse_driver_feature(I830Ptr pI830, struct bdb_header *bdb)
+static void parse_driver_feature(intel_screen_private *intel, struct bdb_header *bdb)
{
struct bdb_driver_feature *feature;
/* For mobile chip, set default as true */
- if (IS_MOBILE(pI830) && !IS_I830(pI830))
- pI830->integrated_lvds = TRUE;
+ if (IS_MOBILE(intel) && !IS_I830(intel))
+ intel->integrated_lvds = TRUE;
/* skip pre-9xx chips which is broken to parse this block. */
- if (!IS_I9XX(pI830))
+ if (!IS_I9XX(intel))
return;
/* XXX Disable this parsing, as it looks doesn't work for all
@@ -238,7 +238,7 @@ static void parse_driver_feature(I830Ptr pI830, struct bdb_header *bdb)
return;
if (feature->lvds_config != BDB_DRIVER_INT_LVDS)
- pI830->integrated_lvds = FALSE;
+ intel->integrated_lvds = FALSE;
}
static
@@ -250,7 +250,7 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
struct child_device_config *child;
int i, child_device_num, count;
struct sdvo_device_mapping *p_mapping;
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
defs = find_section(bdb, BDB_GENERAL_DEFINITIONS);
if (!defs) {
@@ -285,7 +285,7 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
child->slave_addr, child->dvo_port);
/* fill the primary dvo port */
p_mapping =
- &(pI830->sdvo_mappings[child->dvo_port - 1]);
+ &(intel->sdvo_mappings[child->dvo_port - 1]);
if (!p_mapping->initialized) {
p_mapping->dvo_port = child->dvo_port;
p_mapping->dvo_wiring = child->dvo_wiring;
@@ -335,7 +335,7 @@ void parse_sdvo_mapping(ScrnInfoPtr pScrn, struct bdb_header *bdb)
*/
int i830_bios_init(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
struct vbt_header *vbt;
struct bdb_header *bdb;
int vbt_off, bdb_off;
@@ -343,7 +343,7 @@ int i830_bios_init(ScrnInfoPtr pScrn)
int ret;
int size;
- size = pI830->PciInfo->rom_size;
+ size = intel->PciInfo->rom_size;
if (size == 0) {
size = INTEL_VBIOS_SIZE;
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
@@ -354,7 +354,7 @@ int i830_bios_init(ScrnInfoPtr pScrn)
if (bios == NULL)
return -1;
- ret = pci_device_read_rom(pI830->PciInfo, bios);
+ ret = pci_device_read_rom(intel->PciInfo, bios);
if (ret != 0) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"libpciaccess failed to read %dkB video BIOS: %s\n",
@@ -383,9 +383,9 @@ int i830_bios_init(ScrnInfoPtr pScrn)
bdb_off = vbt_off + vbt->bdb_offset;
bdb = (struct bdb_header *)(bios + bdb_off);
- parse_general_features(pI830, bdb);
- parse_panel_data(pI830, bdb);
- parse_driver_feature(pI830, bdb);
+ parse_general_features(intel, bdb);
+ parse_panel_data(intel, bdb);
+ parse_driver_feature(intel, bdb);
parse_sdvo_mapping(pScrn, bdb);
xfree(bios);
diff --git a/src/i830_dri.c b/src/i830_dri.c
index b9d82b8..fe738b8 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -84,7 +84,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
{
ScreenPtr pScreen = pDraw->pScreen;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
DRI2BufferPtr buffers;
dri_bo *bo;
int i;
@@ -113,7 +113,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
switch (attachments[i]) {
case DRI2BufferDepth:
- if (SUPPORTS_YTILING(pI830))
+ if (SUPPORTS_YTILING(intel))
hint = INTEL_CREATE_PIXMAP_TILING_Y;
else
hint = INTEL_CREATE_PIXMAP_TILING_X;
@@ -126,7 +126,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
break;
}
- if (!pI830->tiling)
+ if (!intel->tiling)
hint = 0;
pPixmap = (*pScreen->CreatePixmap) (pScreen,
@@ -165,7 +165,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
{
ScreenPtr pScreen = pDraw->pScreen;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
DRI2Buffer2Ptr buffer;
dri_bo *bo;
I830DRI2BufferPrivatePtr privates;
@@ -189,7 +189,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
switch (attachment) {
case DRI2BufferDepth:
case DRI2BufferDepthStencil:
- if (SUPPORTS_YTILING(pI830))
+ if (SUPPORTS_YTILING(intel))
hint = INTEL_CREATE_PIXMAP_TILING_Y;
else
hint = INTEL_CREATE_PIXMAP_TILING_X;
@@ -202,7 +202,7 @@ I830DRI2CreateBuffer(DrawablePtr pDraw, unsigned int attachment,
break;
}
- if (!pI830->tiling)
+ if (!intel->tiling)
hint = 0;
pPixmap = (*pScreen->CreatePixmap) (pScreen,
@@ -278,7 +278,7 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
I830DRI2BufferPrivatePtr dstPrivate = pDstBuffer->driverPrivate;
ScreenPtr pScreen = pDraw->pScreen;
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
? pDraw : &srcPrivate->pPixmap->drawable;
DrawablePtr dst = (dstPrivate->attachment == DRI2BufferFrontLeft)
@@ -294,7 +294,7 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
/* Wait for the scanline to be outside the region to be copied */
if (pixmap_is_scanout(get_drawable_pixmap(dst))
- && pI830->swapbuffers_wait) {
+ && intel->swapbuffers_wait) {
BoxPtr box;
BoxRec crtcbox;
int y1, y2;
@@ -346,7 +346,7 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
* later.
*/
I830EmitFlush(pScrn);
- pI830->need_mi_flush = FALSE;
+ intel->need_mi_flush = FALSE;
/* We can't rely on getting into the block handler before the DRI
* client gets to run again so flush now. */
@@ -354,14 +354,14 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
#if ALWAYS_SYNC
I830Sync(pScrn);
#endif
- drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE);
+ drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
}
Bool I830DRI2ScreenInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
DRI2InfoRec info;
char *p;
int i;
@@ -384,7 +384,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
}
#endif
- info.fd = pI830->drmSubFD;
+ info.fd = intel->drmSubFD;
/* The whole drmOpen thing is a fiasco and we need to find a way
* back to just using open(2). For now, however, lets just make
@@ -394,7 +394,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
fstat(info.fd, &sbuf);
d = sbuf.st_rdev;
- p = pI830->deviceName;
+ p = intel->deviceName;
for (i = 0; i < DRM_MAX_MINOR; i++) {
sprintf(p, DRM_DEV_NAME, DRM_DIR_NAME, i);
if (stat(p, &sbuf) == 0 && sbuf.st_rdev == d)
@@ -406,7 +406,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
return FALSE;
}
- info.driverName = IS_I965G(pI830) ? "i965" : "i915";
+ info.driverName = IS_I965G(intel) ? "i965" : "i915";
info.deviceName = p;
#if DRI2INFOREC_VERSION >= 3
@@ -435,8 +435,8 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
void I830DRI2CloseScreen(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
DRI2CloseScreen(pScreen);
- pI830->directRenderingType = DRI_NONE;
+ intel->directRenderingType = DRI_NONE;
}
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 56d86fc..dbf6c11 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -226,24 +226,24 @@ const OptionInfoRec *I830AvailableOptions(int chipid, int busid)
static Bool I830GetRec(ScrnInfoPtr pScrn)
{
- I830Ptr pI830;
+ intel_screen_private *intel;
if (pScrn->driverPrivate)
return TRUE;
- pI830 = pScrn->driverPrivate = xnfcalloc(sizeof(I830Rec), 1);
+ intel = pScrn->driverPrivate = xnfcalloc(sizeof(intel_screen_private), 1);
return TRUE;
}
static void I830FreeRec(ScrnInfoPtr pScrn)
{
- I830Ptr pI830;
+ intel_screen_private *intel;
if (!pScrn)
return;
if (!pScrn->driverPrivate)
return;
- pI830 = I830PTR(pScrn);
+ intel = intel_get_screen_private(pScrn);
xfree(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
@@ -332,9 +332,9 @@ I830LoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
static Bool i830CreateScreenResources(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- pScreen->CreateScreenResources = pI830->CreateScreenResources;
+ pScreen->CreateScreenResources = intel->CreateScreenResources;
if (!(*pScreen->CreateScreenResources) (pScreen))
return FALSE;
@@ -351,15 +351,15 @@ static void PreInitCleanup(ScrnInfoPtr pScrn)
/*
* Adjust *width to allow for tiling if possible
*/
-Bool i830_tiled_width(I830Ptr i830, int *width, int cpp)
+Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp)
{
Bool tiled = FALSE;
/*
* Adjust the display width to allow for front buffer tiling if possible
*/
- if (i830->tiling) {
- if (IS_I965G(i830)) {
+ if (intel->tiling) {
+ if (IS_I965G(intel)) {
int tile_pixels = 512 / cpp;
*width = (*width + tile_pixels - 1) &
~(tile_pixels - 1);
@@ -400,7 +400,7 @@ int i830_pad_drawable_width(int width, int cpp)
static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
{
#ifdef DRI2
- I830Ptr i830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
int old_width = scrn->displayWidth;
#endif
int old_x = scrn->virtualX;
@@ -412,13 +412,13 @@ static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
scrn->virtualX = width;
scrn->virtualY = height;
#ifdef DRI2
- if (i830->front_buffer) {
+ if (intel->front_buffer) {
i830_memory *new_front, *old_front;
Bool tiled;
ScreenPtr screen = screenInfo.screens[scrn->scrnIndex];
- scrn->displayWidth = i830_pad_drawable_width(width, i830->cpp);
- tiled = i830_tiled_width(i830, &scrn->displayWidth, i830->cpp);
+ scrn->displayWidth = i830_pad_drawable_width(width, intel->cpp);
+ tiled = i830_tiled_width(intel, &scrn->displayWidth, intel->cpp);
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Allocate new frame buffer %dx%d stride %d\n", width,
height, scrn->displayWidth);
@@ -431,15 +431,15 @@ static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
scrn->displayWidth = old_width;
return FALSE;
}
- old_front = i830->front_buffer;
- i830->front_buffer = new_front;
+ old_front = intel->front_buffer;
+ intel->front_buffer = new_front;
i830_set_pixmap_bo(screen->GetScreenPixmap(screen),
new_front->bo);
- scrn->fbOffset = i830->front_buffer->offset;
+ scrn->fbOffset = intel->front_buffer->offset;
screen->ModifyPixmapHeader(screen->GetScreenPixmap(screen),
width, height, -1, -1,
- scrn->displayWidth * i830->cpp,
+ scrn->displayWidth * intel->cpp,
NULL);
/* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
@@ -448,7 +448,7 @@ static Bool i830_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
scrn->pixmapPrivate.ptr = NULL;
xf86DrvMsg(scrn->scrnIndex, X_INFO,
"New front buffer at 0x%lx\n",
- i830->front_buffer->offset);
+ intel->front_buffer->offset);
i830_set_new_crtc_bo(scrn);
I830Sync(scrn);
i830WaitForVblank(scrn);
@@ -498,12 +498,12 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
static void i830_detect_chipset(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
MessageType from = X_PROBED;
const char *chipname;
uint32_t capid;
- switch (DEVICE_ID(pI830->PciInfo)) {
+ switch (DEVICE_ID(intel->PciInfo)) {
case PCI_CHIP_I830_M:
chipname = "830M";
break;
@@ -512,10 +512,10 @@ static void i830_detect_chipset(ScrnInfoPtr pScrn)
break;
case PCI_CHIP_I855_GM:
/* Check capid register to find the chipset variant */
- pci_device_cfg_read_u32(pI830->PciInfo, &capid, I85X_CAPID);
- pI830->variant =
+ pci_device_cfg_read_u32(intel->PciInfo, &capid, I85X_CAPID);
+ intel->variant =
(capid >> I85X_VARIANT_SHIFT) & I85X_VARIANT_MASK;
- switch (pI830->variant) {
+ switch (intel->variant) {
case I855_GM:
chipname = "855GM";
break;
@@ -531,7 +531,7 @@ static void i830_detect_chipset(ScrnInfoPtr pScrn)
default:
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Unknown 852GM/855GM variant: 0x%x)\n",
- pI830->variant);
+ intel->variant);
chipname = "852GM/855GM (unknown variant)";
break;
}
@@ -622,28 +622,28 @@ static void i830_detect_chipset(ScrnInfoPtr pScrn)
"Integrated Graphics Chipset: Intel(R) %s\n", chipname);
/* Set the Chipset and ChipRev, allowing config file entries to override. */
- if (pI830->pEnt->device->chipset && *pI830->pEnt->device->chipset) {
- pScrn->chipset = pI830->pEnt->device->chipset;
+ if (intel->pEnt->device->chipset && *intel->pEnt->device->chipset) {
+ pScrn->chipset = intel->pEnt->device->chipset;
from = X_CONFIG;
- } else if (pI830->pEnt->device->chipID >= 0) {
+ } else if (intel->pEnt->device->chipID >= 0) {
pScrn->chipset = (char *)xf86TokenToString(I830Chipsets,
- pI830->pEnt->device->
+ intel->pEnt->device->
chipID);
from = X_CONFIG;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"ChipID override: 0x%04X\n",
- pI830->pEnt->device->chipID);
- DEVICE_ID(pI830->PciInfo) = pI830->pEnt->device->chipID;
+ intel->pEnt->device->chipID);
+ DEVICE_ID(intel->PciInfo) = intel->pEnt->device->chipID;
} else {
from = X_PROBED;
pScrn->chipset = (char *)xf86TokenToString(I830Chipsets,
- DEVICE_ID(pI830->
+ DEVICE_ID(intel->
PciInfo));
}
- if (pI830->pEnt->device->chipRev >= 0) {
+ if (intel->pEnt->device->chipRev >= 0) {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
- pI830->pEnt->device->chipRev);
+ intel->pEnt->device->chipRev);
}
xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n",
@@ -652,16 +652,16 @@ static void i830_detect_chipset(ScrnInfoPtr pScrn)
static Bool I830GetEarlyOptions(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
/* Process the options */
xf86CollectOptions(pScrn, NULL);
- if (!(pI830->Options = xalloc(sizeof(I830Options))))
+ if (!(intel->Options = xalloc(sizeof(I830Options))))
return FALSE;
- memcpy(pI830->Options, I830Options, sizeof(I830Options));
- xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI830->Options);
+ memcpy(intel->Options, I830Options, sizeof(I830Options));
+ xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, intel->Options);
- pI830->fallback_debug = xf86ReturnOptValBool(pI830->Options,
+ intel->fallback_debug = xf86ReturnOptValBool(intel->Options,
OPTION_FALLBACKDEBUG,
FALSE);
@@ -670,23 +670,23 @@ static Bool I830GetEarlyOptions(ScrnInfoPtr pScrn)
static void i830_check_dri_option(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- pI830->directRenderingType = DRI_NONE;
- if (!xf86ReturnOptValBool(pI830->Options, OPTION_DRI, TRUE))
- pI830->directRenderingType = DRI_DISABLED;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ intel->directRenderingType = DRI_NONE;
+ if (!xf86ReturnOptValBool(intel->Options, OPTION_DRI, TRUE))
+ intel->directRenderingType = DRI_DISABLED;
if (pScrn->depth != 16 && pScrn->depth != 24) {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"DRI is disabled because it "
"runs only at depths 16 and 24.\n");
- pI830->directRenderingType = DRI_DISABLED;
+ intel->directRenderingType = DRI_DISABLED;
}
}
static Bool i830_open_drm_master(ScrnInfoPtr scrn)
{
- I830Ptr i830 = I830PTR(scrn);
- struct pci_device *dev = i830->PciInfo;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ struct pci_device *dev = intel->PciInfo;
char *busid;
drmSetVersion sv;
struct drm_i915_getparam gp;
@@ -696,8 +696,8 @@ static Bool i830_open_drm_master(ScrnInfoPtr scrn)
busid = XNFprintf("pci:%04x:%02x:%02x.%d",
dev->domain, dev->bus, dev->dev, dev->func);
- i830->drmSubFD = drmOpen("i915", busid);
- if (i830->drmSubFD == -1) {
+ intel->drmSubFD = drmOpen("i915", busid);
+ if (intel->drmSubFD == -1) {
xfree(busid);
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] Failed to open DRM device for %s: %s\n",
@@ -715,25 +715,25 @@ static Bool i830_open_drm_master(ScrnInfoPtr scrn)
sv.drm_di_minor = 1;
sv.drm_dd_major = -1;
sv.drm_dd_minor = -1;
- err = drmSetInterfaceVersion(i830->drmSubFD, &sv);
+ err = drmSetInterfaceVersion(intel->drmSubFD, &sv);
if (err != 0) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] failed to set drm interface version.\n");
- drmClose(i830->drmSubFD);
- i830->drmSubFD = -1;
+ drmClose(intel->drmSubFD);
+ intel->drmSubFD = -1;
return FALSE;
}
has_gem = FALSE;
gp.param = I915_PARAM_HAS_GEM;
gp.value = &has_gem;
- (void)drmCommandWriteRead(i830->drmSubFD, DRM_I915_GETPARAM,
+ (void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM,
&gp, sizeof(gp));
if (!has_gem) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"[drm] Failed to detect GEM. Kernel 2.6.28 required.\n");
- drmClose(i830->drmSubFD);
- i830->drmSubFD = -1;
+ drmClose(intel->drmSubFD);
+ intel->drmSubFD = -1;
return FALSE;
}
@@ -742,18 +742,18 @@ static Bool i830_open_drm_master(ScrnInfoPtr scrn)
static void i830_close_drm_master(ScrnInfoPtr scrn)
{
- I830Ptr i830 = I830PTR(scrn);
- if (i830 && i830->drmSubFD > 0) {
- drmClose(i830->drmSubFD);
- i830->drmSubFD = -1;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ if (intel && intel->drmSubFD > 0) {
+ drmClose(intel->drmSubFD);
+ intel->drmSubFD = -1;
}
}
static Bool I830DrmModeInit(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- if (drmmode_pre_init(pScrn, pI830->drmSubFD, pI830->cpp) == FALSE) {
+ if (drmmode_pre_init(pScrn, intel->drmSubFD, intel->cpp) == FALSE) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Kernel modesetting setup failed\n");
PreInitCleanup(pScrn);
@@ -767,27 +767,27 @@ static Bool I830DrmModeInit(ScrnInfoPtr pScrn)
static void I830XvInit(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
MessageType from = X_PROBED;
- pI830->XvPreferOverlay =
- xf86ReturnOptValBool(pI830->Options, OPTION_PREFER_OVERLAY, FALSE);
+ intel->XvPreferOverlay =
+ xf86ReturnOptValBool(intel->Options, OPTION_PREFER_OVERLAY, FALSE);
- if (xf86GetOptValInteger(pI830->Options, OPTION_VIDEO_KEY,
- &(pI830->colorKey))) {
+ if (xf86GetOptValInteger(intel->Options, OPTION_VIDEO_KEY,
+ &(intel->colorKey))) {
from = X_CONFIG;
- } else if (xf86GetOptValInteger(pI830->Options, OPTION_COLOR_KEY,
- &(pI830->colorKey))) {
+ } else if (xf86GetOptValInteger(intel->Options, OPTION_COLOR_KEY,
+ &(intel->colorKey))) {
from = X_CONFIG;
} else {
- pI830->colorKey =
+ intel->colorKey =
(1 << pScrn->offset.red) | (1 << pScrn->offset.green) |
(((pScrn->mask.blue >> pScrn->offset.blue) - 1) <<
pScrn->offset.blue);
from = X_DEFAULT;
}
xf86DrvMsg(pScrn->scrnIndex, from, "video overlay key set to 0x%x\n",
- pI830->colorKey);
+ intel->colorKey);
}
/**
@@ -805,7 +805,7 @@ static void I830XvInit(ScrnInfoPtr pScrn)
*/
static Bool I830PreInit(ScrnInfoPtr pScrn, int flags)
{
- I830Ptr pI830;
+ intel_screen_private *intel;
rgb defaultWeight = { 0, 0, 0 };
EntityInfoPtr pEnt;
int flags24;
@@ -831,15 +831,15 @@ static Bool I830PreInit(ScrnInfoPtr pScrn, int flags)
if (!I830GetRec(pScrn))
return FALSE;
- pI830 = I830PTR(pScrn);
- pI830->pEnt = pEnt;
+ intel = intel_get_screen_private(pScrn);
+ intel->pEnt = pEnt;
pScrn->displayWidth = 640; /* default it */
- if (pI830->pEnt->location.type != BUS_PCI)
+ if (intel->pEnt->location.type != BUS_PCI)
return FALSE;
- pI830->PciInfo = xf86GetPciInfoForEntity(pI830->pEnt->index);
+ intel->PciInfo = xf86GetPciInfoForEntity(intel->pEnt->index);
if (!i830_open_drm_master(pScrn))
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -873,7 +873,7 @@ static Bool I830PreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86SetDefaultVisual(pScrn, -1))
return FALSE;
- pI830->cpp = pScrn->bitsPerPixel / 8;
+ intel->cpp = pScrn->bitsPerPixel / 8;
if (!I830GetEarlyOptions(pScrn))
return FALSE;
@@ -909,8 +909,8 @@ static Bool I830PreInit(ScrnInfoPtr pScrn, int flags)
}
/* Load the dri2 module if requested. */
- if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
- pI830->directRenderingType != DRI_DISABLED) {
+ if (xf86ReturnOptValBool(intel->Options, OPTION_DRI, FALSE) &&
+ intel->directRenderingType != DRI_DISABLED) {
xf86LoadSubModule(pScrn, "dri2");
}
@@ -931,16 +931,16 @@ enum pipe {
*/
void IntelEmitInvarientState(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
/* If we've emitted our state since the last clobber by another client,
* skip it.
*/
- if (pI830->last_3d != LAST_3D_OTHER)
+ if (intel->last_3d != LAST_3D_OTHER)
return;
- if (!IS_I965G(pI830)) {
- if (IS_I9XX(pI830))
+ if (!IS_I965G(intel)) {
+ if (IS_I9XX(intel))
I915EmitInvarientState(pScrn);
else
I830EmitInvarientState(pScrn);
@@ -952,13 +952,13 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
{
ScreenPtr pScreen = screenInfo.screens[i];
ScrnInfoPtr pScrn = xf86Screens[i];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- pScreen->BlockHandler = pI830->BlockHandler;
+ pScreen->BlockHandler = intel->BlockHandler;
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
- pI830->BlockHandler = pScreen->BlockHandler;
+ intel->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = I830BlockHandler;
if (pScrn->vtSema) {
@@ -967,7 +967,7 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
* rendering results may not hit the framebuffer until significantly
* later.
*/
- if (pI830->need_mi_flush || pI830->batch_used) {
+ if (intel->need_mi_flush || intel->batch_used) {
flushed = TRUE;
I830EmitFlush(pScrn);
}
@@ -976,9 +976,9 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
* fashion.
*/
intel_batch_flush(pScrn, flushed);
- drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE);
+ drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
- pI830->need_mi_flush = FALSE;
+ intel->need_mi_flush = FALSE;
}
i830_uxa_block_handler(pScreen);
@@ -989,7 +989,7 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
static void i830_fixup_mtrrs(ScrnInfoPtr pScrn)
{
#ifdef HAS_MTRR_SUPPORT
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int fd;
struct mtrr_gentry gentry;
struct mtrr_sentry sentry;
@@ -1008,8 +1008,8 @@ static void i830_fixup_mtrrs(ScrnInfoPtr pScrn)
* The Xserver common layer will then setup the right range
* for us.
*/
- if (gentry.base == pI830->LinearAddr &&
- gentry.size < pI830->FbMapSize) {
+ if (gentry.base == intel->LinearAddr &&
+ gentry.size < intel->FbMapSize) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Removing bad MTRR range (base 0x%lx, size 0x%x)\n",
@@ -1032,8 +1032,8 @@ static void i830_fixup_mtrrs(ScrnInfoPtr pScrn)
static Bool i830_try_memory_allocation(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- Bool tiled = pI830->tiling;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ Bool tiled = intel->tiling;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Attempting memory allocation with %stiled buffers.\n",
@@ -1063,11 +1063,11 @@ failed:
*/
static Bool i830_memory_init(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int savedDisplayWidth = pScrn->displayWidth;
Bool tiled = FALSE;
- tiled = i830_tiled_width(pI830, &pScrn->displayWidth, pI830->cpp);
+ tiled = i830_tiled_width(intel, &pScrn->displayWidth, intel->cpp);
/* Set up our video memory allocator for the chosen videoRam */
if (!i830_allocator_init(pScrn, pScrn->videoRam * KB(1))) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1077,7 +1077,7 @@ static Bool i830_memory_init(ScrnInfoPtr pScrn)
}
xf86DrvMsg(pScrn->scrnIndex,
- pI830->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
+ intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
"VideoRam: %d KB\n", pScrn->videoRam);
/* Tiled first if we got a good displayWidth */
@@ -1086,7 +1086,7 @@ static Bool i830_memory_init(ScrnInfoPtr pScrn)
return TRUE;
else {
i830_reset_allocations(pScrn);
- pI830->tiling = FALSE;
+ intel->tiling = FALSE;
}
}
@@ -1101,20 +1101,20 @@ static Bool i830_memory_init(ScrnInfoPtr pScrn)
void i830_init_bufmgr(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int batch_size;
- if (pI830->bufmgr)
+ if (intel->bufmgr)
return;
batch_size = 4096 * 4;
/* The 865 has issues with larger-than-page-sized batch buffers. */
- if (IS_I865G(pI830))
+ if (IS_I865G(intel))
batch_size = 4096;
- pI830->bufmgr = intel_bufmgr_gem_init(pI830->drmSubFD, batch_size);
- intel_bufmgr_gem_enable_reuse(pI830->bufmgr);
+ intel->bufmgr = intel_bufmgr_gem_init(intel->drmSubFD, batch_size);
+ intel_bufmgr_gem_enable_reuse(intel->bufmgr);
}
Bool i830_crtc_on(xf86CrtcPtr crtc)
@@ -1139,23 +1139,23 @@ Bool i830_crtc_on(xf86CrtcPtr crtc)
int i830_crtc_to_pipe(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- return drmmode_get_pipe_from_crtc_id(pI830->bufmgr, crtc);
+ return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
}
static Bool
I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];;
- I830Ptr pI830 = I830PTR(pScrn);;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);;
VisualPtr visual;
MessageType from;
- struct pci_device *const device = pI830->PciInfo;
- int fb_bar = IS_I9XX(pI830) ? 2 : 0;
+ struct pci_device *const device = intel->PciInfo;
+ int fb_bar = IS_I9XX(intel) ? 2 : 0;
pScrn->displayWidth =
- i830_pad_drawable_width(pScrn->virtualX, pI830->cpp);
+ i830_pad_drawable_width(pScrn->virtualX, intel->cpp);
/*
* The "VideoRam" config file parameter specifies the maximum amount of
@@ -1169,13 +1169,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
* actual memory allocation, so alignment and things will cause less than
* VideoRam to be actually used.
*/
- if (pI830->pEnt->device->videoRam == 0) {
+ if (intel->pEnt->device->videoRam == 0) {
from = X_DEFAULT;
- pScrn->videoRam = pI830->FbMapSize / KB(1);
+ pScrn->videoRam = intel->FbMapSize / KB(1);
} else {
#if 0
from = X_CONFIG;
- pScrn->videoRam = pI830->pEnt->device->videoRam;
+ pScrn->videoRam = intel->pEnt->device->videoRam;
#else
/* Disable VideoRam configuration, at least for now. Previously,
* VideoRam was necessary to avoid overly low limits on allocated
@@ -1185,9 +1185,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
* obsolete.
*/
from = X_DEFAULT;
- pScrn->videoRam = pI830->FbMapSize / KB(1);
+ pScrn->videoRam = intel->FbMapSize / KB(1);
- if (pScrn->videoRam != pI830->pEnt->device->videoRam) {
+ if (pScrn->videoRam != intel->pEnt->device->videoRam) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"VideoRam configuration found, which is no longer "
"recommended.\n");
@@ -1195,7 +1195,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
"Continuing with default %dkB VideoRam instead of %d "
"kB.\n",
pScrn->videoRam,
- pI830->pEnt->device->videoRam);
+ intel->pEnt->device->videoRam);
}
#endif
}
@@ -1203,47 +1203,47 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
pScrn->videoRam = device->regions[fb_bar].size / 1024;
#ifdef DRI2
- if (pI830->directRenderingType == DRI_NONE
+ if (intel->directRenderingType == DRI_NONE
&& I830DRI2ScreenInit(pScreen))
- pI830->directRenderingType = DRI_DRI2;
+ intel->directRenderingType = DRI_DRI2;
#endif
/* Enable tiling by default */
- pI830->tiling = TRUE;
+ intel->tiling = TRUE;
/* Allow user override if they set a value */
- if (xf86IsOptionSet(pI830->Options, OPTION_TILING)) {
- if (xf86ReturnOptValBool(pI830->Options, OPTION_TILING, FALSE))
- pI830->tiling = TRUE;
+ if (xf86IsOptionSet(intel->Options, OPTION_TILING)) {
+ if (xf86ReturnOptValBool(intel->Options, OPTION_TILING, FALSE))
+ intel->tiling = TRUE;
else
- pI830->tiling = FALSE;
+ intel->tiling = FALSE;
}
/* SwapBuffers delays to avoid tearing */
- pI830->swapbuffers_wait = TRUE;
+ intel->swapbuffers_wait = TRUE;
/* Allow user override if they set a value */
- if (xf86IsOptionSet(pI830->Options, OPTION_SWAPBUFFERS_WAIT)) {
+ if (xf86IsOptionSet(intel->Options, OPTION_SWAPBUFFERS_WAIT)) {
if (xf86ReturnOptValBool
- (pI830->Options, OPTION_SWAPBUFFERS_WAIT, FALSE))
- pI830->swapbuffers_wait = TRUE;
+ (intel->Options, OPTION_SWAPBUFFERS_WAIT, FALSE))
+ intel->swapbuffers_wait = TRUE;
else
- pI830->swapbuffers_wait = FALSE;
+ intel->swapbuffers_wait = FALSE;
}
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Tiling %sabled\n",
- pI830->tiling ? "en" : "dis");
+ intel->tiling ? "en" : "dis");
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "SwapBuffers wait %sabled\n",
- pI830->swapbuffers_wait ? "en" : "dis");
+ intel->swapbuffers_wait ? "en" : "dis");
- pI830->last_3d = LAST_3D_OTHER;
- pI830->overlayOn = FALSE;
+ intel->last_3d = LAST_3D_OTHER;
+ intel->overlayOn = FALSE;
/*
* Set this so that the overlay allocation is factored in when
* appropriate.
*/
- pI830->XvEnabled = TRUE;
+ intel->XvEnabled = TRUE;
if (!i830_memory_init(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1270,7 +1270,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
* set the initial framebuffer pixmap to point at
* it
*/
- pScrn->fbOffset = pI830->front_buffer->offset;
+ pScrn->fbOffset = intel->front_buffer->offset;
DPRINTF(PFX, "assert( if(!fbScreenInit(pScreen, ...) )\n");
if (!fbScreenInit(pScreen, NULL,
@@ -1304,12 +1304,12 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
return FALSE;
}
- if (IS_I965G(pI830))
- pI830->batch_flush_notify = i965_batch_flush_notify;
- else if (IS_I9XX(pI830))
- pI830->batch_flush_notify = i915_batch_flush_notify;
+ if (IS_I965G(intel))
+ intel->batch_flush_notify = i965_batch_flush_notify;
+ else if (IS_I9XX(intel))
+ intel->batch_flush_notify = i915_batch_flush_notify;
else
- pI830->batch_flush_notify = i830_batch_flush_notify;
+ intel->batch_flush_notify = i830_batch_flush_notify;
miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
@@ -1338,13 +1338,13 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (!I830EnterVT(scrnIndex, 0))
return FALSE;
- pI830->BlockHandler = pScreen->BlockHandler;
+ intel->BlockHandler = pScreen->BlockHandler;
pScreen->BlockHandler = I830BlockHandler;
pScreen->SaveScreen = xf86SaveScreen;
- pI830->CloseScreen = pScreen->CloseScreen;
+ intel->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = I830CloseScreen;
- pI830->CreateScreenResources = pScreen->CreateScreenResources;
+ intel->CreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = i830CreateScreenResources;
if (!xf86CrtcScreenInit(pScreen))
@@ -1364,24 +1364,24 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86DPMSInit(pScreen, xf86DPMSSet, 0);
#ifdef INTEL_XVMC
- pI830->XvMCEnabled = FALSE;
- from = ((pI830->directRenderingType == DRI_DRI2) &&
- xf86GetOptValBool(pI830->Options, OPTION_XVMC,
- &pI830->XvMCEnabled) ? X_CONFIG : X_DEFAULT);
+ intel->XvMCEnabled = FALSE;
+ from = ((intel->directRenderingType == DRI_DRI2) &&
+ xf86GetOptValBool(intel->Options, OPTION_XVMC,
+ &intel->XvMCEnabled) ? X_CONFIG : X_DEFAULT);
xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
- pI830->XvMCEnabled ? "en" : "dis");
+ intel->XvMCEnabled ? "en" : "dis");
#endif
/* Init video */
- if (pI830->XvEnabled)
+ if (intel->XvEnabled)
I830InitVideo(pScreen);
/* Setup 3D engine, needed for rotation too */
IntelEmitInvarientState(pScrn);
#if defined(DRI2)
- switch (pI830->directRenderingType) {
+ switch (intel->directRenderingType) {
case DRI_DRI2:
- pI830->directRenderingOpen = TRUE;
+ intel->directRenderingOpen = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"direct rendering: DRI2 Enabled\n");
break;
@@ -1402,7 +1402,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (serverGeneration == 1)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
- pI830->suspended = FALSE;
+ intel->suspended = FALSE;
return TRUE;
}
@@ -1415,8 +1415,8 @@ static void I830FreeScreen(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
#ifdef INTEL_XVMC
- I830Ptr pI830 = I830PTR(pScrn);
- if (pI830 && pI830->XvMCEnabled)
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ if (intel && intel->XvMCEnabled)
intel_xvmc_finish(xf86Screens[scrnIndex]);
#endif
@@ -1430,7 +1430,7 @@ static void I830FreeScreen(int scrnIndex, int flags)
static void I830LeaveVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int ret;
DPRINTF(PFX, "Leave VT\n");
@@ -1443,10 +1443,10 @@ static void I830LeaveVT(int scrnIndex, int flags)
intel_batch_teardown(pScrn);
- if (IS_I965G(pI830))
+ if (IS_I965G(intel))
gen4_render_state_cleanup(pScrn);
- ret = drmDropMaster(pI830->drmSubFD);
+ ret = drmDropMaster(intel->drmSubFD);
if (ret)
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"drmDropMaster failed: %s\n", strerror(errno));
@@ -1458,12 +1458,12 @@ static void I830LeaveVT(int scrnIndex, int flags)
static Bool I830EnterVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int ret;
DPRINTF(PFX, "Enter VT\n");
- ret = drmSetMaster(pI830->drmSubFD);
+ ret = drmSetMaster(intel->drmSubFD);
if (ret) {
if (errno == EINVAL) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
@@ -1483,14 +1483,14 @@ static Bool I830EnterVT(int scrnIndex, int flags)
intel_batch_init(pScrn);
- if (IS_I965G(pI830))
+ if (IS_I965G(intel))
gen4_render_state_init(pScrn);
if (!xf86SetDesiredModes(pScrn))
return FALSE;
/* Mark 3D state as being clobbered and setup the basics */
- pI830->last_3d = LAST_3D_OTHER;
+ intel->last_3d = LAST_3D_OTHER;
IntelEmitInvarientState(pScrn);
return TRUE;
@@ -1506,21 +1506,21 @@ static Bool I830SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
if (pScrn->vtSema == TRUE) {
I830LeaveVT(scrnIndex, 0);
}
- if (pI830->uxa_driver) {
+ if (intel->uxa_driver) {
uxa_driver_fini(pScreen);
- xfree(pI830->uxa_driver);
- pI830->uxa_driver = NULL;
+ xfree(intel->uxa_driver);
+ intel->uxa_driver = NULL;
}
- if (pI830->front_buffer) {
+ if (intel->front_buffer) {
i830_set_pixmap_bo(pScreen->GetScreenPixmap(pScreen), NULL);
- i830_free_memory(pScrn, pI830->front_buffer);
- pI830->front_buffer = NULL;
+ i830_free_memory(pScrn, intel->front_buffer);
+ intel->front_buffer = NULL;
}
xf86_cursors_fini(pScreen);
@@ -1529,12 +1529,12 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
i965_free_video(pScrn);
- pScreen->CloseScreen = pI830->CloseScreen;
+ pScreen->CloseScreen = intel->CloseScreen;
(*pScreen->CloseScreen) (scrnIndex, pScreen);
- if (pI830->directRenderingOpen
- && pI830->directRenderingType == DRI_DRI2) {
- pI830->directRenderingOpen = FALSE;
+ if (intel->directRenderingOpen
+ && intel->directRenderingType == DRI_DRI2) {
+ intel->directRenderingOpen = FALSE;
I830DRI2CloseScreen(pScreen);
}
@@ -1573,7 +1573,7 @@ I830ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
DPRINTF(PFX, "Enter VT, event %d, undo: %s\n", event,
BOOLTOSTRING(undo));
@@ -1584,23 +1584,23 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
case XF86_APM_USER_SUSPEND:
case XF86_APM_SYS_STANDBY:
case XF86_APM_USER_STANDBY:
- if (!undo && !pI830->suspended) {
+ if (!undo && !intel->suspended) {
pScrn->LeaveVT(scrnIndex, 0);
- pI830->suspended = TRUE;
+ intel->suspended = TRUE;
sleep(SUSPEND_SLEEP);
- } else if (undo && pI830->suspended) {
+ } else if (undo && intel->suspended) {
sleep(RESUME_SLEEP);
pScrn->EnterVT(scrnIndex, 0);
- pI830->suspended = FALSE;
+ intel->suspended = FALSE;
}
break;
case XF86_APM_STANDBY_RESUME:
case XF86_APM_NORMAL_RESUME:
case XF86_APM_CRITICAL_RESUME:
- if (pI830->suspended) {
+ if (intel->suspended) {
sleep(RESUME_SLEEP);
pScrn->EnterVT(scrnIndex, 0);
- pI830->suspended = FALSE;
+ intel->suspended = FALSE;
/*
* Turn the screen saver off when resuming. This seems to be
* needed to stop xscreensaver kicking in (when used).
diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
index 896cd94..1233e0a 100644
--- a/src/i830_hwmc.c
+++ b/src/i830_hwmc.c
@@ -49,20 +49,20 @@ static Bool intel_xvmc_set_driver(struct intel_xvmc_driver *d)
/* This must be first called! */
Bool intel_xvmc_probe(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
Bool ret = FALSE;
- if (!pI830->XvMCEnabled)
+ if (!intel->XvMCEnabled)
return FALSE;
/* Needs KMS support. */
- if (IS_I915G(pI830) || IS_I915GM(pI830))
+ if (IS_I915G(intel) || IS_I915GM(intel))
return FALSE;
- if (IS_I9XX(pI830)) {
- if (IS_I915(pI830))
+ if (IS_I9XX(intel)) {
+ if (IS_I915(intel))
ret = intel_xvmc_set_driver(&i915_xvmc_driver);
- else if (IS_G4X(pI830) || IS_IGDNG(pI830))
+ else if (IS_G4X(intel) || IS_IGDNG(intel))
ret = intel_xvmc_set_driver(&vld_xvmc_driver);
else
ret = intel_xvmc_set_driver(&i965_xvmc_driver);
@@ -83,7 +83,7 @@ void intel_xvmc_finish(ScrnInfoPtr pScrn)
Bool intel_xvmc_driver_init(ScreenPtr pScreen, XF86VideoAdaptorPtr xv_adaptor)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
struct drm_i915_setparam sp;
int ret;
@@ -100,7 +100,7 @@ Bool intel_xvmc_driver_init(ScreenPtr pScreen, XF86VideoAdaptorPtr xv_adaptor)
/* Currently XvMC uses batchbuffer */
sp.param = I915_SETPARAM_ALLOW_BATCHBUFFER;
sp.value = 1;
- ret = drmCommandWrite(pI830->drmSubFD, DRM_I915_SETPARAM,
+ ret = drmCommandWrite(intel->drmSubFD, DRM_I915_SETPARAM,
&sp, sizeof(sp));
if (ret == 0)
return TRUE;
@@ -111,7 +111,7 @@ Bool intel_xvmc_driver_init(ScreenPtr pScreen, XF86VideoAdaptorPtr xv_adaptor)
Bool intel_xvmc_screen_init(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
char buf[64];
if (!xvmc_driver)
@@ -123,15 +123,15 @@ Bool intel_xvmc_screen_init(ScreenPtr pScreen)
xvmc_driver->name);
} else {
intel_xvmc_finish(pScrn);
- pI830->XvMCEnabled = FALSE;
+ intel->XvMCEnabled = FALSE;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"[XvMC] Failed to initialize XvMC.\n");
return FALSE;
}
sprintf(buf, "pci:%04x:%02x:%02x.%d",
- pI830->PciInfo->domain,
- pI830->PciInfo->bus, pI830->PciInfo->dev, pI830->PciInfo->func);
+ intel->PciInfo->domain,
+ intel->PciInfo->bus, intel->PciInfo->dev, intel->PciInfo->func);
xf86XvMCRegisterDRInfo(pScreen, INTEL_XVMC_LIBNAME,
buf,
@@ -142,7 +142,7 @@ Bool intel_xvmc_screen_init(ScreenPtr pScreen)
Bool intel_xvmc_init_batch(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int size = KB(64);
if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC] batch buffer",
@@ -150,9 +150,9 @@ Bool intel_xvmc_init_batch(ScrnInfoPtr pScrn)
ALIGN_BOTH_ENDS))
return FALSE;
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (xvmc_driver->batch->offset +
- pI830->LinearAddr),
+ intel->LinearAddr),
xvmc_driver->batch->size, DRM_AGP, 0,
&xvmc_driver->batch_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -164,10 +164,10 @@ Bool intel_xvmc_init_batch(ScrnInfoPtr pScrn)
void intel_xvmc_fini_batch(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
if (xvmc_driver->batch_handle) {
- drmRmMap(pI830->drmSubFD, xvmc_driver->batch_handle);
+ drmRmMap(intel->drmSubFD, xvmc_driver->batch_handle);
xvmc_driver->batch_handle = 0;
}
if (xvmc_driver->batch) {
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 83fee89..1730a7c 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -58,7 +58,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* only)
*
* The user may request a specific amount of memory to be used
- * (pI830->pEnt->videoRam != 0), in which case allocations have to fit within
+ * (intel->pEnt->videoRam != 0), in which case allocations have to fit within
* that much aperture. If not, the individual allocations will be
* automatically sized, and will be fit within the maximum aperture size.
* Only the actual memory used (not alignment padding) will get actual AGP
@@ -94,19 +94,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/**
* Returns the fence size for a tiled area of the given size.
*/
-unsigned long i830_get_fence_size(I830Ptr pI830, unsigned long size)
+unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size)
{
unsigned long i;
unsigned long start;
- if (IS_I965G(pI830)) {
+ if (IS_I965G(intel)) {
/* The 965 can have fences at any page boundary. */
return ALIGN(size, GTT_PAGE_SIZE);
} else {
/* Align the size to a power of two greater than the smallest fence
* size.
*/
- if (IS_I9XX(pI830))
+ if (IS_I9XX(intel))
start = MB(1);
else
start = KB(512);
@@ -122,7 +122,7 @@ unsigned long i830_get_fence_size(I830Ptr pI830, unsigned long size)
* calculate that here.
*/
unsigned long
-i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch, int format)
+i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch, int format)
{
unsigned long i;
unsigned long tile_width = (format == I915_TILING_Y) ? 128 : 512;
@@ -131,7 +131,7 @@ i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch, int format)
return pitch;
/* 965 is flexible */
- if (IS_I965G(pI830))
+ if (IS_I965G(intel))
return ROUND_TO(pitch, tile_width);
/* Pre-965 needs power of two tile width */
@@ -144,29 +144,29 @@ i830_get_fence_pitch(I830Ptr pI830, unsigned long pitch, int format)
* On some chips, pitch width has to be a power of two tile width, so
* calculate that here.
*/
-static unsigned long i830_get_fence_alignment(I830Ptr pI830, unsigned long size)
+static unsigned long i830_get_fence_alignment(intel_screen_private *intel, unsigned long size)
{
- if (IS_I965G(pI830))
+ if (IS_I965G(intel))
return 4096;
else
- return i830_get_fence_size(pI830, size);
+ return i830_get_fence_size(intel, size);
}
static Bool
i830_check_display_stride(ScrnInfoPtr pScrn, int stride, Bool tiling)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int limit = KB(32);
/* 8xx spec has always 8K limit, but tests show larger limit in
non-tiling mode, which makes large monitor work. */
- if ((IS_845G(pI830) || IS_I85X(pI830)) && tiling)
+ if ((IS_845G(intel) || IS_I85X(intel)) && tiling)
limit = KB(8);
- if (IS_I915(pI830) && tiling)
+ if (IS_I915(intel) && tiling)
limit = KB(8);
- if (IS_I965G(pI830) && tiling)
+ if (IS_I965G(intel) && tiling)
limit = KB(16);
if (stride <= limit)
@@ -181,10 +181,10 @@ void i830_free_memory(ScrnInfoPtr pScrn, i830_memory * mem)
return;
if (mem->bo != NULL) {
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
dri_bo_unreference(mem->bo);
- if (pI830->bo_list == mem) {
- pI830->bo_list = mem->next;
+ if (intel->bo_list == mem) {
+ intel->bo_list = mem->next;
if (mem->next)
mem->next->prev = NULL;
} else {
@@ -212,27 +212,27 @@ void i830_free_memory(ScrnInfoPtr pScrn, i830_memory * mem)
*/
void i830_reset_allocations(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int p;
/* While there is any memory between the start and end markers, free it. */
- while (pI830->memory_list->next->next != NULL) {
- i830_memory *mem = pI830->memory_list->next;
+ while (intel->memory_list->next->next != NULL) {
+ i830_memory *mem = intel->memory_list->next;
i830_free_memory(pScrn, mem);
}
/* Free any allocations in buffer objects */
- while (pI830->bo_list != NULL)
- i830_free_memory(pScrn, pI830->bo_list);
+ while (intel->bo_list != NULL)
+ i830_free_memory(pScrn, intel->bo_list);
/* Null out the pointers for all the allocations we just freed. This is
* kind of gross, but at least it's just one place now.
*/
for (p = 0; p < 2; p++)
- pI830->cursor_mem_argb[p] = NULL;
+ intel->cursor_mem_argb[p] = NULL;
- pI830->front_buffer = NULL;
+ intel->front_buffer = NULL;
}
/**
@@ -246,7 +246,7 @@ void i830_reset_allocations(ScrnInfoPtr pScrn)
*/
Bool i830_allocator_init(ScrnInfoPtr pScrn, unsigned long size)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
i830_memory *start, *end;
start = xcalloc(1, sizeof(*start));
@@ -280,22 +280,22 @@ Bool i830_allocator_init(ScrnInfoPtr pScrn, unsigned long size)
end->size = 0;
end->prev = start;
- pI830->memory_list = start;
+ intel->memory_list = start;
return TRUE;
}
void i830_allocator_fini(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
/* Free most of the allocations */
i830_reset_allocations(pScrn);
/* Free the start/end markers */
- free(pI830->memory_list->next);
- free(pI830->memory_list);
- pI830->memory_list = NULL;
+ free(intel->memory_list->next);
+ free(intel->memory_list);
+ intel->memory_list = NULL;
}
static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
@@ -304,7 +304,7 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
unsigned long align, int flags,
enum tile_format tile_format)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
i830_memory *mem;
uint32_t bo_tiling_mode = I915_TILING_NONE;
int ret;
@@ -313,7 +313,7 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
/* Only allocate page-sized increments. */
size = ALIGN(size, GTT_PAGE_SIZE);
- align = i830_get_fence_alignment(pI830, size);
+ align = i830_get_fence_alignment(intel, size);
mem = xcalloc(1, sizeof(*mem));
if (mem == NULL)
@@ -325,7 +325,7 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
return NULL;
}
- mem->bo = dri_bo_alloc(pI830->bufmgr, name, size, align);
+ mem->bo = dri_bo_alloc(intel->bufmgr, name, size, align);
if (!mem->bo) {
xfree(mem->name);
@@ -369,10 +369,10 @@ static i830_memory *i830_allocate_memory_bo(ScrnInfoPtr pScrn, const char *name,
/* Insert new allocation into the list */
mem->prev = NULL;
- mem->next = pI830->bo_list;
- if (pI830->bo_list != NULL)
- pI830->bo_list->prev = mem;
- pI830->bo_list = mem;
+ mem->next = intel->bo_list;
+ if (intel->bo_list != NULL)
+ intel->bo_list->prev = mem;
+ intel->bo_list = mem;
return mem;
}
@@ -401,7 +401,7 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
enum tile_format tile_format)
{
i830_memory *mem;
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
/* Manage tile alignment and size constraints */
if (tile_format != TILE_NONE) {
@@ -409,7 +409,7 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
size = ALIGN(size, GTT_PAGE_SIZE);
/* Check for maximum tiled region size */
- if (IS_I9XX(pI830)) {
+ if (IS_I9XX(intel)) {
if (size > MB(128))
return NULL;
} else {
@@ -418,8 +418,8 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
}
/* round to size necessary for the fence register to work */
- size = i830_get_fence_size(pI830, size);
- alignment = i830_get_fence_alignment(pI830, size);
+ size = i830_get_fence_size(intel, size);
+ alignment = i830_get_fence_alignment(intel, size);
}
return i830_allocate_memory_bo(pScrn, name, size,
@@ -431,16 +431,16 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
void
i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
i830_memory *mem;
- if (pI830->memory_list == NULL) {
+ if (intel->memory_list == NULL) {
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
"%sMemory allocator not initialized\n", prefix);
return;
}
- if (pI830->memory_list->next->next == NULL) {
+ if (intel->memory_list->next->next == NULL) {
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
"%sNo memory allocations\n", prefix);
return;
@@ -449,7 +449,7 @@ i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
"%sFixed memory allocation layout:\n", prefix);
- for (mem = pI830->memory_list->next; mem->next != NULL; mem = mem->next) {
+ for (mem = intel->memory_list->next; mem->next != NULL; mem = mem->next) {
char phys_suffix[32] = "";
char *tile_suffix = "";
@@ -465,11 +465,11 @@ i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
}
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
"%s0x%08lx: end of aperture\n",
- prefix, pI830->FbMapSize);
+ prefix, intel->FbMapSize);
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, verbosity,
"%sBO memory allocation layout:\n", prefix);
- for (mem = pI830->bo_list; mem != NULL; mem = mem->next) {
+ for (mem = intel->bo_list; mem != NULL; mem = mem->next) {
char *tile_suffix = "";
if (mem->tiling == TILE_XMAJOR)
@@ -485,9 +485,9 @@ i830_describe_allocations(ScrnInfoPtr pScrn, int verbosity, const char *prefix)
static Bool IsTileable(ScrnInfoPtr pScrn, int pitch)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- if (IS_I965G(pI830)) {
+ if (IS_I965G(intel)) {
if (pitch / 512 * 512 == pitch && pitch <= KB(128))
return TRUE;
else
@@ -501,7 +501,7 @@ static Bool IsTileable(ScrnInfoPtr pScrn, int pitch)
switch (pitch) {
case 128:
case 256:
- if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_G33CLASS(pI830))
+ if (IS_I945G(intel) || IS_I945GM(intel) || IS_G33CLASS(intel))
return TRUE;
else
return FALSE;
@@ -524,8 +524,8 @@ static Bool IsTileable(ScrnInfoPtr pScrn, int pitch)
*/
i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- unsigned int pitch = pScrn->displayWidth * pI830->cpp;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ unsigned int pitch = pScrn->displayWidth * intel->cpp;
unsigned long minspace;
int align;
long size, fb_height;
@@ -548,7 +548,7 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn)
size = ROUND_TO_PAGE(pitch * fb_height);
- if (pI830->tiling)
+ if (intel->tiling)
tile_format = TILE_XMAJOR;
if (!IsTileable(pScrn, pitch))
@@ -564,7 +564,7 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn)
/* Attempt to allocate it tiled first if we have page flipping on. */
if (tile_format != TILE_NONE) {
/* XXX: probably not the case on 965 */
- if (IS_I9XX(pI830))
+ if (IS_I9XX(intel))
align = MB(1);
else
align = KB(512);
@@ -586,7 +586,7 @@ i830_memory *i830_allocate_framebuffer(ScrnInfoPtr pScrn)
static Bool i830_allocate_cursor_buffers(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int i;
@@ -596,12 +596,12 @@ static Bool i830_allocate_cursor_buffers(ScrnInfoPtr pScrn)
* bail back to software cursors everywhere
*/
for (i = 0; i < xf86_config->num_crtc; i++) {
- pI830->cursor_mem_argb[i] =
+ intel->cursor_mem_argb[i] =
i830_allocate_memory(pScrn, "ARGB cursor",
HWCURSOR_SIZE_ARGB, PITCH_NONE,
GTT_PAGE_SIZE, DISABLE_REUSE,
TILE_NONE);
- if (!pI830->cursor_mem_argb[i])
+ if (!intel->cursor_mem_argb[i])
return FALSE;
}
@@ -614,7 +614,7 @@ static Bool i830_allocate_cursor_buffers(ScrnInfoPtr pScrn)
*/
Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
/* Next, allocate other fixed-size allocations we have. */
if (!i830_allocate_cursor_buffers(pScrn)) {
@@ -623,8 +623,8 @@ Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn)
return FALSE;
}
- pI830->front_buffer = i830_allocate_framebuffer(pScrn);
- if (pI830->front_buffer == NULL)
+ intel->front_buffer = i830_allocate_framebuffer(pScrn);
+ if (intel->front_buffer == NULL)
return FALSE;
return TRUE;
@@ -634,26 +634,26 @@ Bool i830_allocate_2d_memory(ScrnInfoPtr pScrn)
* Called at EnterVT to grab the AGP GART and bind our allocations.
*
* In zaphod mode, this will walk the list trying to bind twice, since each
- * pI830 points to the same allocation list, but the bind_memory will just
+ * intel points to the same allocation list, but the bind_memory will just
* no-op then.
*/
Bool i830_bind_all_memory(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- if (pI830->memory_list == NULL)
+ if (intel->memory_list == NULL)
return TRUE;
int i;
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
for (i = 0; i < xf86_config->num_crtc; i++)
drmmode_crtc_set_cursor_bo(xf86_config->crtc[i],
- pI830->cursor_mem_argb[i]->bo);
+ intel->cursor_mem_argb[i]->bo);
i830_set_max_gtt_map_size(pScrn);
- if (pI830->front_buffer)
- pScrn->fbOffset = pI830->front_buffer->offset;
+ if (intel->front_buffer)
+ pScrn->fbOffset = intel->front_buffer->offset;
return TRUE;
}
@@ -701,21 +701,21 @@ void i830_free_xvmc_buffer(ScrnInfoPtr pScrn, i830_memory * buffer)
void i830_set_max_gtt_map_size(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
struct drm_i915_gem_get_aperture aperture;
int ret;
/* Default low value in case it gets used during server init. */
- pI830->max_gtt_map_size = 16 * 1024 * 1024;
+ intel->max_gtt_map_size = 16 * 1024 * 1024;
ret =
- ioctl(pI830->drmSubFD, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
+ ioctl(intel->drmSubFD, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
if (ret == 0) {
/* Let objects up get bound up to the size where only 2 would fit in
* the aperture, but then leave slop to account for alignment like
* libdrm does.
*/
- pI830->max_gtt_map_size =
+ intel->max_gtt_map_size =
aperture.aper_available_size * 3 / 4 / 2;
}
}
diff --git a/src/i830_render.c b/src/i830_render.c
index 4e84967..4969e0b 100644
--- a/src/i830_render.c
+++ b/src/i830_render.c
@@ -271,17 +271,17 @@ static void i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
{
ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
uint32_t format, pitch, filter;
uint32_t wrap_mode;
uint32_t texcoordtype;
pitch = intel_get_pixmap_pitch(pPix);
- pI830->scale_units[unit][0] = pPix->drawable.width;
- pI830->scale_units[unit][1] = pPix->drawable.height;
- pI830->transform[unit] = pPict->transform;
+ intel->scale_units[unit][0] = pPix->drawable.width;
+ intel->scale_units[unit][1] = pPix->drawable.height;
+ intel->transform[unit] = pPict->transform;
- if (i830_transform_is_affine(pI830->transform[unit]))
+ if (i830_transform_is_affine(intel->transform[unit]))
texcoordtype = TEXCOORDTYPE_CARTESIAN;
else
texcoordtype = TEXCOORDTYPE_HOMOGENEOUS;
@@ -409,36 +409,36 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- pI830->render_src_picture = pSrcPicture;
- pI830->render_src = pSrc;
- pI830->render_mask_picture = pMaskPicture;
- pI830->render_mask = pMask;
- pI830->render_dst_picture = pDstPicture;
- pI830->render_dst = pDst;
+ intel->render_src_picture = pSrcPicture;
+ intel->render_src = pSrc;
+ intel->render_mask_picture = pMaskPicture;
+ intel->render_mask = pMask;
+ intel->render_dst_picture = pDstPicture;
+ intel->render_dst = pDst;
i830_exa_check_pitch_3d(pSrc);
if (pMask)
i830_exa_check_pitch_3d(pMask);
i830_exa_check_pitch_3d(pDst);
- if (!i830_get_dest_format(pDstPicture, &pI830->render_dst_format))
+ if (!i830_get_dest_format(pDstPicture, &intel->render_dst_format))
return FALSE;
- pI830->dst_coord_adjust = 0;
- pI830->src_coord_adjust = 0;
- pI830->mask_coord_adjust = 0;
+ intel->dst_coord_adjust = 0;
+ intel->src_coord_adjust = 0;
+ intel->mask_coord_adjust = 0;
if (pSrcPicture->filter == PictFilterNearest)
- pI830->src_coord_adjust = 0.375;
+ intel->src_coord_adjust = 0.375;
if (pMask != NULL) {
- pI830->mask_coord_adjust = 0;
+ intel->mask_coord_adjust = 0;
if (pMaskPicture->filter == PictFilterNearest)
- pI830->mask_coord_adjust = 0.375;
+ intel->mask_coord_adjust = 0.375;
} else {
- pI830->transform[1] = NULL;
- pI830->scale_units[1][0] = -1;
- pI830->scale_units[1][1] = -1;
+ intel->transform[1] = NULL;
+ intel->scale_units[1][0] = -1;
+ intel->scale_units[1][1] = -1;
}
{
@@ -522,64 +522,64 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
return FALSE;
}
- pI830->cblend = cblend;
- pI830->ablend = ablend;
- pI830->s8_blendctl = blendctl;
+ intel->cblend = cblend;
+ intel->ablend = ablend;
+ intel->s8_blendctl = blendctl;
}
i830_debug_sync(pScrn);
- pI830->needs_render_state_emit = TRUE;
+ intel->needs_render_state_emit = TRUE;
return TRUE;
}
static void i830_emit_composite_state(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
uint32_t vf2;
uint32_t texcoordfmt = 0;
- pI830->needs_render_state_emit = FALSE;
+ intel->needs_render_state_emit = FALSE;
IntelEmitInvarientState(pScrn);
- pI830->last_3d = LAST_3D_RENDER;
+ intel->last_3d = LAST_3D_RENDER;
BEGIN_BATCH(21);
OUT_BATCH(_3DSTATE_BUF_INFO_CMD);
OUT_BATCH(BUF_3D_ID_COLOR_BACK | BUF_3D_USE_FENCE |
- BUF_3D_PITCH(intel_get_pixmap_pitch(pI830->render_dst)));
- OUT_RELOC_PIXMAP(pI830->render_dst,
+ BUF_3D_PITCH(intel_get_pixmap_pitch(intel->render_dst)));
+ OUT_RELOC_PIXMAP(intel->render_dst,
I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
- OUT_BATCH(pI830->render_dst_format);
+ OUT_BATCH(intel->render_dst_format);
OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);
OUT_BATCH(0);
OUT_BATCH(0); /* ymin, xmin */
- OUT_BATCH(DRAW_YMAX(pI830->render_dst->drawable.height - 1) |
- DRAW_XMAX(pI830->render_dst->drawable.width - 1));
+ OUT_BATCH(DRAW_YMAX(intel->render_dst->drawable.height - 1) |
+ DRAW_XMAX(intel->render_dst->drawable.width - 1));
OUT_BATCH(0); /* yorig, xorig */
OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
I1_LOAD_S(2) | I1_LOAD_S(3) | I1_LOAD_S(8) | 2);
- if (pI830->render_mask)
+ if (intel->render_mask)
vf2 = 2 << 12; /* 2 texture coord sets */
else
vf2 = 1 << 12;
OUT_BATCH(vf2); /* number of coordinate sets */
OUT_BATCH(S3_CULLMODE_NONE | S3_VERTEXHAS_XY);
- OUT_BATCH(S8_ENABLE_COLOR_BLEND | S8_BLENDFUNC_ADD | pI830->
+ OUT_BATCH(S8_ENABLE_COLOR_BLEND | S8_BLENDFUNC_ADD | intel->
s8_blendctl | S8_ENABLE_COLOR_BUFFER_WRITE);
OUT_BATCH(_3DSTATE_INDPT_ALPHA_BLEND_CMD | DISABLE_INDPT_ALPHA_BLEND);
OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 |
LOAD_TEXTURE_BLEND_STAGE(0) | 1);
- OUT_BATCH(pI830->cblend);
- OUT_BATCH(pI830->ablend);
+ OUT_BATCH(intel->cblend);
+ OUT_BATCH(intel->ablend);
OUT_BATCH(_3DSTATE_ENABLES_1_CMD | DISABLE_LOGIC_OP |
DISABLE_STENCIL_TEST | DISABLE_DEPTH_BIAS |
@@ -590,13 +590,13 @@ static void i830_emit_composite_state(ScrnInfoPtr pScrn)
DISABLE_STENCIL_WRITE | ENABLE_TEX_CACHE |
DISABLE_DITHER | ENABLE_COLOR_WRITE | DISABLE_DEPTH_WRITE);
- if (i830_transform_is_affine(pI830->render_src_picture->transform))
+ if (i830_transform_is_affine(intel->render_src_picture->transform))
texcoordfmt |= (TEXCOORDFMT_2D << 0);
else
texcoordfmt |= (TEXCOORDFMT_3D << 0);
- if (pI830->render_mask) {
+ if (intel->render_mask) {
if (i830_transform_is_affine
- (pI830->render_mask_picture->transform))
+ (intel->render_mask_picture->transform))
texcoordfmt |= (TEXCOORDFMT_2D << 2);
else
texcoordfmt |= (TEXCOORDFMT_3D << 2);
@@ -605,10 +605,10 @@ static void i830_emit_composite_state(ScrnInfoPtr pScrn)
ADVANCE_BATCH();
- i830_texture_setup(pI830->render_src_picture, pI830->render_src, 0);
- if (pI830->render_mask) {
- i830_texture_setup(pI830->render_mask_picture,
- pI830->render_mask, 1);
+ i830_texture_setup(intel->render_src_picture, intel->render_src, 0);
+ if (intel->render_mask) {
+ i830_texture_setup(intel->render_mask_picture,
+ intel->render_mask, 1);
}
}
@@ -623,7 +623,7 @@ i830_emit_composite_primitive(PixmapPtr pDst,
int dstX, int dstY, int w, int h)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
Bool is_affine_src, is_affine_mask = TRUE;
int per_vertex, num_floats;
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
@@ -631,27 +631,27 @@ i830_emit_composite_primitive(PixmapPtr pDst,
per_vertex = 2; /* dest x/y */
{
- float x = srcX + pI830->src_coord_adjust;
- float y = srcY + pI830->src_coord_adjust;
+ float x = srcX + intel->src_coord_adjust;
+ float y = srcY + intel->src_coord_adjust;
- is_affine_src = i830_transform_is_affine(pI830->transform[0]);
+ is_affine_src = i830_transform_is_affine(intel->transform[0]);
if (is_affine_src) {
if (!i830_get_transformed_coordinates(x, y,
- pI830->
+ intel->
transform[0],
&src_x[0],
&src_y[0]))
return;
if (!i830_get_transformed_coordinates(x, y + h,
- pI830->
+ intel->
transform[0],
&src_x[1],
&src_y[1]))
return;
if (!i830_get_transformed_coordinates(x + w, y + h,
- pI830->
+ intel->
transform[0],
&src_x[2],
&src_y[2]))
@@ -660,7 +660,7 @@ i830_emit_composite_primitive(PixmapPtr pDst,
per_vertex += 2; /* src x/y */
} else {
if (!i830_get_transformed_coordinates_3d(x, y,
- pI830->
+ intel->
transform[0],
&src_x[0],
&src_y[0],
@@ -668,7 +668,7 @@ i830_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x, y + h,
- pI830->
+ intel->
transform[0],
&src_x[1],
&src_y[1],
@@ -676,7 +676,7 @@ i830_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x + w, y + h,
- pI830->
+ intel->
transform[0],
&src_x[2],
&src_y[2],
@@ -687,28 +687,28 @@ i830_emit_composite_primitive(PixmapPtr pDst,
}
}
- if (pI830->render_mask) {
- float x = maskX + pI830->mask_coord_adjust;
- float y = maskY + pI830->mask_coord_adjust;
+ if (intel->render_mask) {
+ float x = maskX + intel->mask_coord_adjust;
+ float y = maskY + intel->mask_coord_adjust;
- is_affine_mask = i830_transform_is_affine(pI830->transform[1]);
+ is_affine_mask = i830_transform_is_affine(intel->transform[1]);
if (is_affine_mask) {
if (!i830_get_transformed_coordinates(x, y,
- pI830->
+ intel->
transform[1],
&mask_x[0],
&mask_y[0]))
return;
if (!i830_get_transformed_coordinates(x, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[1],
&mask_y[1]))
return;
if (!i830_get_transformed_coordinates(x + w, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[2],
&mask_y[2]))
@@ -717,7 +717,7 @@ i830_emit_composite_primitive(PixmapPtr pDst,
per_vertex += 2; /* mask x/y */
} else {
if (!i830_get_transformed_coordinates_3d(x, y,
- pI830->
+ intel->
transform[1],
&mask_x[0],
&mask_y[0],
@@ -725,7 +725,7 @@ i830_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[1],
&mask_y[1],
@@ -733,7 +733,7 @@ i830_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x + w, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[2],
&mask_y[2],
@@ -749,46 +749,46 @@ i830_emit_composite_primitive(PixmapPtr pDst,
BEGIN_BATCH(1 + num_floats);
OUT_BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST | (num_floats - 1));
- OUT_BATCH_F(pI830->dst_coord_adjust + dstX + w);
- OUT_BATCH_F(pI830->dst_coord_adjust + dstY + h);
- OUT_BATCH_F(src_x[2] / pI830->scale_units[0][0]);
- OUT_BATCH_F(src_y[2] / pI830->scale_units[0][1]);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstX + w);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstY + h);
+ OUT_BATCH_F(src_x[2] / intel->scale_units[0][0]);
+ OUT_BATCH_F(src_y[2] / intel->scale_units[0][1]);
if (!is_affine_src) {
OUT_BATCH_F(src_w[2]);
}
- if (pI830->render_mask) {
- OUT_BATCH_F(mask_x[2] / pI830->scale_units[1][0]);
- OUT_BATCH_F(mask_y[2] / pI830->scale_units[1][1]);
+ if (intel->render_mask) {
+ OUT_BATCH_F(mask_x[2] / intel->scale_units[1][0]);
+ OUT_BATCH_F(mask_y[2] / intel->scale_units[1][1]);
if (!is_affine_mask) {
OUT_BATCH_F(mask_w[2]);
}
}
- OUT_BATCH_F(pI830->dst_coord_adjust + dstX);
- OUT_BATCH_F(pI830->dst_coord_adjust + dstY + h);
- OUT_BATCH_F(src_x[1] / pI830->scale_units[0][0]);
- OUT_BATCH_F(src_y[1] / pI830->scale_units[0][1]);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstX);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstY + h);
+ OUT_BATCH_F(src_x[1] / intel->scale_units[0][0]);
+ OUT_BATCH_F(src_y[1] / intel->scale_units[0][1]);
if (!is_affine_src) {
OUT_BATCH_F(src_w[1]);
}
- if (pI830->render_mask) {
- OUT_BATCH_F(mask_x[1] / pI830->scale_units[1][0]);
- OUT_BATCH_F(mask_y[1] / pI830->scale_units[1][1]);
+ if (intel->render_mask) {
+ OUT_BATCH_F(mask_x[1] / intel->scale_units[1][0]);
+ OUT_BATCH_F(mask_y[1] / intel->scale_units[1][1]);
if (!is_affine_mask) {
OUT_BATCH_F(mask_w[1]);
}
}
- OUT_BATCH_F(pI830->dst_coord_adjust + dstX);
- OUT_BATCH_F(pI830->dst_coord_adjust + dstY);
- OUT_BATCH_F(src_x[0] / pI830->scale_units[0][0]);
- OUT_BATCH_F(src_y[0] / pI830->scale_units[0][1]);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstX);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstY);
+ OUT_BATCH_F(src_x[0] / intel->scale_units[0][0]);
+ OUT_BATCH_F(src_y[0] / intel->scale_units[0][1]);
if (!is_affine_src) {
OUT_BATCH_F(src_w[0]);
}
- if (pI830->render_mask) {
- OUT_BATCH_F(mask_x[0] / pI830->scale_units[1][0]);
- OUT_BATCH_F(mask_y[0] / pI830->scale_units[1][1]);
+ if (intel->render_mask) {
+ OUT_BATCH_F(mask_x[0] / intel->scale_units[1][0]);
+ OUT_BATCH_F(mask_y[0] / intel->scale_units[1][1]);
if (!is_affine_mask) {
OUT_BATCH_F(mask_w[0]);
}
@@ -805,14 +805,14 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
intel_batch_start_atomic(pScrn, 58 + /* invarient */
22 + /* setup */
20 + /* 2 * setup_texture */
1 + 30 /* verts */ );
- if (pI830->needs_render_state_emit)
+ if (intel->needs_render_state_emit)
i830_emit_composite_state(pScrn);
i830_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX,
@@ -825,7 +825,7 @@ i830_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
void i830_batch_flush_notify(ScrnInfoPtr scrn)
{
- I830Ptr i830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- i830->needs_render_state_emit = TRUE;
+ intel->needs_render_state_emit = TRUE;
}
diff --git a/src/i830_ring.h b/src/i830_ring.h
index 062b7ea..efa61c6 100644
--- a/src/i830_ring.h
+++ b/src/i830_ring.h
@@ -33,13 +33,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define OUT_RING(n) do { \
if (I810_DEBUG & DEBUG_VERBOSE_RING) \
ErrorF("OUT_RING 0x%08x: 0x%08x, (mask %x)\n", \
- pI830->ring_next, (unsigned int)(n), \
- pI830->ring.tail_mask); \
- *(volatile uint32_t *)(pI830->ring.virtual_start + \
- pI830->ring_next) = n; \
- pI830->ring_used += 4; \
- pI830->ring_next += 4; \
- pI830->ring_next &= pI830->ring.tail_mask; \
+ intel->ring_next, (unsigned int)(n), \
+ intel->ring.tail_mask); \
+ *(volatile uint32_t *)(intel->ring.virtual_start + \
+ intel->ring_next) = n; \
+ intel->ring_used += 4; \
+ intel->ring_next += 4; \
+ intel->ring_next &= intel->ring.tail_mask; \
} while (0)
#define OUT_RING_F(x) do { \
@@ -49,43 +49,43 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
} while(0)
#define ADVANCE_LP_RING() do { \
- if (pI830->ring_emitting == 0) \
+ if (intel->ring_emitting == 0) \
FatalError("%s: ADVANCE_LP_RING called with no matching " \
"BEGIN_LP_RING\n", __FUNCTION__); \
- if (pI830->ring_used > pI830->ring_emitting) \
+ if (intel->ring_used > intel->ring_emitting) \
FatalError("%s: ADVANCE_LP_RING: exceeded allocation %d/%d\n ", \
- __FUNCTION__, pI830->ring_used, \
- pI830->ring_emitting); \
- if (pI830->ring_used < pI830->ring_emitting) \
+ __FUNCTION__, intel->ring_used, \
+ intel->ring_emitting); \
+ if (intel->ring_used < intel->ring_emitting) \
FatalError("%s: ADVANCE_LP_RING: under-used allocation %d/%d\n ", \
- __FUNCTION__, pI830->ring_used, \
- pI830->ring_emitting); \
- pI830->ring.tail = pI830->ring_next; \
- pI830->ring.space -= pI830->ring_used; \
- if (pI830->ring_next & 0x07) \
+ __FUNCTION__, intel->ring_used, \
+ intel->ring_emitting); \
+ intel->ring.tail = intel->ring_next; \
+ intel->ring.space -= intel->ring_used; \
+ if (intel->ring_next & 0x07) \
FatalError("%s: ADVANCE_LP_RING: " \
"ring_next (0x%x) isn't on a QWord boundary\n", \
- __FUNCTION__, pI830->ring_next); \
- OUTREG(LP_RING + RING_TAIL, pI830->ring_next); \
- pI830->ring_emitting = 0; \
+ __FUNCTION__, intel->ring_next); \
+ OUTREG(LP_RING + RING_TAIL, intel->ring_next); \
+ intel->ring_emitting = 0; \
} while (0)
#define BEGIN_LP_RING(n) \
do { \
- if (pI830->ring_emitting != 0) \
+ if (intel->ring_emitting != 0) \
FatalError("%s: BEGIN_LP_RING called without closing " \
"ADVANCE_LP_RING\n", __FUNCTION__); \
if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC)) \
i830_wait_ring_idle(pScrn); \
- pI830->ring_emitting = (n) * 4; \
+ intel->ring_emitting = (n) * 4; \
if ((n) & 1) \
- pI830->ring_emitting += 4; \
- if (pI830->ring.space < pI830->ring_emitting) \
- WaitRingFunc(pScrn, pI830->ring_emitting, 0); \
- pI830->ring_next = pI830->ring.tail; \
+ intel->ring_emitting += 4; \
+ if (intel->ring.space < intel->ring_emitting) \
+ WaitRingFunc(pScrn, intel->ring_emitting, 0); \
+ intel->ring_next = intel->ring.tail; \
if (I810_DEBUG & DEBUG_VERBOSE_RING) \
ErrorF( "BEGIN_LP_RING %d in %s\n", n, FUNCTION_NAME); \
- pI830->ring_used = 0; \
+ intel->ring_used = 0; \
if ((n) & 1) \
OUT_RING(MI_NOOP); \
} while (0)
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index ecd654e..f28731f 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -108,15 +108,15 @@ Bool
i830_get_aperture_space(ScrnInfoPtr pScrn, drm_intel_bo ** bo_table,
int num_bos)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- if (pI830->batch_bo == NULL)
+ if (intel->batch_bo == NULL)
I830FALLBACK("VT inactive\n");
- bo_table[0] = pI830->batch_bo;
+ bo_table[0] = intel->batch_bo;
if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) != 0) {
intel_batch_flush(pScrn, FALSE);
- bo_table[0] = pI830->batch_bo;
+ bo_table[0] = intel->batch_bo;
if (drm_intel_bufmgr_check_aperture_space(bo_table, num_bos) !=
0)
I830FALLBACK("Couldn't get aperture space for BOs\n");
@@ -132,10 +132,10 @@ static unsigned long i830_pixmap_pitch(PixmapPtr pixmap)
static int i830_pixmap_pitch_is_aligned(PixmapPtr pixmap)
{
ScrnInfoPtr pScrn = xf86Screens[pixmap->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
return i830_pixmap_pitch(pixmap) %
- pI830->accel_pixmap_pitch_alignment == 0;
+ intel->accel_pixmap_pitch_alignment == 0;
}
/**
@@ -145,7 +145,7 @@ static Bool
i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
{
ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
unsigned long pitch;
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
@@ -171,27 +171,27 @@ i830_uxa_prepare_solid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
if (!i830_get_aperture_space(pScrn, bo_table, ARRAY_SIZE(bo_table)))
return FALSE;
- pI830->BR[13] = (I830PatternROP[alu] & 0xff) << 16;
+ intel->BR[13] = (I830PatternROP[alu] & 0xff) << 16;
switch (pPixmap->drawable.bitsPerPixel) {
case 8:
break;
case 16:
/* RGB565 */
- pI830->BR[13] |= (1 << 24);
+ intel->BR[13] |= (1 << 24);
break;
case 32:
/* RGB8888 */
- pI830->BR[13] |= ((1 << 24) | (1 << 25));
+ intel->BR[13] |= ((1 << 24) | (1 << 25));
break;
}
- pI830->BR[16] = fg;
+ intel->BR[16] = fg;
return TRUE;
}
static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
{
ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
unsigned long pitch;
uint32_t cmd;
@@ -206,7 +206,7 @@ static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
cmd |=
XY_COLOR_BLT_WRITE_ALPHA | XY_COLOR_BLT_WRITE_RGB;
- if (IS_I965G(pI830) && i830_pixmap_tiled(pPixmap)) {
+ if (IS_I965G(intel) && i830_pixmap_tiled(pPixmap)) {
assert((pitch % 512) == 0);
pitch >>= 2;
cmd |= XY_COLOR_BLT_TILED;
@@ -214,12 +214,12 @@ static void i830_uxa_solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2)
OUT_BATCH(cmd);
- OUT_BATCH(pI830->BR[13] | pitch);
+ OUT_BATCH(intel->BR[13] | pitch);
OUT_BATCH((y1 << 16) | (x1 & 0xffff));
OUT_BATCH((y2 << 16) | (x2 & 0xffff));
OUT_RELOC_PIXMAP(pPixmap, I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER, 0);
- OUT_BATCH(pI830->BR[16]);
+ OUT_BATCH(intel->BR[16]);
ADVANCE_BATCH();
}
}
@@ -240,7 +240,7 @@ i830_uxa_prepare_copy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
int ydir, int alu, Pixel planemask)
{
ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
i830_get_pixmap_bo(pSrcPixmap),
@@ -259,18 +259,18 @@ i830_uxa_prepare_copy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
i830_exa_check_pitch_2d(pSrcPixmap);
i830_exa_check_pitch_2d(pDstPixmap);
- pI830->pSrcPixmap = pSrcPixmap;
+ intel->pSrcPixmap = pSrcPixmap;
- pI830->BR[13] = I830CopyROP[alu] << 16;
+ intel->BR[13] = I830CopyROP[alu] << 16;
switch (pSrcPixmap->drawable.bitsPerPixel) {
case 8:
break;
case 16:
- pI830->BR[13] |= (1 << 24);
+ intel->BR[13] |= (1 << 24);
break;
case 32:
- pI830->BR[13] |= ((1 << 25) | (1 << 24));
+ intel->BR[13] |= ((1 << 25) | (1 << 24));
break;
}
return TRUE;
@@ -281,7 +281,7 @@ i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
int dst_y1, int w, int h)
{
ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
uint32_t cmd;
int dst_x2, dst_y2;
unsigned int dst_pitch, src_pitch;
@@ -290,7 +290,7 @@ i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
dst_y2 = dst_y1 + h;
dst_pitch = i830_pixmap_pitch(pDstPixmap);
- src_pitch = i830_pixmap_pitch(pI830->pSrcPixmap);
+ src_pitch = i830_pixmap_pitch(intel->pSrcPixmap);
{
BEGIN_BATCH(8);
@@ -302,14 +302,14 @@ i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
XY_SRC_COPY_BLT_WRITE_ALPHA |
XY_SRC_COPY_BLT_WRITE_RGB;
- if (IS_I965G(pI830)) {
+ if (IS_I965G(intel)) {
if (i830_pixmap_tiled(pDstPixmap)) {
assert((dst_pitch % 512) == 0);
dst_pitch >>= 2;
cmd |= XY_SRC_COPY_BLT_DST_TILED;
}
- if (i830_pixmap_tiled(pI830->pSrcPixmap)) {
+ if (i830_pixmap_tiled(intel->pSrcPixmap)) {
assert((src_pitch % 512) == 0);
src_pitch >>= 2;
cmd |= XY_SRC_COPY_BLT_SRC_TILED;
@@ -318,14 +318,14 @@ i830_uxa_copy(PixmapPtr pDstPixmap, int src_x1, int src_y1, int dst_x1,
OUT_BATCH(cmd);
- OUT_BATCH(pI830->BR[13] | dst_pitch);
+ OUT_BATCH(intel->BR[13] | dst_pitch);
OUT_BATCH((dst_y1 << 16) | (dst_x1 & 0xffff));
OUT_BATCH((dst_y2 << 16) | (dst_x2 & 0xffff));
OUT_RELOC_PIXMAP(pDstPixmap, I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER, 0);
OUT_BATCH((src_y1 << 16) | (src_x1 & 0xffff));
OUT_BATCH(src_pitch);
- OUT_RELOC_PIXMAP(pI830->pSrcPixmap, I915_GEM_DOMAIN_RENDER, 0,
+ OUT_RELOC_PIXMAP(intel->pSrcPixmap, I915_GEM_DOMAIN_RENDER, 0,
0);
ADVANCE_BATCH();
@@ -457,7 +457,7 @@ static Bool i830_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access)
{
dri_bo *bo = i830_get_pixmap_bo(pixmap);
ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
- I830Ptr i830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
intel_batch_flush(scrn, FALSE);
@@ -470,7 +470,7 @@ static Bool i830_uxa_prepare_access(PixmapPtr pixmap, uxa_access_t access)
}
/* Kernel manages fences at GTT map/fault time */
- if (bo->size < i830->max_gtt_map_size) {
+ if (bo->size < intel->max_gtt_map_size) {
if (drm_intel_gem_bo_map_gtt(bo)) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"%s: bo map failed\n", __FUNCTION__);
@@ -495,10 +495,10 @@ static void i830_uxa_finish_access(PixmapPtr pixmap)
if (bo) {
ScreenPtr screen = pixmap->drawable.pScreen;
ScrnInfoPtr scrn = xf86Screens[screen->myNum];
- I830Ptr i830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- if (bo == i830->front_buffer->bo)
- i830->need_flush = TRUE;
+ if (bo == intel->front_buffer->bo)
+ intel->need_flush = TRUE;
if (!scrn->vtSema) {
dri_bo_unmap(bo);
@@ -506,7 +506,7 @@ static void i830_uxa_finish_access(PixmapPtr pixmap)
return;
}
- if (bo->size < i830->max_gtt_map_size)
+ if (bo->size < intel->max_gtt_map_size)
drm_intel_gem_bo_unmap_gtt(bo);
else
dri_bo_unmap(bo);
@@ -517,11 +517,11 @@ static void i830_uxa_finish_access(PixmapPtr pixmap)
void i830_uxa_block_handler(ScreenPtr screen)
{
ScrnInfoPtr scrn = xf86Screens[screen->myNum];
- I830Ptr i830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- if (i830->need_flush) {
- dri_bo_wait_rendering(i830->front_buffer->bo);
- i830->need_flush = FALSE;
+ if (intel->need_flush) {
+ dri_bo_wait_rendering(intel->front_buffer->bo);
+ intel->need_flush = FALSE;
}
}
@@ -541,7 +541,7 @@ i830_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth,
unsigned usage)
{
ScrnInfoPtr scrn = xf86Screens[screen->myNum];
- I830Ptr i830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
dri_bo *bo;
int stride;
PixmapPtr pixmap;
@@ -566,7 +566,7 @@ i830_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth,
tiling = I915_TILING_Y;
pitch_align = 512;
} else {
- pitch_align = i830->accel_pixmap_pitch_alignment;
+ pitch_align = intel->accel_pixmap_pitch_alignment;
}
stride = ROUND_TO((w * pixmap->drawable.bitsPerPixel + 7) / 8,
@@ -585,14 +585,14 @@ i830_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth,
else
aligned_h = ALIGN(h, 32);
- stride = i830_get_fence_pitch(i830, stride, tiling);
+ stride = i830_get_fence_pitch(intel, stride, tiling);
/* Round the object up to the size of the fence it will live in
* if necessary. We could potentially make the kernel allocate
* a larger aperture space and just bind the subset of pages in,
* but this is easier and also keeps us out of trouble (as much)
* with drm_intel_bufmgr_check_aperture().
*/
- size = i830_get_fence_size(i830, stride * aligned_h);
+ size = i830_get_fence_size(intel, stride * aligned_h);
assert(size >= stride * aligned_h);
}
@@ -611,10 +611,10 @@ i830_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth,
}
if (usage == UXA_CREATE_PIXMAP_FOR_MAP)
- bo = drm_intel_bo_alloc(i830->bufmgr, "pixmap", size,
+ bo = drm_intel_bo_alloc(intel->bufmgr, "pixmap", size,
0);
else
- bo = drm_intel_bo_alloc_for_render(i830->bufmgr,
+ bo = drm_intel_bo_alloc_for_render(intel->bufmgr,
"pixmap", size, 0);
if (!bo) {
fbDestroyPixmap(pixmap);
@@ -647,8 +647,8 @@ static Bool i830_uxa_destroy_pixmap(PixmapPtr pixmap)
void i830_uxa_create_screen_resources(ScreenPtr pScreen)
{
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
- I830Ptr i830 = I830PTR(scrn);
- dri_bo *bo = i830->front_buffer->bo;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ dri_bo *bo = intel->front_buffer->bo;
if (bo != NULL) {
PixmapPtr pixmap = pScreen->GetScreenPixmap(pScreen);
@@ -660,65 +660,65 @@ void i830_uxa_create_screen_resources(ScreenPtr pScreen)
Bool i830_uxa_init(ScreenPtr pScreen)
{
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
- I830Ptr i830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
if (!dixRequestPrivate(&uxa_pixmap_index, 0))
return FALSE;
- i830->uxa_driver = uxa_driver_alloc();
- if (i830->uxa_driver == NULL)
+ intel->uxa_driver = uxa_driver_alloc();
+ if (intel->uxa_driver == NULL)
return FALSE;
- memset(i830->uxa_driver, 0, sizeof(*i830->uxa_driver));
+ memset(intel->uxa_driver, 0, sizeof(*intel->uxa_driver));
- i830->bufferOffset = 0;
- i830->uxa_driver->uxa_major = 1;
- i830->uxa_driver->uxa_minor = 0;
+ intel->bufferOffset = 0;
+ intel->uxa_driver->uxa_major = 1;
+ intel->uxa_driver->uxa_minor = 0;
/* Solid fill */
- i830->uxa_driver->prepare_solid = i830_uxa_prepare_solid;
- i830->uxa_driver->solid = i830_uxa_solid;
- i830->uxa_driver->done_solid = i830_uxa_done_solid;
+ intel->uxa_driver->prepare_solid = i830_uxa_prepare_solid;
+ intel->uxa_driver->solid = i830_uxa_solid;
+ intel->uxa_driver->done_solid = i830_uxa_done_solid;
/* Copy */
- i830->uxa_driver->prepare_copy = i830_uxa_prepare_copy;
- i830->uxa_driver->copy = i830_uxa_copy;
- i830->uxa_driver->done_copy = i830_uxa_done_copy;
+ intel->uxa_driver->prepare_copy = i830_uxa_prepare_copy;
+ intel->uxa_driver->copy = i830_uxa_copy;
+ intel->uxa_driver->done_copy = i830_uxa_done_copy;
/* Composite */
- if (!IS_I9XX(i830)) {
- i830->uxa_driver->check_composite = i830_check_composite;
- i830->uxa_driver->prepare_composite = i830_prepare_composite;
- i830->uxa_driver->composite = i830_composite;
- i830->uxa_driver->done_composite = i830_done_composite;
- } else if (IS_I915G(i830) || IS_I915GM(i830) ||
- IS_I945G(i830) || IS_I945GM(i830) || IS_G33CLASS(i830)) {
- i830->uxa_driver->check_composite = i915_check_composite;
- i830->uxa_driver->prepare_composite = i915_prepare_composite;
- i830->uxa_driver->composite = i915_composite;
- i830->uxa_driver->done_composite = i830_done_composite;
+ if (!IS_I9XX(intel)) {
+ intel->uxa_driver->check_composite = i830_check_composite;
+ intel->uxa_driver->prepare_composite = i830_prepare_composite;
+ intel->uxa_driver->composite = i830_composite;
+ intel->uxa_driver->done_composite = i830_done_composite;
+ } else if (IS_I915G(intel) || IS_I915GM(intel) ||
+ IS_I945G(intel) || IS_I945GM(intel) || IS_G33CLASS(intel)) {
+ intel->uxa_driver->check_composite = i915_check_composite;
+ intel->uxa_driver->prepare_composite = i915_prepare_composite;
+ intel->uxa_driver->composite = i915_composite;
+ intel->uxa_driver->done_composite = i830_done_composite;
} else {
- i830->uxa_driver->check_composite = i965_check_composite;
- i830->uxa_driver->prepare_composite = i965_prepare_composite;
- i830->uxa_driver->composite = i965_composite;
- i830->uxa_driver->done_composite = i830_done_composite;
+ intel->uxa_driver->check_composite = i965_check_composite;
+ intel->uxa_driver->prepare_composite = i965_prepare_composite;
+ intel->uxa_driver->composite = i965_composite;
+ intel->uxa_driver->done_composite = i830_done_composite;
}
- i830->uxa_driver->prepare_access = i830_uxa_prepare_access;
- i830->uxa_driver->finish_access = i830_uxa_finish_access;
- i830->uxa_driver->pixmap_is_offscreen = i830_uxa_pixmap_is_offscreen;
+ intel->uxa_driver->prepare_access = i830_uxa_prepare_access;
+ intel->uxa_driver->finish_access = i830_uxa_finish_access;
+ intel->uxa_driver->pixmap_is_offscreen = i830_uxa_pixmap_is_offscreen;
- if (!uxa_driver_init(pScreen, i830->uxa_driver)) {
+ if (!uxa_driver_init(pScreen, intel->uxa_driver)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"UXA initialization failed\n");
- xfree(i830->uxa_driver);
+ xfree(intel->uxa_driver);
return FALSE;
}
pScreen->CreatePixmap = i830_uxa_create_pixmap;
pScreen->DestroyPixmap = i830_uxa_destroy_pixmap;
- uxa_set_fallback_debug(pScreen, i830->fallback_debug);
+ uxa_set_fallback_debug(pScreen, intel->fallback_debug);
return TRUE;
}
diff --git a/src/i830_video.c b/src/i830_video.c
index 820c2d8..1667ca0 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -205,7 +205,7 @@ static XF86ImageRec Images[NUM_IMAGES] = {
};
#if VIDEO_DEBUG
-static void CompareOverlay(I830Ptr pI830, uint32_t * overlay, int size)
+static void CompareOverlay(intel_screen_private *intel, uint32_t * overlay, int size)
{
int i;
uint32_t val;
@@ -229,7 +229,7 @@ static void CompareOverlay(I830Ptr pI830, uint32_t * overlay, int size)
static Bool drmmode_has_overlay(ScrnInfoPtr pScrn)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- I830Ptr p830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
struct drm_i915_getparam gp;
int has_overlay = 0;
@@ -246,7 +246,7 @@ static Bool drmmode_has_overlay(ScrnInfoPtr pScrn)
static void drmmode_overlay_update_attrs(ScrnInfoPtr pScrn)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- I830Ptr p830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
struct drm_intel_overlay_attrs attrs;
int ret;
@@ -274,7 +274,7 @@ static void drmmode_overlay_update_attrs(ScrnInfoPtr pScrn)
static void drmmode_overlay_off(ScrnInfoPtr pScrn)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- I830Ptr p830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
struct drm_intel_overlay_put_image request;
int ret;
@@ -296,7 +296,7 @@ drmmode_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
short drw_h)
{
#ifdef DRM_MODE_OVERLAY_LANDED
- I830Ptr p830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I830PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
struct drm_intel_overlay_put_image request;
int ret;
@@ -369,7 +369,7 @@ drmmode_overlay_put_image(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
void I830InitVideo(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
int num_adaptors;
@@ -399,8 +399,8 @@ void I830InitVideo(ScreenPtr pScreen)
/* Set up textured video if we can do it at this depth and we are on
* supported hardware.
*/
- if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(pI830) || IS_I965G(pI830)) &&
- !(!IS_I965G(pI830) && pScrn->displayWidth > 2048)) {
+ if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(intel) || IS_I965G(intel)) &&
+ !(!IS_I965G(intel) && pScrn->displayWidth > 2048)) {
texturedAdaptor = I830SetupImageVideoTextured(pScreen);
if (texturedAdaptor != NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -412,9 +412,9 @@ void I830InitVideo(ScreenPtr pScreen)
}
/* Set up overlay video if we can do it at this depth. */
- if (!OVERLAY_NOEXIST(pI830) && pScrn->bitsPerPixel != 8) {
- pI830->use_drmmode_overlay = drmmode_has_overlay(pScrn);
- if (pI830->use_drmmode_overlay) {
+ if (!OVERLAY_NOEXIST(intel) && pScrn->bitsPerPixel != 8) {
+ intel->use_drmmode_overlay = drmmode_has_overlay(pScrn);
+ if (intel->use_drmmode_overlay) {
overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
if (overlayAdaptor != NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -426,13 +426,13 @@ void I830InitVideo(ScreenPtr pScreen)
}
}
- if (overlayAdaptor && pI830->XvPreferOverlay)
+ if (overlayAdaptor && intel->XvPreferOverlay)
adaptors[num_adaptors++] = overlayAdaptor;
if (texturedAdaptor)
adaptors[num_adaptors++] = texturedAdaptor;
- if (overlayAdaptor && !pI830->XvPreferOverlay)
+ if (overlayAdaptor && !intel->XvPreferOverlay)
adaptors[num_adaptors++] = overlayAdaptor;
#ifdef INTEL_XVMC
@@ -448,7 +448,7 @@ void I830InitVideo(ScreenPtr pScreen)
} else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Disabling Xv because no adaptors could be initialized.\n");
- pI830->XvEnabled = FALSE;
+ intel->XvEnabled = FALSE;
}
#ifdef INTEL_XVMC
@@ -467,7 +467,7 @@ void I830InitVideo(ScreenPtr pScreen)
static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
XF86VideoAdaptorPtr adapt;
I830PortPrivPtr pPriv;
XF86AttributePtr att;
@@ -484,7 +484,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
adapt->nEncodings = 1;
adapt->pEncodings = DummyEncoding;
/* update the DummyEncoding for these two chipsets */
- if (IS_845G(pI830) || IS_I830(pI830)) {
+ if (IS_845G(intel) || IS_I830(intel)) {
adapt->pEncodings->width = IMAGE_MAX_WIDTH_LEGACY;
adapt->pEncodings->height = IMAGE_MAX_HEIGHT_LEGACY;
}
@@ -498,7 +498,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
adapt->pPortPrivates[0].ptr = (pointer) (pPriv);
adapt->nAttributes = NUM_ATTRIBUTES;
adapt->nAttributes += CLONE_ATTRIBUTES;
- if (IS_I9XX(pI830))
+ if (IS_I9XX(intel))
adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */
adapt->pAttributes =
xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
@@ -510,7 +510,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
memcpy((char *)att, (char *)CloneAttributes,
sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES);
att += CLONE_ATTRIBUTES;
- if (IS_I9XX(pI830)) {
+ if (IS_I9XX(intel)) {
memcpy((char *)att, (char *)GammaAttributes,
sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
att += GAMMA_ATTRIBUTES;
@@ -529,7 +529,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
adapt->QueryImageAttributes = I830QueryImageAttributes;
pPriv->textured = FALSE;
- pPriv->colorKey = pI830->colorKey & ((1 << pScrn->depth) - 1);
+ pPriv->colorKey = intel->colorKey & ((1 << pScrn->depth) - 1);
pPriv->videoStatus = 0;
pPriv->brightness = -19; /* (255/219) * -16 */
pPriv->contrast = 75; /* 255/219 * 64 */
@@ -551,7 +551,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
/* gotta uninit this someplace */
REGION_NULL(pScreen, &pPriv->clip);
- pI830->adaptor = adapt;
+ intel->adaptor = adapt;
/* With LFP's we need to detect whether we're in One Line Mode, which
* essentially means a resolution greater than 1024x768, and fix up
@@ -574,7 +574,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
/* Allow the pipe to be switched from pipe A to B when in clone mode */
xvPipe = MAKE_ATOM("XV_PIPE");
- if (IS_I9XX(pI830)) {
+ if (IS_I9XX(intel)) {
xvGamma0 = MAKE_ATOM("XV_GAMMA0");
xvGamma1 = MAKE_ATOM("XV_GAMMA1");
xvGamma2 = MAKE_ATOM("XV_GAMMA2");
@@ -736,7 +736,7 @@ I830SetPortAttributeOverlay(ScrnInfoPtr pScrn,
Atom attribute, INT32 value, pointer data)
{
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
if (attribute == xvBrightness) {
if ((value < -128) || (value > 127))
@@ -763,17 +763,17 @@ I830SetPortAttributeOverlay(ScrnInfoPtr pScrn,
/*
* Leave this to be updated at the next frame
*/
- } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma0 && (IS_I9XX(intel))) {
pPriv->gamma0 = value;
- } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma1 && (IS_I9XX(intel))) {
pPriv->gamma1 = value;
- } else if (attribute == xvGamma2 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma2 && (IS_I9XX(intel))) {
pPriv->gamma2 = value;
- } else if (attribute == xvGamma3 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma3 && (IS_I9XX(intel))) {
pPriv->gamma3 = value;
- } else if (attribute == xvGamma4 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma4 && (IS_I9XX(intel))) {
pPriv->gamma4 = value;
- } else if (attribute == xvGamma5 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma5 && (IS_I9XX(intel))) {
pPriv->gamma5 = value;
} else if (attribute == xvColorKey) {
pPriv->colorKey = value;
@@ -787,7 +787,7 @@ I830SetPortAttributeOverlay(ScrnInfoPtr pScrn,
attribute == xvGamma2 ||
attribute == xvGamma3 ||
attribute == xvGamma4 ||
- attribute == xvGamma5) && (IS_I9XX(pI830))) {
+ attribute == xvGamma5) && (IS_I9XX(intel))) {
OVERLAY_DEBUG("GAMMA\n");
}
@@ -803,7 +803,7 @@ static int
I830GetPortAttribute(ScrnInfoPtr pScrn,
Atom attribute, INT32 * value, pointer data)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
if (attribute == xvBrightness) {
@@ -821,17 +821,17 @@ I830GetPortAttribute(ScrnInfoPtr pScrn,
if (c == xf86_config->num_crtc)
c = -1;
*value = c;
- } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma0 && (IS_I9XX(intel))) {
*value = pPriv->gamma0;
- } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma1 && (IS_I9XX(intel))) {
*value = pPriv->gamma1;
- } else if (attribute == xvGamma2 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma2 && (IS_I9XX(intel))) {
*value = pPriv->gamma2;
- } else if (attribute == xvGamma3 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma3 && (IS_I9XX(intel))) {
*value = pPriv->gamma3;
- } else if (attribute == xvGamma4 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma4 && (IS_I9XX(intel))) {
*value = pPriv->gamma4;
- } else if (attribute == xvGamma5 && (IS_I9XX(pI830))) {
+ } else if (attribute == xvGamma5 && (IS_I9XX(intel))) {
*value = pPriv->gamma5;
} else if (attribute == xvColorKey) {
*value = pPriv->colorKey;
@@ -1254,15 +1254,15 @@ i830_display_overlay(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
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;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ I830PortPrivPtr pPriv = intel->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);
+ CompareOverlay(intel, (uint32_t *) overlay, 0x100);
#endif
/*
@@ -1372,7 +1372,7 @@ static void
i830_wait_for_scanline(ScrnInfoPtr pScrn, PixmapPtr pPixmap,
xf86CrtcPtr crtc, RegionPtr clipBoxes)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
BoxPtr box;
pixman_box16_t box_in_crtc_coordinates;
int pipe = -1, event, load_scan_lines_pipe;
@@ -1413,7 +1413,7 @@ static Bool
i830_setup_video_buffer(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
int alloc_size, int id)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(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);
@@ -1424,7 +1424,7 @@ i830_setup_video_buffer(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
i830_free_video_buffers(pPriv);
} else {
if (pPriv->buf == NULL) {
- pPriv->buf = drm_intel_bo_alloc(pI830->bufmgr,
+ pPriv->buf = drm_intel_bo_alloc(intel->bufmgr,
"xv buffer", alloc_size,
4096);
if (pPriv->buf == NULL)
@@ -1440,7 +1440,7 @@ 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);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int pitchAlignMask;
/* Only needs to be DWORD-aligned for textured on i915, but overlay has
@@ -1450,11 +1450,11 @@ i830_dst_pitch_and_size(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, short width,
pitchAlignMask = 3;
#ifdef INTEL_XVMC
/* for i915 xvmc, hw requires at least 1kb aligned surface */
- if ((id == FOURCC_XVMC) && IS_I915(pI830))
+ if ((id == FOURCC_XVMC) && IS_I915(intel))
pitchAlignMask = 0x3ff;
#endif
} else {
- if (IS_I965G(pI830))
+ if (IS_I965G(intel))
pitchAlignMask = 255;
else
pitchAlignMask = 63;
@@ -1513,7 +1513,7 @@ i830_copy_video_data(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
INT32 x1, INT32 y1, INT32 x2, INT32 y2,
int id, unsigned char *buf)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int srcPitch = 0, srcPitch2 = 0;
int top, left, npixels, nlines, size;
@@ -1532,7 +1532,7 @@ i830_copy_video_data(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
/* fixup pointers */
#ifdef INTEL_XVMC
- if (id == FOURCC_XVMC && IS_I915(pI830)) {
+ if (id == FOURCC_XVMC && IS_I915(intel)) {
pPriv->YBufOffset = (uint32_t) ((uintptr_t) buf);
pPriv->VBufOffset = pPriv->YBufOffset + (*dstPitch2 * height);
pPriv->UBufOffset =
@@ -1601,7 +1601,7 @@ I830PutImage(ScrnInfoPtr pScrn,
short width, short height,
Bool sync, RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I830PortPrivPtr pPriv = (I830PortPrivPtr) data;
ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
PixmapPtr pPixmap = get_drawable_pixmap(pDraw);;
@@ -1678,7 +1678,7 @@ I830PutImage(ScrnInfoPtr pScrn,
i830_wait_for_scanline(pScrn, pPixmap, crtc, clipBoxes);
}
- if (IS_I965G(pI830)) {
+ if (IS_I965G(intel)) {
if (xvmc_passthrough(id, pPriv->rotation)) {
/* XXX: KMS */
pPriv->YBufOffset = (uintptr_t) buf;
@@ -1713,14 +1713,14 @@ I830QueryImageAttributes(ScrnInfoPtr pScrn,
unsigned short *w, unsigned short *h,
int *pitches, int *offsets)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int size, tmp;
#if 0
ErrorF("I830QueryImageAttributes: w is %d, h is %d\n", *w, *h);
#endif
- if (IS_845G(pI830) || IS_I830(pI830)) {
+ if (IS_845G(intel) || IS_I830(intel)) {
if (*w > IMAGE_MAX_WIDTH_LEGACY)
*w = IMAGE_MAX_WIDTH_LEGACY;
if (*h > IMAGE_MAX_HEIGHT_LEGACY)
@@ -1798,11 +1798,11 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask)
{
ScrnInfoPtr pScrn = xf86Screens[i];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I830PortPrivPtr pPriv;
/* no overlay */
- if (pI830->adaptor == NULL)
+ if (intel->adaptor == NULL)
return;
pPriv = GET_PORT_PRIVATE(pScrn);
diff --git a/src/i830_video.h b/src/i830_video.h
index ac47801..2905be3 100644
--- a/src/i830_video.h
+++ b/src/i830_video.h
@@ -60,13 +60,13 @@ typedef struct {
int oneLineMode;
int scaleRatio;
Bool textured;
- Rotation rotation; /* should remove I830->rotation later */
+ Rotation rotation; /* should remove intel->rotation later */
int SyncToVblank; /* -1: auto, 0: off, 1: on */
} I830PortPrivRec, *I830PortPrivPtr;
#define GET_PORT_PRIVATE(pScrn) \
- (I830PortPrivPtr)((I830PTR(pScrn))->adaptor->pPortPrivates[0].ptr)
+ (I830PortPrivPtr)((intel_get_screen_private(pScrn))->adaptor->pPortPrivates[0].ptr)
void I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
int id, RegionPtr dstRegion, short width,
diff --git a/src/i915_3d.c b/src/i915_3d.c
index deee696..053a94f 100644
--- a/src/i915_3d.c
+++ b/src/i915_3d.c
@@ -36,7 +36,7 @@
void I915EmitInvarientState(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
BEGIN_BATCH(24);
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index 02e5fe8..1c1aced 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -210,11 +210,11 @@ static void cleanupI915XvMC(I915XvMCPtr xvmc)
static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
I915XvMCContextPriv * ctxpriv)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (ctxpriv->mcStaticIndirectState->offset +
- pI830->LinearAddr),
+ intel->LinearAddr),
ctxpriv->mcStaticIndirectState->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->sis_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -222,9 +222,9 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
return FALSE;
}
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (ctxpriv->mcSamplerState->offset +
- pI830->LinearAddr),
+ intel->LinearAddr),
ctxpriv->mcSamplerState->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->ssb_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -232,9 +232,9 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
return FALSE;
}
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (ctxpriv->mcMapState->offset +
- pI830->LinearAddr),
+ intel->LinearAddr),
ctxpriv->mcMapState->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->msb_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -242,9 +242,9 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
return FALSE;
}
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (ctxpriv->mcPixelShaderProgram->offset +
- pI830->LinearAddr),
+ intel->LinearAddr),
ctxpriv->mcPixelShaderProgram->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->psp_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -252,9 +252,9 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
return FALSE;
}
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (ctxpriv->mcPixelShaderConstants->offset +
- pI830->LinearAddr),
+ intel->LinearAddr),
ctxpriv->mcPixelShaderConstants->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->psc_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -262,9 +262,9 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
return FALSE;
}
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (ctxpriv->mcCorrdata->offset +
- pI830->LinearAddr),
+ intel->LinearAddr),
ctxpriv->mcCorrdata->size, DRM_AGP, 0,
(drmAddress) & ctxpriv->corrdata_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -278,35 +278,35 @@ static Bool i915_map_xvmc_buffers(ScrnInfoPtr pScrn,
static void i915_unmap_xvmc_buffers(ScrnInfoPtr pScrn,
I915XvMCContextPriv * ctxpriv)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
if (ctxpriv->sis_handle) {
- drmRmMap(pI830->drmSubFD, ctxpriv->sis_handle);
+ drmRmMap(intel->drmSubFD, ctxpriv->sis_handle);
ctxpriv->sis_handle = 0;
}
if (ctxpriv->ssb_handle) {
- drmRmMap(pI830->drmSubFD, ctxpriv->ssb_handle);
+ drmRmMap(intel->drmSubFD, ctxpriv->ssb_handle);
ctxpriv->ssb_handle = 0;
}
if (ctxpriv->msb_handle) {
- drmRmMap(pI830->drmSubFD, ctxpriv->msb_handle);
+ drmRmMap(intel->drmSubFD, ctxpriv->msb_handle);
ctxpriv->msb_handle = 0;
}
if (ctxpriv->psp_handle) {
- drmRmMap(pI830->drmSubFD, ctxpriv->psp_handle);
+ drmRmMap(intel->drmSubFD, ctxpriv->psp_handle);
ctxpriv->psp_handle = 0;
}
if (ctxpriv->psc_handle) {
- drmRmMap(pI830->drmSubFD, ctxpriv->psc_handle);
+ drmRmMap(intel->drmSubFD, ctxpriv->psc_handle);
ctxpriv->psc_handle = 0;
}
if (ctxpriv->corrdata_handle) {
- drmRmMap(pI830->drmSubFD, ctxpriv->corrdata_handle);
+ drmRmMap(intel->drmSubFD, ctxpriv->corrdata_handle);
ctxpriv->corrdata_handle = 0;
}
@@ -315,11 +315,11 @@ static void i915_unmap_xvmc_buffers(ScrnInfoPtr pScrn,
static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr pScrn,
I915XvMCContextPriv * ctxpriv)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int flags = ALIGN_BOTH_ENDS;
/* on 915G/GM, load indirect can only use physical address...sigh */
- if (IS_I915G(pI830) || IS_I915GM(pI830))
+ if (IS_I915G(intel) || IS_I915GM(intel))
flags |= NEED_PHYSICAL_ADDR;
if (!i830_allocate_xvmc_buffer(pScrn, "[XvMC]Static Indirect State",
@@ -415,7 +415,7 @@ static void i915_free_xvmc_buffers(ScrnInfoPtr pScrn,
static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
int *num_priv, long **priv)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I915XvMCCreateContextRec *contextRec = NULL;
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
I915XvMCContextPriv *ctxpriv = NULL;
@@ -424,7 +424,7 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
*priv = NULL;
*num_priv = 0;
- if (!pI830->XvMCEnabled) {
+ if (!intel->XvMCEnabled) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[XvMC] i915: XvMC disabled!\n");
return BadAlloc;
@@ -513,11 +513,11 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
contextRec->corrdata.handle = ctxpriv->corrdata_handle;
contextRec->corrdata.offset = ctxpriv->mcCorrdata->offset;
contextRec->corrdata.size = ctxpriv->mcCorrdata->size;
- contextRec->deviceID = DEVICE_ID(pI830->PciInfo);
+ contextRec->deviceID = DEVICE_ID(intel->PciInfo);
/* XXX: KMS */
#if 0
- if (IS_I915G(pI830) || IS_I915GM(pI830)) {
+ if (IS_I915G(intel) || IS_I915GM(intel)) {
contextRec->sis.bus_addr =
ctxpriv->mcStaticIndirectState->bus_addr;
contextRec->ssb.bus_addr = ctxpriv->mcSamplerState->bus_addr;
@@ -539,7 +539,7 @@ static int i915_xvmc_create_context(ScrnInfoPtr pScrn, XvMCContextPtr pContext,
static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
int *num_priv, long **priv)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
I915XvMCSurfacePriv *sfpriv = NULL;
I915XvMCCreateSurfaceRec *surfaceRec = NULL;
@@ -547,7 +547,7 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
unsigned int srfno;
unsigned long bufsize;
- if (!pI830->XvMCEnabled) {
+ if (!intel->XvMCEnabled) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[XvMC] i915: XvMC disabled!\n");
return BadAlloc;
@@ -608,9 +608,9 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
if (0)
i830_describe_allocations(pScrn, 1, "");
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (sfpriv->surface->offset +
- pI830->LinearAddr), sfpriv->surface->size,
+ intel->LinearAddr), sfpriv->surface->size,
DRM_AGP, 0, (drmAddress) & sfpriv->surface_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(surface_handle) failed!\n");
@@ -637,7 +637,7 @@ static int i915_xvmc_create_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
int *num_priv, long **priv)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
I915XvMCSurfacePriv *sfpriv = NULL;
I915XvMCCreateSurfaceRec *surfaceRec = NULL;
@@ -697,9 +697,9 @@ static int i915_xvmc_create_subpict(ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp,
return BadAlloc;
}
- if (drmAddMap(pI830->drmSubFD,
+ if (drmAddMap(intel->drmSubFD,
(drm_handle_t) (sfpriv->surface->offset +
- pI830->LinearAddr), sfpriv->surface->size,
+ intel->LinearAddr), sfpriv->surface->size,
DRM_AGP, 0, (drmAddress) & sfpriv->surface_handle) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[drm] drmAddMap(surface_handle) failed!\n");
@@ -746,13 +746,13 @@ static void i915_xvmc_destroy_context(ScrnInfoPtr pScrn,
static void i915_xvmc_destroy_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
int i;
for (i = 0; i < I915_XVMC_MAX_SURFACES; i++) {
if (pXvMC->surfaces[i] == pSurf->surface_id) {
- drmRmMap(pI830->drmSubFD,
+ drmRmMap(intel->drmSubFD,
pXvMC->sfprivs[i]->surface_handle);
i830_free_xvmc_buffer(pScrn,
pXvMC->sfprivs[i]->surface);
@@ -770,13 +770,13 @@ static void i915_xvmc_destroy_surface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf)
static void i915_xvmc_destroy_subpict(ScrnInfoPtr pScrn,
XvMCSubpicturePtr pSubp)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
I915XvMCPtr pXvMC = (I915XvMCPtr) xvmc_driver->devPrivate;
int i;
for (i = 0; i < I915_XVMC_MAX_SURFACES; i++) {
if (pXvMC->surfaces[i] == pSubp->subpicture_id) {
- drmRmMap(pI830->drmSubFD,
+ drmRmMap(intel->drmSubFD,
pXvMC->sfprivs[i]->surface_handle);
i830_free_xvmc_buffer(pScrn,
pXvMC->sfprivs[i]->surface);
diff --git a/src/i915_render.c b/src/i915_render.c
index 5a578ab..389fa9d 100644
--- a/src/i915_render.c
+++ b/src/i915_render.c
@@ -240,7 +240,7 @@ i915_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
{
ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
uint32_t format, pitch, filter;
int w, h, i;
uint32_t wrap_mode;
@@ -248,8 +248,8 @@ static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
pitch = intel_get_pixmap_pitch(pPix);
w = pPict->pDrawable->width;
h = pPict->pDrawable->height;
- pI830->scale_units[unit][0] = pPix->drawable.width;
- pI830->scale_units[unit][1] = pPix->drawable.height;
+ intel->scale_units[unit][0] = pPix->drawable.width;
+ intel->scale_units[unit][1] = pPix->drawable.height;
for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
i++) {
@@ -292,25 +292,25 @@ static Bool i915_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit)
}
/* offset filled in at emit time */
- pI830->mapstate[unit * 3 + 0] = 0;
- pI830->mapstate[unit * 3 + 1] = format |
+ intel->mapstate[unit * 3 + 0] = 0;
+ intel->mapstate[unit * 3 + 1] = format |
MS3_USE_FENCE_REGS |
((pPix->drawable.height - 1) << MS3_HEIGHT_SHIFT) |
((pPix->drawable.width - 1) << MS3_WIDTH_SHIFT);
- pI830->mapstate[unit * 3 + 2] = ((pitch / 4) - 1) << MS4_PITCH_SHIFT;
+ intel->mapstate[unit * 3 + 2] = ((pitch / 4) - 1) << MS4_PITCH_SHIFT;
- pI830->samplerstate[unit * 3 + 0] = (MIPFILTER_NONE <<
+ intel->samplerstate[unit * 3 + 0] = (MIPFILTER_NONE <<
SS2_MIP_FILTER_SHIFT);
- pI830->samplerstate[unit * 3 + 0] |= filter;
- pI830->samplerstate[unit * 3 + 1] = SS3_NORMALIZED_COORDS;
- pI830->samplerstate[unit * 3 + 1] |=
+ intel->samplerstate[unit * 3 + 0] |= filter;
+ intel->samplerstate[unit * 3 + 1] = SS3_NORMALIZED_COORDS;
+ intel->samplerstate[unit * 3 + 1] |=
wrap_mode << SS3_TCX_ADDR_MODE_SHIFT;
- pI830->samplerstate[unit * 3 + 1] |=
+ intel->samplerstate[unit * 3 + 1] |=
wrap_mode << SS3_TCY_ADDR_MODE_SHIFT;
- pI830->samplerstate[unit * 3 + 1] |= unit << SS3_TEXTUREMAP_INDEX_SHIFT;
- pI830->samplerstate[unit * 3 + 2] = 0x00000000; /* border color */
+ intel->samplerstate[unit * 3 + 1] |= unit << SS3_TEXTUREMAP_INDEX_SHIFT;
+ intel->samplerstate[unit * 3 + 2] = 0x00000000; /* border color */
- pI830->transform[unit] = pPict->transform;
+ intel->transform[unit] = pPict->transform;
return TRUE;
}
@@ -321,7 +321,7 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
ScrnInfoPtr pScrn = xf86Screens[pSrcPicture->pDrawable->pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
drm_intel_bo *bo_table[] = {
NULL, /* batch_bo */
i830_get_pixmap_bo(pSrc),
@@ -329,12 +329,12 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
i830_get_pixmap_bo(pDst),
};
- pI830->render_src_picture = pSrcPicture;
- pI830->render_src = pSrc;
- pI830->render_mask_picture = pMaskPicture;
- pI830->render_mask = pMask;
- pI830->render_dst_picture = pDstPicture;
- pI830->render_dst = pDst;
+ intel->render_src_picture = pSrcPicture;
+ intel->render_src = pSrc;
+ intel->render_mask_picture = pMaskPicture;
+ intel->render_mask = pMask;
+ intel->render_dst_picture = pDstPicture;
+ intel->render_dst = pDst;
i830_exa_check_pitch_3d(pSrc);
if (pMask)
@@ -342,7 +342,7 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
i830_exa_check_pitch_3d(pDst);
if (!i915_get_dest_format(pDstPicture,
- &pI830->i915_render_state.dst_format))
+ &intel->i915_render_state.dst_format))
return FALSE;
if (!i830_get_aperture_space(pScrn, bo_table, ARRAY_SIZE(bo_table)))
@@ -351,88 +351,88 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
if (!i915_texture_setup(pSrcPicture, pSrc, 0))
I830FALLBACK("fail to setup src texture\n");
- pI830->dst_coord_adjust = 0;
- pI830->src_coord_adjust = 0;
- pI830->mask_coord_adjust = 0;
+ intel->dst_coord_adjust = 0;
+ intel->src_coord_adjust = 0;
+ intel->mask_coord_adjust = 0;
if (pSrcPicture->filter == PictFilterNearest)
- pI830->dst_coord_adjust = -0.125;
+ intel->dst_coord_adjust = -0.125;
if (pMask != NULL) {
if (!i915_texture_setup(pMaskPicture, pMask, 1))
I830FALLBACK("fail to setup mask texture\n");
if (pMaskPicture->filter == PictFilterNearest)
- pI830->dst_coord_adjust = -0.125;
+ intel->dst_coord_adjust = -0.125;
} else {
- pI830->transform[1] = NULL;
- pI830->scale_units[1][0] = -1;
- pI830->scale_units[1][1] = -1;
+ intel->transform[1] = NULL;
+ intel->scale_units[1][0] = -1;
+ intel->scale_units[1][1] = -1;
}
- pI830->i915_render_state.op = op;
- pI830->i915_render_state.needs_emit = TRUE;
+ intel->i915_render_state.op = op;
+ intel->i915_render_state.needs_emit = TRUE;
return TRUE;
}
static void i915_emit_composite_setup(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- int op = pI830->i915_render_state.op;
- PicturePtr pSrcPicture = pI830->render_src_picture;
- PicturePtr pMaskPicture = pI830->render_mask_picture;
- PicturePtr pDstPicture = pI830->render_dst_picture;
- PixmapPtr pSrc = pI830->render_src;
- PixmapPtr pMask = pI830->render_mask;
- PixmapPtr pDst = pI830->render_dst;
- uint32_t dst_format = pI830->i915_render_state.dst_format, dst_pitch;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ int op = intel->i915_render_state.op;
+ PicturePtr pSrcPicture = intel->render_src_picture;
+ PicturePtr pMaskPicture = intel->render_mask_picture;
+ PicturePtr pDstPicture = intel->render_dst_picture;
+ PixmapPtr pSrc = intel->render_src;
+ PixmapPtr pMask = intel->render_mask;
+ PixmapPtr pDst = intel->render_dst;
+ uint32_t dst_format = intel->i915_render_state.dst_format, dst_pitch;
uint32_t blendctl;
int out_reg = FS_OC;
FS_LOCALS(20);
Bool is_affine_src, is_affine_mask;
- pI830->i915_render_state.needs_emit = FALSE;
+ intel->i915_render_state.needs_emit = FALSE;
IntelEmitInvarientState(pScrn);
- pI830->last_3d = LAST_3D_RENDER;
+ intel->last_3d = LAST_3D_RENDER;
dst_pitch = intel_get_pixmap_pitch(pDst);
- is_affine_src = i830_transform_is_affine(pI830->transform[0]);
- is_affine_mask = i830_transform_is_affine(pI830->transform[1]);
+ is_affine_src = i830_transform_is_affine(intel->transform[0]);
+ is_affine_mask = i830_transform_is_affine(intel->transform[1]);
if (pMask == NULL) {
BEGIN_BATCH(10);
OUT_BATCH(_3DSTATE_MAP_STATE | 3);
OUT_BATCH(0x00000001); /* map 0 */
OUT_RELOC_PIXMAP(pSrc, I915_GEM_DOMAIN_SAMPLER, 0, 0);
- OUT_BATCH(pI830->mapstate[1]);
- OUT_BATCH(pI830->mapstate[2]);
+ OUT_BATCH(intel->mapstate[1]);
+ OUT_BATCH(intel->mapstate[2]);
OUT_BATCH(_3DSTATE_SAMPLER_STATE | 3);
OUT_BATCH(0x00000001); /* sampler 0 */
- OUT_BATCH(pI830->samplerstate[0]);
- OUT_BATCH(pI830->samplerstate[1]);
- OUT_BATCH(pI830->samplerstate[2]);
+ OUT_BATCH(intel->samplerstate[0]);
+ OUT_BATCH(intel->samplerstate[1]);
+ OUT_BATCH(intel->samplerstate[2]);
ADVANCE_BATCH();
} else {
BEGIN_BATCH(16);
OUT_BATCH(_3DSTATE_MAP_STATE | 6);
OUT_BATCH(0x00000003); /* map 0,1 */
OUT_RELOC_PIXMAP(pSrc, I915_GEM_DOMAIN_SAMPLER, 0, 0);
- OUT_BATCH(pI830->mapstate[1]);
- OUT_BATCH(pI830->mapstate[2]);
+ OUT_BATCH(intel->mapstate[1]);
+ OUT_BATCH(intel->mapstate[2]);
OUT_RELOC_PIXMAP(pMask, I915_GEM_DOMAIN_SAMPLER, 0, 0);
- OUT_BATCH(pI830->mapstate[4]);
- OUT_BATCH(pI830->mapstate[5]);
+ OUT_BATCH(intel->mapstate[4]);
+ OUT_BATCH(intel->mapstate[5]);
OUT_BATCH(_3DSTATE_SAMPLER_STATE | 6);
OUT_BATCH(0x00000003); /* sampler 0,1 */
- OUT_BATCH(pI830->samplerstate[0]);
- OUT_BATCH(pI830->samplerstate[1]);
- OUT_BATCH(pI830->samplerstate[2]);
- OUT_BATCH(pI830->samplerstate[3]);
- OUT_BATCH(pI830->samplerstate[4]);
- OUT_BATCH(pI830->samplerstate[5]);
+ OUT_BATCH(intel->samplerstate[0]);
+ OUT_BATCH(intel->samplerstate[1]);
+ OUT_BATCH(intel->samplerstate[2]);
+ OUT_BATCH(intel->samplerstate[3]);
+ OUT_BATCH(intel->samplerstate[4]);
+ OUT_BATCH(intel->samplerstate[5]);
ADVANCE_BATCH();
}
{
@@ -571,7 +571,7 @@ i915_emit_composite_primitive(PixmapPtr pDst,
int dstX, int dstY, int w, int h)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
Bool is_affine_src, is_affine_mask = TRUE;
int per_vertex, num_floats;
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
@@ -579,27 +579,27 @@ i915_emit_composite_primitive(PixmapPtr pDst,
per_vertex = 2; /* dest x/y */
{
- float x = srcX + pI830->src_coord_adjust;
- float y = srcY + pI830->src_coord_adjust;
+ float x = srcX + intel->src_coord_adjust;
+ float y = srcY + intel->src_coord_adjust;
- is_affine_src = i830_transform_is_affine(pI830->transform[0]);
+ is_affine_src = i830_transform_is_affine(intel->transform[0]);
if (is_affine_src) {
if (!i830_get_transformed_coordinates(x, y,
- pI830->
+ intel->
transform[0],
&src_x[0],
&src_y[0]))
return;
if (!i830_get_transformed_coordinates(x, y + h,
- pI830->
+ intel->
transform[0],
&src_x[1],
&src_y[1]))
return;
if (!i830_get_transformed_coordinates(x + w, y + h,
- pI830->
+ intel->
transform[0],
&src_x[2],
&src_y[2]))
@@ -608,7 +608,7 @@ i915_emit_composite_primitive(PixmapPtr pDst,
per_vertex += 2; /* src x/y */
} else {
if (!i830_get_transformed_coordinates_3d(x, y,
- pI830->
+ intel->
transform[0],
&src_x[0],
&src_y[0],
@@ -616,7 +616,7 @@ i915_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x, y + h,
- pI830->
+ intel->
transform[0],
&src_x[1],
&src_y[1],
@@ -624,7 +624,7 @@ i915_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x + w, y + h,
- pI830->
+ intel->
transform[0],
&src_x[2],
&src_y[2],
@@ -635,28 +635,28 @@ i915_emit_composite_primitive(PixmapPtr pDst,
}
}
- if (pI830->render_mask) {
- float x = maskX + pI830->mask_coord_adjust;
- float y = maskY + pI830->mask_coord_adjust;
+ if (intel->render_mask) {
+ float x = maskX + intel->mask_coord_adjust;
+ float y = maskY + intel->mask_coord_adjust;
- is_affine_mask = i830_transform_is_affine(pI830->transform[1]);
+ is_affine_mask = i830_transform_is_affine(intel->transform[1]);
if (is_affine_mask) {
if (!i830_get_transformed_coordinates(x, y,
- pI830->
+ intel->
transform[1],
&mask_x[0],
&mask_y[0]))
return;
if (!i830_get_transformed_coordinates(x, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[1],
&mask_y[1]))
return;
if (!i830_get_transformed_coordinates(x + w, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[2],
&mask_y[2]))
@@ -665,7 +665,7 @@ i915_emit_composite_primitive(PixmapPtr pDst,
per_vertex += 2; /* mask x/y */
} else {
if (!i830_get_transformed_coordinates_3d(x, y,
- pI830->
+ intel->
transform[1],
&mask_x[0],
&mask_y[0],
@@ -673,7 +673,7 @@ i915_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[1],
&mask_y[1],
@@ -681,7 +681,7 @@ i915_emit_composite_primitive(PixmapPtr pDst,
return;
if (!i830_get_transformed_coordinates_3d(x + w, y + h,
- pI830->
+ intel->
transform[1],
&mask_x[2],
&mask_y[2],
@@ -697,51 +697,51 @@ i915_emit_composite_primitive(PixmapPtr pDst,
BEGIN_BATCH(1 + num_floats);
OUT_BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST | (num_floats - 1));
- OUT_BATCH_F(pI830->dst_coord_adjust + dstX + w);
- OUT_BATCH_F(pI830->dst_coord_adjust + dstY + h);
- OUT_BATCH_F(src_x[2] / pI830->scale_units[0][0]);
- OUT_BATCH_F(src_y[2] / pI830->scale_units[0][1]);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstX + w);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstY + h);
+ OUT_BATCH_F(src_x[2] / intel->scale_units[0][0]);
+ OUT_BATCH_F(src_y[2] / intel->scale_units[0][1]);
if (!is_affine_src) {
OUT_BATCH_F(0.0);
OUT_BATCH_F(src_w[2]);
}
- if (pI830->render_mask) {
- OUT_BATCH_F(mask_x[2] / pI830->scale_units[1][0]);
- OUT_BATCH_F(mask_y[2] / pI830->scale_units[1][1]);
+ if (intel->render_mask) {
+ OUT_BATCH_F(mask_x[2] / intel->scale_units[1][0]);
+ OUT_BATCH_F(mask_y[2] / intel->scale_units[1][1]);
if (!is_affine_mask) {
OUT_BATCH_F(0.0);
OUT_BATCH_F(mask_w[2]);
}
}
- OUT_BATCH_F(pI830->dst_coord_adjust + dstX);
- OUT_BATCH_F(pI830->dst_coord_adjust + dstY + h);
- OUT_BATCH_F(src_x[1] / pI830->scale_units[0][0]);
- OUT_BATCH_F(src_y[1] / pI830->scale_units[0][1]);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstX);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstY + h);
+ OUT_BATCH_F(src_x[1] / intel->scale_units[0][0]);
+ OUT_BATCH_F(src_y[1] / intel->scale_units[0][1]);
if (!is_affine_src) {
OUT_BATCH_F(0.0);
OUT_BATCH_F(src_w[1]);
}
- if (pI830->render_mask) {
- OUT_BATCH_F(mask_x[1] / pI830->scale_units[1][0]);
- OUT_BATCH_F(mask_y[1] / pI830->scale_units[1][1]);
+ if (intel->render_mask) {
+ OUT_BATCH_F(mask_x[1] / intel->scale_units[1][0]);
+ OUT_BATCH_F(mask_y[1] / intel->scale_units[1][1]);
if (!is_affine_mask) {
OUT_BATCH_F(0.0);
OUT_BATCH_F(mask_w[1]);
}
}
- OUT_BATCH_F(pI830->dst_coord_adjust + dstX);
- OUT_BATCH_F(pI830->dst_coord_adjust + dstY);
- OUT_BATCH_F(src_x[0] / pI830->scale_units[0][0]);
- OUT_BATCH_F(src_y[0] / pI830->scale_units[0][1]);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstX);
+ OUT_BATCH_F(intel->dst_coord_adjust + dstY);
+ OUT_BATCH_F(src_x[0] / intel->scale_units[0][0]);
+ OUT_BATCH_F(src_y[0] / intel->scale_units[0][1]);
if (!is_affine_src) {
OUT_BATCH_F(0.0);
OUT_BATCH_F(src_w[0]);
}
- if (pI830->render_mask) {
- OUT_BATCH_F(mask_x[0] / pI830->scale_units[1][0]);
- OUT_BATCH_F(mask_y[0] / pI830->scale_units[1][1]);
+ if (intel->render_mask) {
+ OUT_BATCH_F(mask_x[0] / intel->scale_units[1][0]);
+ OUT_BATCH_F(mask_y[0] / intel->scale_units[1][1]);
if (!is_affine_mask) {
OUT_BATCH_F(0.0);
OUT_BATCH_F(mask_w[0]);
@@ -756,11 +756,11 @@ i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
intel_batch_start_atomic(pScrn, 150);
- if (pI830->i915_render_state.needs_emit)
+ if (intel->i915_render_state.needs_emit)
i915_emit_composite_setup(pScrn);
i915_emit_composite_primitive(pDst, srcX, srcY, maskX, maskY, dstX,
@@ -771,7 +771,7 @@ i915_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
void i915_batch_flush_notify(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
- pI830->i915_render_state.needs_emit = TRUE;
+ intel->i915_render_state.needs_emit = TRUE;
}
diff --git a/src/i915_video.c b/src/i915_video.c
index 5911831..e2080e7 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -47,7 +47,7 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
short src_w, short src_h, short drw_w, short drw_h,
PixmapPtr pPixmap)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
uint32_t format, ms3, s5;
BoxPtr pbox = REGION_RECTS(dstRegion);
int nbox_total = REGION_NUM_RECTS(dstRegion);
@@ -65,14 +65,14 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
while (nbox_total) {
nbox_this_time = nbox_total;
- if (BYTES_FOR_BOXES(nbox_this_time) > BATCH_BYTES(pI830))
- nbox_this_time = BOXES_IN_BYTES(BATCH_BYTES(pI830));
+ if (BYTES_FOR_BOXES(nbox_this_time) > BATCH_BYTES(intel))
+ nbox_this_time = BOXES_IN_BYTES(BATCH_BYTES(intel));
nbox_total -= nbox_this_time;
intel_batch_start_atomic(pScrn, 200 + 20 * nbox_this_time);
IntelEmitInvarientState(pScrn);
- pI830->last_3d = LAST_3D_VIDEO;
+ intel->last_3d = LAST_3D_VIDEO;
BEGIN_BATCH(20);
@@ -105,7 +105,7 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH((1 << S4_POINT_WIDTH_SHIFT) | S4_LINE_WIDTH_ONE |
S4_CULLMODE_NONE | S4_VFMT_XY);
s5 = 0x0;
- if (pI830->cpp == 2)
+ if (intel->cpp == 2)
s5 |= S5_COLOR_DITHER_ENABLE;
OUT_BATCH(s5); /* S5 - enable bits */
OUT_BATCH((2 << S6_DEPTH_TEST_FUNC_SHIFT) |
@@ -117,7 +117,7 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH(0x00000000);
OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD);
- if (pI830->cpp == 2)
+ if (intel->cpp == 2)
format = COLR_BUF_RGB565;
else
format =
diff --git a/src/i965_hwmc.c b/src/i965_hwmc.c
index 3c10f4e..261a270 100644
--- a/src/i965_hwmc.c
+++ b/src/i965_hwmc.c
@@ -55,7 +55,7 @@ static int create_context(ScrnInfoPtr pScrn,
CARD32 ** private)
{
struct i965_xvmc_context *private_context, *context_dup;
- I830Ptr I830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
unsigned int blocknum =
(((context->width + 15) / 16) * ((context->height + 15) / 16));
@@ -71,9 +71,9 @@ static int create_context(ScrnInfoPtr pScrn,
return BadAlloc;
}
- private_context->is_g4x = IS_G4X(I830);
- private_context->is_965_q = IS_965_Q(I830);
- private_context->is_igdng = IS_IGDNG(I830);
+ private_context->is_g4x = IS_G4X(intel);
+ private_context->is_965_q = IS_965_Q(intel);
+ private_context->is_igdng = IS_IGDNG(intel);
private_context->comm.kernel_exec_fencing = 1;
private_context->comm.type = xvmc_driver->flag;
@@ -158,17 +158,17 @@ static int put_image(ScrnInfoPtr pScrn,
short height, Bool sync, RegionPtr clipBoxes, pointer data,
DrawablePtr pDraw)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
struct intel_xvmc_command *cmd = (struct intel_xvmc_command *)buf;
dri_bo *bo;
if (id == FOURCC_XVMC) {
- bo = intel_bo_gem_create_from_name(pI830->bufmgr, "surface",
+ bo = intel_bo_gem_create_from_name(intel->bufmgr, "surface",
cmd->handle);
dri_bo_pin(bo, 0x1000);
/* XXX: KMS */
#if 0
- buf = pI830->FbBase + bo->offset;
+ buf = intel->FbBase + bo->offset;
#endif
}
XvPutImage(pScrn, src_x, src_y, drw_x, drw_y, src_w, src_h,
diff --git a/src/i965_render.c b/src/i965_render.c
index 8fa3c0f..9f4b1c0 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -630,11 +630,11 @@ struct gen4_render_state {
static drm_intel_bo *gen4_create_sf_state(ScrnInfoPtr scrn,
drm_intel_bo * kernel_bo)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct brw_sf_unit_state *sf_state;
drm_intel_bo *sf_state_bo;
- sf_state_bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 SF state",
+ sf_state_bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 SF state",
sizeof(*sf_state), 4096);
drm_intel_bo_map(sf_state_bo, TRUE);
sf_state = sf_state_bo->virtual;
@@ -772,12 +772,12 @@ static drm_intel_bo *gen4_create_sampler_state(ScrnInfoPtr scrn,
mask_extend,
drm_intel_bo * border_color_bo)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *sampler_state_bo;
struct brw_sampler_state *sampler_state;
sampler_state_bo =
- drm_intel_bo_alloc(pI830->bufmgr, "gen4 sampler state",
+ drm_intel_bo_alloc(intel->bufmgr, "gen4 sampler state",
sizeof(struct brw_sampler_state) * 2, 4096);
drm_intel_bo_map(sampler_state_bo, TRUE);
sampler_state = sampler_state_bo->virtual;
@@ -840,11 +840,11 @@ static drm_intel_bo *gen4_create_wm_state(ScrnInfoPtr scrn,
drm_intel_bo * kernel_bo,
drm_intel_bo * sampler_bo)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct brw_wm_unit_state *wm_state;
drm_intel_bo *wm_state_bo;
- wm_state_bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 WM state",
+ wm_state_bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 WM state",
sizeof(*wm_state), 4096);
drm_intel_bo_map(wm_state_bo, TRUE);
wm_state = wm_state_bo->virtual;
@@ -872,7 +872,7 @@ static drm_intel_bo *gen4_create_wm_state(ScrnInfoPtr scrn,
wm_state->wm4.stats_enable = 1; /* statistic */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
wm_state->wm4.sampler_count = 0; /* hardware requirement */
else
wm_state->wm4.sampler_count = 1; /* 1-4 samplers used */
@@ -906,7 +906,7 @@ static drm_intel_bo *gen4_create_wm_state(ScrnInfoPtr scrn,
/* binding table entry count is only used for prefetching, and it has to
* be set 0 for IGDNG
*/
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
wm_state->thread1.binding_table_entry_count = 0;
drm_intel_bo_unmap(wm_state_bo);
@@ -916,14 +916,14 @@ static drm_intel_bo *gen4_create_wm_state(ScrnInfoPtr scrn,
static drm_intel_bo *gen4_create_cc_viewport(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bo;
struct brw_cc_viewport cc_viewport;
cc_viewport.min_depth = -1.e35;
cc_viewport.max_depth = 1.e35;
- bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 render unit state",
+ bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 render unit state",
sizeof(cc_viewport), 4096);
drm_intel_bo_subdata(bo, 0, sizeof(cc_viewport), &cc_viewport);
@@ -932,12 +932,12 @@ static drm_intel_bo *gen4_create_cc_viewport(ScrnInfoPtr scrn)
static drm_intel_bo *gen4_create_vs_unit_state(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct brw_vs_unit_state vs_state;
memset(&vs_state, 0, sizeof(vs_state));
/* Set up the vertex shader to be disabled (passthrough) */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
vs_state.thread4.nr_urb_entries = URB_VS_ENTRIES >> 2; /* hardware requirement */
else
vs_state.thread4.nr_urb_entries = URB_VS_ENTRIES;
@@ -955,14 +955,14 @@ static drm_intel_bo *gen4_create_vs_unit_state(ScrnInfoPtr scrn)
*/
static drm_intel_bo *gen4_create_cc_unit_state(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct gen4_cc_unit_state *cc_state;
drm_intel_bo *cc_state_bo, *cc_vp_bo;
int i, j;
cc_vp_bo = gen4_create_cc_viewport(scrn);
- cc_state_bo = drm_intel_bo_alloc(pI830->bufmgr, "gen4 CC state",
+ cc_state_bo = drm_intel_bo_alloc(intel->bufmgr, "gen4 CC state",
sizeof(*cc_state), 4096);
drm_intel_bo_map(cc_state_bo, TRUE);
cc_state = cc_state_bo->virtual;
@@ -1096,8 +1096,8 @@ i965_set_picture_surface_state(dri_bo * ss_bo, int ss_index,
static void i965_emit_composite_state(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state = pI830->gen4_render_state;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
int op = composite_op->op;
PicturePtr pMaskPicture = composite_op->mask_picture;
@@ -1120,7 +1120,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
render_state->needs_state_emit = FALSE;
IntelEmitInvarientState(pScrn);
- pI830->last_3d = LAST_3D_RENDER;
+ intel->last_3d = LAST_3D_RENDER;
urb_vs_start = 0;
urb_vs_size = URB_VS_ENTRIES * URB_VS_ENTRY_SIZE;
@@ -1148,13 +1148,13 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
ADVANCE_BATCH();
}
{
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
BEGIN_BATCH(14);
else
BEGIN_BATCH(12);
/* Match Mesa driver setup */
- if (IS_G4X(pI830) || IS_IGDNG(pI830))
+ if (IS_G4X(intel) || IS_IGDNG(intel))
OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
else
OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
@@ -1166,7 +1166,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
/* Zero out the two base address registers so all offsets are
* absolute.
*/
- if (IS_IGDNG(pI830)) {
+ if (IS_IGDNG(intel)) {
OUT_BATCH(BRW_STATE_BASE_ADDRESS | 6);
OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Generate state base address */
OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Surface state base address */
@@ -1200,7 +1200,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
BEGIN_BATCH(26);
/* Pipe control */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
pipe_ctrl = BRW_PIPE_CONTROL_NOWRITE;
else
pipe_ctrl =
@@ -1309,7 +1309,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
w_component = BRW_VFCOMPONENT_STORE_SRC;
}
- if (IS_IGDNG(pI830)) {
+ if (IS_IGDNG(intel)) {
BEGIN_BATCH(pMask ? 9 : 7);
/*
* The reason to add this extra vertex element in the header is that
@@ -1354,7 +1354,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
(BRW_SURFACEFORMAT_R32G32_FLOAT << VE0_FORMAT_SHIFT) |
(0 << VE0_OFFSET_SHIFT));
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC <<
VE1_VFCOMPONENT_0_SHIFT) |
(BRW_VFCOMPONENT_STORE_SRC <<
@@ -1376,7 +1376,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
/* u0, v0, w0 */
OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) | VE0_VALID | (src_format << VE0_FORMAT_SHIFT) | ((2 * 4) << VE0_OFFSET_SHIFT)); /* offset vb in bytes */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC <<
VE1_VFCOMPONENT_0_SHIFT) |
(BRW_VFCOMPONENT_STORE_SRC <<
@@ -1390,7 +1390,7 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
if (pMask) {
OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) | VE0_VALID | (src_format << VE0_FORMAT_SHIFT) | (((2 + selem) * 4) << VE0_OFFSET_SHIFT)); /* vb offset in bytes */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
OUT_BATCH((BRW_VFCOMPONENT_STORE_SRC <<
VE1_VFCOMPONENT_0_SHIFT) |
(BRW_VFCOMPONENT_STORE_SRC <<
@@ -1413,11 +1413,11 @@ static void i965_emit_composite_state(ScrnInfoPtr pScrn)
*/
static Bool i965_composite_check_aperture(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state = pI830->gen4_render_state;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
drm_intel_bo *bo_table[] = {
- pI830->batch_bo,
+ intel->batch_bo,
composite_op->binding_table_bo,
render_state->vertex_buffer_bo,
render_state->vs_state_bo,
@@ -1442,8 +1442,8 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
{
ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state = pI830->gen4_render_state;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ struct gen4_render_state *render_state = intel->gen4_render_state;
gen4_composite_op *composite_op = &render_state->composite_op;
uint32_t *binding_table;
drm_intel_bo *binding_table_bo, *surface_state_bo;
@@ -1472,7 +1472,7 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
}
/* Set up the surface states. */
- surface_state_bo = dri_bo_alloc(pI830->bufmgr, "surface_state",
+ surface_state_bo = dri_bo_alloc(intel->bufmgr, "surface_state",
3 * sizeof(brw_surface_state_padded),
4096);
if (dri_bo_map(surface_state_bo, 1) != 0) {
@@ -1493,7 +1493,7 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
dri_bo_unmap(surface_state_bo);
/* Set up the binding table of surface indices to surface state. */
- binding_table_bo = dri_bo_alloc(pI830->bufmgr, "binding_table",
+ binding_table_bo = dri_bo_alloc(intel->bufmgr, "binding_table",
3 * sizeof(uint32_t), 4096);
if (dri_bo_map(binding_table_bo, 1) != 0) {
dri_bo_unreference(binding_table_bo);
@@ -1544,22 +1544,22 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
composite_op->src_filter =
sampler_state_filter_from_picture(pSrcPicture->filter);
- pI830->scale_units[0][0] = pSrc->drawable.width;
- pI830->scale_units[0][1] = pSrc->drawable.height;
+ intel->scale_units[0][0] = pSrc->drawable.width;
+ intel->scale_units[0][1] = pSrc->drawable.height;
- pI830->transform[0] = pSrcPicture->transform;
- composite_op->is_affine = i830_transform_is_affine(pI830->transform[0]);
+ intel->transform[0] = pSrcPicture->transform;
+ composite_op->is_affine = i830_transform_is_affine(intel->transform[0]);
if (!pMask) {
- pI830->transform[1] = NULL;
- pI830->scale_units[1][0] = -1;
- pI830->scale_units[1][1] = -1;
+ intel->transform[1] = NULL;
+ intel->scale_units[1][0] = -1;
+ intel->scale_units[1][1] = -1;
} else {
- pI830->transform[1] = pMaskPicture->transform;
- pI830->scale_units[1][0] = pMask->drawable.width;
- pI830->scale_units[1][1] = pMask->drawable.height;
+ intel->transform[1] = pMaskPicture->transform;
+ intel->scale_units[1][0] = pMask->drawable.width;
+ intel->scale_units[1][1] = pMask->drawable.height;
composite_op->is_affine |=
- i830_transform_is_affine(pI830->transform[1]);
+ i830_transform_is_affine(intel->transform[1]);
}
if (pMask) {
@@ -1609,8 +1609,8 @@ i965_prepare_composite(int op, PicturePtr pSrcPicture,
static drm_intel_bo *i965_get_vb_space(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state = pI830->gen4_render_state;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ struct gen4_render_state *render_state = intel->gen4_render_state;
/* If the vertex buffer is too full, then we free the old and a new one
* gets made.
@@ -1624,7 +1624,7 @@ static drm_intel_bo *i965_get_vb_space(ScrnInfoPtr pScrn)
/* Alloc a new vertex buffer if necessary. */
if (render_state->vertex_buffer_bo == NULL) {
render_state->vertex_buffer_bo =
- drm_intel_bo_alloc(pI830->bufmgr, "vb",
+ drm_intel_bo_alloc(intel->bufmgr, "vb",
sizeof(gen4_vertex_buffer), 4096);
render_state->vb_offset = 0;
}
@@ -1638,8 +1638,8 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
int dstX, int dstY, int w, int h)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state = pI830->gen4_render_state;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ struct gen4_render_state *render_state = intel->gen4_render_state;
Bool has_mask;
float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3];
int i;
@@ -1649,70 +1649,70 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
if (is_affine) {
if (!i830_get_transformed_coordinates(srcX, srcY,
- pI830->transform[0],
+ intel->transform[0],
&src_x[0], &src_y[0]))
return;
if (!i830_get_transformed_coordinates(srcX, srcY + h,
- pI830->transform[0],
+ intel->transform[0],
&src_x[1], &src_y[1]))
return;
if (!i830_get_transformed_coordinates(srcX + w, srcY + h,
- pI830->transform[0],
+ intel->transform[0],
&src_x[2], &src_y[2]))
return;
} else {
if (!i830_get_transformed_coordinates_3d(srcX, srcY,
- pI830->transform[0],
+ intel->transform[0],
&src_x[0], &src_y[0],
&src_w[0]))
return;
if (!i830_get_transformed_coordinates_3d(srcX, srcY + h,
- pI830->transform[0],
+ intel->transform[0],
&src_x[1], &src_y[1],
&src_w[1]))
return;
if (!i830_get_transformed_coordinates_3d(srcX + w, srcY + h,
- pI830->transform[0],
+ intel->transform[0],
&src_x[2], &src_y[2],
&src_w[2]))
return;
}
- if (pI830->scale_units[1][0] == -1 || pI830->scale_units[1][1] == -1) {
+ if (intel->scale_units[1][0] == -1 || intel->scale_units[1][1] == -1) {
has_mask = FALSE;
} else {
has_mask = TRUE;
if (is_affine) {
if (!i830_get_transformed_coordinates(maskX, maskY,
- pI830->
+ intel->
transform[1],
&mask_x[0],
&mask_y[0]))
return;
if (!i830_get_transformed_coordinates(maskX, maskY + h,
- pI830->
+ intel->
transform[1],
&mask_x[1],
&mask_y[1]))
return;
if (!i830_get_transformed_coordinates
- (maskX + w, maskY + h, pI830->transform[1],
+ (maskX + w, maskY + h, intel->transform[1],
&mask_x[2], &mask_y[2]))
return;
} else {
if (!i830_get_transformed_coordinates_3d(maskX, maskY,
- pI830->
+ intel->
transform[1],
&mask_x[0],
&mask_y[0],
&mask_w[0]))
return;
if (!i830_get_transformed_coordinates_3d
- (maskX, maskY + h, pI830->transform[1], &mask_x[1],
+ (maskX, maskY + h, intel->transform[1], &mask_x[1],
&mask_y[1], &mask_w[1]))
return;
if (!i830_get_transformed_coordinates_3d
- (maskX + w, maskY + h, pI830->transform[1],
+ (maskX + w, maskY + h, intel->transform[1],
&mask_x[2], &mask_y[2], &mask_w[2]))
return;
}
@@ -1725,13 +1725,13 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
/* rect (x2,y2) */
vb[i++] = (float)(dstX + w);
vb[i++] = (float)(dstY + h);
- vb[i++] = src_x[2] / pI830->scale_units[0][0];
- vb[i++] = src_y[2] / pI830->scale_units[0][1];
+ vb[i++] = src_x[2] / intel->scale_units[0][0];
+ vb[i++] = src_y[2] / intel->scale_units[0][1];
if (!is_affine)
vb[i++] = src_w[2];
if (has_mask) {
- vb[i++] = mask_x[2] / pI830->scale_units[1][0];
- vb[i++] = mask_y[2] / pI830->scale_units[1][1];
+ vb[i++] = mask_x[2] / intel->scale_units[1][0];
+ vb[i++] = mask_y[2] / intel->scale_units[1][1];
if (!is_affine)
vb[i++] = mask_w[2];
}
@@ -1739,13 +1739,13 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
/* rect (x1,y2) */
vb[i++] = (float)dstX;
vb[i++] = (float)(dstY + h);
- vb[i++] = src_x[1] / pI830->scale_units[0][0];
- vb[i++] = src_y[1] / pI830->scale_units[0][1];
+ vb[i++] = src_x[1] / intel->scale_units[0][0];
+ vb[i++] = src_y[1] / intel->scale_units[0][1];
if (!is_affine)
vb[i++] = src_w[1];
if (has_mask) {
- vb[i++] = mask_x[1] / pI830->scale_units[1][0];
- vb[i++] = mask_y[1] / pI830->scale_units[1][1];
+ vb[i++] = mask_x[1] / intel->scale_units[1][0];
+ vb[i++] = mask_y[1] / intel->scale_units[1][1];
if (!is_affine)
vb[i++] = mask_w[1];
}
@@ -1753,13 +1753,13 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
/* rect (x1,y1) */
vb[i++] = (float)dstX;
vb[i++] = (float)dstY;
- vb[i++] = src_x[0] / pI830->scale_units[0][0];
- vb[i++] = src_y[0] / pI830->scale_units[0][1];
+ vb[i++] = src_x[0] / intel->scale_units[0][0];
+ vb[i++] = src_y[0] / intel->scale_units[0][1];
if (!is_affine)
vb[i++] = src_w[0];
if (has_mask) {
- vb[i++] = mask_x[0] / pI830->scale_units[1][0];
- vb[i++] = mask_y[0] / pI830->scale_units[1][1];
+ vb[i++] = mask_x[0] / intel->scale_units[1][0];
+ vb[i++] = mask_y[0] / intel->scale_units[1][1];
if (!is_affine)
vb[i++] = mask_w[0];
}
@@ -1783,7 +1783,7 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0,
render_state->vb_offset * 4);
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0,
render_state->vb_offset * 4 + i * 4);
else
@@ -1810,8 +1810,8 @@ i965_composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
void i965_batch_flush_notify(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state = pI830->gen4_render_state;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ struct gen4_render_state *render_state = intel->gen4_render_state;
/* Once a batch is emitted, we never want to map again any buffer
* object being referenced by that batch, (which would be very
@@ -1829,22 +1829,22 @@ void i965_batch_flush_notify(ScrnInfoPtr pScrn)
*/
void gen4_render_state_init(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
struct gen4_render_state *render_state;
int i, j, k, l, m;
drm_intel_bo *sf_kernel_bo, *sf_kernel_mask_bo;
drm_intel_bo *border_color_bo;
- if (pI830->gen4_render_state == NULL)
- pI830->gen4_render_state = calloc(sizeof(*render_state), 1);
+ if (intel->gen4_render_state == NULL)
+ intel->gen4_render_state = calloc(sizeof(*render_state), 1);
- render_state = pI830->gen4_render_state;
+ render_state = intel->gen4_render_state;
render_state->vb_offset = 0;
render_state->vs_state_bo = gen4_create_vs_unit_state(pScrn);
/* Set up the two SF states (one for blending with a mask, one without) */
- if (IS_IGDNG(pI830)) {
+ if (IS_IGDNG(intel)) {
sf_kernel_bo = intel_bo_alloc_for_data(pScrn,
sf_kernel_static_gen5,
sizeof
@@ -1872,7 +1872,7 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
drm_intel_bo_unreference(sf_kernel_mask_bo);
for (m = 0; m < WM_KERNEL_COUNT; m++) {
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
render_state->wm_kernel_bo[m] =
intel_bo_alloc_for_data(pScrn,
wm_kernels_gen5[m].data,
@@ -1903,7 +1903,7 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
border_color_bo);
for (m = 0; m < WM_KERNEL_COUNT; m++) {
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
render_state->
wm_state_bo[m][i][j]
[k][l] =
@@ -1947,8 +1947,8 @@ void gen4_render_state_init(ScrnInfoPtr pScrn)
*/
void gen4_render_state_cleanup(ScrnInfoPtr pScrn)
{
- I830Ptr pI830 = I830PTR(pScrn);
- struct gen4_render_state *render_state = pI830->gen4_render_state;
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
+ struct gen4_render_state *render_state = intel->gen4_render_state;
int i, j, k, l, m;
gen4_composite_op *composite_op = &render_state->composite_op;
@@ -1975,6 +1975,6 @@ void gen4_render_state_cleanup(ScrnInfoPtr pScrn)
drm_intel_bo_unreference(render_state->cc_state_bo);
drm_intel_bo_unreference(render_state->sip_kernel_bo);
- free(pI830->gen4_render_state);
- pI830->gen4_render_state = NULL;
+ free(intel->gen4_render_state);
+ intel->gen4_render_state = NULL;
}
diff --git a/src/i965_video.c b/src/i965_video.c
index 881554c..b35979b 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -157,7 +157,7 @@ static struct {
static void brw_debug(ScrnInfoPtr pScrn, char *when)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int i;
uint32_t v;
@@ -178,7 +178,7 @@ static void brw_debug(ScrnInfoPtr pScrn, char *when)
static void i965_pre_draw_debug(ScrnInfoPtr scrn)
{
#if 0
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
#endif
#if 0
@@ -229,7 +229,7 @@ static void i965_pre_draw_debug(ScrnInfoPtr scrn)
static void i965_post_draw_debug(ScrnInfoPtr scrn)
{
#if 0
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
#endif
#if 0
@@ -340,12 +340,12 @@ static void i965_post_draw_debug(ScrnInfoPtr scrn)
#define URB_CS_ENTRY_SIZE 0
static int
-intel_alloc_and_map(I830Ptr i830, char *name, int size,
+intel_alloc_and_map(intel_screen_private *intel, char *name, int size,
drm_intel_bo ** bop, void *virtualp)
{
drm_intel_bo *bo;
- bo = drm_intel_bo_alloc(i830->bufmgr, name, size, 4096);
+ bo = drm_intel_bo_alloc(intel->bufmgr, name, size, 4096);
if (!bo)
return -1;
if (drm_intel_bo_map(bo, TRUE) != 0) {
@@ -361,19 +361,19 @@ intel_alloc_and_map(I830Ptr i830, char *name, int size,
static drm_intel_bo *i965_create_dst_surface_state(ScrnInfoPtr scrn,
PixmapPtr pixmap)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
struct brw_surface_state *dest_surf_state;
drm_intel_bo *pixmap_bo = i830_get_pixmap_bo(pixmap);
drm_intel_bo *surf_bo;
- if (intel_alloc_and_map(pI830, "textured video surface state", 4096,
+ if (intel_alloc_and_map(intel, "textured video surface state", 4096,
&surf_bo, &dest_surf_state) != 0)
return NULL;
dest_surf_state->ss0.surface_type = BRW_SURFACE_2D;
dest_surf_state->ss0.data_return_format =
BRW_SURFACERETURNFORMAT_FLOAT32;
- if (pI830->cpp == 2) {
+ if (intel->cpp == 2) {
dest_surf_state->ss0.surface_format =
BRW_SURFACEFORMAT_B5G6R5_UNORM;
} else {
@@ -414,11 +414,11 @@ static drm_intel_bo *i965_create_src_surface_state(ScrnInfoPtr scrn,
int src_pitch,
uint32_t src_surf_format)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *surface_bo;
struct brw_surface_state *src_surf_state;
- if (intel_alloc_and_map(pI830, "textured video surface state", 4096,
+ if (intel_alloc_and_map(intel, "textured video surface state", 4096,
&surface_bo, &src_surf_state) != 0)
return NULL;
@@ -459,14 +459,14 @@ static drm_intel_bo *i965_create_binding_table(ScrnInfoPtr scrn,
drm_intel_bo ** surf_bos,
int n_surf)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *bind_bo;
uint32_t *binding_table;
int i;
/* Set up a binding table for our surfaces. Only the PS will use it */
- if (intel_alloc_and_map(pI830, "textured video binding table", 4096,
+ if (intel_alloc_and_map(intel, "textured video binding table", 4096,
&bind_bo, &binding_table) != 0)
return NULL;
@@ -481,11 +481,11 @@ static drm_intel_bo *i965_create_binding_table(ScrnInfoPtr scrn,
static drm_intel_bo *i965_create_sampler_state(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *sampler_bo;
struct brw_sampler_state *sampler_state;
- if (intel_alloc_and_map(pI830, "textured video sampler state", 4096,
+ if (intel_alloc_and_map(intel, "textured video sampler state", 4096,
&sampler_bo, &sampler_state) != 0)
return NULL;
@@ -501,16 +501,16 @@ static drm_intel_bo *i965_create_sampler_state(ScrnInfoPtr scrn)
static drm_intel_bo *i965_create_vs_state(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *vs_bo;
struct brw_vs_unit_state *vs_state;
- if (intel_alloc_and_map(pI830, "textured video vs state", 4096,
+ if (intel_alloc_and_map(intel, "textured video vs state", 4096,
&vs_bo, &vs_state) != 0)
return NULL;
/* Set up the vertex shader to be disabled (passthrough) */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
vs_state->thread4.nr_urb_entries = URB_VS_ENTRIES >> 2;
else
vs_state->thread4.nr_urb_entries = URB_VS_ENTRIES;
@@ -526,10 +526,10 @@ static drm_intel_bo *i965_create_program(ScrnInfoPtr scrn,
const uint32_t * program,
unsigned int program_size)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *prog_bo;
- prog_bo = drm_intel_bo_alloc(pI830->bufmgr, "textured video program",
+ prog_bo = drm_intel_bo_alloc(intel->bufmgr, "textured video program",
program_size, 4096);
if (!prog_bo)
return NULL;
@@ -541,11 +541,11 @@ static drm_intel_bo *i965_create_program(ScrnInfoPtr scrn,
static drm_intel_bo *i965_create_sf_state(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *sf_bo, *kernel_bo;
struct brw_sf_unit_state *sf_state;
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
kernel_bo =
i965_create_program(scrn, &sf_kernel_static_gen5[0][0],
sizeof(sf_kernel_static_gen5));
@@ -556,7 +556,7 @@ static drm_intel_bo *i965_create_sf_state(ScrnInfoPtr scrn)
if (!kernel_bo)
return NULL;
- if (intel_alloc_and_map(pI830, "textured video sf state", 4096,
+ if (intel_alloc_and_map(intel, "textured video sf state", 4096,
&sf_bo, &sf_state) != 0) {
drm_intel_bo_unreference(kernel_bo);
return NULL;
@@ -605,12 +605,12 @@ static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
drm_intel_bo * sampler_bo,
Bool is_packed)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *wm_bo, *kernel_bo;
struct brw_wm_unit_state *wm_state;
if (is_packed) {
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
kernel_bo =
i965_create_program(scrn,
&ps_kernel_packed_static_gen5[0]
@@ -624,7 +624,7 @@ static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
sizeof
(ps_kernel_packed_static));
} else {
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
kernel_bo =
i965_create_program(scrn,
&ps_kernel_planar_static_gen5[0]
@@ -642,7 +642,7 @@ static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
return NULL;
if (intel_alloc_and_map
- (pI830, "textured video wm state", sizeof(*wm_state), &wm_bo,
+ (intel, "textured video wm state", sizeof(*wm_state), &wm_bo,
&wm_state)) {
drm_intel_bo_unreference(kernel_bo);
return NULL;
@@ -662,7 +662,7 @@ static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
/* binding table entry count is only used for prefetching, and it has to
* be set 0 for IGDNG
*/
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
wm_state->thread1.binding_table_entry_count = 0;
/* Though we never use the scratch space in our WM kernel, it has to be
@@ -680,7 +680,7 @@ static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
intel_emit_reloc(wm_bo, offsetof(struct brw_wm_unit_state, wm4),
sampler_bo, 0,
I915_GEM_DOMAIN_INSTRUCTION, 0) >> 5;
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
wm_state->wm4.sampler_count = 0;
else
wm_state->wm4.sampler_count = 1; /* 1-4 samplers used */
@@ -698,11 +698,11 @@ static drm_intel_bo *i965_create_wm_state(ScrnInfoPtr scrn,
static drm_intel_bo *i965_create_cc_vp_state(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *cc_vp_bo;
struct brw_cc_viewport *cc_viewport;
- if (intel_alloc_and_map(pI830, "textured video cc viewport", 4096,
+ if (intel_alloc_and_map(intel, "textured video cc viewport", 4096,
&cc_vp_bo, &cc_viewport) != 0)
return NULL;
@@ -715,7 +715,7 @@ static drm_intel_bo *i965_create_cc_vp_state(ScrnInfoPtr scrn)
static drm_intel_bo *i965_create_cc_state(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
drm_intel_bo *cc_bo, *cc_vp_bo;
struct brw_cc_unit_state *cc_state;
@@ -724,7 +724,7 @@ static drm_intel_bo *i965_create_cc_state(ScrnInfoPtr scrn)
return NULL;
if (intel_alloc_and_map
- (pI830, "textured video cc state", sizeof(*cc_state), &cc_bo,
+ (intel, "textured video cc state", sizeof(*cc_state), &cc_bo,
&cc_state) != 0) {
drm_intel_bo_unreference(cc_vp_bo);
return NULL;
@@ -757,7 +757,7 @@ static drm_intel_bo *i965_create_cc_state(ScrnInfoPtr scrn)
static void
i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
int urb_vs_start, urb_vs_size;
int urb_gs_start, urb_gs_size;
int urb_clip_start, urb_clip_size;
@@ -766,7 +766,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
int pipe_ctl;
IntelEmitInvarientState(pScrn);
- pI830->last_3d = LAST_3D_VIDEO;
+ intel->last_3d = LAST_3D_VIDEO;
urb_vs_start = 0;
urb_vs_size = URB_VS_ENTRIES * URB_VS_ENTRY_SIZE;
@@ -787,12 +787,12 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
ADVANCE_BATCH();
/* brw_debug (pScrn, "before base address modify"); */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
BEGIN_BATCH(14);
else
BEGIN_BATCH(12);
/* Match Mesa driver setup */
- if (IS_G4X(pI830) || IS_IGDNG(pI830))
+ if (IS_G4X(intel) || IS_IGDNG(intel))
OUT_BATCH(NEW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
else
OUT_BATCH(BRW_PIPELINE_SELECT | PIPELINE_SELECT_3D);
@@ -805,7 +805,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
/* Zero out the two base address registers so all offsets are
* absolute
*/
- if (IS_IGDNG(pI830)) {
+ if (IS_IGDNG(intel)) {
OUT_BATCH(BRW_STATE_BASE_ADDRESS | 6);
OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Generate state base address */
OUT_BATCH(0 | BASE_ADDRESS_MODIFY); /* Surface state base address */
@@ -831,7 +831,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
/* Set system instruction pointer */
OUT_BATCH(BRW_STATE_SIP | 0);
/* system instruction pointer */
- OUT_RELOC(pI830->video.gen4_sip_kernel_bo,
+ OUT_RELOC(intel->video.gen4_sip_kernel_bo,
I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
OUT_BATCH(MI_NOOP);
@@ -839,7 +839,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
/* brw_debug (pScrn, "after base address modify"); */
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
pipe_ctl = BRW_PIPE_CONTROL_NOWRITE;
else
pipe_ctl = BRW_PIPE_CONTROL_NOWRITE | BRW_PIPE_CONTROL_IS_FLUSH;
@@ -885,19 +885,19 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
/* Set the pointers to the 3d pipeline state */
OUT_BATCH(BRW_3DSTATE_PIPELINED_POINTERS | 5);
- OUT_RELOC(pI830->video.gen4_vs_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+ OUT_RELOC(intel->video.gen4_vs_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
/* disable GS, resulting in passthrough */
OUT_BATCH(BRW_GS_DISABLE);
/* disable CLIP, resulting in passthrough */
OUT_BATCH(BRW_CLIP_DISABLE);
- OUT_RELOC(pI830->video.gen4_sf_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+ OUT_RELOC(intel->video.gen4_sf_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
if (n_src_surf == 1)
- OUT_RELOC(pI830->video.gen4_wm_packed_bo,
+ OUT_RELOC(intel->video.gen4_wm_packed_bo,
I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
else
- OUT_RELOC(pI830->video.gen4_wm_planar_bo,
+ OUT_RELOC(intel->video.gen4_wm_planar_bo,
I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
- OUT_RELOC(pI830->video.gen4_cc_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
+ OUT_RELOC(intel->video.gen4_cc_bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
/* URB fence */
OUT_BATCH(BRW_URB_FENCE |
@@ -916,7 +916,7 @@ i965_emit_video_setup(ScrnInfoPtr pScrn, drm_intel_bo * bind_bo, int n_src_surf)
/* Set up our vertex elements, sourced from the single vertex buffer. */
- if (IS_IGDNG(pI830)) {
+ if (IS_IGDNG(intel)) {
OUT_BATCH(BRW_3DSTATE_VERTEX_ELEMENTS | 3);
/* offset 0: X,Y -> {X, Y, 1.0, 1.0} */
OUT_BATCH((0 << VE0_VERTEX_BUFFER_INDEX_SHIFT) |
@@ -984,7 +984,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
short src_w, short src_h,
short drw_w, short drw_h, PixmapPtr pPixmap)
{
- I830Ptr pI830 = I830PTR(pScrn);
+ intel_screen_private *intel = intel_get_screen_private(pScrn);
BoxPtr pbox;
int nbox, dxo, dyo, pix_xoff, pix_yoff;
float src_scale_x, src_scale_y;
@@ -1087,55 +1087,55 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
if (!bind_bo)
return;
- if (pI830->video.gen4_sampler_bo == NULL)
- pI830->video.gen4_sampler_bo = i965_create_sampler_state(pScrn);
- if (pI830->video.gen4_sip_kernel_bo == NULL) {
- pI830->video.gen4_sip_kernel_bo =
+ if (intel->video.gen4_sampler_bo == NULL)
+ intel->video.gen4_sampler_bo = i965_create_sampler_state(pScrn);
+ if (intel->video.gen4_sip_kernel_bo == NULL) {
+ intel->video.gen4_sip_kernel_bo =
i965_create_program(pScrn, &sip_kernel_static[0][0],
sizeof(sip_kernel_static));
- if (!pI830->video.gen4_sip_kernel_bo) {
+ if (!intel->video.gen4_sip_kernel_bo) {
drm_intel_bo_unreference(bind_bo);
return;
}
}
- if (pI830->video.gen4_vs_bo == NULL) {
- pI830->video.gen4_vs_bo = i965_create_vs_state(pScrn);
- if (!pI830->video.gen4_vs_bo) {
+ if (intel->video.gen4_vs_bo == NULL) {
+ intel->video.gen4_vs_bo = i965_create_vs_state(pScrn);
+ if (!intel->video.gen4_vs_bo) {
drm_intel_bo_unreference(bind_bo);
return;
}
}
- if (pI830->video.gen4_sf_bo == NULL) {
- pI830->video.gen4_sf_bo = i965_create_sf_state(pScrn);
- if (!pI830->video.gen4_sf_bo) {
+ if (intel->video.gen4_sf_bo == NULL) {
+ intel->video.gen4_sf_bo = i965_create_sf_state(pScrn);
+ if (!intel->video.gen4_sf_bo) {
drm_intel_bo_unreference(bind_bo);
return;
}
}
- if (pI830->video.gen4_wm_packed_bo == NULL) {
- pI830->video.gen4_wm_packed_bo =
- i965_create_wm_state(pScrn, pI830->video.gen4_sampler_bo,
+ if (intel->video.gen4_wm_packed_bo == NULL) {
+ intel->video.gen4_wm_packed_bo =
+ i965_create_wm_state(pScrn, intel->video.gen4_sampler_bo,
TRUE);
- if (!pI830->video.gen4_wm_packed_bo) {
+ if (!intel->video.gen4_wm_packed_bo) {
drm_intel_bo_unreference(bind_bo);
return;
}
}
- if (pI830->video.gen4_wm_planar_bo == NULL) {
- pI830->video.gen4_wm_planar_bo =
- i965_create_wm_state(pScrn, pI830->video.gen4_sampler_bo,
+ if (intel->video.gen4_wm_planar_bo == NULL) {
+ intel->video.gen4_wm_planar_bo =
+ i965_create_wm_state(pScrn, intel->video.gen4_sampler_bo,
FALSE);
- if (!pI830->video.gen4_wm_planar_bo) {
+ if (!intel->video.gen4_wm_planar_bo) {
drm_intel_bo_unreference(bind_bo);
return;
}
}
- if (pI830->video.gen4_cc_bo == NULL) {
- pI830->video.gen4_cc_bo = i965_create_cc_state(pScrn);
- if (!pI830->video.gen4_cc_bo) {
+ if (intel->video.gen4_cc_bo == NULL) {
+ intel->video.gen4_cc_bo = i965_create_cc_state(pScrn);
+ if (!intel->video.gen4_cc_bo) {
drm_intel_bo_unreference(bind_bo);
return;
}
@@ -1171,20 +1171,20 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
float *vb;
drm_intel_bo *bo_table[] = {
NULL, /* vb_bo */
- pI830->batch_bo,
+ intel->batch_bo,
bind_bo,
- pI830->video.gen4_sampler_bo,
- pI830->video.gen4_sip_kernel_bo,
- pI830->video.gen4_vs_bo,
- pI830->video.gen4_sf_bo,
- pI830->video.gen4_wm_packed_bo,
- pI830->video.gen4_wm_planar_bo,
- pI830->video.gen4_cc_bo,
+ intel->video.gen4_sampler_bo,
+ intel->video.gen4_sip_kernel_bo,
+ intel->video.gen4_vs_bo,
+ intel->video.gen4_sf_bo,
+ intel->video.gen4_wm_packed_bo,
+ intel->video.gen4_wm_planar_bo,
+ intel->video.gen4_cc_bo,
};
pbox++;
- if (intel_alloc_and_map(pI830, "textured video vb", 4096,
+ if (intel_alloc_and_map(intel, "textured video vb", 4096,
&vb_bo, &vb) != 0)
break;
bo_table[0] = vb_bo;
@@ -1207,7 +1207,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
drm_intel_bo_unmap(vb_bo);
- if (!IS_IGDNG(pI830))
+ if (!IS_IGDNG(intel))
i965_pre_draw_debug(pScrn);
/* If this command won't fit in the current batch, flush.
@@ -1230,7 +1230,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
OUT_BATCH((0 << VB0_BUFFER_INDEX_SHIFT) |
VB0_VERTEXDATA | ((4 * 4) << VB0_BUFFER_PITCH_SHIFT));
OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0, 0);
- if (IS_IGDNG(pI830))
+ if (IS_IGDNG(intel))
OUT_RELOC(vb_bo, I915_GEM_DOMAIN_VERTEX, 0,
(vb_bo->offset + i) * 4);
else
@@ -1251,7 +1251,7 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
drm_intel_bo_unreference(vb_bo);
- if (!IS_IGDNG(pI830))
+ if (!IS_IGDNG(intel))
i965_post_draw_debug(pScrn);
}
@@ -1266,22 +1266,22 @@ I965DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id,
void i965_free_video(ScrnInfoPtr scrn)
{
- I830Ptr pI830 = I830PTR(scrn);
-
- drm_intel_bo_unreference(pI830->video.gen4_vs_bo);
- pI830->video.gen4_vs_bo = NULL;
- drm_intel_bo_unreference(pI830->video.gen4_sf_bo);
- pI830->video.gen4_sf_bo = NULL;
- drm_intel_bo_unreference(pI830->video.gen4_cc_bo);
- pI830->video.gen4_cc_bo = NULL;
- drm_intel_bo_unreference(pI830->video.gen4_wm_packed_bo);
- pI830->video.gen4_wm_packed_bo = NULL;
- drm_intel_bo_unreference(pI830->video.gen4_wm_planar_bo);
- pI830->video.gen4_wm_planar_bo = NULL;
- drm_intel_bo_unreference(pI830->video.gen4_cc_vp_bo);
- pI830->video.gen4_cc_vp_bo = NULL;
- drm_intel_bo_unreference(pI830->video.gen4_sampler_bo);
- pI830->video.gen4_sampler_bo = NULL;
- drm_intel_bo_unreference(pI830->video.gen4_sip_kernel_bo);
- pI830->video.gen4_sip_kernel_bo = NULL;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+
+ drm_intel_bo_unreference(intel->video.gen4_vs_bo);
+ intel->video.gen4_vs_bo = NULL;
+ drm_intel_bo_unreference(intel->video.gen4_sf_bo);
+ intel->video.gen4_sf_bo = NULL;
+ drm_intel_bo_unreference(intel->video.gen4_cc_bo);
+ intel->video.gen4_cc_bo = NULL;
+ drm_intel_bo_unreference(intel->video.gen4_wm_packed_bo);
+ intel->video.gen4_wm_packed_bo = NULL;
+ drm_intel_bo_unreference(intel->video.gen4_wm_planar_bo);
+ intel->video.gen4_wm_planar_bo = NULL;
+ drm_intel_bo_unreference(intel->video.gen4_cc_vp_bo);
+ intel->video.gen4_cc_vp_bo = NULL;
+ drm_intel_bo_unreference(intel->video.gen4_sampler_bo);
+ intel->video.gen4_sampler_bo = NULL;
+ drm_intel_bo_unreference(intel->video.gen4_sip_kernel_bo);
+ intel->video.gen4_sip_kernel_bo = NULL;
}
More information about the xorg-commit
mailing list