| mach64_state.c (182080) | mach64_state.c (198332) |
|---|---|
| 1/* mach64_state.c -- State support for mach64 (Rage Pro) driver -*- linux-c -*- 2 * Created: Sun Dec 03 19:20:26 2000 by gareth@valinux.com 3 */ 4/*- 5 * Copyright 2000 Gareth Hughes 6 * Copyright 2002-2003 Leif Delgass 7 * All Rights Reserved. 8 * --- 17 unchanged lines hidden (view full) --- 26 * 27 * Authors: 28 * Gareth Hughes <gareth@valinux.com> 29 * Leif Delgass <ldelgass@retinalburn.net> 30 * Jos�� Fonseca <j_r_fonseca@yahoo.co.uk> 31 */ 32 33#include <sys/cdefs.h> | 1/* mach64_state.c -- State support for mach64 (Rage Pro) driver -*- linux-c -*- 2 * Created: Sun Dec 03 19:20:26 2000 by gareth@valinux.com 3 */ 4/*- 5 * Copyright 2000 Gareth Hughes 6 * Copyright 2002-2003 Leif Delgass 7 * All Rights Reserved. 8 * --- 17 unchanged lines hidden (view full) --- 26 * 27 * Authors: 28 * Gareth Hughes <gareth@valinux.com> 29 * Leif Delgass <ldelgass@retinalburn.net> 30 * Jos�� Fonseca <j_r_fonseca@yahoo.co.uk> 31 */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/dev/drm/mach64_state.c 182080 2008-08-23 20:59:12Z rnoland $"); | 34__FBSDID("$FreeBSD: head/sys/dev/drm/mach64_state.c 198332 2009-10-21 15:54:45Z brueffer $"); |
| 35 36#include "dev/drm/drmP.h" 37#include "dev/drm/drm.h" 38#include "dev/drm/mach64_drm.h" 39#include "dev/drm/mach64_drv.h" 40 41/* Interface history: 42 * --- 778 unchanged lines hidden (view full) --- 821 sarea_priv->dirty |= (MACH64_UPLOAD_CONTEXT | MACH64_UPLOAD_MISC); 822 return ret; 823} 824 825int mach64_dma_vertex(struct drm_device *dev, void *data, 826 struct drm_file *file_priv) 827{ 828 drm_mach64_private_t *dev_priv = dev->dev_private; | 35 36#include "dev/drm/drmP.h" 37#include "dev/drm/drm.h" 38#include "dev/drm/mach64_drm.h" 39#include "dev/drm/mach64_drv.h" 40 41/* Interface history: 42 * --- 778 unchanged lines hidden (view full) --- 821 sarea_priv->dirty |= (MACH64_UPLOAD_CONTEXT | MACH64_UPLOAD_MISC); 822 return ret; 823} 824 825int mach64_dma_vertex(struct drm_device *dev, void *data, 826 struct drm_file *file_priv) 827{ 828 drm_mach64_private_t *dev_priv = dev->dev_private; |
| 829 drm_mach64_sarea_t *sarea_priv = dev_priv->sarea_priv; | 829 drm_mach64_sarea_t *sarea_priv; |
| 830 drm_mach64_vertex_t *vertex = data; 831 832 LOCK_TEST_WITH_RETURN(dev, file_priv); 833 834 if (!dev_priv) { 835 DRM_ERROR("called with no initialization\n"); 836 return -EINVAL; 837 } | 830 drm_mach64_vertex_t *vertex = data; 831 832 LOCK_TEST_WITH_RETURN(dev, file_priv); 833 834 if (!dev_priv) { 835 DRM_ERROR("called with no initialization\n"); 836 return -EINVAL; 837 } |
| 838 sarea_priv = dev_priv->sarea_priv; |
|
| 838 839 DRM_DEBUG("pid=%d buf=%p used=%lu discard=%d\n", 840 DRM_CURRENTPID, 841 vertex->buf, vertex->used, vertex->discard); 842 843 if (vertex->prim < 0 || vertex->prim > MACH64_PRIM_POLYGON) { 844 DRM_ERROR("buffer prim %d\n", vertex->prim); 845 return -EINVAL; --- 68 unchanged lines hidden --- | 839 840 DRM_DEBUG("pid=%d buf=%p used=%lu discard=%d\n", 841 DRM_CURRENTPID, 842 vertex->buf, vertex->used, vertex->discard); 843 844 if (vertex->prim < 0 || vertex->prim > MACH64_PRIM_POLYGON) { 845 DRM_ERROR("buffer prim %d\n", vertex->prim); 846 return -EINVAL; --- 68 unchanged lines hidden --- |