CVS commit: src/sys/external/bsd/drm2/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 09:46:40 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/drm: drm_file.c

Log Message:
Include newly split off headers Don't initialize struct members that no longer 
exist. Make DRIVER_PRIME code unconditional, similar to upstream drm_file.c

Author: Maya Rashish <m...@netbsd.org>


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_file.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/drm/drm_file.c
diff -u src/sys/external/bsd/drm2/drm/drm_file.c:1.2 src/sys/external/bsd/drm2/drm/drm_file.c:1.3
--- src/sys/external/bsd/drm2/drm/drm_file.c:1.2	Sun Dec 19 00:58:04 2021
+++ src/sys/external/bsd/drm2/drm/drm_file.c	Sun Dec 19 09:46:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_file.c,v 1.2 2021/12/19 00:58:04 riastradh Exp $	*/
+/*	$NetBSD: drm_file.c,v 1.3 2021/12/19 09:46:40 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,14 +30,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_file.c,v 1.2 2021/12/19 00:58:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_file.c,v 1.3 2021/12/19 09:46:40 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/select.h>
 
 #include <drm/drmP.h>
-#include <drm/drm_internal.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_legacy.h>
+#include <drm/drm_file.h>
 
 #include "../dist/drm/drm_crtc_internal.h"
 #include "../dist/drm/drm_internal.h"
@@ -85,14 +86,12 @@ drm_open_file(struct drm_file *file, voi
 	/* file->prime is initialized by drm_prime_init_file_private.  */
 	file->event_read_lock = NULL;
 	DRM_INIT_WAITQUEUE(&file->event_read_wq, "drmevtrd");
-	file->lock_count = 0;
 
 	if (drm_core_check_feature(dev, DRIVER_GEM))
 		drm_gem_open(dev, file);
 	if (drm_core_check_feature(dev, DRIVER_SYNCOBJ))
 		drm_syncobj_open(file);
-	if (drm_core_check_feature(dev, DRIVER_PRIME))
-		drm_prime_init_file_private(&file->prime);
+	drm_prime_init_file_private(&file->prime);
 
 	if (dev->driver->open) {
 		ret = (*dev->driver->open)(dev, file);
@@ -119,8 +118,7 @@ fail1:
 	    dev->driver->preclose)
 		(*dev->driver->preclose)(dev, file);
 fail0:
-	if (drm_core_check_feature(dev, DRIVER_PRIME))
-		drm_prime_destroy_file_private(&file->prime);
+	drm_prime_destroy_file_private(&file->prime);
 	if (drm_core_check_feature(dev, DRIVER_SYNCOBJ))
 		drm_syncobj_release(file);
 	if (drm_core_check_feature(dev, DRIVER_GEM))
@@ -175,8 +173,7 @@ drm_close_file(struct drm_file *file)
 	if (dev->driver->postclose)
 		dev->driver->postclose(dev, file);
 
-	if (drm_core_check_feature(dev, DRIVER_PRIME))
-		drm_prime_destroy_file_private(&file->prime);
+	drm_prime_destroy_file_private(&file->prime);
 
 	KASSERT(list_empty(&file->event_list));