Attachment #611550 for bug #706774

View | Details | Raw Unified | Return to bug 706774
Collapse All | Expand All

Lines 36-41 kernel/nvidia/nv-rsync.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resm Link Here

(-)a/.manifest (+1 lines)
36	kernel/nvidia/nv-msi.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman	36	kernel/nvidia/nv-msi.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
37	kernel/conftest.sh 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman	37	kernel/conftest.sh 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
38	kernel/common/inc/nv.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman	38	kernel/common/inc/nv.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
		39	kernel/common/inc/nv-drm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
39	kernel/common/inc/nv-pci.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman	40	kernel/common/inc/nv-pci.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
40	kernel/common/inc/nv-pgprot.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman	41	kernel/common/inc/nv-pgprot.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
41	kernel/common/inc/nv-mm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman	42	kernel/common/inc/nv-mm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman




#ifndef _NV_DRM_H_
#define _NV_DRM_H_

#include "conftest.h"

#if defined(NV_DRM_DRMP_H_PRESENT)
#include <drm/drmP.h>
#else
#include <linux/agp_backend.h>
#include <linux/file.h>
#include <linux/init.h>
#include <linux/jiffies.h>
#include <linux/kernel.h>
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <asm/pgalloc.h>
#include <linux/uaccess.h>

#include <uapi/drm/drm.h>
#include <uapi/drm/drm_mode.h>

#include <drm/drm_agpsupport.h>
#include <drm/drm_crtc.h>
#include <drm/drm_drv.h>
#include <drm/drm_prime.h>
#include <drm/drm_pci.h>
#include <drm/drm_ioctl.h>
#include <drm/drm_sysfs.h>
#include <drm/drm_vblank.h>
#include <drm/drm_device.h>

#include <drm/drm_gem.h>
#endif

#endif

