diff options
| -rw-r--r-- | bsd-core/drm_irq.c | 10 | ||||
| -rw-r--r-- | linux-core/drm_bo.c | 3 | ||||
| -rw-r--r-- | linux-core/drm_fops.c | 5 | ||||
| -rw-r--r-- | linux-core/i915_drv.c | 1 | ||||
| -rw-r--r-- | shared-core/i915_dma.c | 11 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 2 | ||||
| -rw-r--r-- | shared-core/nv04_graph.c | 382 |
7 files changed, 280 insertions, 134 deletions
diff --git a/bsd-core/drm_irq.c b/bsd-core/drm_irq.c index 5f44f918..f7da5ed7 100644 --- a/bsd-core/drm_irq.c +++ b/bsd-core/drm_irq.c @@ -102,11 +102,13 @@ int drm_irq_install(drm_device_t *dev) retcode = ENOENT; goto err; } -#if __FreeBSD_version < 500000 - retcode = bus_setup_intr(dev->device, dev->irqr, INTR_TYPE_TTY, - dev->irq_handler, dev, &dev->irqh); +#if __FreeBSD_version >= 700031 + retcode = bus_setup_intr(dev->device, dev->irqr, + INTR_TYPE_TTY | INTR_MPSAFE, + NULL, drm_irq_handler_wrap, dev, &dev->irqh); #else - retcode = bus_setup_intr(dev->device, dev->irqr, INTR_TYPE_TTY | INTR_MPSAFE, + retcode = bus_setup_intr(dev->device, dev->irqr, + INTR_TYPE_TTY | INTR_MPSAFE, drm_irq_handler_wrap, dev, &dev->irqh); #endif if (retcode != 0) diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index d3e89af6..1bdc6fef 100644 --- a/linux-core/drm_bo.c +++ b/linux-core/drm_bo.c @@ -832,6 +832,9 @@ int drm_bo_mem_space(drm_buffer_object_t * bo, mem_type = prios[i]; man = &bm->man[mem_type]; + if (!man->has_type) + continue; + if (!drm_bo_mt_compatible(man, mem_type, mem->mask, &cur_flags)) continue; diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 3521c092..d400a4d5 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -154,10 +154,13 @@ int drm_open(struct inode *inode, struct file *filp) spin_lock(&dev->count_lock); if (!dev->open_count++) { spin_unlock(&dev->count_lock); - return drm_setup(dev); + retcode = drm_setup(dev); + goto out; } spin_unlock(&dev->count_lock); } + + out: mutex_lock(&dev->struct_mutex); BUG_ON((dev->dev_mapping != NULL) && (dev->dev_mapping != inode->i_mapping)); diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c index 56e5998f..7fdb0839 100644 --- a/linux-core/i915_drv.c +++ b/linux-core/i915_drv.c @@ -79,6 +79,7 @@ static struct drm_driver driver = { DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL | DRIVER_IRQ_VBL2, .load = i915_driver_load, + .firstopen = i915_driver_firstopen, .lastclose = i915_driver_lastclose, .preclose = i915_driver_preclose, .device_is_agp = i915_driver_device_is_agp, diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index cd70769c..aed3eea1 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -196,9 +196,6 @@ static int i915_initialize(drm_device_t * dev, I915_WRITE(0x02080, dev_priv->dma_status_page); DRM_DEBUG("Enabled hardware status page\n"); dev->dev_private = (void *)dev_priv; -#ifdef I915_HAVE_BUFFER - drm_bo_driver_init(dev); -#endif return 0; } @@ -950,3 +947,11 @@ int i915_driver_device_is_agp(drm_device_t * dev) { return 1; } + +int i915_driver_firstopen(struct drm_device *dev) +{ +#ifdef I915_HAVE_BUFFER + drm_bo_driver_init(dev); +#endif + return 0; +} diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 662ffad6..e8a7be29 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -153,7 +153,7 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, extern void i915_emit_breadcrumb(drm_device_t *dev); extern void i915_dispatch_flip(drm_device_t * dev, int pipes, int sync); extern int i915_emit_mi_flush(drm_device_t *dev, uint32_t flush); - +extern int i915_driver_firstopen(struct drm_device *dev); /* i915_irq.c */ extern int i915_irq_emit(DRM_IOCTL_ARGS); diff --git a/shared-core/nv04_graph.c b/shared-core/nv04_graph.c index cf4e58f6..0cd4d3b8 100644 --- a/shared-core/nv04_graph.c +++ b/shared-core/nv04_graph.c @@ -32,122 +32,259 @@ struct reg_interval uint32_t reg; int number; } nv04_graph_ctx_regs [] = { - {NV04_PGRAPH_CTX_SWITCH1, 1}, - {NV04_PGRAPH_CTX_SWITCH2, 1}, - {NV04_PGRAPH_CTX_SWITCH3, 1}, - {NV04_PGRAPH_CTX_SWITCH4, 1}, - {NV04_PGRAPH_CTX_USER, 1}, - {NV04_PGRAPH_CTX_CACHE1, 8}, - {NV04_PGRAPH_CTX_CACHE2, 8}, - {NV04_PGRAPH_CTX_CACHE3, 8}, - {NV04_PGRAPH_CTX_CACHE4, 8}, - {NV03_PGRAPH_ABS_X_RAM, 32}, - {NV03_PGRAPH_ABS_Y_RAM, 32}, - {NV03_PGRAPH_X_MISC, 1}, - {NV03_PGRAPH_Y_MISC, 1}, - {NV04_PGRAPH_VALID1, 1}, - {NV04_PGRAPH_SOURCE_COLOR, 1}, - {NV04_PGRAPH_MISC24_0, 1}, - {NV03_PGRAPH_XY_LOGIC_MISC0, 1}, - {NV03_PGRAPH_XY_LOGIC_MISC1, 1}, - {NV03_PGRAPH_XY_LOGIC_MISC2, 1}, - {NV03_PGRAPH_XY_LOGIC_MISC3, 1}, - {NV03_PGRAPH_CLIPX_0, 1}, - {NV03_PGRAPH_CLIPX_1, 1}, - {NV03_PGRAPH_CLIPY_0, 1}, - {NV03_PGRAPH_CLIPY_1, 1}, - {NV03_PGRAPH_ABS_ICLIP_XMAX, 1}, - {NV03_PGRAPH_ABS_ICLIP_YMAX, 1}, - {NV03_PGRAPH_ABS_UCLIP_XMIN, 1}, - {NV03_PGRAPH_ABS_UCLIP_YMIN, 1}, - {NV03_PGRAPH_ABS_UCLIP_XMAX, 1}, - {NV03_PGRAPH_ABS_UCLIP_YMAX, 1}, - {NV03_PGRAPH_ABS_UCLIPA_XMIN, 1}, - {NV03_PGRAPH_ABS_UCLIPA_YMIN, 1}, - {NV03_PGRAPH_ABS_UCLIPA_XMAX, 1}, - {NV03_PGRAPH_ABS_UCLIPA_YMAX, 1}, - {NV04_PGRAPH_MISC24_1, 1}, - {NV04_PGRAPH_MISC24_2, 1}, - {NV04_PGRAPH_VALID2, 1}, - {NV04_PGRAPH_PASSTHRU_0, 1}, - {NV04_PGRAPH_PASSTHRU_1, 1}, - {NV04_PGRAPH_PASSTHRU_2, 1}, - {NV04_PGRAPH_COMBINE_0_ALPHA, 1}, - {NV04_PGRAPH_COMBINE_0_COLOR, 1}, - {NV04_PGRAPH_COMBINE_1_ALPHA, 1}, - {NV04_PGRAPH_COMBINE_1_COLOR, 1}, - // texture state - {NV04_PGRAPH_FORMAT_0, 1}, - {NV04_PGRAPH_FORMAT_1, 1}, - {NV04_PGRAPH_FILTER_0, 1}, - {NV04_PGRAPH_FILTER_1, 1}, - // vertex state - {0x004005c0, 1}, - {0x004005c4, 1}, - {0x004005c8, 1}, - {0x004005cc, 1}, - {0x004005d0, 1}, - {0x004005d4, 1}, - {0x004005d8, 1}, - {0x004005dc, 1}, - {0x004005e0, 1}, - {NV03_PGRAPH_MONO_COLOR0, 1}, - {NV04_PGRAPH_ROP3, 1}, - {NV04_PGRAPH_BETA_AND, 1}, - {NV04_PGRAPH_BETA_PREMULT, 1}, - {NV04_PGRAPH_FORMATS, 1}, - {NV04_PGRAPH_BOFFSET0, 6}, - {NV04_PGRAPH_BBASE0, 6}, - {NV04_PGRAPH_BPITCH0, 5}, - {NV04_PGRAPH_BLIMIT0, 6}, - {NV04_PGRAPH_BSWIZZLE2, 1}, - {NV04_PGRAPH_BSWIZZLE5, 1}, - {NV04_PGRAPH_SURFACE, 1}, - {NV04_PGRAPH_STATE, 1}, - {NV04_PGRAPH_NOTIFY, 1}, - {NV04_PGRAPH_BPIXEL, 1}, - {NV04_PGRAPH_DMA_PITCH, 1}, - {NV04_PGRAPH_DVD_COLORFMT, 1}, - {NV04_PGRAPH_SCALED_FORMAT, 1}, - {NV04_PGRAPH_PATT_COLOR0, 1}, - {NV04_PGRAPH_PATT_COLOR1, 1}, - {NV04_PGRAPH_PATTERN, 2}, - {NV04_PGRAPH_PATTERN_SHAPE, 1}, - {NV04_PGRAPH_CHROMA, 1}, - {NV04_PGRAPH_CONTROL0, 1}, - {NV04_PGRAPH_CONTROL1, 1}, - {NV04_PGRAPH_CONTROL2, 1}, - {NV04_PGRAPH_BLEND, 1}, - {NV04_PGRAPH_STORED_FMT, 1}, - {NV04_PGRAPH_PATT_COLORRAM, 64}, - {NV04_PGRAPH_U_RAM, 16}, - {NV04_PGRAPH_V_RAM, 16}, - {NV04_PGRAPH_W_RAM, 16}, - {NV04_PGRAPH_DMA_START_0, 1}, - {NV04_PGRAPH_DMA_START_1, 1}, - {NV04_PGRAPH_DMA_LENGTH, 1}, - {NV04_PGRAPH_DMA_MISC, 1}, - {NV04_PGRAPH_DMA_DATA_0, 1}, - {NV04_PGRAPH_DMA_DATA_1, 1}, - {NV04_PGRAPH_DMA_RM, 1}, - {NV04_PGRAPH_DMA_A_XLATE_INST, 1}, - {NV04_PGRAPH_DMA_A_CONTROL, 1}, - {NV04_PGRAPH_DMA_A_LIMIT, 1}, - {NV04_PGRAPH_DMA_A_TLB_PTE, 1}, - {NV04_PGRAPH_DMA_A_TLB_TAG, 1}, - {NV04_PGRAPH_DMA_A_ADJ_OFFSET, 1}, - {NV04_PGRAPH_DMA_A_OFFSET, 1}, - {NV04_PGRAPH_DMA_A_SIZE, 1}, - {NV04_PGRAPH_DMA_A_Y_SIZE, 1}, - {NV04_PGRAPH_DMA_B_XLATE_INST, 1}, - {NV04_PGRAPH_DMA_B_CONTROL, 1}, - {NV04_PGRAPH_DMA_B_LIMIT, 1}, - {NV04_PGRAPH_DMA_B_TLB_PTE, 1}, - {NV04_PGRAPH_DMA_B_TLB_TAG, 1}, - {NV04_PGRAPH_DMA_B_ADJ_OFFSET, 1}, - {NV04_PGRAPH_DMA_B_OFFSET, 1}, - {NV04_PGRAPH_DMA_B_SIZE, 1}, - {NV04_PGRAPH_DMA_B_Y_SIZE, 1}, + {NV04_PGRAPH_CTX_SWITCH1,1}, + {NV04_PGRAPH_CTX_SWITCH2,1}, + {NV04_PGRAPH_CTX_SWITCH3,1}, + {NV04_PGRAPH_CTX_SWITCH4,1}, + {NV04_PGRAPH_CTX_CACHE1,1}, + {NV04_PGRAPH_CTX_CACHE2,1}, + {NV04_PGRAPH_CTX_CACHE3,1}, + {NV04_PGRAPH_CTX_CACHE4,1}, + {0x00400184,1}, + {0x004001a4,1}, + {0x004001c4,1}, + {0x004001e4,1}, + {0x00400188,1}, + {0x004001a8,1}, + {0x004001c8,1}, + {0x004001e8,1}, + {0x0040018c,1}, + {0x004001ac,1}, + {0x004001cc,1}, + {0x004001ec,1}, + {0x00400190,1}, + {0x004001b0,1}, + {0x004001d0,1}, + {0x004001f0,1}, + {0x00400194,1}, + {0x004001b4,1}, + {0x004001d4,1}, + {0x004001f4,1}, + {0x00400198,1}, + {0x004001b8,1}, + {0x004001d8,1}, + {0x004001f8,1}, + {0x0040019c,1}, + {0x004001bc,1}, + {0x004001dc,1}, + {0x004001fc,1}, + {0x00400174,1}, + {NV04_PGRAPH_DMA_START_0,1}, + {NV04_PGRAPH_DMA_START_1,1}, + {NV04_PGRAPH_DMA_LENGTH,1}, + {NV04_PGRAPH_DMA_MISC,1}, + {NV04_PGRAPH_DMA_PITCH,1}, + {NV04_PGRAPH_BOFFSET0,1}, + {NV04_PGRAPH_BBASE0,1}, + {NV04_PGRAPH_BLIMIT0,1}, + {NV04_PGRAPH_BOFFSET1,1}, + {NV04_PGRAPH_BBASE1,1}, + {NV04_PGRAPH_BLIMIT1,1}, + {NV04_PGRAPH_BOFFSET2,1}, + {NV04_PGRAPH_BBASE2,1}, + {NV04_PGRAPH_BLIMIT2,1}, + {NV04_PGRAPH_BOFFSET3,1}, + {NV04_PGRAPH_BBASE3,1}, + {NV04_PGRAPH_BLIMIT3,1}, + {NV04_PGRAPH_BOFFSET4,1}, + {NV04_PGRAPH_BBASE4,1}, + {NV04_PGRAPH_BLIMIT4,1}, + {NV04_PGRAPH_BOFFSET5,1}, + {NV04_PGRAPH_BBASE5,1}, + {NV04_PGRAPH_BLIMIT5,1}, + {NV04_PGRAPH_BPITCH0,1}, + {NV04_PGRAPH_BPITCH1,1}, + {NV04_PGRAPH_BPITCH2,1}, + {NV04_PGRAPH_BPITCH3,1}, + {NV04_PGRAPH_BPITCH4,1}, + {NV04_PGRAPH_SURFACE,1}, + {NV04_PGRAPH_STATE,1}, + {NV04_PGRAPH_BSWIZZLE2,1}, + {NV04_PGRAPH_BSWIZZLE5,1}, + {NV04_PGRAPH_BPIXEL,1}, + {NV04_PGRAPH_NOTIFY,1}, + {NV04_PGRAPH_PATT_COLOR0,1}, + {NV04_PGRAPH_PATT_COLOR1,1}, + {NV04_PGRAPH_PATT_COLORRAM,64}, + {NV04_PGRAPH_PATTERN,1}, + {0x0040080c,1}, + {NV04_PGRAPH_PATTERN_SHAPE,1}, + {0x00400600,1}, + {NV04_PGRAPH_ROP3,1}, + {NV04_PGRAPH_CHROMA,1}, + {NV04_PGRAPH_BETA_AND,1}, + {NV04_PGRAPH_BETA_PREMULT,1}, + {NV04_PGRAPH_CONTROL0,1}, + {NV04_PGRAPH_CONTROL1,1}, + {NV04_PGRAPH_CONTROL2,1}, + {NV04_PGRAPH_BLEND,1}, + {NV04_PGRAPH_STORED_FMT,1}, + {NV04_PGRAPH_SOURCE_COLOR,1}, + {0x00400560,1}, + {0x00400568,1}, + {0x00400564,1}, + {0x0040056c,1}, + {0x00400400,1}, + {0x00400480,1}, + {0x00400404,1}, + {0x00400484,1}, + {0x00400408,1}, + {0x00400488,1}, + {0x0040040c,1}, + {0x0040048c,1}, + {0x00400410,1}, + {0x00400490,1}, + {0x00400414,1}, + {0x00400494,1}, + {0x00400418,1}, + {0x00400498,1}, + {0x0040041c,1}, + {0x0040049c,1}, + {0x00400420,1}, + {0x004004a0,1}, + {0x00400424,1}, + {0x004004a4,1}, + {0x00400428,1}, + {0x004004a8,1}, + {0x0040042c,1}, + {0x004004ac,1}, + {0x00400430,1}, + {0x004004b0,1}, + {0x00400434,1}, + {0x004004b4,1}, + {0x00400438,1}, + {0x004004b8,1}, + {0x0040043c,1}, + {0x004004bc,1}, + {0x00400440,1}, + {0x004004c0,1}, + {0x00400444,1}, + {0x004004c4,1}, + {0x00400448,1}, + {0x004004c8,1}, + {0x0040044c,1}, + {0x004004cc,1}, + {0x00400450,1}, + {0x004004d0,1}, + {0x00400454,1}, + {0x004004d4,1}, + {0x00400458,1}, + {0x004004d8,1}, + {0x0040045c,1}, + {0x004004dc,1}, + {0x00400460,1}, + {0x004004e0,1}, + {0x00400464,1}, + {0x004004e4,1}, + {0x00400468,1}, + {0x004004e8,1}, + {0x0040046c,1}, + {0x004004ec,1}, + {0x00400470,1}, + {0x004004f0,1}, + {0x00400474,1}, + {0x004004f4,1}, + {0x00400478,1}, + {0x004004f8,1}, + {0x0040047c,1}, + {0x004004fc,1}, + {0x0040053c,1}, + {0x00400544,1}, + {0x00400540,1}, + {0x00400548,1}, + {0x00400560,1}, + {0x00400568,1}, + {0x00400564,1}, + {0x0040056c,1}, + {0x00400534,1}, + {0x00400538,1}, + {0x00400514,1}, + {0x00400518,1}, + {0x0040051c,1}, + {0x00400520,1}, + {0x00400524,1}, + {0x00400528,1}, + {0x0040052c,1}, + {0x00400530,1}, + {0x00400d00,1}, + {0x00400d40,1}, + {0x00400d80,1}, + {0x00400d04,1}, + {0x00400d44,1}, + {0x00400d84,1}, + {0x00400d08,1}, + {0x00400d48,1}, + {0x00400d88,1}, + {0x00400d0c,1}, + {0x00400d4c,1}, + {0x00400d8c,1}, + {0x00400d10,1}, + {0x00400d50,1}, + {0x00400d90,1}, + {0x00400d14,1}, + {0x00400d54,1}, + {0x00400d94,1}, + {0x00400d18,1}, + {0x00400d58,1}, + {0x00400d98,1}, + {0x00400d1c,1}, + {0x00400d5c,1}, + {0x00400d9c,1}, + {0x00400d20,1}, + {0x00400d60,1}, + {0x00400da0,1}, + {0x00400d24,1}, + {0x00400d64,1}, + {0x00400da4,1}, + {0x00400d28,1}, + {0x00400d68,1}, + {0x00400da8,1}, + {0x00400d2c,1}, + {0x00400d6c,1}, + {0x00400dac,1}, + {0x00400d30,1}, + {0x00400d70,1}, + {0x00400db0,1}, + {0x00400d34,1}, + {0x00400d74,1}, + {0x00400db4,1}, + {0x00400d38,1}, + {0x00400d78,1}, + {0x00400db8,1}, + {0x00400d3c,1}, + {0x00400d7c,1}, + {0x00400dbc,1}, + {0x00400590,1}, + {0x00400594,1}, + {0x00400598,1}, + {0x0040059c,1}, + {0x004005a8,1}, + {0x004005ac,1}, + {0x004005b0,1}, + {0x004005b4,1}, + {0x004005c0,1}, + {0x004005c4,1}, + {0x004005c8,1}, + {0x004005cc,1}, + {0x004005d0,1}, + {0x004005d4,1}, + {0x004005d8,1}, + {0x004005dc,1}, + {0x004005e0,1}, + {NV04_PGRAPH_PASSTHRU_0,1}, + {NV04_PGRAPH_PASSTHRU_1,1}, + {NV04_PGRAPH_PASSTHRU_2,1}, + {NV04_PGRAPH_DVD_COLORFMT,1}, + {NV04_PGRAPH_SCALED_FORMAT,1}, + {NV04_PGRAPH_MISC24_0,1}, + {NV04_PGRAPH_MISC24_1,1}, + {NV04_PGRAPH_MISC24_2,1}, + {0x00400500,1}, + {0x00400504,1}, + {NV04_PGRAPH_VALID1,1}, + {NV04_PGRAPH_VALID2,1} + + }; void nouveau_nv04_context_switch(drm_device_t *dev) @@ -158,13 +295,15 @@ void nouveau_nv04_context_switch(drm_device_t *dev) channel=NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1); channel_old = (NV_READ(NV04_PGRAPH_CTX_USER) >> 24) & (nouveau_fifo_number(dev)-1); - DRM_INFO("NV: PGRAPH context switch interrupt channel %x -> %x\n",channel_old, channel); + DRM_DEBUG("NV: PGRAPH context switch interrupt channel %x -> %x\n",channel_old, channel); NV_WRITE(NV03_PFIFO_CACHES, 0x0); NV_WRITE(NV04_PFIFO_CACHE0_PULL0, 0x0); NV_WRITE(NV04_PFIFO_CACHE1_PULL0, 0x0); NV_WRITE(NV04_PGRAPH_FIFO,0x0); + nouveau_wait_for_idle(dev); + // save PGRAPH context index=0; for (i = 0; i<sizeof(nv04_graph_ctx_regs)/sizeof(nv04_graph_ctx_regs[0]); i++) @@ -174,15 +313,10 @@ void nouveau_nv04_context_switch(drm_device_t *dev) index++; } - nouveau_wait_for_idle(dev); - NV_WRITE(NV04_PGRAPH_CTX_CONTROL, 0x10000000); NV_WRITE(NV04_PGRAPH_CTX_USER, (NV_READ(NV04_PGRAPH_CTX_USER) & 0xffffff) | (0x0f << 24)); - nouveau_wait_for_idle(dev); // restore PGRAPH context - //XXX not working yet -#if 1 index=0; for (i = 0; i<sizeof(nv04_graph_ctx_regs)/sizeof(nv04_graph_ctx_regs[0]); i++) for (j = 0; j<nv04_graph_ctx_regs[i].number; j++) @@ -190,12 +324,10 @@ void nouveau_nv04_context_switch(drm_device_t *dev) NV_WRITE(nv04_graph_ctx_regs[i].reg+j*4, dev_priv->fifos[channel].pgraph_ctx[index]); index++; } - nouveau_wait_for_idle(dev); -#endif NV_WRITE(NV04_PGRAPH_CTX_CONTROL, 0x10010100); NV_WRITE(NV04_PGRAPH_CTX_USER, channel << 24); - NV_WRITE(NV04_PGRAPH_FFINTFC_ST2, NV_READ(NV04_PGRAPH_FFINTFC_ST2)&0xCFFFFFFF); + NV_WRITE(NV04_PGRAPH_FFINTFC_ST2, NV_READ(NV04_PGRAPH_FFINTFC_ST2)&0x000FFFFF); NV_WRITE(NV04_PGRAPH_FIFO,0x0); NV_WRITE(NV04_PFIFO_CACHE0_PULL0, 0x0); |