Merge tag 'drm-misc-fixes-2020-10-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (671d2799) · Commits · 戴 / test

Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml

+4 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,9 @@ properties:

		reset-gpios: true

		'mantix,tp-rstn-gpios':
		description: second reset line that triggers DSI config load

		backlight: true

		required:
		@@ -63,6 +66,7 @@ examples:
		avee-supply = <&reg_avee>;
		vddi-supply = <&reg_1v8_p>;
		reset-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
		mantix,tp-rstn-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
		backlight = <&backlight>;
		};
		};

+11 −1

Original line number	Diff line number	Diff line
		@@ -374,6 +374,10 @@ static bool is_edid_digital_input_dp(const struct edid *edid)
		* drm_dp_downstream_is_type() - is the downstream facing port of certain type?
		* @dpcd: DisplayPort configuration data
		* @port_cap: port capabilities
		* @type: port type to be checked. Can be:
		* %DP_DS_PORT_TYPE_DP, %DP_DS_PORT_TYPE_VGA, %DP_DS_PORT_TYPE_DVI,
		* %DP_DS_PORT_TYPE_HDMI, %DP_DS_PORT_TYPE_NON_EDID,
		* %DP_DS_PORT_TYPE_DP_DUALMODE or %DP_DS_PORT_TYPE_WIRELESS.
		*
		* Caveat: Only works with DPCD 1.1+ port caps.
		*
		@@ -870,6 +874,7 @@ EXPORT_SYMBOL(drm_dp_downstream_444_to_420_conversion);

		/**
		* drm_dp_downstream_mode() - return a mode for downstream facing port
		* @dev: DRM device
		* @dpcd: DisplayPort configuration data
		* @port_cap: port capabilities
		*
		@@ -1028,7 +1033,8 @@ EXPORT_SYMBOL(drm_dp_downstream_debug);

		/**
		* drm_dp_subconnector_type() - get DP branch device type
		*
		* @dpcd: DisplayPort configuration data
		* @port_cap: port capabilities
		*/
		enum drm_mode_subconnector
		drm_dp_subconnector_type(const u8 dpcd[DP_RECEIVER_CAP_SIZE],
		@@ -1079,6 +1085,10 @@ EXPORT_SYMBOL(drm_dp_subconnector_type);

		/**
		* drm_mode_set_dp_subconnector_property - set subconnector for DP connector
		* @connector: connector to set property on
		* @status: connector status
		* @dpcd: DisplayPort configuration data
		* @port_cap: port capabilities
		*
		* Called by a driver on every detect event.
		*/

+1 −1

Original line number	Diff line number	Diff line
		@@ -3741,7 +3741,7 @@ drm_add_cmdb_modes(struct drm_connector *connector, u8 svd)
		/**
		* drm_display_mode_from_cea_vic() - return a mode for CEA VIC
		* @dev: DRM device
		* @vic: CEA VIC of the mode
		* @video_code: CEA VIC of the mode
		*
		* Creates a new mode matching the specified CEA VIC.
		*

+2 −2

Original line number	Diff line number	Diff line
		@@ -1085,6 +1085,8 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
		*/
		drm_gem_object_get(obj);

		vma->vm_private_data = obj;

		if (obj->funcs && obj->funcs->mmap) {
		ret = obj->funcs->mmap(obj, vma);
		if (ret) {
		@@ -1107,8 +1109,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
		vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
		}

		vma->vm_private_data = obj;

		return 0;
		}
		EXPORT_SYMBOL(drm_gem_mmap_obj);

+6 −1

Original line number	Diff line number	Diff line
		@@ -593,8 +593,13 @@ int drm_gem_shmem_mmap(struct drm_gem_object obj, struct vm_area_struct vma)
		/* Remove the fake offset */
		vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node);

		if (obj->import_attach)
		if (obj->import_attach) {
		/* Drop the reference drm_gem_mmap_obj() acquired.*/
		drm_gem_object_put(obj);
		vma->vm_private_data = NULL;

		return dma_buf_mmap(obj->dma_buf, vma, 0);
		}

		shmem = to_drm_gem_shmem_obj(obj);