fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-06 05:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux compile fixes

Browse source
This commit is contained in:
Alan Hourihane 2001-05-04 09:30:14 +00:00
parent f412294c7c
commit dd61a63346
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linux-core/drm_drv.c
View file

@ -127,8 +127,7 @@ static struct file_operations DRM(fops) = {
#include <sys/proc.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#include <compat/linux/linux_ioctl.h>
#include <dev/drm/drm_linux.h>
#include "drm_linux.h"
#endif
static int DRM(init)(device_t nbdev);

1
linux-core/drm_os_linux.h
View file

@ -267,6 +267,7 @@ do { \
#define DRM_OS_DEVICE drm_file_t *priv = filp->private_data; \
drm_device_t *dev = priv->dev
#define DRM_OS_PRIV
#define DRM_OS_DELAY(d) udelay(d)
#define DRM_OS_RETURN(v) return -v;
#define DRM_OS_CURRENTPID current->pid
#define DRM_OS_KRNTOUSR(arg1, arg2, arg3) \

3
linux/drm_drv.h
View file

@ -127,8 +127,7 @@ static struct file_operations DRM(fops) = {
#include <sys/proc.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#include <compat/linux/linux_ioctl.h>
#include <dev/drm/drm_linux.h>
#include "drm_linux.h"
#endif
static int DRM(init)(device_t nbdev);

1
linux/drm_os_linux.h
View file

@ -267,6 +267,7 @@ do { \
#define DRM_OS_DEVICE drm_file_t *priv = filp->private_data; \
drm_device_t *dev = priv->dev
#define DRM_OS_PRIV
#define DRM_OS_DELAY(d) udelay(d)
#define DRM_OS_RETURN(v) return -v;
#define DRM_OS_CURRENTPID current->pid
#define DRM_OS_KRNTOUSR(arg1, arg2, arg3) \

4
linux/mga_dma.c
View file

@ -515,7 +515,7 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init )
break;
}
}
#else
#endif
DRM_FIND_MAP( dev_priv->fb, init->fb_offset );
DRM_FIND_MAP( dev_priv->mmio, init->mmio_offset );
@ -771,7 +771,7 @@ int mga_dma_buffers( DRM_OS_IOCTL )
ret = 0;
}
DRM_OS_KRNTOUSR( data, &d, sizeof(d) );
DRM_OS_KRNTOUSR( (drm_dma_t *) data, d, sizeof(d) );
return ret;
}

3
linux/mga_drv.h
View file

@ -143,6 +143,7 @@ extern int mga_warp_init( drm_device_t *dev );
#endif
#if defined( __FreeBSD__ )
#define mga_flush_write_combine() \
{ \
int xchangeDummy; \
DRM_DEBUG("%s\n", __FUNCTION__); \
__asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy)); \
@ -641,7 +642,7 @@ do { \
/* Simple idle test.
*/
static inline int mga_is_idle( drm_mga_private_t *dev_priv )
static __inline__ int mga_is_idle( drm_mga_private_t *dev_priv )
{
u32 status = MGA_READ( MGA_STATUS ) & MGA_ENGINE_IDLE_MASK;
return ( status == MGA_ENDPRDMASTS );

14
linux/mga_state.c
View file

@ -69,7 +69,7 @@ static void mga_emit_clip_rect( drm_mga_private_t *dev_priv,
ADVANCE_DMA();
}
static inline void mga_g200_emit_context( drm_mga_private_t *dev_priv )
static __inline__ void mga_g200_emit_context( drm_mga_private_t *dev_priv )
{
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
@ -95,7 +95,7 @@ static inline void mga_g200_emit_context( drm_mga_private_t *dev_priv )
ADVANCE_DMA();
}
static inline void mga_g400_emit_context( drm_mga_private_t *dev_priv )
static __inline__ void mga_g400_emit_context( drm_mga_private_t *dev_priv )
{
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_mga_context_regs_t *ctx = &sarea_priv->context_state;
@ -126,7 +126,7 @@ static inline void mga_g400_emit_context( drm_mga_private_t *dev_priv )
ADVANCE_DMA();
}
static inline void mga_g200_emit_tex0( drm_mga_private_t *dev_priv )
static __inline__ void mga_g200_emit_tex0( drm_mga_private_t *dev_priv )
{
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
@ -157,7 +157,7 @@ static inline void mga_g200_emit_tex0( drm_mga_private_t *dev_priv )
ADVANCE_DMA();
}
static inline void mga_g400_emit_tex0( drm_mga_private_t *dev_priv )
static __inline__ void mga_g400_emit_tex0( drm_mga_private_t *dev_priv )
{
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0];
@ -198,7 +198,7 @@ static inline void mga_g400_emit_tex0( drm_mga_private_t *dev_priv )
ADVANCE_DMA();
}
static inline void mga_g400_emit_tex1( drm_mga_private_t *dev_priv )
static __inline__ void mga_g400_emit_tex1( drm_mga_private_t *dev_priv )
{
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1];
@ -236,7 +236,7 @@ static inline void mga_g400_emit_tex1( drm_mga_private_t *dev_priv )
ADVANCE_DMA();
}
static inline void mga_g200_emit_pipe( drm_mga_private_t *dev_priv )
static __inline__ void mga_g200_emit_pipe( drm_mga_private_t *dev_priv )
{
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int pipe = sarea_priv->warp_pipe;
@ -266,7 +266,7 @@ static inline void mga_g200_emit_pipe( drm_mga_private_t *dev_priv )
ADVANCE_DMA();
}
static inline void mga_g400_emit_pipe( drm_mga_private_t *dev_priv )
static __inline__ void mga_g400_emit_pipe( drm_mga_private_t *dev_priv )
{
drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int pipe = sarea_priv->warp_pipe;