Fri Aug 7 22:51:05 2009 UTC ()
remove some netbsd specific code that does nothing.


(mrg)
diff -r1.12 -r1.13 src/sys/external/bsd/drm/dist/bsd-core/drmP.h
diff -r1.5 -r1.6 src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c
cvs diff -r1.12 -r1.13 src/sys/external/bsd/drm/dist/bsd-core/drmP.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm/dist/bsd-core/drmP.h 2009/06/20 01:07:09 1.12
+++ src/sys/external/bsd/drm/dist/bsd-core/drmP.h 2009/08/07 22:51:04 1.13
@@ -572,29 +572,26 @@ typedef struct drm_buf_entry { @@ -572,29 +572,26 @@ typedef struct drm_buf_entry {
572 572
573 drm_freelist_t freelist; 573 drm_freelist_t freelist;
574} drm_buf_entry_t; 574} drm_buf_entry_t;
575 575
576typedef TAILQ_HEAD(drm_file_list, drm_file) drm_file_list_t; 576typedef TAILQ_HEAD(drm_file_list, drm_file) drm_file_list_t;
577struct drm_file { 577struct drm_file {
578 TAILQ_ENTRY(drm_file) link; 578 TAILQ_ENTRY(drm_file) link;
579 struct drm_device *dev; 579 struct drm_device *dev;
580 int authenticated; 580 int authenticated;
581 int master; 581 int master;
582 int minor; 582 int minor;
583 pid_t pid; 583 pid_t pid;
584 uid_t uid; 584 uid_t uid;
585#if defined(__NetBSD__) 
586 int refs; 
587#endif 
588 drm_magic_t magic; 585 drm_magic_t magic;
589 unsigned long ioctl_count; 586 unsigned long ioctl_count;
590 void *driver_priv; 587 void *driver_priv;
591}; 588};
592 589
593typedef struct drm_lock_data { 590typedef struct drm_lock_data {
594 struct drm_hw_lock *hw_lock; /* Hardware lock */ 591 struct drm_hw_lock *hw_lock; /* Hardware lock */
595 struct drm_file *file_priv; /* Unique identifier of holding process (NULL is kernel)*/ 592 struct drm_file *file_priv; /* Unique identifier of holding process (NULL is kernel)*/
596 int lock_queue; /* Queue of blocked processes */ 593 int lock_queue; /* Queue of blocked processes */
597 unsigned long lock_time; /* Time of last lock in jiffies */ 594 unsigned long lock_time; /* Time of last lock in jiffies */
598} drm_lock_data_t; 595} drm_lock_data_t;
599 596
600/* This structure, in the struct drm_device, is always initialized while the 597/* This structure, in the struct drm_device, is always initialized while the
cvs diff -r1.5 -r1.6 src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c 2009/06/20 01:07:09 1.5
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c 2009/08/07 22:51:04 1.6
@@ -60,38 +60,35 @@ int drm_open_helper(dev_t kdev, int flag @@ -60,38 +60,35 @@ int drm_open_helper(dev_t kdev, int flag
60{ 60{
61 int m = minor(kdev); 61 int m = minor(kdev);
62 struct drm_file *priv; 62 struct drm_file *priv;
63 int retcode; 63 int retcode;
64 64
65 if (flags & O_EXCL) 65 if (flags & O_EXCL)
66 return EBUSY; /* No exclusive opens */ 66 return EBUSY; /* No exclusive opens */
67 dev->flags = flags; 67 dev->flags = flags;
68 68
69 DRM_DEBUG("pid = %d, minor = %d\n", DRM_CURRENTPID, m); 69 DRM_DEBUG("pid = %d, minor = %d\n", DRM_CURRENTPID, m);
70 70
71 DRM_LOCK(); 71 DRM_LOCK();
72 priv = drm_find_file_by_proc(dev, p); 72 priv = drm_find_file_by_proc(dev, p);
73 if (priv) { 73 if (!priv) {
74 priv->refs++; 
75 } else { 
76 priv = malloc(sizeof(*priv), DRM_MEM_FILES, M_NOWAIT | M_ZERO); 74 priv = malloc(sizeof(*priv), DRM_MEM_FILES, M_NOWAIT | M_ZERO);
77 if (priv == NULL) { 75 if (priv == NULL) {
78 DRM_UNLOCK(); 76 DRM_UNLOCK();
79 return ENOMEM; 77 return ENOMEM;
80 } 78 }
81 priv->uid = kauth_cred_getsvuid(p->p_cred); 79 priv->uid = kauth_cred_getsvuid(p->p_cred);
82 priv->pid = p->p_pid; 80 priv->pid = p->p_pid;
83 81
84 priv->refs = 1; 
85 priv->minor = m; 82 priv->minor = m;
86 priv->ioctl_count = 0; 83 priv->ioctl_count = 0;
87 84
88 /* for compatibility root is always authenticated */ 85 /* for compatibility root is always authenticated */
89 priv->authenticated = DRM_SUSER(p); 86 priv->authenticated = DRM_SUSER(p);
90 87
91 if (dev->driver->open) { 88 if (dev->driver->open) {
92 /* shared code returns -errno */ 89 /* shared code returns -errno */
93 retcode = -dev->driver->open(dev, priv); 90 retcode = -dev->driver->open(dev, priv);
94 if (retcode != 0) { 91 if (retcode != 0) {
95 free(priv, DRM_MEM_FILES); 92 free(priv, DRM_MEM_FILES);
96 DRM_UNLOCK(); 93 DRM_UNLOCK();
97 return retcode; 94 return retcode;