Attachment #611554 for bug #708208

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

Lines 96-102 test_headers() { Link Here

(-)a/kernel/conftest.sh (-14 / +22 lines)
96	# present) are provided by the target kernel.	96	# present) are provided by the target kernel.
97	#	97	#
98	FILES="asm/system.h"	98	FILES="asm/system.h"
99	FILES="$FILES drm/drmP.h"	99	FILES="$FILES drm/drm_plane.h"
100	FILES="$FILES drm/drm_auth.h"	100	FILES="$FILES drm/drm_auth.h"
101	FILES="$FILES drm/drm_gem.h"	101	FILES="$FILES drm/drm_gem.h"
102	FILES="$FILES drm/drm_crtc.h"	102	FILES="$FILES drm/drm_crtc.h"
Lines 124-129 test_headers() { Link Here
124	FILES="$FILES linux/sched/signal.h"	124	FILES="$FILES linux/sched/signal.h"
125	FILES="$FILES linux/sched/task.h"	125	FILES="$FILES linux/sched/task.h"
126	FILES="$FILES linux/sched/task_stack.h"	126	FILES="$FILES linux/sched/task_stack.h"
		127	FILES="$FILES linux/reservation.h"
127	FILES="$FILES xen/ioemu.h"	128	FILES="$FILES xen/ioemu.h"
128	FILES="$FILES linux/fence.h"	129	FILES="$FILES linux/fence.h"
129		130
Lines 1181-1188 compile_test() { Link Here
1181	drm_available)	1182	drm_available)
1182	# Determine if the DRM subsystem is usable	1183	# Determine if the DRM subsystem is usable
1183	CODE="	1184	CODE="
		1185	typedef long __kernel_old_time_t;
1184	#if defined(NV_DRM_DRMP_H_PRESENT)	1186	#if defined(NV_DRM_DRMP_H_PRESENT)
1185	#include <drm/drmP.h>	1187	#include <drm/drmP.h>
		1188	#else
		1189	#include <drm/drm_drv.h>
		1190	#include <drm/drm_prime.h>
1186	#endif	1191	#endif
1187	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)	1192	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
1188	#error DRM not enabled	1193	#error DRM not enabled
Lines 1225-1230 compile_test() { Link Here
1225	CODE="	1230	CODE="
1226	#if defined(NV_DRM_DRMP_H_PRESENT)	1231	#if defined(NV_DRM_DRMP_H_PRESENT)
1227	#include <drm/drmP.h>	1232	#include <drm/drmP.h>
		1233	#else
		1234	#include <drm/drm_plane.h>
1228	#endif	1235	#endif
1229	void conftest_drm_dev_unref(void) {	1236	void conftest_drm_dev_unref(void) {
1230	drm_dev_unref();	1237	drm_dev_unref();
Lines 1767-1772 compile_test() { Link Here
1767	echo "$CONFTEST_PREAMBLE	1774	echo "$CONFTEST_PREAMBLE
1768	#if defined(NV_DRM_DRMP_H_PRESENT)	1775	#if defined(NV_DRM_DRMP_H_PRESENT)
1769	#include <drm/drmP.h>	1776	#include <drm/drmP.h>
		1777	#else
		1778	#include <drm/drm_plane.h>
1770	#endif	1779	#endif
1771	#include <drm/drm_atomic.h>	1780	#include <drm/drm_atomic.h>
1772	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)	1781	#if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
Lines 1895-1901 compile_test() { Link Here
1895	# attached drivers") in v3.14 (2013-12-11)	1904	# attached drivers") in v3.14 (2013-12-11)
1896	#	1905	#
1897	CODE="	1906	CODE="
1898	#include <drm/drmP.h>	1907	#include <drm/drm_drv.h>
1899	int conftest_drm_driver_has_legacy_dev_list(void) {	1908	int conftest_drm_driver_has_legacy_dev_list(void) {
1900	return offsetof(struct drm_driver, legacy_dev_list);	1909	return offsetof(struct drm_driver, legacy_dev_list);
1901	}"	1910	}"
Lines 1919-1925 compile_test() { Link Here
1919	# 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814	1928	# 2017-07-23 e6fc3b68558e4c6d8d160b5daf2511b99afa8814
1920	#	1929	#
1921	CODE="	1930	CODE="
1922	#include <drm/drmP.h>	1931	#include <drm/drm_plane.h>
1923		1932
1924	int conftest_drm_crtc_init_with_planes_has_name_arg(void) {	1933	int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
1925	return	1934	return
Lines 1935-1941 compile_test() { Link Here
1935	compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"	1944	compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"
1936		1945
1937	CODE="	1946	CODE="
1938	#include <drm/drmP.h>	1947	#include <drm/drm_plane.h>
1939		1948
1940	int conftest_drm_encoder_init_has_name_arg(void) {	1949	int conftest_drm_encoder_init_has_name_arg(void) {
1941	return	1950	return
Lines 1950-1956 compile_test() { Link Here
1950	compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"	1959	compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"
1951		1960
1952	echo "$CONFTEST_PREAMBLE	1961	echo "$CONFTEST_PREAMBLE
1953	#include <drm/drmP.h>	1962	#include <drm/drm_plane.h>
1954		1963
1955	int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {	1964	int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
1956	return	1965	return
Lines 1977-1983 compile_test() { Link Here
1977	echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" \| append_conftest "types"	1986	echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" \| append_conftest "types"
1978		1987
1979	echo "$CONFTEST_PREAMBLE	1988	echo "$CONFTEST_PREAMBLE
1980	#include <drm/drmP.h>	1989	#include <drm/drm_plane.h>
1981		1990
1982	int conftest_drm_universal_plane_init_has_name_arg(void) {	1991	int conftest_drm_universal_plane_init_has_name_arg(void) {
1983	return	1992	return
Lines 2050-2056 compile_test() { Link Here
2050	# callback") in v3.18 (2014-08-29)	2059	# callback") in v3.18 (2014-08-29)
2051	#	2060	#
2052	CODE="	2061	CODE="
2053	#include <drm/drmP.h>	2062	#include <drm/drm_plane.h>
2054	int conftest_drm_driver_has_set_busid(void) {	2063	int conftest_drm_driver_has_set_busid(void) {
2055	return offsetof(struct drm_driver, set_busid);	2064	return offsetof(struct drm_driver, set_busid);
2056	}"	2065	}"
Lines 2067-2075 compile_test() { Link Here
2067	# objects") in v3.17 (2014-07-01)	2076	# objects") in v3.17 (2014-07-01)
2068	#	2077	#
2069	CODE="	2078	CODE="
2070	#include <drm/drmP.h>	2079	#include <drm/drm_drv.h>
2071	int conftest_drm_driver_has_gem_prime_res_obj(void) {	2080	int conftest_drm_driver_has_gem_prime_res_obj(void) {
2072	return offsetof(struct drm_driver, gem_prime_res_obj);	2081	//return offsetof(struct drm_driver, gem_prime_res_obj);
2073	}"	2082	}"
2074		2083
2075	compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ" "" "types"	2084	compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ" "" "types"
Lines 2534-2539 compile_test() { Link Here
2534	echo "$CONFTEST_PREAMBLE	2543	echo "$CONFTEST_PREAMBLE
2535	#if defined(NV_DRM_DRMP_H_PRESENT)	2544	#if defined(NV_DRM_DRMP_H_PRESENT)
2536	#include <drm/drmP.h>	2545	#include <drm/drmP.h>
		2546	#else
		2547	#include <drm/drm_drv.h>
2537	#endif	2548	#endif
2538	#if defined(NV_DRM_DRM_GEM_H_PRESENT)	2549	#if defined(NV_DRM_DRM_GEM_H_PRESENT)
2539	#include <drm/drm_gem.h>	2550	#include <drm/drm_gem.h>
Lines 2563-2569 compile_test() { Link Here
2563	# in v4.8 (2016-06-21)	2574	# in v4.8 (2016-06-21)
2564	#	2575	#
2565	CODE="	2576	CODE="
2566	#include <drm/drmP.h>	2577	#include <drm/drm_drv.h>
2567	void conftest_drm_master_drop_has_from_release_arg(struct drm_driver *drv) {	2578	void conftest_drm_master_drop_has_from_release_arg(struct drm_driver *drv) {
2568	drv->master_drop(NULL, NULL, false);	2579	drv->master_drop(NULL, NULL, false);
2569	}"	2580	}"
Lines 2730-2736 compile_test() { Link Here
2730	# type of the unload hook to void") in v4.11 (2017-01-06)	2741	# type of the unload hook to void") in v4.11 (2017-01-06)
2731	#	2742	#
2732	CODE="	2743	CODE="
2733	#include <drm/drmP.h>	2744	#include <drm/drm_drv.h>
2734		2745
2735	int conftest_drm_driver_unload_has_int_return_type(struct drm_driver *drv) {	2746	int conftest_drm_driver_unload_has_int_return_type(struct drm_driver *drv) {
2736	return drv->unload(NULL /* dev */);	2747	return drv->unload(NULL /* dev */);
Lines 3122-3128 compile_test() { Link Here
3122	# Introduce drm_framebuffer_{get,put}()) on 2017-02-28.	3133	# Introduce drm_framebuffer_{get,put}()) on 2017-02-28.
3123	#	3134	#
3124	CODE="	3135	CODE="
3125	#include <drm/drmP.h>
3126	#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)	3136	#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
3127	#include <drm/drm_framebuffer.h>	3137	#include <drm/drm_framebuffer.h>
3128	#endif	3138	#endif
Lines 3141-3147 compile_test() { Link Here
3141	# Introduce drm_gem_object_{get,put}()) on 2017-02-28.	3151	# Introduce drm_gem_object_{get,put}()) on 2017-02-28.
3142	#	3152	#
3143	CODE="	3153	CODE="
3144	#include <drm/drmP.h>
3145	#if defined(NV_DRM_DRM_GEM_H_PRESENT)	3154	#if defined(NV_DRM_DRM_GEM_H_PRESENT)
3146	#include <drm/drm_gem.h>	3155	#include <drm/drm_gem.h>
3147	#endif	3156	#endif
Lines 3160-3166 compile_test() { Link Here
3160	# introduce drm_dev_{get/put} functions) on 2017-09-26.	3169	# introduce drm_dev_{get/put} functions) on 2017-09-26.
3161	#	3170	#
3162	CODE="	3171	CODE="
3163	#include <drm/drmP.h>
3164	#if defined(NV_DRM_DRM_DRV_H_PRESENT)	3172	#if defined(NV_DRM_DRM_DRV_H_PRESENT)
3165	#include <drm/drm_drv.h>	3173	#include <drm/drm_drv.h>
3166	#endif	3174	#endif

Lines 40-46 Link Here

(-)a/kernel/nvidia-drm/nvidia-dma-fence-helper.h (+2 lines)
40	#include <linux/dma-fence.h>	40	#include <linux/dma-fence.h>
41	#endif	41	#endif
42		42
		43	#if defined(NV_LINUX_RESERVATION_H_PRESENT)
43	#include <linux/reservation.h>	44	#include <linux/reservation.h>
		45	#endif
44		46
45	#if defined(NV_LINUX_FENCE_H_PRESENT)	47	#if defined(NV_LINUX_FENCE_H_PRESENT)
46	typedef struct fence nv_dma_fence_t;	48	typedef struct fence nv_dma_fence_t;





    enum drm_connector_status status = connector_status_disconnected;

    struct drm_encoder *encoder;
    struct drm_encoder *detected_encoder = NULL;
    struct nv_drm_encoder *nv_detected_encoder = NULL;

    struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
    unsigned int i;

    BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));


        goto done;
    }

    drm_connector_for_each_possible_encoder(connector, encoder) {
         i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
        struct drm_encoder *encoder;
        struct nv_drm_encoder *nv_encoder;

        if (connector->encoder_ids[i] == 0) {
            break;
        }

        encoder = nv_drm_encoder_find(dev, connector->encoder_ids[i]);

        if (encoder == NULL) {
            BUG_ON(encoder != NULL);
            continue;
        }

        /*
         * DVI-I connectors can drive both digital and analog
         * encoders.  If a digital connection has been forced then

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 <drm/drm_plane.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 / +2 lines)
29		29
30	#include "nvidia-drm-helper.h"	30	#include "nvidia-drm-helper.h"
31		31
32	#include <drm/drmP.h>	32	#include <drm/drm_plane.h>
		33	#include <drm/drm_crtc.h>
33	#include "nvtypes.h"	34	#include "nvtypes.h"
34	#include "nvkms-kapi.h"	35	#include "nvkms-kapi.h"
35		36

Lines 39-46 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-drv.c (-3 / +6 lines)
39		39
40	#include "nvidia-drm-ioctl.h"	40	#include "nvidia-drm-ioctl.h"
41		41
42	#include <drm/drmP.h>	42	#include <drm/drm_plane.h>
43		43	#include <drm/drm_device.h>
		44	#include <drm/drm_vblank.h>
		45	#include <drm/drm_ioctl.h>
		46	#include <linux/pci.h>
44	/*	47	/*
45	* Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")	48	* Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
46	* moves a number of helper function definitions from	49	* moves a number of helper function definitions from
Lines 670-676 static struct drm_driver nv_drm_driver = Link Here
670	.gem_prime_vunmap = nv_drm_gem_prime_vunmap,	673	.gem_prime_vunmap = nv_drm_gem_prime_vunmap,
671		674
672	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)	675	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
673	.gem_prime_res_obj = nv_drm_gem_prime_res_obj,	676	//.gem_prime_res_obj = nv_drm_gem_prime_res_obj,
674	#endif	677	#endif
675		678
676	#if defined(NV_DRM_DRIVER_HAS_SET_BUSID)	679	#if defined(NV_DRM_DRIVER_HAS_SET_BUSID)

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 <drm/drm_plane.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 / +2 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 <drm/drm_plane.h>
		31	#include <drm/drm_framebuffer.h>
31	#include "nvidia-drm-gem-nvkms-memory.h"	32	#include "nvidia-drm-gem-nvkms-memory.h"
32	#include "nvkms-kapi.h"	33	#include "nvkms-kapi.h"
33		34

Lines 24-29 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-gem.c (-1 / +5 lines)
24		24
25	#if defined(NV_DRM_AVAILABLE)	25	#if defined(NV_DRM_AVAILABLE)
26		26
		27	#include <drm/drm_drv.h>
		28	#include <drm/drm_prime.h>
27	#include "nvidia-drm-priv.h"	29	#include "nvidia-drm-priv.h"
28	#include "nvidia-drm-ioctl.h"	30	#include "nvidia-drm-ioctl.h"
29	#include "nvidia-drm-prime-fence.h"	31	#include "nvidia-drm-prime-fence.h"
Lines 46-52 void nv_drm_gem_free(struct drm_gem_obje Link Here
46	drm_gem_object_release(&nv_gem->base);	48	drm_gem_object_release(&nv_gem->base);
47		49
48	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)	50	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
49	reservation_object_fini(&nv_gem->resv);	51	dma_resv_fini(&nv_gem->resv);
50	#endif	52	#endif
51		53
52	nv_gem->ops->free(nv_gem);	54	nv_gem->ops->free(nv_gem);
Lines 113-124 void nv_drm_gem_prime_vunmap(struct drm_ Link Here
113	}	115	}
114		116
115	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)	117	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
		118	/*
116	struct reservation_object* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj)	119	struct reservation_object* nv_drm_gem_prime_res_obj(struct drm_gem_object *obj)
117	{	120	{
118	struct nv_drm_gem_object *nv_gem = to_nv_gem_object(obj);	121	struct nv_drm_gem_object *nv_gem = to_nv_gem_object(obj);
119		122
120	return &nv_gem->resv;	123	return &nv_gem->resv;
121	}	124	}
		125	*/
122	#endif	126	#endif
123		127
124	#endif /* NV_DRM_AVAILABLE */	128	#endif /* NV_DRM_AVAILABLE */





#include "nvidia-drm-priv.h"

#include <drm/drm_plane.h>
#include "nvkms-kapi.h"

#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)

    const struct nv_drm_gem_object_funcs *ops;

#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
    struct dma_resv resv;
#endif
};


    drm_gem_private_object_init(dev, &nv_gem->base, size);

#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
    dma_resv_init(&nv_gem->resv);
#endif
}


Lines 29-34 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c (+2 lines)
29		29
30	#include "nv-mm.h"	30	#include "nv-mm.h"
31		31
		32	#include <drm/drm_drv.h>
		33
32	static void __nv_drm_gem_nvkms_memory_free(struct nv_drm_gem_object *nv_gem)	34	static void __nv_drm_gem_nvkms_memory_free(struct nv_drm_gem_object *nv_gem)
33	{	35	{
34	struct nv_drm_device *nv_dev = nv_gem->nv_dev;	36	struct nv_drm_device *nv_dev = nv_gem->nv_dev;

Lines 27-32 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-gem-user-memory.c (+2 lines)
27	#include "nvidia-drm-gem-user-memory.h"	27	#include "nvidia-drm-gem-user-memory.h"
28	#include "nvidia-drm-ioctl.h"	28	#include "nvidia-drm-ioctl.h"
29		29
		30	#include <drm/drm_prime.h>
		31
30	static inline	32	static inline
31	void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)	33	void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)
32	{	34	{

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 <drm/drm_plane.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 / +2 lines)
27		27
28	#if defined(NV_DRM_AVAILABLE)	28	#if defined(NV_DRM_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include <drm/drm_plane.h>
		31	#include <drm/drm_drv.h>
31		32
32	/*	33	/*
33	* drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d	34	* drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d

Lines 33-38 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-modeset.c (+1 lines)
33	#include <drm/drm_atomic.h>	33	#include <drm/drm_atomic.h>
34	#include <drm/drm_atomic_helper.h>	34	#include <drm/drm_atomic_helper.h>
35	#include <drm/drm_crtc.h>	35	#include <drm/drm_crtc.h>
		36	#include <drm/drm_vblank.h>
36		37
37	struct nv_drm_atomic_state {	38	struct nv_drm_atomic_state {
38	struct NvKmsKapiRequestedModeSetConfig config;	39	struct NvKmsKapiRequestedModeSetConfig config;

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 <drm/drm_plane.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 <drm/drm_plane.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 518-524 int nv_drm_gem_fence_attach_ioctl(struct Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-prime-fence.c (-1 / +1 lines)
518	goto fence_context_create_fence_failed;	518	goto fence_context_create_fence_failed;
519	}	519	}
520		520
521	reservation_object_add_excl_fence(&nv_gem->resv, fence);	521	dma_resv_add_excl_fence(&nv_gem->resv, fence);
522		522
523	ret = 0;	523	ret = 0;
524		524

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 <drm/drm_plane.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 / +2 lines)
27		27
28	#if defined(NV_DRM_AVAILABLE)	28	#if defined(NV_DRM_AVAILABLE)
29		29
30	#include <drm/drmP.h>	30	#include <drm/drm_plane.h>
		31	#include <drm/drm_device.h>
31		32
32	#if defined(NV_DRM_DRM_GEM_H_PRESENT)	33	#if defined(NV_DRM_DRM_GEM_H_PRESENT)
33	#include <drm/drm_gem.h>	34	#include <drm/drm_gem.h>

Lines 24-29 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-utils.c (+2 lines)
24		24
25	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)	25	#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
26		26
		27	#include <drm/drm_modes.h>
		28	#include <drm/drm_fourcc.h>
27	#include "nvidia-drm-priv.h"	29	#include "nvidia-drm-priv.h"
28	#include "nvidia-drm-utils.h"	30	#include "nvidia-drm-utils.h"
29		31

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 <drm/drm_plane.h>
31	#include "nvkms-kapi.h"	31	#include "nvkms-kapi.h"
32		32
33	struct NvKmsKapiConnectorInfo*	33	struct NvKmsKapiConnectorInfo*

Return to bug 708208

Lines 67-77 static enum drm_connector_status __nv_dr Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-connector.c (-15 / +2 lines)
67		67
68	enum drm_connector_status status = connector_status_disconnected;	68	enum drm_connector_status status = connector_status_disconnected;
69		69
		70	struct drm_encoder *encoder;
70	struct drm_encoder *detected_encoder = NULL;	71	struct drm_encoder *detected_encoder = NULL;
71	struct nv_drm_encoder *nv_detected_encoder = NULL;	72	struct nv_drm_encoder *nv_detected_encoder = NULL;
72		73
73	struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;	74	struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
74	unsigned int i;
75		75
76	BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));	76	BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
77		77
Lines 87-108 static enum drm_connector_status __nv_dr Link Here
87	goto done;	87	goto done;
88	}	88	}
89		89
90	for (i = 0;	90	drm_connector_for_each_possible_encoder(connector, encoder) {
91	i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
92	struct drm_encoder *encoder;
93	struct nv_drm_encoder *nv_encoder;	91	struct nv_drm_encoder *nv_encoder;
94		92
95	if (connector->encoder_ids[i] == 0) {
96	break;
97	}
98
99	encoder = nv_drm_encoder_find(dev, connector->encoder_ids[i]);
100
101	if (encoder == NULL) {
102	BUG_ON(encoder != NULL);
103	continue;
104	}
105
106	/*	93	/*
107	* DVI-I connectors can drive both digital and analog	94	* DVI-I connectors can drive both digital and analog
108	* encoders. If a digital connection has been forced then	95	* encoders. If a digital connection has been forced then

Lines 29-35 Link Here

(-)a/kernel/nvidia-drm/nvidia-drm-gem.h (-3 / +3 lines)
29		29
30	#include "nvidia-drm-priv.h"	30	#include "nvidia-drm-priv.h"
31		31
32	#include <drm/drmP.h>	32	#include <drm/drm_plane.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 56-62 struct nv_drm_gem_object { Link Here
56	const struct nv_drm_gem_object_funcs *ops;	56	const struct nv_drm_gem_object_funcs *ops;
57		57
58	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)	58	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
59	struct reservation_object resv;	59	struct dma_resv resv;
60	#endif	60	#endif
61	};	61	};
62		62
Lines 127-133 void nv_drm_gem_object_init(struct nv_dr Link Here
127	drm_gem_private_object_init(dev, &nv_gem->base, size);	127	drm_gem_private_object_init(dev, &nv_gem->base, size);
128		128
129	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)	129	#if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
130	reservation_object_init(&nv_gem->resv);	130	dma_resv_init(&nv_gem->resv);
131	#endif	131	#endif
132	}	132	}
133		133