Lines 1150-1155 compile_test() { Link Here

(-)a/kernel/conftest.sh (+31 lines)
1150	CODE="	1150	CODE="
1151	#if defined(NV_DRM_DRMP_H_PRESENT)	1151	#if defined(NV_DRM_DRMP_H_PRESENT)
1152	#include <drm/drmP.h>	1152	#include <drm/drmP.h>
		1153	#else
		1154	#include <drm/drm_drv.h>
		1155	#include <drm/drm_prime.h>
1153	#endif	1156	#endif
1154	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)	1157	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
1155	#error DRM not enabled	1158	#error DRM not enabled
Lines 1781-1786 compile_test() { Link Here
1781	echo "$CONFTEST_PREAMBLE	1784	echo "$CONFTEST_PREAMBLE
1782	#if defined(NV_DRM_DRMP_H_PRESENT)	1785	#if defined(NV_DRM_DRMP_H_PRESENT)
1783	#include <drm/drmP.h>	1786	#include <drm/drmP.h>
		1787	#else
		1788	#include <drm/drm_drv.h>
1784	#endif	1789	#endif
1785	#include <drm/drm_atomic.h>	1790	#include <drm/drm_atomic.h>
1786	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)	1791	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
Lines 1909-1915 compile_test() { Link Here
1909	# attached drivers") in v3.14 (2013-12-11)	1914	# attached drivers") in v3.14 (2013-12-11)
1910	#	1915	#
1911	CODE="	1916	CODE="
		1917	#if defined(NV_DRM_DRMP_H_PRESENT)
1912	#include <drm/drmP.h>	1918	#include <drm/drmP.h>
		1919	#else
		1920	#include <drm/drm_drv.h>
		1921	#endif
1913	int conftest_drm_driver_has_legacy_dev_list(void) {	1922	int conftest_drm_driver_has_legacy_dev_list(void) {
1914	return offsetof(struct drm_driver, legacy_dev_list);	1923	return offsetof(struct drm_driver, legacy_dev_list);
1915	}"	1924	}"
Lines 1933-1939 compile_test() { Link Here
1933	# 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814	1942	# 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814
1934	#	1943	#
1935	CODE="	1944	CODE="
		1945	#if defined(NV_DRM_DRMP_H_PRESENT)
1936	#include <drm/drmP.h>	1946	#include <drm/drmP.h>
		1947	#else
		1948	#include <drm/drm_crtc.h>
		1949	#endif
1937		1950
1938	int conftest_drm_crtc_init_with_planes_has_name_arg(void) {	1951	int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
1939	return	1952	return
Lines 1949-1955 compile_test() { Link Here
1949	compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"	1962	compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"
1950		1963
1951	CODE="	1964	CODE="
		1965	#if defined(NV_DRM_DRMP_H_PRESENT)
1952	#include <drm/drmP.h>	1966	#include <drm/drmP.h>
		1967	#else
		1968	#include <drm/drm_encoder.h>
		1969	#endif
1953		1970
1954	int conftest_drm_encoder_init_has_name_arg(void) {	1971	int conftest_drm_encoder_init_has_name_arg(void) {
1955	return	1972	return
Lines 1964-1970 compile_test() { Link Here
1964	compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"	1981	compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"
1965		1982
1966	echo "$CONFTEST_PREAMBLE	1983	echo "$CONFTEST_PREAMBLE
		1984	#if defined(NV_DRM_DRMP_H_PRESENT)
1967	#include <drm/drmP.h>	1985	#include <drm/drmP.h>
		1986	#else
		1987	#include <drm/drm_plane.h>
		1988	#endif
1968		1989
1969	int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {	1990	int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
1970	return	1991	return
Lines 1991-1997 compile_test() { Link Here
1991	echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" \| append_conftest "types"	2012	echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" \| append_conftest "types"
1992		2013
1993	echo "$CONFTEST_PREAMBLE	2014	echo "$CONFTEST_PREAMBLE
		2015	#if defined(NV_DRM_DRMP_H_PRESENT)
1994	#include <drm/drmP.h>	2016	#include <drm/drmP.h>
		2017	#else
		2018	#include <drm/drm_plane.h>
		2019	#endif
1995		2020
1996	int conftest_drm_universal_plane_init_has_name_arg(void) {	2021	int conftest_drm_universal_plane_init_has_name_arg(void) {
1997	return	2022	return
Lines 3084-3090 compile_test() { Link Here
3084	# drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).	3109	# drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).
3085	#	3110	#
3086	CODE="	3111	CODE="
		3112	#if defined(NV_DRM_DRMP_H_PRESENT)
3087	#include <drm/drmP.h>	3113	#include <drm/drmP.h>
		3114	#endif
3088	#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)	3115	#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
3089	#include <drm/drm_framebuffer.h>	3116	#include <drm/drm_framebuffer.h>
3090	#endif	3117	#endif
Lines 3103-3109 compile_test() { Link Here
3103	# drm_gem_object_{get,put}()") in v4.12 (2017-02-28).	3130	# drm_gem_object_{get,put}()") in v4.12 (2017-02-28).
3104	#	3131	#
3105	CODE="	3132	CODE="
		3133	#if defined(NV_DRM_DRMP_H_PRESENT)
3106	#include <drm/drmP.h>	3134	#include <drm/drmP.h>
		3135	#endif
3107	#if defined(NV_DRM_DRM_GEM_H_PRESENT)	3136	#if defined(NV_DRM_DRM_GEM_H_PRESENT)
3108	#include <drm/drm_gem.h>	3137	#include <drm/drm_gem.h>
3109	#endif	3138	#endif
Lines 3122-3128 compile_test() { Link Here
3122	# functions") in v4.15 (2017-09-26).	3151	# functions") in v4.15 (2017-09-26).
3123	#	3152	#
3124	CODE="	3153	CODE="
		3154	#if defined(NV_DRM_DRMP_H_PRESENT)
3125	#include <drm/drmP.h>	3155	#include <drm/drmP.h>
		3156	#endif
3126	#if defined(NV_DRM_DRM_DRV_H_PRESENT)	3157	#if defined(NV_DRM_DRM_DRV_H_PRESENT)
3127	#include <drm/drm_drv.h>	3158	#include <drm/drm_drv.h>
3128	#endif	3159	#endif

Lines 20-25 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-connector.c (+14 lines)
20	* DEALINGS IN THE SOFTWARE.	20	* DEALINGS IN THE SOFTWARE.
21	*/	21	*/
22		22
		23	#include <linux/version.h>
		24
23	#include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */	25	#include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
24		26
25	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	27	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
Lines 71-77 static enum drm_connector_status __nv_drm_connector_detect_internal( Link Here
71	struct nv_drm_encoder *nv_detected_encoder = NULL;	73	struct nv_drm_encoder *nv_detected_encoder = NULL;
72		74
73	struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;	75	struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
		76	#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
74	unsigned int i;	77	unsigned int i;
		78	#else
		79	struct drm_encoder *encoder = NULL;
		80	#endif
75		81
76	BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));	82	BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
77		83
Lines 87-97 static enum drm_connector_status __nv_drm_connector_detect_internal( Link Here
87	goto done;	93	goto done;
88	}	94	}
89		95
		96	#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
90	for (i = 0;	97	for (i = 0;
91	i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {	98	i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
92	struct drm_encoder *encoder;	99	struct drm_encoder *encoder;
		100	#else
		101	drm_connector_for_each_possible_encoder(connector, encoder) {
		102	#endif
93	struct nv_drm_encoder *nv_encoder;	103	struct nv_drm_encoder *nv_encoder;
94		104
		105	#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
95	if (connector->encoder_ids[i] == 0) {	106	if (connector->encoder_ids[i] == 0) {
96	break;	107	break;
97	}	108	}
Lines 102-107 static enum drm_connector_status __nv_drm_connector_detect_internal( Link Here
102	BUG_ON(encoder != NULL);	113	BUG_ON(encoder != NULL);
103	continue;	114	continue;
104	}	115	}
		116	#endif
105		117
106	/*	118	/*
107	* DVI-I connectors can drive both digital and analog	119	* DVI-I connectors can drive both digital and analog
Lines 169-174 static enum drm_connector_status __nv_drm_connector_detect_internal( Link Here
169	}	181	}
170		182
171	detected_encoder = encoder;	183	detected_encoder = encoder;
		184
		185	break;
172	}	186	}
173	}	187	}
174		188

Lines 27-33 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-connector.h (-1 / +1 lines)
27		27
28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include "nv-drm.h"
31		31
32	#include "nvtypes.h"	32	#include "nvtypes.h"
33	#include "nvkms-api-types.h"	33	#include "nvkms-api-types.h"

Lines 29-35 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-crtc.h (-1 / +1 lines)
29		29
30	#include "nvidia-drm-helper.h"	30	#include "nvidia-drm-helper.h"
31		31
32	#include <drm/drmP.h>	32	#include "nv-drm.h"
33	#include "nvtypes.h"	33	#include "nvtypes.h"
34	#include "nvkms-kapi.h"	34	#include "nvkms-kapi.h"
35		35

Lines 39-45 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-drv.c (-1 / +1 lines)
39		39
40	#include "nvidia-drm-ioctl.h"	40	#include "nvidia-drm-ioctl.h"
41		41
42	#include <drm/drmP.h>	42	#include "nv-drm.h"
43		43
44	/*	44	/*
45	* Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")	45	* Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")

Lines 32-38 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-encoder.h (-1 / +1 lines)
32	#if defined(NV_DRM_DRM_ENCODER_H_PRESENT)	32	#if defined(NV_DRM_DRM_ENCODER_H_PRESENT)
33	#include <drm/drm_encoder.h>	33	#include <drm/drm_encoder.h>
34	#else	34	#else
35	#include <drm/drmP.h>	35	#include "nv-drm.h"
36	#endif	36	#endif
37		37
38	#include "nvkms-kapi.h"	38	#include "nvkms-kapi.h"

Lines 27-33 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-fb.h (-1 / +1 lines)
27		27
28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include "nv-drm.h"
31	#include "nvidia-drm-gem-nvkms-memory.h"	31	#include "nvidia-drm-gem-nvkms-memory.h"
32	#include "nvkms-kapi.h"	32	#include "nvkms-kapi.h"
33		33

Lines 29-35 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-gem.h (-1 / +1 lines)
29		29
30	#include "nvidia-drm-priv.h"	30	#include "nvidia-drm-priv.h"
31		31
32	#include <drm/drmP.h>	32	#include "nv-drm.h"
33	#include "nvkms-kapi.h"	33	#include "nvkms-kapi.h"
34		34
35	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)	35	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)

Lines 31-37 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-helper.c (-1 / +1 lines)
31		31
32	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	32	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
33		33
34	#include <drm/drmP.h>	34	#include "nv-drm.h"
35	#if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)	35	#if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)
36	#include <drm/drm_atomic_uapi.h>	36	#include <drm/drm_atomic_uapi.h>
37	#endif	37	#endif

Lines 27-33 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-helper.h (-1 / +1 lines)
27		27
28	#if defined(NV_DRM_AVAILABLE)	28	#if defined(NV_DRM_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include "nv-drm.h"
31		31
32	/*	32	/*
33	* drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d	33	* drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d

Lines 27-33 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-modeset.h (-1 / +1 lines)
27		27
28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include "nv-drm.h"
31		31
32	struct drm_atomic_state nv_drm_atomic_state_alloc(struct drm_device dev);	32	struct drm_atomic_state nv_drm_atomic_state_alloc(struct drm_device dev);
33	void nv_drm_atomic_state_clear(struct drm_atomic_state *state);	33	void nv_drm_atomic_state_clear(struct drm_atomic_state *state);

Lines 29-35 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-os-interface.h (-1 / +1 lines)
29		29
30	#if defined(NV_DRM_AVAILABLE)	30	#if defined(NV_DRM_AVAILABLE)
31		31
32	#include <drm/drmP.h>	32	#include "nv-drm.h"
33		33
34	/* Set to true when the atomic modeset feature is enabled. */	34	/* Set to true when the atomic modeset feature is enabled. */
35	extern bool nv_drm_modeset_module_param;	35	extern bool nv_drm_modeset_module_param;

Lines 27-33 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-prime-fence.h (-1 / +1 lines)
27		27
28	#if defined(NV_DRM_AVAILABLE)	28	#if defined(NV_DRM_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include "nv-drm.h"
31		31
32	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)	32	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
33		33

Lines 27-33 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-priv.h (-1 / +1 lines)
27		27
28	#if defined(NV_DRM_AVAILABLE)	28	#if defined(NV_DRM_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include "nv-drm.h"
31		31
32	#if defined(NV_DRM_DRM_GEM_H_PRESENT)	32	#if defined(NV_DRM_DRM_GEM_H_PRESENT)
33	#include <drm/drm_gem.h>	33	#include <drm/drm_gem.h>

Lines 27-33 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-utils.h (-1 / +1 lines)
27		27
28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	28	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include "nv-drm.h"
31	#include "nvkms-kapi.h"	31	#include "nvkms-kapi.h"
32		32
33	struct NvKmsKapiConnectorInfo*	33	struct NvKmsKapiConnectorInfo*

Return to bug 706774

Line 0 Link Here

(-)a/kernel/common/inc/nv-drm.h (+36 lines)
	1	#ifndef _NV_DRM_H_
	2	#define _NV_DRM_H_
	3
	4	#include "conftest.h"
	5
	6	#if defined(NV_DRM_DRMP_H_PRESENT)
	7	#include <drm/drmP.h>
	8	#else
	9	#include <linux/agp_backend.h>
	10	#include <linux/file.h>
	11	#include <linux/init.h>
	12	#include <linux/jiffies.h>
	13	#include <linux/kernel.h>
	14	#include <linux/mutex.h>
	15	#include <linux/slab.h>
	16	#include <linux/types.h>
	17	#include <asm/pgalloc.h>
	18	#include <linux/uaccess.h>
	19
	20	#include <uapi/drm/drm.h>
	21	#include <uapi/drm/drm_mode.h>
	22
	23	#include <drm/drm_agpsupport.h>
	24	#include <drm/drm_crtc.h>
	25	#include <drm/drm_drv.h>
	26	#include <drm/drm_prime.h>
	27	#include <drm/drm_pci.h>
	28	#include <drm/drm_ioctl.h>
	29	#include <drm/drm_sysfs.h>
	30	#include <drm/drm_vblank.h>
	31	#include <drm/drm_device.h>
	32
	33	#include <drm/drm_gem.h>
	34	#endif
	35
	36	#endif