xf86-video-intel: 7 commits - src/intel_display.c src/intel_driver.c src/intel.h src/intel_uxa.c
Chris Wilson
ickle at kemper.freedesktop.org
Sat Jan 8 11:51:26 PST 2011
src/intel.h | 56 ---------
src/intel_display.c | 17 +-
src/intel_driver.c | 313 +++++++++++++++-------------------------------------
src/intel_uxa.c | 1
4 files changed, 103 insertions(+), 284 deletions(-)
New commits:
commit fd9235ebe03a01982238cdd6e8b55f613e14b6af
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 17 00:58:36 2010 +0000
Delete unused memory allocation flags.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel.h b/src/intel.h
index 46e6758..e7c47db 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -639,11 +639,6 @@ static inline drm_intel_bo *intel_bo_alloc_for_data(ScrnInfoPtr scrn,
return bo;
}
-/* Flags for memory allocation function */
-#define NEED_PHYSICAL_ADDR 0x00000001
-#define ALLOW_SHARING 0x00000010
-#define DISABLE_REUSE 0x00000020
-
void intel_debug_flush(ScrnInfoPtr scrn);
static inline PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
commit 03248a798409ca4dd1caf5e25a3d5f5a80173260
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 17 00:57:01 2010 +0000
Cache the fixed crtc<->pipe relationship
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel.h b/src/intel.h
index fff0fbb..46e6758 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -500,11 +500,7 @@ void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
unsigned int tv_usec, void *user_data);
extern Bool intel_crtc_on(xf86CrtcPtr crtc);
-static inline int intel_crtc_to_pipe(xf86CrtcPtr crtc)
-{
- intel_screen_private *intel = intel_get_screen_private(crtc->scrn);
- return intel_get_pipe_from_crtc_id(intel->bufmgr, crtc);
-}
+int intel_crtc_to_pipe(xf86CrtcPtr crtc);
/* intel_memory.c */
unsigned long intel_get_fence_size(intel_screen_private *intel, unsigned long size);
diff --git a/src/intel_display.c b/src/intel_display.c
index 1198013..e3d783c 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -70,6 +70,7 @@ struct intel_crtc {
struct intel_mode *mode;
drmModeModeInfo kmode;
drmModeCrtcPtr mode_crtc;
+ int pipe;
dri_bo *cursor;
dri_bo *rotate_bo;
uint32_t rotate_pitch;
@@ -678,6 +679,9 @@ intel_crtc_init(ScrnInfoPtr scrn, struct intel_mode *mode, int num)
intel_crtc->mode = mode;
crtc->driver_private = intel_crtc;
+ intel_crtc->pipe = drm_intel_get_pipe_from_crtc_id(intel->bufmgr,
+ crtc_id(intel_crtc));
+
intel_crtc->cursor = drm_intel_bo_alloc(intel->bufmgr, "ARGB cursor",
HWCURSOR_SIZE_ARGB,
GTT_PAGE_SIZE);
@@ -1671,16 +1675,15 @@ intel_mode_fini(intel_screen_private *intel)
intel->modes = NULL;
}
-int
-intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc)
-{
- return drm_intel_get_pipe_from_crtc_id(bufmgr,
- crtc_id(crtc->driver_private));
-}
-
/* for the mode overlay */
int
intel_crtc_id(xf86CrtcPtr crtc)
{
return crtc_id(crtc->driver_private);
}
+
+int intel_crtc_to_pipe(xf86CrtcPtr crtc)
+{
+ struct intel_crtc *intel_crtc = crtc->driver_private;
+ return intel_crtc->pipe;
+}
commit 00a2aee38dc5cbbd4907a593fa8d617f5a20292e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 17 00:50:33 2010 +0000
Remove unused I830Output
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel.h b/src/intel.h
index fc0b6d5..fff0fbb 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -227,8 +227,6 @@ static inline Bool intel_pixmap_tiled(PixmapPtr pixmap)
dri_bo *intel_get_pixmap_bo(PixmapPtr pixmap);
void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo);
-typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
-
#include "common.h"
#ifdef XvMCExtension
commit a851879695c48e88d421b053a78f867d9902273f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 17 00:48:26 2010 +0000
Remove bitrotted, but fortunately unused, I830CrtcPrivate
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel.h b/src/intel.h
index b6e8bde..fc0b6d5 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -239,22 +239,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
#define PITCH_NONE 0
-typedef struct _I830CrtcPrivateRec {
- int pipe;
- int plane;
-
- Bool enabled;
-
- int dpms_mode;
-
- int x, y;
-
- /* Lookup table values to be set when the CRTC is enabled */
- uint8_t lut_r[256], lut_g[256], lut_b[256];
-} I830CrtcPrivateRec, *I830CrtcPrivatePtr;
-
-#define I830CrtcPrivate(c) ((I830CrtcPrivatePtr) (c)->driver_private)
-
/** enumeration of 3d consumers so some can maintain invariant state. */
enum last_3d {
LAST_3D_OTHER,
@@ -510,8 +494,6 @@ extern void I830InitVideo(ScreenPtr pScreen);
extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
xf86CrtcPtr desired, BoxPtr crtc_box_ret);
-extern xf86CrtcPtr intel_pipe_to_crtc(ScrnInfoPtr scrn, int pipe);
-
Bool I830DRI2ScreenInit(ScreenPtr pScreen);
void I830DRI2CloseScreen(ScreenPtr pScreen);
void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 803cf61..2cd5f1f 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -166,14 +166,6 @@ I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices,
for (p = 0; p < xf86_config->num_crtc; p++) {
xf86CrtcPtr crtc = xf86_config->crtc[p];
- I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-
- /* Initialize to the old lookup table values. */
- for (i = 0; i < 256; i++) {
- lut_r[i] = intel_crtc->lut_r[i] << 8;
- lut_g[i] = intel_crtc->lut_g[i] << 8;
- lut_b[i] = intel_crtc->lut_b[i] << 8;
- }
switch (scrn->depth) {
case 15:
@@ -1277,22 +1269,6 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
return TRUE;
}
-xf86CrtcPtr intel_pipe_to_crtc(ScrnInfoPtr scrn, int pipe)
-{
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
- int c;
-
- for (c = 0; c < config->num_crtc; c++) {
- xf86CrtcPtr crtc = config->crtc[c];
- I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-
- if (intel_crtc->pipe == pipe)
- return crtc;
- }
-
- return NULL;
-}
-
void intel_init_scrn(ScrnInfoPtr scrn)
{
scrn->PreInit = I830PreInit;
commit f8a5d7737e014e99943b947d088a4f9f1b465d46
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 17 00:37:47 2010 +0000
Delete some dead code
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_driver.c b/src/intel_driver.c
index f946981..803cf61 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -37,10 +37,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "config.h"
#endif
-#ifndef PRINT_MODE_INFO
-#define PRINT_MODE_INFO 0
-#endif
-
#include <assert.h>
#include <string.h>
#include <stdio.h>
@@ -80,10 +76,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "i915_drm.h"
#include <xf86drmMode.h>
-#define BIT(x) (1 << (x))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define NB_OF(x) (sizeof (x) / sizeof (*x))
-
/* *INDENT-OFF* */
/*
* Note: "ColorKey" is provided for compatibility with the i810 driver.
@@ -607,12 +599,9 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
intel->tiling = TRUE;
/* Allow user override if they set a value */
- if (!ALWAYS_TILING(intel) && xf86IsOptionSet(intel->Options, OPTION_TILING)) {
- if (xf86ReturnOptValBool(intel->Options, OPTION_TILING, FALSE))
- intel->tiling = TRUE;
- else
- intel->tiling = FALSE;
- }
+ if (!ALWAYS_TILING(intel))
+ intel->tiling = xf86ReturnOptValBool(intel->Options,
+ OPTION_TILING, TRUE);
intel->can_blt = can_accelerate_blt(intel);
intel->use_shadow = !intel->can_blt;
@@ -631,19 +620,11 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
}
/* SwapBuffers delays to avoid tearing */
- intel->swapbuffers_wait = TRUE;
-
- /* Allow user override if they set a value */
- if (xf86IsOptionSet(intel->Options, OPTION_SWAPBUFFERS_WAIT)) {
- if (xf86ReturnOptValBool
- (intel->Options, OPTION_SWAPBUFFERS_WAIT, FALSE))
- intel->swapbuffers_wait = TRUE;
- else
- intel->swapbuffers_wait = FALSE;
- }
-
+ intel->swapbuffers_wait = xf86ReturnOptValBool(intel->Options,
+ OPTION_SWAPBUFFERS_WAIT,
+ TRUE);
if (IS_GEN6(intel))
- intel->swapbuffers_wait = FALSE;
+ intel->swapbuffers_wait = FALSE;
xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Tiling %sabled\n",
intel->tiling ? "en" : "dis");
@@ -679,19 +660,12 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
}
/* Load the dri2 module if requested. */
- if (xf86ReturnOptValBool(intel->Options, OPTION_DRI, FALSE) &&
- intel->directRenderingType != DRI_DISABLED) {
+ if (intel->directRenderingType != DRI_DISABLED)
xf86LoadSubModule(scrn, "dri2");
- }
return TRUE;
}
-enum pipe {
- PIPE_A = 0,
- PIPE_B,
-};
-
/**
* Intialiazes the hardware for the 3D pipeline use in the 2D driver.
*
@@ -765,7 +739,7 @@ Bool intel_crtc_on(xf86CrtcPtr crtc)
{
ScrnInfoPtr scrn = crtc->scrn;
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- int i, active_outputs = 0;
+ int i;
if (!crtc->enabled)
return FALSE;
@@ -775,11 +749,9 @@ Bool intel_crtc_on(xf86CrtcPtr crtc)
xf86OutputPtr output = xf86_config->output[i];
if (output->crtc == crtc &&
intel_output_dpms_status(output) == DPMSModeOn)
- active_outputs++;
+ return TRUE;
}
- if (active_outputs)
- return TRUE;
return FALSE;
}
@@ -805,103 +777,102 @@ intel_flush_callback(CallbackListPtr *list,
static void
I830HandleUEvents(int fd, void *closure)
{
- ScrnInfoPtr scrn = closure;
+ ScrnInfoPtr scrn = closure;
intel_screen_private *intel = intel_get_screen_private(scrn);
- struct udev_device *dev;
- const char *hotplug;
- struct stat s;
- dev_t udev_devnum;
-
- dev = udev_monitor_receive_device(intel->uevent_monitor);
- if (!dev)
- return;
-
- udev_devnum = udev_device_get_devnum(dev);
- fstat(intel->drmSubFD, &s);
- /*
- * Check to make sure this event is directed at our
- * device (by comparing dev_t values), then make
- * sure it's a hotplug event (HOTPLUG=1)
- */
-
- hotplug = udev_device_get_property_value(dev, "HOTPLUG");
-
- if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 &&
- hotplug && atoi(hotplug) == 1)
- RRGetInfo(screenInfo.screens[scrn->scrnIndex], TRUE);
-
- udev_device_unref(dev);
+ struct udev_device *dev;
+ const char *hotplug;
+ struct stat s;
+ dev_t udev_devnum;
+
+ dev = udev_monitor_receive_device(intel->uevent_monitor);
+ if (!dev)
+ return;
+
+ udev_devnum = udev_device_get_devnum(dev);
+ fstat(intel->drmSubFD, &s);
+ /*
+ * Check to make sure this event is directed at our
+ * device (by comparing dev_t values), then make
+ * sure it's a hotplug event (HOTPLUG=1)
+ */
+
+ hotplug = udev_device_get_property_value(dev, "HOTPLUG");
+
+ if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 &&
+ hotplug && atoi(hotplug) == 1)
+ RRGetInfo(screenInfo.screens[scrn->scrnIndex], TRUE);
+
+ udev_device_unref(dev);
}
static void
I830UeventInit(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(scrn);
- struct udev *u;
- struct udev_monitor *mon;
- Bool hotplug;
- MessageType from = X_CONFIG;
-
- if (!xf86GetOptValBool(intel->Options, OPTION_HOTPLUG, &hotplug)) {
- from = X_DEFAULT;
- hotplug = TRUE;
- }
-
- xf86DrvMsg(scrn->scrnIndex, from, "hotplug detection: \"%s\"\n",
- hotplug ? "enabled" : "disabled");
- if (!hotplug)
- return;
-
- u = udev_new();
- if (!u)
- return;
-
- mon = udev_monitor_new_from_netlink(u, "udev");
-
- if (!mon) {
- udev_unref(u);
- return;
- }
-
- if (udev_monitor_filter_add_match_subsystem_devtype(mon,
- "drm",
- "drm_minor") < 0 ||
- udev_monitor_enable_receiving(mon) < 0)
- {
- udev_monitor_unref(mon);
- udev_unref(u);
- return;
- }
-
- intel->uevent_handler =
- xf86AddGeneralHandler(udev_monitor_get_fd(mon),
- I830HandleUEvents,
- scrn);
- if (!intel->uevent_handler) {
- udev_monitor_unref(mon);
- udev_unref(u);
- return;
- }
-
- intel->uevent_monitor = mon;
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+ struct udev *u;
+ struct udev_monitor *mon;
+ Bool hotplug;
+ MessageType from = X_CONFIG;
+
+ if (!xf86GetOptValBool(intel->Options, OPTION_HOTPLUG, &hotplug)) {
+ from = X_DEFAULT;
+ hotplug = TRUE;
+ }
+
+ xf86DrvMsg(scrn->scrnIndex, from, "hotplug detection: \"%s\"\n",
+ hotplug ? "enabled" : "disabled");
+ if (!hotplug)
+ return;
+
+ u = udev_new();
+ if (!u)
+ return;
+
+ mon = udev_monitor_new_from_netlink(u, "udev");
+
+ if (!mon) {
+ udev_unref(u);
+ return;
+ }
+
+ if (udev_monitor_filter_add_match_subsystem_devtype(mon,
+ "drm",
+ "drm_minor") < 0 ||
+ udev_monitor_enable_receiving(mon) < 0)
+ {
+ udev_monitor_unref(mon);
+ udev_unref(u);
+ return;
+ }
+
+ intel->uevent_handler =
+ xf86AddGeneralHandler(udev_monitor_get_fd(mon),
+ I830HandleUEvents,
+ scrn);
+ if (!intel->uevent_handler) {
+ udev_monitor_unref(mon);
+ udev_unref(u);
+ return;
+ }
+
+ intel->uevent_monitor = mon;
}
static void
I830UeventFini(ScrnInfoPtr scrn)
{
- intel_screen_private *intel = intel_get_screen_private(scrn);
+ intel_screen_private *intel = intel_get_screen_private(scrn);
- if (intel->uevent_handler)
- {
- struct udev *u = udev_monitor_get_udev(intel->uevent_monitor);
+ if (intel->uevent_handler) {
+ struct udev *u = udev_monitor_get_udev(intel->uevent_monitor);
- xf86RemoveGeneralHandler(intel->uevent_handler);
+ xf86RemoveGeneralHandler(intel->uevent_handler);
- udev_monitor_unref(intel->uevent_monitor);
- udev_unref(u);
- intel->uevent_handler = NULL;
- intel->uevent_monitor = NULL;
- }
+ udev_monitor_unref(intel->uevent_monitor);
+ udev_unref(u);
+ intel->uevent_handler = NULL;
+ intel->uevent_monitor = NULL;
+ }
}
#endif /* HAVE_UDEV */
commit 968151898b807b06953b2f4170ac02889f16c8dc
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 17 00:18:25 2010 +0000
Remove unused GTT/Map sizes and addresses
These have been made obsolete by KMS and GEM.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel.h b/src/intel.h
index 4969bff..b6e8bde 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -271,19 +271,12 @@ enum dri_type {
typedef struct intel_screen_private {
ScrnInfoPtr scrn;
- unsigned char *MMIOBase;
int cpp;
#define RENDER_BATCH I915_EXEC_RENDER
#define BLT_BATCH I915_EXEC_BLT
unsigned int current_batch;
- unsigned int bufferOffset; /* for I830SelectBuffer */
-
- /* These are set in PreInit and never changed. */
- long FbMapSize;
- long GTTMapSize;
-
void *modes;
drm_intel_bo *front_buffer;
long front_pitch, front_tiling;
@@ -327,7 +320,6 @@ typedef struct intel_screen_private {
Bool has_relaxed_fencing;
int Chipset;
- unsigned long LinearAddr;
EntityInfoPtr pEnt;
struct pci_device *PciInfo;
struct intel_chipset chipset;
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 1275e4b..f946981 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -733,50 +733,6 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
intel_video_block_handler(intel);
}
-static void intel_fixup_mtrrs(ScrnInfoPtr scrn)
-{
-#ifdef HAS_MTRR_SUPPORT
- intel_screen_private *intel = intel_get_screen_private(scrn);
- int fd;
- struct mtrr_gentry gentry;
- struct mtrr_sentry sentry;
-
- if ((fd = open("/proc/mtrr", O_RDONLY, 0)) != -1) {
- for (gentry.regnum = 0;
- ioctl(fd, MTRRIOC_GET_ENTRY, &gentry) == 0;
- ++gentry.regnum) {
-
- if (gentry.size < 1) {
- /* DISABLED */
- continue;
- }
-
- /* Check the MTRR range is one we like and if not - remove it.
- * The Xserver common layer will then setup the right range
- * for us.
- */
- if (gentry.base == intel->LinearAddr &&
- gentry.size < intel->FbMapSize) {
-
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "Removing bad MTRR range (base 0x%lx, size 0x%x)\n",
- gentry.base, gentry.size);
-
- sentry.base = gentry.base;
- sentry.size = gentry.size;
- sentry.type = gentry.type;
-
- if (ioctl(fd, MTRRIOC_DEL_ENTRY, &sentry) == -1) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- "Failed to remove bad MTRR range\n");
- }
- }
- }
- close(fd);
- }
-#endif
-}
-
static Bool
intel_init_initial_framebuffer(ScrnInfoPtr scrn)
{
@@ -961,32 +917,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
struct pci_device *const device = intel->PciInfo;
int fb_bar = IS_GEN2(intel) ? 0 : 2;
- /*
- * The "VideoRam" config file parameter specifies the maximum amount of
- * memory that will be used/allocated. When not present, we allow the
- * driver to allocate as much memory as it wishes to satisfy its
- * allocations, but if agpgart support isn't available, it gets limited
- * to the amount of pre-allocated ("stolen") memory.
- *
- * Note that in using this value for allocator initialization, we're
- * limiting aperture allocation to the VideoRam option, rather than limiting
- * actual memory allocation, so alignment and things will cause less than
- * VideoRam to be actually used.
- */
- scrn->videoRam = intel->FbMapSize / KB(1);
- if (intel->pEnt->device->videoRam != 0) {
- if (scrn->videoRam != intel->pEnt->device->videoRam) {
- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "VideoRam configuration found, which is no "
- "longer used.\n");
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
- "Continuing with (ignored) %dkB VideoRam "
- "instead of %d kB.\n",
- scrn->videoRam,
- intel->pEnt->device->videoRam);
- }
- }
-
scrn->videoRam = device->regions[fb_bar].size / 1024;
intel->last_3d = LAST_3D_OTHER;
@@ -998,10 +928,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
*/
intel->XvEnabled = TRUE;
- xf86DrvMsg(scrn->scrnIndex,
- intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
- "VideoRam: %d KB\n", scrn->videoRam);
-
#ifdef DRI2
if (intel->directRenderingType == DRI_NONE
&& I830DRI2ScreenInit(screen))
@@ -1011,8 +937,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
if (!intel_init_initial_framebuffer(scrn))
return FALSE;
- intel_fixup_mtrrs(scrn);
-
intel_batch_init(scrn);
if (INTEL_INFO(intel)->gen >= 40)
diff --git a/src/intel_uxa.c b/src/intel_uxa.c
index 1a591f1..8f58c29 100644
--- a/src/intel_uxa.c
+++ b/src/intel_uxa.c
@@ -1185,7 +1185,6 @@ Bool intel_uxa_init(ScreenPtr screen)
memset(intel->uxa_driver, 0, sizeof(*intel->uxa_driver));
- intel->bufferOffset = 0;
intel->uxa_driver->uxa_major = 1;
intel->uxa_driver->uxa_minor = 0;
commit 19b5817a54d4a17161340ada9bf20027644ff074
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 17 00:15:31 2010 +0000
Remove unused struct _intel_memory definition
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel.h b/src/intel.h
index 9063328..4969bff 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -239,23 +239,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
#define PITCH_NONE 0
-/** Record of a linear allocation in the aperture. */
-typedef struct _intel_memory intel_memory;
-struct _intel_memory {
- /** Description of the allocation, for logging */
- char *name;
-
- /** @{
- * Memory allocator linked list pointers
- */
- intel_memory *next;
- intel_memory *prev;
- /** @} */
-
- drm_intel_bo *bo;
- uint32_t gem_name;
-};
-
typedef struct _I830CrtcPrivateRec {
int pipe;
int plane;
More information about the xorg-commit
mailing list