mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2025-12-26 07:40:12 +01:00
run i915 through lindent
This commit is contained in:
Dave Airlie
parent
019fd38a3c
commit
73e606753f
13 changed files with 1002 additions and 1158 deletions
|
|
@ -14,14 +14,14 @@
|
|||
#include "i915_drm.h"
|
||||
#include "i915_drv.h"
|
||||
|
||||
#include "drm_agpsupport.h"
|
||||
#include "drm_agpsupport.h"
|
||||
#include "drm_auth.h" /* is this needed? */
|
||||
#include "drm_bufs.h"
|
||||
#include "drm_context.h" /* is this needed? */
|
||||
#include "drm_drawable.h" /* is this needed? */
|
||||
#include "drm_dma.h"
|
||||
#include "drm_drv.h"
|
||||
#include "drm_fops.h"
|
||||
#include "drm_fops.h"
|
||||
#include "drm_init.h"
|
||||
#include "drm_irq.h"
|
||||
#include "drm_ioctl.h"
|
||||
|
|
@ -29,5 +29,5 @@
|
|||
#include "drm_memory.h" /* */
|
||||
#include "drm_proc.h"
|
||||
#include "drm_vm.h"
|
||||
#include "drm_stub.h"
|
||||
#include "drm_stub.h"
|
||||
#include "drm_scatter.h"
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
#include "i915_drm.h"
|
||||
#include "i915_drv.h"
|
||||
|
||||
#include "drm_agpsupport.h"
|
||||
#include "drm_agpsupport.h"
|
||||
#include "drm_auth.h" /* is this needed? */
|
||||
#include "drm_bufs.h"
|
||||
#include "drm_context.h" /* is this needed? */
|
||||
#include "drm_drawable.h" /* is this needed? */
|
||||
#include "drm_dma.h"
|
||||
#include "drm_drv.h"
|
||||
#include "drm_fops.h"
|
||||
#include "drm_fops.h"
|
||||
#include "drm_init.h"
|
||||
#include "drm_irq.h"
|
||||
#include "drm_ioctl.h"
|
||||
|
|
@ -29,5 +29,5 @@
|
|||
#include "drm_memory.h" /* */
|
||||
#include "drm_proc.h"
|
||||
#include "drm_vm.h"
|
||||
#include "drm_stub.h"
|
||||
#include "drm_stub.h"
|
||||
#include "drm_scatter.h"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -13,7 +13,6 @@
|
|||
* of chars for next/prev indices */
|
||||
#define I915_LOG_MIN_TEX_REGION_SIZE 14
|
||||
|
||||
|
||||
typedef struct _drm_i915_init {
|
||||
enum {
|
||||
I915_INIT_DMA = 0x01,
|
||||
|
|
@ -35,31 +34,29 @@ typedef struct _drm_i915_init {
|
|||
unsigned int back_pitch;
|
||||
unsigned int depth_pitch;
|
||||
unsigned int cpp;
|
||||
unsigned int chipset;
|
||||
unsigned int chipset;
|
||||
} drm_i915_init_t;
|
||||
|
||||
|
||||
typedef struct _drm_i915_sarea {
|
||||
drm_tex_region_t texList[I915_NR_TEX_REGIONS+1];
|
||||
int last_upload; /* last time texture was uploaded */
|
||||
int last_enqueue; /* last time a buffer was enqueued */
|
||||
drm_tex_region_t texList[I915_NR_TEX_REGIONS + 1];
|
||||
int last_upload; /* last time texture was uploaded */
|
||||
int last_enqueue; /* last time a buffer was enqueued */
|
||||
int last_dispatch; /* age of the most recently dispatched buffer */
|
||||
int ctxOwner; /* last context to upload state */
|
||||
int texAge;
|
||||
int pf_enabled; /* is pageflipping allowed? */
|
||||
int pf_active;
|
||||
int pf_current_page; /* which buffer is being displayed? */
|
||||
int perf_boxes; /* performance boxes to be displayed */
|
||||
int pf_enabled; /* is pageflipping allowed? */
|
||||
int pf_active;
|
||||
int pf_current_page; /* which buffer is being displayed? */
|
||||
int perf_boxes; /* performance boxes to be displayed */
|
||||
} drm_i915_sarea_t;
|
||||
|
||||
/* Flags for perf_boxes
|
||||
*/
|
||||
#define I915_BOX_RING_EMPTY 0x1
|
||||
#define I915_BOX_FLIP 0x2
|
||||
#define I915_BOX_WAIT 0x4
|
||||
#define I915_BOX_TEXTURE_LOAD 0x8
|
||||
#define I915_BOX_LOST_CONTEXT 0x10
|
||||
|
||||
#define I915_BOX_RING_EMPTY 0x1
|
||||
#define I915_BOX_FLIP 0x2
|
||||
#define I915_BOX_WAIT 0x4
|
||||
#define I915_BOX_TEXTURE_LOAD 0x8
|
||||
#define I915_BOX_LOST_CONTEXT 0x10
|
||||
|
||||
/* I915 specific ioctls
|
||||
* The device specific ioctl range is 0x40 to 0x79.
|
||||
|
|
@ -77,32 +74,30 @@ typedef struct _drm_i915_sarea {
|
|||
#define DRM_IOCTL_I915_INIT_HEAP DRM_IOW( 0x4a, drm_i915_mem_init_heap_t)
|
||||
#define DRM_IOCTL_I915_CMDBUFFER DRM_IOW( 0x4b, drm_i915_cmdbuffer_t)
|
||||
|
||||
|
||||
/* Allow drivers to submit batchbuffers directly to hardware, relying
|
||||
* on the security mechanisms provided by hardware.
|
||||
*/
|
||||
typedef struct _drm_i915_batchbuffer {
|
||||
int start; /* agp offset */
|
||||
int start; /* agp offset */
|
||||
int used; /* nr bytes in use */
|
||||
int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO*/
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO */
|
||||
int num_cliprects; /* mulitpass with multiple cliprects? */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
} drm_i915_batchbuffer_t;
|
||||
|
||||
/* As above, but pass a pointer to userspace buffer which can be
|
||||
* validated by the kernel prior to sending to hardware.
|
||||
*/
|
||||
typedef struct _drm_i915_cmdbuffer {
|
||||
char __user *buf; /* pointer to userspace command buffer */
|
||||
int sz; /* nr bytes in buf */
|
||||
char __user *buf; /* pointer to userspace command buffer */
|
||||
int sz; /* nr bytes in buf */
|
||||
int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO*/
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO */
|
||||
int num_cliprects; /* mulitpass with multiple cliprects? */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
} drm_i915_cmdbuffer_t;
|
||||
|
||||
|
||||
/* Userspace can request & wait on irq's:
|
||||
*/
|
||||
typedef struct drm_i915_irq_emit {
|
||||
|
|
@ -113,7 +108,6 @@ typedef struct drm_i915_irq_wait {
|
|||
int irq_seq;
|
||||
} drm_i915_irq_wait_t;
|
||||
|
||||
|
||||
/* Ioctl to query kernel params:
|
||||
*/
|
||||
#define I915_PARAM_IRQ_ACTIVE 1
|
||||
|
|
@ -124,7 +118,6 @@ typedef struct drm_i915_getparam {
|
|||
int __user *value;
|
||||
} drm_i915_getparam_t;
|
||||
|
||||
|
||||
/* Ioctl to set kernel params:
|
||||
*/
|
||||
#define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1
|
||||
|
|
@ -155,8 +148,7 @@ typedef struct drm_i915_mem_free {
|
|||
typedef struct drm_i915_mem_init_heap {
|
||||
int region;
|
||||
int size;
|
||||
int start;
|
||||
int start;
|
||||
} drm_i915_mem_init_heap_t;
|
||||
|
||||
|
||||
#endif /* _I915_DRM_H_ */
|
||||
#endif /* _I915_DRM_H_ */
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@
|
|||
#ifndef _I915_DRV_H_
|
||||
#define _I915_DRV_H_
|
||||
|
||||
|
||||
typedef struct _drm_i915_ring_buffer{
|
||||
typedef struct _drm_i915_ring_buffer {
|
||||
int tail_mask;
|
||||
unsigned long Start;
|
||||
unsigned long End;
|
||||
|
|
@ -36,23 +35,21 @@ typedef struct drm_i915_private {
|
|||
drm_local_map_t *mmio_map;
|
||||
|
||||
drm_i915_sarea_t *sarea_priv;
|
||||
drm_i915_ring_buffer_t ring;
|
||||
drm_i915_ring_buffer_t ring;
|
||||
|
||||
void * hw_status_page;
|
||||
unsigned long counter;
|
||||
void *hw_status_page;
|
||||
unsigned long counter;
|
||||
dma_addr_t dma_status_page;
|
||||
|
||||
|
||||
int back_offset;
|
||||
int front_offset;
|
||||
int current_page;
|
||||
int page_flipping;
|
||||
int use_mi_batchbuffer_start;
|
||||
|
||||
|
||||
wait_queue_head_t irq_queue;
|
||||
atomic_t irq_received;
|
||||
atomic_t irq_emitted;
|
||||
atomic_t irq_received;
|
||||
atomic_t irq_emitted;
|
||||
|
||||
int tex_lru_log_granularity;
|
||||
int allow_batchbuffer;
|
||||
|
|
@ -60,42 +57,40 @@ typedef struct drm_i915_private {
|
|||
} drm_i915_private_t;
|
||||
|
||||
/* i915_dma.c */
|
||||
extern int i915_dma_init( DRM_IOCTL_ARGS );
|
||||
extern int i915_dma_cleanup(drm_device_t *dev);
|
||||
extern int i915_flush_ioctl( DRM_IOCTL_ARGS );
|
||||
extern int i915_batchbuffer( DRM_IOCTL_ARGS );
|
||||
extern int i915_flip_bufs( DRM_IOCTL_ARGS );
|
||||
extern int i915_getparam( DRM_IOCTL_ARGS );
|
||||
extern int i915_setparam( DRM_IOCTL_ARGS );
|
||||
extern int i915_cmdbuffer( DRM_IOCTL_ARGS );
|
||||
extern void i915_kernel_lost_context(drm_device_t *dev);
|
||||
extern int i915_dma_init(DRM_IOCTL_ARGS);
|
||||
extern int i915_dma_cleanup(drm_device_t * dev);
|
||||
extern int i915_flush_ioctl(DRM_IOCTL_ARGS);
|
||||
extern int i915_batchbuffer(DRM_IOCTL_ARGS);
|
||||
extern int i915_flip_bufs(DRM_IOCTL_ARGS);
|
||||
extern int i915_getparam(DRM_IOCTL_ARGS);
|
||||
extern int i915_setparam(DRM_IOCTL_ARGS);
|
||||
extern int i915_cmdbuffer(DRM_IOCTL_ARGS);
|
||||
extern void i915_kernel_lost_context(drm_device_t * dev);
|
||||
|
||||
/* i915_irq.c */
|
||||
extern int i915_irq_emit( DRM_IOCTL_ARGS );
|
||||
extern int i915_irq_wait( DRM_IOCTL_ARGS );
|
||||
extern int i915_wait_irq(drm_device_t *dev, int irq_nr);
|
||||
extern int i915_emit_irq(drm_device_t *dev);
|
||||
extern int i915_irq_emit(DRM_IOCTL_ARGS);
|
||||
extern int i915_irq_wait(DRM_IOCTL_ARGS);
|
||||
extern int i915_wait_irq(drm_device_t * dev, int irq_nr);
|
||||
extern int i915_emit_irq(drm_device_t * dev);
|
||||
|
||||
extern irqreturn_t i915_driver_irq_handler( DRM_IRQ_ARGS );
|
||||
extern void i915_driver_irq_preinstall( drm_device_t *dev );
|
||||
extern void i915_driver_irq_postinstall( drm_device_t *dev );
|
||||
extern void i915_driver_irq_uninstall( drm_device_t *dev );
|
||||
extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
|
||||
extern void i915_driver_irq_preinstall(drm_device_t * dev);
|
||||
extern void i915_driver_irq_postinstall(drm_device_t * dev);
|
||||
extern void i915_driver_irq_uninstall(drm_device_t * dev);
|
||||
|
||||
/* i915_mem.c */
|
||||
extern int i915_mem_alloc( DRM_IOCTL_ARGS );
|
||||
extern int i915_mem_free( DRM_IOCTL_ARGS );
|
||||
extern int i915_mem_init_heap( DRM_IOCTL_ARGS );
|
||||
extern void i915_mem_takedown( struct mem_block **heap );
|
||||
extern void i915_mem_release( drm_device_t *dev,
|
||||
DRMFILE filp, struct mem_block *heap );
|
||||
extern int i915_mem_alloc(DRM_IOCTL_ARGS);
|
||||
extern int i915_mem_free(DRM_IOCTL_ARGS);
|
||||
extern int i915_mem_init_heap(DRM_IOCTL_ARGS);
|
||||
extern void i915_mem_takedown(struct mem_block **heap);
|
||||
extern void i915_mem_release(drm_device_t * dev,
|
||||
DRMFILE filp, struct mem_block *heap);
|
||||
|
||||
#define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg)
|
||||
#define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val)
|
||||
#define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg)
|
||||
#define I915_WRITE16(reg,val) DRM_WRITE16(dev_priv->mmio_map, reg, val)
|
||||
|
||||
|
||||
|
||||
#define I915_VERBOSE 0
|
||||
|
||||
#define RING_LOCALS unsigned int outring, ringmask, outcount; \
|
||||
|
|
@ -113,7 +108,6 @@ extern void i915_mem_release( drm_device_t *dev,
|
|||
virt = dev_priv->ring.virtual_start; \
|
||||
} while (0)
|
||||
|
||||
|
||||
#define OUT_RING(n) do { \
|
||||
if (I915_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \
|
||||
*(volatile unsigned int *)(virt + outring) = n; \
|
||||
|
|
@ -129,8 +123,7 @@ extern void i915_mem_release( drm_device_t *dev,
|
|||
I915_WRITE(LP_RING + RING_TAIL, outring); \
|
||||
} while(0)
|
||||
|
||||
extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
||||
|
||||
extern int i915_wait_ring(drm_device_t * dev, int n, const char *caller);
|
||||
|
||||
#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23))
|
||||
#define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23))
|
||||
|
|
@ -142,7 +135,6 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define INST_OP_FLUSH 0x02000000
|
||||
#define INST_FLUSH_MAP_CACHE 0x00000001
|
||||
|
||||
|
||||
#define BB1_START_ADDR_MASK (~0x7)
|
||||
#define BB1_PROTECTED (1<<0)
|
||||
#define BB1_UNPROTECTED (0<<0)
|
||||
|
|
@ -180,7 +172,7 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define RING_START 0x08
|
||||
#define START_ADDR 0x0xFFFFF000
|
||||
#define RING_LEN 0x0C
|
||||
#define RING_NR_PAGES 0x001FF000
|
||||
#define RING_NR_PAGES 0x001FF000
|
||||
#define RING_REPORT_MASK 0x00000006
|
||||
#define RING_REPORT_64K 0x00000002
|
||||
#define RING_REPORT_128K 0x00000004
|
||||
|
|
@ -208,18 +200,14 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
|
||||
#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
|
||||
|
||||
|
||||
#define MI_BATCH_BUFFER ((0x30<<23)|1)
|
||||
#define MI_BATCH_BUFFER_START (0x31<<23)
|
||||
#define MI_BATCH_BUFFER_END (0xA<<23)
|
||||
#define MI_BATCH_NON_SECURE (1)
|
||||
|
||||
|
||||
|
||||
#define MI_WAIT_FOR_EVENT ((0x3<<23))
|
||||
#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2)
|
||||
#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1)
|
||||
|
||||
#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2)
|
||||
#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1)
|
||||
|
||||
#define MI_LOAD_SCAN_LINES_INCL ((0x12<<23))
|
||||
|
||||
|
|
@ -229,4 +217,3 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -17,156 +17,149 @@
|
|||
#define MAX_NOPID ((u32)~0)
|
||||
#define READ_BREADCRUMB(dev_priv) (((u32*)(dev_priv->hw_status_page))[5])
|
||||
|
||||
|
||||
irqreturn_t i915_driver_irq_handler( DRM_IRQ_ARGS )
|
||||
irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
|
||||
{
|
||||
drm_device_t *dev = (drm_device_t *)arg;
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private;
|
||||
u16 temp;
|
||||
drm_device_t *dev = (drm_device_t *) arg;
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
u16 temp;
|
||||
|
||||
temp = I915_READ16(I915REG_INT_IDENTITY_R);
|
||||
temp = I915_READ16(I915REG_INT_IDENTITY_R);
|
||||
temp &= USER_INT_FLAG;
|
||||
|
||||
|
||||
DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
|
||||
|
||||
if (temp == 0)
|
||||
if (temp == 0)
|
||||
return IRQ_NONE;
|
||||
|
||||
I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
|
||||
DRM_WAKEUP( &dev_priv->irq_queue );
|
||||
I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
|
||||
DRM_WAKEUP(&dev_priv->irq_queue);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
int i915_emit_irq(drm_device_t *dev)
|
||||
int i915_emit_irq(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
u32 ret;
|
||||
RING_LOCALS;
|
||||
|
||||
i915_kernel_lost_context(dev);
|
||||
i915_kernel_lost_context(dev);
|
||||
|
||||
DRM_DEBUG("%s\n", __FUNCTION__);
|
||||
|
||||
ret = dev_priv->counter;
|
||||
|
||||
BEGIN_LP_RING(2);
|
||||
OUT_RING( 0 );
|
||||
OUT_RING( GFX_OP_USER_INTERRUPT );
|
||||
ADVANCE_LP_RING();
|
||||
BEGIN_LP_RING(2);
|
||||
OUT_RING(0);
|
||||
OUT_RING(GFX_OP_USER_INTERRUPT);
|
||||
ADVANCE_LP_RING();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int i915_wait_irq(drm_device_t *dev, int irq_nr)
|
||||
int i915_wait_irq(drm_device_t * dev, int irq_nr)
|
||||
{
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
int ret = 0;
|
||||
|
||||
DRM_DEBUG("%s irq_nr=%d breadcrumb=%d\n", __FUNCTION__, irq_nr, READ_BREADCRUMB(dev_priv));
|
||||
DRM_DEBUG("%s irq_nr=%d breadcrumb=%d\n", __FUNCTION__, irq_nr,
|
||||
READ_BREADCRUMB(dev_priv));
|
||||
|
||||
if (READ_BREADCRUMB(dev_priv) >= irq_nr)
|
||||
return 0;
|
||||
if (READ_BREADCRUMB(dev_priv) >= irq_nr)
|
||||
return 0;
|
||||
|
||||
dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
|
||||
|
||||
DRM_WAIT_ON( ret, dev_priv->irq_queue, 3 * DRM_HZ,
|
||||
READ_BREADCRUMB(dev_priv) >= irq_nr );
|
||||
DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
|
||||
READ_BREADCRUMB(dev_priv) >= irq_nr);
|
||||
|
||||
if (ret == DRM_ERR(EBUSY)) {
|
||||
DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n",
|
||||
DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n",
|
||||
__FUNCTION__,
|
||||
READ_BREADCRUMB(dev_priv),
|
||||
(int)dev_priv->counter);
|
||||
READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
|
||||
}
|
||||
|
||||
dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
|
||||
dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/* Needs the lock as it touches the ring.
|
||||
*/
|
||||
int i915_irq_emit( DRM_IOCTL_ARGS )
|
||||
int i915_irq_emit(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_irq_emit_t emit;
|
||||
int result;
|
||||
|
||||
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
||||
if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
||||
DRM_ERROR("i915_irq_emit called without lock held\n");
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( emit, (drm_i915_irq_emit_t __user *)data,
|
||||
sizeof(emit) );
|
||||
DRM_COPY_FROM_USER_IOCTL(emit, (drm_i915_irq_emit_t __user *) data,
|
||||
sizeof(emit));
|
||||
|
||||
result = i915_emit_irq( dev );
|
||||
result = i915_emit_irq(dev);
|
||||
|
||||
if ( DRM_COPY_TO_USER( emit.irq_seq, &result, sizeof(int) ) ) {
|
||||
DRM_ERROR( "copy_to_user\n" );
|
||||
if (DRM_COPY_TO_USER(emit.irq_seq, &result, sizeof(int))) {
|
||||
DRM_ERROR("copy_to_user\n");
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* Doesn't need the hardware lock.
|
||||
*/
|
||||
int i915_irq_wait( DRM_IOCTL_ARGS )
|
||||
int i915_irq_wait(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_irq_wait_t irqwait;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_i915_irq_wait_t __user *)data,
|
||||
sizeof(irqwait) );
|
||||
DRM_COPY_FROM_USER_IOCTL(irqwait, (drm_i915_irq_wait_t __user *) data,
|
||||
sizeof(irqwait));
|
||||
|
||||
return i915_wait_irq( dev, irqwait.irq_seq );
|
||||
return i915_wait_irq(dev, irqwait.irq_seq);
|
||||
}
|
||||
|
||||
|
||||
/* drm_dma.h hooks
|
||||
*/
|
||||
void i915_driver_irq_preinstall( drm_device_t *dev ) {
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
void i915_driver_irq_preinstall(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
|
||||
I915_WRITE16( I915REG_HWSTAM, 0xfffe );
|
||||
I915_WRITE16( I915REG_INT_MASK_R, 0x0 );
|
||||
I915_WRITE16( I915REG_INT_ENABLE_R, 0x0 );
|
||||
I915_WRITE16(I915REG_HWSTAM, 0xfffe);
|
||||
I915_WRITE16(I915REG_INT_MASK_R, 0x0);
|
||||
I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
|
||||
}
|
||||
|
||||
void i915_driver_irq_postinstall( drm_device_t *dev ) {
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
void i915_driver_irq_postinstall(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
|
||||
I915_WRITE16( I915REG_INT_ENABLE_R, USER_INT_FLAG );
|
||||
I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG);
|
||||
DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
|
||||
}
|
||||
|
||||
void i915_driver_irq_uninstall( drm_device_t *dev ) {
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
void i915_driver_irq_uninstall(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
if (!dev_priv)
|
||||
return;
|
||||
|
||||
I915_WRITE16( I915REG_HWSTAM, 0xffff );
|
||||
I915_WRITE16( I915REG_INT_MASK_R, 0xffff );
|
||||
I915_WRITE16( I915REG_INT_ENABLE_R, 0x0 );
|
||||
I915_WRITE16(I915REG_HWSTAM, 0xffff);
|
||||
I915_WRITE16(I915REG_INT_MASK_R, 0xffff);
|
||||
I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,60 +25,58 @@
|
|||
* block to allocate, and the ring is drained prior to allocations --
|
||||
* in other words allocation is expensive.
|
||||
*/
|
||||
static void mark_block( drm_device_t *dev, struct mem_block *p,
|
||||
int in_use )
|
||||
static void mark_block(drm_device_t * dev, struct mem_block *p, int in_use)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
|
||||
drm_tex_region_t *list;
|
||||
unsigned shift, nr;
|
||||
unsigned start;
|
||||
unsigned end;
|
||||
unsigned i;
|
||||
int age;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
|
||||
drm_tex_region_t *list;
|
||||
unsigned shift, nr;
|
||||
unsigned start;
|
||||
unsigned end;
|
||||
unsigned i;
|
||||
int age;
|
||||
|
||||
shift = dev_priv->tex_lru_log_granularity;
|
||||
nr = I915_NR_TEX_REGIONS;
|
||||
shift = dev_priv->tex_lru_log_granularity;
|
||||
nr = I915_NR_TEX_REGIONS;
|
||||
|
||||
start = p->start >> shift;
|
||||
end = (p->start + p->size - 1) >> shift;
|
||||
start = p->start >> shift;
|
||||
end = (p->start + p->size - 1) >> shift;
|
||||
|
||||
age = ++sarea_priv->texAge;
|
||||
list = sarea_priv->texList;
|
||||
age = ++sarea_priv->texAge;
|
||||
list = sarea_priv->texList;
|
||||
|
||||
/* Mark the regions with the new flag and update their age. Move
|
||||
* them to head of list to preserve LRU semantics.
|
||||
*/
|
||||
for (i = start ; i <= end ; i++) {
|
||||
list[i].in_use = in_use;
|
||||
list[i].age = age;
|
||||
/* Mark the regions with the new flag and update their age. Move
|
||||
* them to head of list to preserve LRU semantics.
|
||||
*/
|
||||
for (i = start; i <= end; i++) {
|
||||
list[i].in_use = in_use;
|
||||
list[i].age = age;
|
||||
|
||||
/* remove_from_list(i)
|
||||
*/
|
||||
list[(unsigned)list[i].next].prev = list[i].prev;
|
||||
list[(unsigned)list[i].prev].next = list[i].next;
|
||||
/* remove_from_list(i)
|
||||
*/
|
||||
list[(unsigned)list[i].next].prev = list[i].prev;
|
||||
list[(unsigned)list[i].prev].next = list[i].next;
|
||||
|
||||
/* insert_at_head(list, i)
|
||||
*/
|
||||
list[i].prev = nr;
|
||||
list[i].next = list[nr].next;
|
||||
list[(unsigned)list[nr].next].prev = i;
|
||||
list[nr].next = i;
|
||||
}
|
||||
/* insert_at_head(list, i)
|
||||
*/
|
||||
list[i].prev = nr;
|
||||
list[i].next = list[nr].next;
|
||||
list[(unsigned)list[nr].next].prev = i;
|
||||
list[nr].next = i;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Very simple allocator for agp memory, working on a static range
|
||||
* already mapped into each client's address space.
|
||||
*/
|
||||
|
||||
static struct mem_block *split_block(struct mem_block *p, int start, int size,
|
||||
DRMFILE filp )
|
||||
DRMFILE filp)
|
||||
{
|
||||
/* Maybe cut off the start of an existing block */
|
||||
if (start > p->start) {
|
||||
struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
|
||||
if (!newblock)
|
||||
if (!newblock)
|
||||
goto out;
|
||||
newblock->start = start;
|
||||
newblock->size = p->size - (start - p->start);
|
||||
|
|
@ -90,7 +88,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
|
|||
p->size -= newblock->size;
|
||||
p = newblock;
|
||||
}
|
||||
|
||||
|
||||
/* Maybe cut off the end of an existing block */
|
||||
if (size < p->size) {
|
||||
struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
|
||||
|
|
@ -106,40 +104,39 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
|
|||
p->size = size;
|
||||
}
|
||||
|
||||
out:
|
||||
out:
|
||||
/* Our block is in the middle */
|
||||
p->filp = filp;
|
||||
return p;
|
||||
}
|
||||
|
||||
static struct mem_block *alloc_block( struct mem_block *heap, int size,
|
||||
int align2, DRMFILE filp )
|
||||
static struct mem_block *alloc_block(struct mem_block *heap, int size,
|
||||
int align2, DRMFILE filp)
|
||||
{
|
||||
struct mem_block *p;
|
||||
int mask = (1 << align2)-1;
|
||||
int mask = (1 << align2) - 1;
|
||||
|
||||
for (p = heap->next ; p != heap ; p = p->next) {
|
||||
for (p = heap->next; p != heap; p = p->next) {
|
||||
int start = (p->start + mask) & ~mask;
|
||||
if (p->filp == NULL && start + size <= p->start + p->size)
|
||||
return split_block( p, start, size, filp );
|
||||
return split_block(p, start, size, filp);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct mem_block *find_block( struct mem_block *heap, int start )
|
||||
static struct mem_block *find_block(struct mem_block *heap, int start)
|
||||
{
|
||||
struct mem_block *p;
|
||||
|
||||
for (p = heap->next ; p != heap ; p = p->next)
|
||||
for (p = heap->next; p != heap; p = p->next)
|
||||
if (p->start == start)
|
||||
return p;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static void free_block( struct mem_block *p )
|
||||
static void free_block(struct mem_block *p)
|
||||
{
|
||||
p->filp = NULL;
|
||||
|
||||
|
|
@ -169,12 +166,12 @@ static int init_heap(struct mem_block **heap, int start, int size)
|
|||
{
|
||||
struct mem_block *blocks = DRM_MALLOC(sizeof(*blocks));
|
||||
|
||||
if (!blocks)
|
||||
if (!blocks)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
*heap = DRM_MALLOC(sizeof(**heap));
|
||||
if (!*heap) {
|
||||
DRM_FREE( blocks, sizeof(*blocks) );
|
||||
DRM_FREE(blocks, sizeof(*blocks));
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -183,34 +180,32 @@ static int init_heap(struct mem_block **heap, int start, int size)
|
|||
blocks->filp = NULL;
|
||||
blocks->next = blocks->prev = *heap;
|
||||
|
||||
memset( *heap, 0, sizeof(**heap) );
|
||||
(*heap)->filp = (DRMFILE) -1;
|
||||
memset(*heap, 0, sizeof(**heap));
|
||||
(*heap)->filp = (DRMFILE) - 1;
|
||||
(*heap)->next = (*heap)->prev = blocks;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* Free all blocks associated with the releasing file.
|
||||
*/
|
||||
void i915_mem_release( drm_device_t *dev,
|
||||
DRMFILE filp, struct mem_block *heap )
|
||||
void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap)
|
||||
{
|
||||
struct mem_block *p;
|
||||
|
||||
if (!heap || !heap->next)
|
||||
return;
|
||||
|
||||
for (p = heap->next ; p != heap ; p = p->next) {
|
||||
for (p = heap->next; p != heap; p = p->next) {
|
||||
if (p->filp == filp) {
|
||||
p->filp = NULL;
|
||||
mark_block( dev, p, 0 );
|
||||
mark_block(dev, p, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Assumes a single contiguous range. Needs a special filp in
|
||||
* 'heap' to stop it being subsumed.
|
||||
*/
|
||||
for (p = heap->next ; p != heap ; p = p->next) {
|
||||
for (p = heap->next; p != heap; p = p->next) {
|
||||
while (p->filp == NULL && p->next->filp == NULL) {
|
||||
struct mem_block *q = p->next;
|
||||
p->size += q->size;
|
||||
|
|
@ -223,139 +218,130 @@ void i915_mem_release( drm_device_t *dev,
|
|||
|
||||
/* Shutdown.
|
||||
*/
|
||||
void i915_mem_takedown( struct mem_block **heap )
|
||||
void i915_mem_takedown(struct mem_block **heap)
|
||||
{
|
||||
struct mem_block *p;
|
||||
|
||||
|
||||
if (!*heap)
|
||||
return;
|
||||
|
||||
for (p = (*heap)->next ; p != *heap ; ) {
|
||||
for (p = (*heap)->next; p != *heap;) {
|
||||
struct mem_block *q = p;
|
||||
p = p->next;
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
|
||||
DRM_FREE( *heap, sizeof(**heap) );
|
||||
DRM_FREE(*heap, sizeof(**heap));
|
||||
*heap = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static struct mem_block **get_heap( drm_i915_private_t *dev_priv,
|
||||
int region )
|
||||
static struct mem_block **get_heap(drm_i915_private_t * dev_priv, int region)
|
||||
{
|
||||
switch( region ) {
|
||||
switch (region) {
|
||||
case I915_MEM_REGION_AGP:
|
||||
return &dev_priv->agp_heap;
|
||||
return &dev_priv->agp_heap;
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* IOCTL HANDLERS */
|
||||
|
||||
int i915_mem_alloc( DRM_IOCTL_ARGS )
|
||||
int i915_mem_alloc(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_mem_alloc_t alloc;
|
||||
struct mem_block *block, **heap;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( alloc, (drm_i915_mem_alloc_t __user *)data,
|
||||
sizeof(alloc) );
|
||||
DRM_COPY_FROM_USER_IOCTL(alloc, (drm_i915_mem_alloc_t __user *) data,
|
||||
sizeof(alloc));
|
||||
|
||||
heap = get_heap( dev_priv, alloc.region );
|
||||
heap = get_heap(dev_priv, alloc.region);
|
||||
if (!heap || !*heap)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
|
||||
/* Make things easier on ourselves: all allocations at least
|
||||
* 4k aligned.
|
||||
*/
|
||||
if (alloc.alignment < 12)
|
||||
alloc.alignment = 12;
|
||||
|
||||
block = alloc_block( *heap, alloc.size, alloc.alignment,
|
||||
filp );
|
||||
block = alloc_block(*heap, alloc.size, alloc.alignment, filp);
|
||||
|
||||
if (!block)
|
||||
if (!block)
|
||||
return DRM_ERR(ENOMEM);
|
||||
|
||||
mark_block( dev, block, 1 );
|
||||
mark_block(dev, block, 1);
|
||||
|
||||
if ( DRM_COPY_TO_USER( alloc.region_offset, &block->start,
|
||||
sizeof(int) ) ) {
|
||||
DRM_ERROR( "copy_to_user\n" );
|
||||
if (DRM_COPY_TO_USER(alloc.region_offset, &block->start, sizeof(int))) {
|
||||
DRM_ERROR("copy_to_user\n");
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int i915_mem_free( DRM_IOCTL_ARGS )
|
||||
int i915_mem_free(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_mem_free_t memfree;
|
||||
struct mem_block *block, **heap;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( memfree, (drm_i915_mem_free_t __user *)data,
|
||||
sizeof(memfree) );
|
||||
DRM_COPY_FROM_USER_IOCTL(memfree, (drm_i915_mem_free_t __user *) data,
|
||||
sizeof(memfree));
|
||||
|
||||
heap = get_heap( dev_priv, memfree.region );
|
||||
heap = get_heap(dev_priv, memfree.region);
|
||||
if (!heap || !*heap)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
block = find_block( *heap, memfree.region_offset );
|
||||
|
||||
block = find_block(*heap, memfree.region_offset);
|
||||
if (!block)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
if (block->filp != filp)
|
||||
return DRM_ERR(EPERM);
|
||||
|
||||
mark_block( dev, block, 0 );
|
||||
free_block( block );
|
||||
mark_block(dev, block, 0);
|
||||
free_block(block);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int i915_mem_init_heap( DRM_IOCTL_ARGS )
|
||||
int i915_mem_init_heap(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_mem_init_heap_t initheap;
|
||||
struct mem_block **heap;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( initheap, (drm_i915_mem_init_heap_t __user *)data,
|
||||
sizeof(initheap) );
|
||||
DRM_COPY_FROM_USER_IOCTL(initheap,
|
||||
(drm_i915_mem_init_heap_t __user *) data,
|
||||
sizeof(initheap));
|
||||
|
||||
heap = get_heap( dev_priv, initheap.region );
|
||||
if (!heap)
|
||||
heap = get_heap(dev_priv, initheap.region);
|
||||
if (!heap)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
|
||||
if (*heap) {
|
||||
DRM_ERROR("heap already initialized?");
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
return init_heap( heap, initheap.start, initheap.size );
|
||||
|
||||
return init_heap(heap, initheap.start, initheap.size);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#define DRIVER_MINOR 1
|
||||
#define DRIVER_PATCHLEVEL 0
|
||||
|
||||
|
||||
#define DRIVER_IOCTLS \
|
||||
[DRM_IOCTL_NR(DRM_IOCTL_I915_INIT)] = { i915_dma_init, 1, 1 }, \
|
||||
[DRM_IOCTL_NR(DRM_IOCTL_I915_FLUSH)] = { i915_flush_ioctl, 1, 0 }, \
|
||||
|
|
@ -46,7 +45,6 @@
|
|||
[DRM_IOCTL_NR(DRM_IOCTL_I915_INIT_HEAP)] = { i915_mem_init_heap, 1, 1 }, \
|
||||
[DRM_IOCTL_NR(DRM_IOCTL_I915_CMDBUFFER)] = { i915_cmdbuffer, 1, 0 }
|
||||
|
||||
|
||||
#define __HAVE_COUNTERS 4
|
||||
#define __HAVE_COUNTER6 _DRM_STAT_IRQ
|
||||
#define __HAVE_COUNTER7 _DRM_STAT_PRIMARY
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -13,7 +13,6 @@
|
|||
* of chars for next/prev indices */
|
||||
#define I915_LOG_MIN_TEX_REGION_SIZE 14
|
||||
|
||||
|
||||
typedef struct _drm_i915_init {
|
||||
enum {
|
||||
I915_INIT_DMA = 0x01,
|
||||
|
|
@ -35,31 +34,29 @@ typedef struct _drm_i915_init {
|
|||
unsigned int back_pitch;
|
||||
unsigned int depth_pitch;
|
||||
unsigned int cpp;
|
||||
unsigned int chipset;
|
||||
unsigned int chipset;
|
||||
} drm_i915_init_t;
|
||||
|
||||
|
||||
typedef struct _drm_i915_sarea {
|
||||
drm_tex_region_t texList[I915_NR_TEX_REGIONS+1];
|
||||
int last_upload; /* last time texture was uploaded */
|
||||
int last_enqueue; /* last time a buffer was enqueued */
|
||||
drm_tex_region_t texList[I915_NR_TEX_REGIONS + 1];
|
||||
int last_upload; /* last time texture was uploaded */
|
||||
int last_enqueue; /* last time a buffer was enqueued */
|
||||
int last_dispatch; /* age of the most recently dispatched buffer */
|
||||
int ctxOwner; /* last context to upload state */
|
||||
int texAge;
|
||||
int pf_enabled; /* is pageflipping allowed? */
|
||||
int pf_active;
|
||||
int pf_current_page; /* which buffer is being displayed? */
|
||||
int perf_boxes; /* performance boxes to be displayed */
|
||||
int pf_enabled; /* is pageflipping allowed? */
|
||||
int pf_active;
|
||||
int pf_current_page; /* which buffer is being displayed? */
|
||||
int perf_boxes; /* performance boxes to be displayed */
|
||||
} drm_i915_sarea_t;
|
||||
|
||||
/* Flags for perf_boxes
|
||||
*/
|
||||
#define I915_BOX_RING_EMPTY 0x1
|
||||
#define I915_BOX_FLIP 0x2
|
||||
#define I915_BOX_WAIT 0x4
|
||||
#define I915_BOX_TEXTURE_LOAD 0x8
|
||||
#define I915_BOX_LOST_CONTEXT 0x10
|
||||
|
||||
#define I915_BOX_RING_EMPTY 0x1
|
||||
#define I915_BOX_FLIP 0x2
|
||||
#define I915_BOX_WAIT 0x4
|
||||
#define I915_BOX_TEXTURE_LOAD 0x8
|
||||
#define I915_BOX_LOST_CONTEXT 0x10
|
||||
|
||||
/* I915 specific ioctls
|
||||
* The device specific ioctl range is 0x40 to 0x79.
|
||||
|
|
@ -77,32 +74,30 @@ typedef struct _drm_i915_sarea {
|
|||
#define DRM_IOCTL_I915_INIT_HEAP DRM_IOW( 0x4a, drm_i915_mem_init_heap_t)
|
||||
#define DRM_IOCTL_I915_CMDBUFFER DRM_IOW( 0x4b, drm_i915_cmdbuffer_t)
|
||||
|
||||
|
||||
/* Allow drivers to submit batchbuffers directly to hardware, relying
|
||||
* on the security mechanisms provided by hardware.
|
||||
*/
|
||||
typedef struct _drm_i915_batchbuffer {
|
||||
int start; /* agp offset */
|
||||
int start; /* agp offset */
|
||||
int used; /* nr bytes in use */
|
||||
int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO*/
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO */
|
||||
int num_cliprects; /* mulitpass with multiple cliprects? */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
} drm_i915_batchbuffer_t;
|
||||
|
||||
/* As above, but pass a pointer to userspace buffer which can be
|
||||
* validated by the kernel prior to sending to hardware.
|
||||
*/
|
||||
typedef struct _drm_i915_cmdbuffer {
|
||||
char __user *buf; /* pointer to userspace command buffer */
|
||||
int sz; /* nr bytes in buf */
|
||||
char __user *buf; /* pointer to userspace command buffer */
|
||||
int sz; /* nr bytes in buf */
|
||||
int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO*/
|
||||
int DR4; /* window origin for GFX_OP_DRAWRECT_INFO */
|
||||
int num_cliprects; /* mulitpass with multiple cliprects? */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
drm_clip_rect_t __user *cliprects; /* pointer to userspace cliprects */
|
||||
} drm_i915_cmdbuffer_t;
|
||||
|
||||
|
||||
/* Userspace can request & wait on irq's:
|
||||
*/
|
||||
typedef struct drm_i915_irq_emit {
|
||||
|
|
@ -113,7 +108,6 @@ typedef struct drm_i915_irq_wait {
|
|||
int irq_seq;
|
||||
} drm_i915_irq_wait_t;
|
||||
|
||||
|
||||
/* Ioctl to query kernel params:
|
||||
*/
|
||||
#define I915_PARAM_IRQ_ACTIVE 1
|
||||
|
|
@ -124,7 +118,6 @@ typedef struct drm_i915_getparam {
|
|||
int __user *value;
|
||||
} drm_i915_getparam_t;
|
||||
|
||||
|
||||
/* Ioctl to set kernel params:
|
||||
*/
|
||||
#define I915_SETPARAM_USE_MI_BATCHBUFFER_START 1
|
||||
|
|
@ -155,8 +148,7 @@ typedef struct drm_i915_mem_free {
|
|||
typedef struct drm_i915_mem_init_heap {
|
||||
int region;
|
||||
int size;
|
||||
int start;
|
||||
int start;
|
||||
} drm_i915_mem_init_heap_t;
|
||||
|
||||
|
||||
#endif /* _I915_DRM_H_ */
|
||||
#endif /* _I915_DRM_H_ */
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@
|
|||
#ifndef _I915_DRV_H_
|
||||
#define _I915_DRV_H_
|
||||
|
||||
|
||||
typedef struct _drm_i915_ring_buffer{
|
||||
typedef struct _drm_i915_ring_buffer {
|
||||
int tail_mask;
|
||||
unsigned long Start;
|
||||
unsigned long End;
|
||||
|
|
@ -36,23 +35,21 @@ typedef struct drm_i915_private {
|
|||
drm_local_map_t *mmio_map;
|
||||
|
||||
drm_i915_sarea_t *sarea_priv;
|
||||
drm_i915_ring_buffer_t ring;
|
||||
drm_i915_ring_buffer_t ring;
|
||||
|
||||
void * hw_status_page;
|
||||
unsigned long counter;
|
||||
void *hw_status_page;
|
||||
unsigned long counter;
|
||||
dma_addr_t dma_status_page;
|
||||
|
||||
|
||||
int back_offset;
|
||||
int front_offset;
|
||||
int current_page;
|
||||
int page_flipping;
|
||||
int use_mi_batchbuffer_start;
|
||||
|
||||
|
||||
wait_queue_head_t irq_queue;
|
||||
atomic_t irq_received;
|
||||
atomic_t irq_emitted;
|
||||
atomic_t irq_received;
|
||||
atomic_t irq_emitted;
|
||||
|
||||
int tex_lru_log_granularity;
|
||||
int allow_batchbuffer;
|
||||
|
|
@ -60,42 +57,40 @@ typedef struct drm_i915_private {
|
|||
} drm_i915_private_t;
|
||||
|
||||
/* i915_dma.c */
|
||||
extern int i915_dma_init( DRM_IOCTL_ARGS );
|
||||
extern int i915_dma_cleanup(drm_device_t *dev);
|
||||
extern int i915_flush_ioctl( DRM_IOCTL_ARGS );
|
||||
extern int i915_batchbuffer( DRM_IOCTL_ARGS );
|
||||
extern int i915_flip_bufs( DRM_IOCTL_ARGS );
|
||||
extern int i915_getparam( DRM_IOCTL_ARGS );
|
||||
extern int i915_setparam( DRM_IOCTL_ARGS );
|
||||
extern int i915_cmdbuffer( DRM_IOCTL_ARGS );
|
||||
extern void i915_kernel_lost_context(drm_device_t *dev);
|
||||
extern int i915_dma_init(DRM_IOCTL_ARGS);
|
||||
extern int i915_dma_cleanup(drm_device_t * dev);
|
||||
extern int i915_flush_ioctl(DRM_IOCTL_ARGS);
|
||||
extern int i915_batchbuffer(DRM_IOCTL_ARGS);
|
||||
extern int i915_flip_bufs(DRM_IOCTL_ARGS);
|
||||
extern int i915_getparam(DRM_IOCTL_ARGS);
|
||||
extern int i915_setparam(DRM_IOCTL_ARGS);
|
||||
extern int i915_cmdbuffer(DRM_IOCTL_ARGS);
|
||||
extern void i915_kernel_lost_context(drm_device_t * dev);
|
||||
|
||||
/* i915_irq.c */
|
||||
extern int i915_irq_emit( DRM_IOCTL_ARGS );
|
||||
extern int i915_irq_wait( DRM_IOCTL_ARGS );
|
||||
extern int i915_wait_irq(drm_device_t *dev, int irq_nr);
|
||||
extern int i915_emit_irq(drm_device_t *dev);
|
||||
extern int i915_irq_emit(DRM_IOCTL_ARGS);
|
||||
extern int i915_irq_wait(DRM_IOCTL_ARGS);
|
||||
extern int i915_wait_irq(drm_device_t * dev, int irq_nr);
|
||||
extern int i915_emit_irq(drm_device_t * dev);
|
||||
|
||||
extern irqreturn_t i915_driver_irq_handler( DRM_IRQ_ARGS );
|
||||
extern void i915_driver_irq_preinstall( drm_device_t *dev );
|
||||
extern void i915_driver_irq_postinstall( drm_device_t *dev );
|
||||
extern void i915_driver_irq_uninstall( drm_device_t *dev );
|
||||
extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
|
||||
extern void i915_driver_irq_preinstall(drm_device_t * dev);
|
||||
extern void i915_driver_irq_postinstall(drm_device_t * dev);
|
||||
extern void i915_driver_irq_uninstall(drm_device_t * dev);
|
||||
|
||||
/* i915_mem.c */
|
||||
extern int i915_mem_alloc( DRM_IOCTL_ARGS );
|
||||
extern int i915_mem_free( DRM_IOCTL_ARGS );
|
||||
extern int i915_mem_init_heap( DRM_IOCTL_ARGS );
|
||||
extern void i915_mem_takedown( struct mem_block **heap );
|
||||
extern void i915_mem_release( drm_device_t *dev,
|
||||
DRMFILE filp, struct mem_block *heap );
|
||||
extern int i915_mem_alloc(DRM_IOCTL_ARGS);
|
||||
extern int i915_mem_free(DRM_IOCTL_ARGS);
|
||||
extern int i915_mem_init_heap(DRM_IOCTL_ARGS);
|
||||
extern void i915_mem_takedown(struct mem_block **heap);
|
||||
extern void i915_mem_release(drm_device_t * dev,
|
||||
DRMFILE filp, struct mem_block *heap);
|
||||
|
||||
#define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg)
|
||||
#define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val)
|
||||
#define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg)
|
||||
#define I915_WRITE16(reg,val) DRM_WRITE16(dev_priv->mmio_map, reg, val)
|
||||
|
||||
|
||||
|
||||
#define I915_VERBOSE 0
|
||||
|
||||
#define RING_LOCALS unsigned int outring, ringmask, outcount; \
|
||||
|
|
@ -113,7 +108,6 @@ extern void i915_mem_release( drm_device_t *dev,
|
|||
virt = dev_priv->ring.virtual_start; \
|
||||
} while (0)
|
||||
|
||||
|
||||
#define OUT_RING(n) do { \
|
||||
if (I915_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \
|
||||
*(volatile unsigned int *)(virt + outring) = n; \
|
||||
|
|
@ -129,8 +123,7 @@ extern void i915_mem_release( drm_device_t *dev,
|
|||
I915_WRITE(LP_RING + RING_TAIL, outring); \
|
||||
} while(0)
|
||||
|
||||
extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
||||
|
||||
extern int i915_wait_ring(drm_device_t * dev, int n, const char *caller);
|
||||
|
||||
#define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23))
|
||||
#define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23))
|
||||
|
|
@ -142,7 +135,6 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define INST_OP_FLUSH 0x02000000
|
||||
#define INST_FLUSH_MAP_CACHE 0x00000001
|
||||
|
||||
|
||||
#define BB1_START_ADDR_MASK (~0x7)
|
||||
#define BB1_PROTECTED (1<<0)
|
||||
#define BB1_UNPROTECTED (0<<0)
|
||||
|
|
@ -180,7 +172,7 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define RING_START 0x08
|
||||
#define START_ADDR 0x0xFFFFF000
|
||||
#define RING_LEN 0x0C
|
||||
#define RING_NR_PAGES 0x001FF000
|
||||
#define RING_NR_PAGES 0x001FF000
|
||||
#define RING_REPORT_MASK 0x00000006
|
||||
#define RING_REPORT_64K 0x00000002
|
||||
#define RING_REPORT_128K 0x00000004
|
||||
|
|
@ -208,18 +200,14 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define GFX_OP_DESTBUFFER_VARS ((0x3<<29)|(0x1d<<24)|(0x85<<16)|0x0)
|
||||
#define GFX_OP_DRAWRECT_INFO ((0x3<<29)|(0x1d<<24)|(0x80<<16)|(0x3))
|
||||
|
||||
|
||||
#define MI_BATCH_BUFFER ((0x30<<23)|1)
|
||||
#define MI_BATCH_BUFFER_START (0x31<<23)
|
||||
#define MI_BATCH_BUFFER_END (0xA<<23)
|
||||
#define MI_BATCH_NON_SECURE (1)
|
||||
|
||||
|
||||
|
||||
#define MI_WAIT_FOR_EVENT ((0x3<<23))
|
||||
#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2)
|
||||
#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1)
|
||||
|
||||
#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2)
|
||||
#define MI_WAIT_FOR_PLANE_A_SCANLINES (1<<1)
|
||||
|
||||
#define MI_LOAD_SCAN_LINES_INCL ((0x12<<23))
|
||||
|
||||
|
|
@ -229,4 +217,3 @@ extern int i915_wait_ring(drm_device_t *dev, int n, const char *caller);
|
|||
#define CMD_OP_DESTBUFFER_INFO ((0x3<<29)|(0x1d<<24)|(0x8e<<16)|1)
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -17,156 +17,149 @@
|
|||
#define MAX_NOPID ((u32)~0)
|
||||
#define READ_BREADCRUMB(dev_priv) (((u32*)(dev_priv->hw_status_page))[5])
|
||||
|
||||
|
||||
irqreturn_t i915_driver_irq_handler( DRM_IRQ_ARGS )
|
||||
irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
|
||||
{
|
||||
drm_device_t *dev = (drm_device_t *)arg;
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *)dev->dev_private;
|
||||
u16 temp;
|
||||
drm_device_t *dev = (drm_device_t *) arg;
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
u16 temp;
|
||||
|
||||
temp = I915_READ16(I915REG_INT_IDENTITY_R);
|
||||
temp = I915_READ16(I915REG_INT_IDENTITY_R);
|
||||
temp &= USER_INT_FLAG;
|
||||
|
||||
|
||||
DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
|
||||
|
||||
if (temp == 0)
|
||||
if (temp == 0)
|
||||
return IRQ_NONE;
|
||||
|
||||
I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
|
||||
DRM_WAKEUP( &dev_priv->irq_queue );
|
||||
I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
|
||||
DRM_WAKEUP(&dev_priv->irq_queue);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
int i915_emit_irq(drm_device_t *dev)
|
||||
int i915_emit_irq(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
u32 ret;
|
||||
RING_LOCALS;
|
||||
|
||||
i915_kernel_lost_context(dev);
|
||||
i915_kernel_lost_context(dev);
|
||||
|
||||
DRM_DEBUG("%s\n", __FUNCTION__);
|
||||
|
||||
ret = dev_priv->counter;
|
||||
|
||||
BEGIN_LP_RING(2);
|
||||
OUT_RING( 0 );
|
||||
OUT_RING( GFX_OP_USER_INTERRUPT );
|
||||
ADVANCE_LP_RING();
|
||||
BEGIN_LP_RING(2);
|
||||
OUT_RING(0);
|
||||
OUT_RING(GFX_OP_USER_INTERRUPT);
|
||||
ADVANCE_LP_RING();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int i915_wait_irq(drm_device_t *dev, int irq_nr)
|
||||
int i915_wait_irq(drm_device_t * dev, int irq_nr)
|
||||
{
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
int ret = 0;
|
||||
|
||||
DRM_DEBUG("%s irq_nr=%d breadcrumb=%d\n", __FUNCTION__, irq_nr, READ_BREADCRUMB(dev_priv));
|
||||
DRM_DEBUG("%s irq_nr=%d breadcrumb=%d\n", __FUNCTION__, irq_nr,
|
||||
READ_BREADCRUMB(dev_priv));
|
||||
|
||||
if (READ_BREADCRUMB(dev_priv) >= irq_nr)
|
||||
return 0;
|
||||
if (READ_BREADCRUMB(dev_priv) >= irq_nr)
|
||||
return 0;
|
||||
|
||||
dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
|
||||
|
||||
DRM_WAIT_ON( ret, dev_priv->irq_queue, 3 * DRM_HZ,
|
||||
READ_BREADCRUMB(dev_priv) >= irq_nr );
|
||||
DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
|
||||
READ_BREADCRUMB(dev_priv) >= irq_nr);
|
||||
|
||||
if (ret == DRM_ERR(EBUSY)) {
|
||||
DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n",
|
||||
DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n",
|
||||
__FUNCTION__,
|
||||
READ_BREADCRUMB(dev_priv),
|
||||
(int)dev_priv->counter);
|
||||
READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
|
||||
}
|
||||
|
||||
dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
|
||||
dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/* Needs the lock as it touches the ring.
|
||||
*/
|
||||
int i915_irq_emit( DRM_IOCTL_ARGS )
|
||||
int i915_irq_emit(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_irq_emit_t emit;
|
||||
int result;
|
||||
|
||||
if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
||||
if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
|
||||
DRM_ERROR("i915_irq_emit called without lock held\n");
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( emit, (drm_i915_irq_emit_t __user *)data,
|
||||
sizeof(emit) );
|
||||
DRM_COPY_FROM_USER_IOCTL(emit, (drm_i915_irq_emit_t __user *) data,
|
||||
sizeof(emit));
|
||||
|
||||
result = i915_emit_irq( dev );
|
||||
result = i915_emit_irq(dev);
|
||||
|
||||
if ( DRM_COPY_TO_USER( emit.irq_seq, &result, sizeof(int) ) ) {
|
||||
DRM_ERROR( "copy_to_user\n" );
|
||||
if (DRM_COPY_TO_USER(emit.irq_seq, &result, sizeof(int))) {
|
||||
DRM_ERROR("copy_to_user\n");
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* Doesn't need the hardware lock.
|
||||
*/
|
||||
int i915_irq_wait( DRM_IOCTL_ARGS )
|
||||
int i915_irq_wait(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_irq_wait_t irqwait;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( irqwait, (drm_i915_irq_wait_t __user *)data,
|
||||
sizeof(irqwait) );
|
||||
DRM_COPY_FROM_USER_IOCTL(irqwait, (drm_i915_irq_wait_t __user *) data,
|
||||
sizeof(irqwait));
|
||||
|
||||
return i915_wait_irq( dev, irqwait.irq_seq );
|
||||
return i915_wait_irq(dev, irqwait.irq_seq);
|
||||
}
|
||||
|
||||
|
||||
/* drm_dma.h hooks
|
||||
*/
|
||||
void i915_driver_irq_preinstall( drm_device_t *dev ) {
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
void i915_driver_irq_preinstall(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
|
||||
I915_WRITE16( I915REG_HWSTAM, 0xfffe );
|
||||
I915_WRITE16( I915REG_INT_MASK_R, 0x0 );
|
||||
I915_WRITE16( I915REG_INT_ENABLE_R, 0x0 );
|
||||
I915_WRITE16(I915REG_HWSTAM, 0xfffe);
|
||||
I915_WRITE16(I915REG_INT_MASK_R, 0x0);
|
||||
I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
|
||||
}
|
||||
|
||||
void i915_driver_irq_postinstall( drm_device_t *dev ) {
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
void i915_driver_irq_postinstall(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
|
||||
I915_WRITE16( I915REG_INT_ENABLE_R, USER_INT_FLAG );
|
||||
I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG);
|
||||
DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
|
||||
}
|
||||
|
||||
void i915_driver_irq_uninstall( drm_device_t *dev ) {
|
||||
drm_i915_private_t *dev_priv =
|
||||
(drm_i915_private_t *)dev->dev_private;
|
||||
void i915_driver_irq_uninstall(drm_device_t * dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
|
||||
if (!dev_priv)
|
||||
return;
|
||||
|
||||
I915_WRITE16( I915REG_HWSTAM, 0xffff );
|
||||
I915_WRITE16( I915REG_INT_MASK_R, 0xffff );
|
||||
I915_WRITE16( I915REG_INT_ENABLE_R, 0x0 );
|
||||
I915_WRITE16(I915REG_HWSTAM, 0xffff);
|
||||
I915_WRITE16(I915REG_INT_MASK_R, 0xffff);
|
||||
I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,60 +25,58 @@
|
|||
* block to allocate, and the ring is drained prior to allocations --
|
||||
* in other words allocation is expensive.
|
||||
*/
|
||||
static void mark_block( drm_device_t *dev, struct mem_block *p,
|
||||
int in_use )
|
||||
static void mark_block(drm_device_t * dev, struct mem_block *p, int in_use)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
|
||||
drm_tex_region_t *list;
|
||||
unsigned shift, nr;
|
||||
unsigned start;
|
||||
unsigned end;
|
||||
unsigned i;
|
||||
int age;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
|
||||
drm_tex_region_t *list;
|
||||
unsigned shift, nr;
|
||||
unsigned start;
|
||||
unsigned end;
|
||||
unsigned i;
|
||||
int age;
|
||||
|
||||
shift = dev_priv->tex_lru_log_granularity;
|
||||
nr = I915_NR_TEX_REGIONS;
|
||||
shift = dev_priv->tex_lru_log_granularity;
|
||||
nr = I915_NR_TEX_REGIONS;
|
||||
|
||||
start = p->start >> shift;
|
||||
end = (p->start + p->size - 1) >> shift;
|
||||
start = p->start >> shift;
|
||||
end = (p->start + p->size - 1) >> shift;
|
||||
|
||||
age = ++sarea_priv->texAge;
|
||||
list = sarea_priv->texList;
|
||||
age = ++sarea_priv->texAge;
|
||||
list = sarea_priv->texList;
|
||||
|
||||
/* Mark the regions with the new flag and update their age. Move
|
||||
* them to head of list to preserve LRU semantics.
|
||||
*/
|
||||
for (i = start ; i <= end ; i++) {
|
||||
list[i].in_use = in_use;
|
||||
list[i].age = age;
|
||||
/* Mark the regions with the new flag and update their age. Move
|
||||
* them to head of list to preserve LRU semantics.
|
||||
*/
|
||||
for (i = start; i <= end; i++) {
|
||||
list[i].in_use = in_use;
|
||||
list[i].age = age;
|
||||
|
||||
/* remove_from_list(i)
|
||||
*/
|
||||
list[(unsigned)list[i].next].prev = list[i].prev;
|
||||
list[(unsigned)list[i].prev].next = list[i].next;
|
||||
/* remove_from_list(i)
|
||||
*/
|
||||
list[(unsigned)list[i].next].prev = list[i].prev;
|
||||
list[(unsigned)list[i].prev].next = list[i].next;
|
||||
|
||||
/* insert_at_head(list, i)
|
||||
*/
|
||||
list[i].prev = nr;
|
||||
list[i].next = list[nr].next;
|
||||
list[(unsigned)list[nr].next].prev = i;
|
||||
list[nr].next = i;
|
||||
}
|
||||
/* insert_at_head(list, i)
|
||||
*/
|
||||
list[i].prev = nr;
|
||||
list[i].next = list[nr].next;
|
||||
list[(unsigned)list[nr].next].prev = i;
|
||||
list[nr].next = i;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Very simple allocator for agp memory, working on a static range
|
||||
* already mapped into each client's address space.
|
||||
*/
|
||||
|
||||
static struct mem_block *split_block(struct mem_block *p, int start, int size,
|
||||
DRMFILE filp )
|
||||
DRMFILE filp)
|
||||
{
|
||||
/* Maybe cut off the start of an existing block */
|
||||
if (start > p->start) {
|
||||
struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
|
||||
if (!newblock)
|
||||
if (!newblock)
|
||||
goto out;
|
||||
newblock->start = start;
|
||||
newblock->size = p->size - (start - p->start);
|
||||
|
|
@ -90,7 +88,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
|
|||
p->size -= newblock->size;
|
||||
p = newblock;
|
||||
}
|
||||
|
||||
|
||||
/* Maybe cut off the end of an existing block */
|
||||
if (size < p->size) {
|
||||
struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
|
||||
|
|
@ -106,40 +104,39 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
|
|||
p->size = size;
|
||||
}
|
||||
|
||||
out:
|
||||
out:
|
||||
/* Our block is in the middle */
|
||||
p->filp = filp;
|
||||
return p;
|
||||
}
|
||||
|
||||
static struct mem_block *alloc_block( struct mem_block *heap, int size,
|
||||
int align2, DRMFILE filp )
|
||||
static struct mem_block *alloc_block(struct mem_block *heap, int size,
|
||||
int align2, DRMFILE filp)
|
||||
{
|
||||
struct mem_block *p;
|
||||
int mask = (1 << align2)-1;
|
||||
int mask = (1 << align2) - 1;
|
||||
|
||||
for (p = heap->next ; p != heap ; p = p->next) {
|
||||
for (p = heap->next; p != heap; p = p->next) {
|
||||
int start = (p->start + mask) & ~mask;
|
||||
if (p->filp == NULL && start + size <= p->start + p->size)
|
||||
return split_block( p, start, size, filp );
|
||||
return split_block(p, start, size, filp);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct mem_block *find_block( struct mem_block *heap, int start )
|
||||
static struct mem_block *find_block(struct mem_block *heap, int start)
|
||||
{
|
||||
struct mem_block *p;
|
||||
|
||||
for (p = heap->next ; p != heap ; p = p->next)
|
||||
for (p = heap->next; p != heap; p = p->next)
|
||||
if (p->start == start)
|
||||
return p;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static void free_block( struct mem_block *p )
|
||||
static void free_block(struct mem_block *p)
|
||||
{
|
||||
p->filp = NULL;
|
||||
|
||||
|
|
@ -169,12 +166,12 @@ static int init_heap(struct mem_block **heap, int start, int size)
|
|||
{
|
||||
struct mem_block *blocks = DRM_MALLOC(sizeof(*blocks));
|
||||
|
||||
if (!blocks)
|
||||
if (!blocks)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
*heap = DRM_MALLOC(sizeof(**heap));
|
||||
if (!*heap) {
|
||||
DRM_FREE( blocks, sizeof(*blocks) );
|
||||
DRM_FREE(blocks, sizeof(*blocks));
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
@ -183,34 +180,32 @@ static int init_heap(struct mem_block **heap, int start, int size)
|
|||
blocks->filp = NULL;
|
||||
blocks->next = blocks->prev = *heap;
|
||||
|
||||
memset( *heap, 0, sizeof(**heap) );
|
||||
(*heap)->filp = (DRMFILE) -1;
|
||||
memset(*heap, 0, sizeof(**heap));
|
||||
(*heap)->filp = (DRMFILE) - 1;
|
||||
(*heap)->next = (*heap)->prev = blocks;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* Free all blocks associated with the releasing file.
|
||||
*/
|
||||
void i915_mem_release( drm_device_t *dev,
|
||||
DRMFILE filp, struct mem_block *heap )
|
||||
void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap)
|
||||
{
|
||||
struct mem_block *p;
|
||||
|
||||
if (!heap || !heap->next)
|
||||
return;
|
||||
|
||||
for (p = heap->next ; p != heap ; p = p->next) {
|
||||
for (p = heap->next; p != heap; p = p->next) {
|
||||
if (p->filp == filp) {
|
||||
p->filp = NULL;
|
||||
mark_block( dev, p, 0 );
|
||||
mark_block(dev, p, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Assumes a single contiguous range. Needs a special filp in
|
||||
* 'heap' to stop it being subsumed.
|
||||
*/
|
||||
for (p = heap->next ; p != heap ; p = p->next) {
|
||||
for (p = heap->next; p != heap; p = p->next) {
|
||||
while (p->filp == NULL && p->next->filp == NULL) {
|
||||
struct mem_block *q = p->next;
|
||||
p->size += q->size;
|
||||
|
|
@ -223,139 +218,130 @@ void i915_mem_release( drm_device_t *dev,
|
|||
|
||||
/* Shutdown.
|
||||
*/
|
||||
void i915_mem_takedown( struct mem_block **heap )
|
||||
void i915_mem_takedown(struct mem_block **heap)
|
||||
{
|
||||
struct mem_block *p;
|
||||
|
||||
|
||||
if (!*heap)
|
||||
return;
|
||||
|
||||
for (p = (*heap)->next ; p != *heap ; ) {
|
||||
for (p = (*heap)->next; p != *heap;) {
|
||||
struct mem_block *q = p;
|
||||
p = p->next;
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
|
||||
DRM_FREE( *heap, sizeof(**heap) );
|
||||
DRM_FREE(*heap, sizeof(**heap));
|
||||
*heap = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static struct mem_block **get_heap( drm_i915_private_t *dev_priv,
|
||||
int region )
|
||||
static struct mem_block **get_heap(drm_i915_private_t * dev_priv, int region)
|
||||
{
|
||||
switch( region ) {
|
||||
switch (region) {
|
||||
case I915_MEM_REGION_AGP:
|
||||
return &dev_priv->agp_heap;
|
||||
return &dev_priv->agp_heap;
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* IOCTL HANDLERS */
|
||||
|
||||
int i915_mem_alloc( DRM_IOCTL_ARGS )
|
||||
int i915_mem_alloc(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_mem_alloc_t alloc;
|
||||
struct mem_block *block, **heap;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( alloc, (drm_i915_mem_alloc_t __user *)data,
|
||||
sizeof(alloc) );
|
||||
DRM_COPY_FROM_USER_IOCTL(alloc, (drm_i915_mem_alloc_t __user *) data,
|
||||
sizeof(alloc));
|
||||
|
||||
heap = get_heap( dev_priv, alloc.region );
|
||||
heap = get_heap(dev_priv, alloc.region);
|
||||
if (!heap || !*heap)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
|
||||
/* Make things easier on ourselves: all allocations at least
|
||||
* 4k aligned.
|
||||
*/
|
||||
if (alloc.alignment < 12)
|
||||
alloc.alignment = 12;
|
||||
|
||||
block = alloc_block( *heap, alloc.size, alloc.alignment,
|
||||
filp );
|
||||
block = alloc_block(*heap, alloc.size, alloc.alignment, filp);
|
||||
|
||||
if (!block)
|
||||
if (!block)
|
||||
return DRM_ERR(ENOMEM);
|
||||
|
||||
mark_block( dev, block, 1 );
|
||||
mark_block(dev, block, 1);
|
||||
|
||||
if ( DRM_COPY_TO_USER( alloc.region_offset, &block->start,
|
||||
sizeof(int) ) ) {
|
||||
DRM_ERROR( "copy_to_user\n" );
|
||||
if (DRM_COPY_TO_USER(alloc.region_offset, &block->start, sizeof(int))) {
|
||||
DRM_ERROR("copy_to_user\n");
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int i915_mem_free( DRM_IOCTL_ARGS )
|
||||
int i915_mem_free(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_mem_free_t memfree;
|
||||
struct mem_block *block, **heap;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( memfree, (drm_i915_mem_free_t __user *)data,
|
||||
sizeof(memfree) );
|
||||
DRM_COPY_FROM_USER_IOCTL(memfree, (drm_i915_mem_free_t __user *) data,
|
||||
sizeof(memfree));
|
||||
|
||||
heap = get_heap( dev_priv, memfree.region );
|
||||
heap = get_heap(dev_priv, memfree.region);
|
||||
if (!heap || !*heap)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
block = find_block( *heap, memfree.region_offset );
|
||||
|
||||
block = find_block(*heap, memfree.region_offset);
|
||||
if (!block)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
if (block->filp != filp)
|
||||
return DRM_ERR(EPERM);
|
||||
|
||||
mark_block( dev, block, 0 );
|
||||
free_block( block );
|
||||
mark_block(dev, block, 0);
|
||||
free_block(block);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int i915_mem_init_heap( DRM_IOCTL_ARGS )
|
||||
int i915_mem_init_heap(DRM_IOCTL_ARGS)
|
||||
{
|
||||
DRM_DEVICE;
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
drm_i915_mem_init_heap_t initheap;
|
||||
struct mem_block **heap;
|
||||
|
||||
if ( !dev_priv ) {
|
||||
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
|
||||
if (!dev_priv) {
|
||||
DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
|
||||
return DRM_ERR(EINVAL);
|
||||
}
|
||||
|
||||
DRM_COPY_FROM_USER_IOCTL( initheap, (drm_i915_mem_init_heap_t __user *)data,
|
||||
sizeof(initheap) );
|
||||
DRM_COPY_FROM_USER_IOCTL(initheap,
|
||||
(drm_i915_mem_init_heap_t __user *) data,
|
||||
sizeof(initheap));
|
||||
|
||||
heap = get_heap( dev_priv, initheap.region );
|
||||
if (!heap)
|
||||
heap = get_heap(dev_priv, initheap.region);
|
||||
if (!heap)
|
||||
return DRM_ERR(EFAULT);
|
||||
|
||||
|
||||
if (*heap) {
|
||||
DRM_ERROR("heap already initialized?");
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
return init_heap( heap, initheap.start, initheap.size );
|
||||
|
||||
return init_heap(heap, initheap.start, initheap.size);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue