drm/udl: Fixed problem with UDL adpater reconnection (afdfc4c6) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/drm/udl/udl_connector.c

+50 −26

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,7 @@
	#include <drm/drm_crtc.h>		#include <drm/drm_crtc.h>
	#include <drm/drm_edid.h>		#include <drm/drm_edid.h>
	#include <drm/drm_crtc_helper.h>		#include <drm/drm_crtc_helper.h>
			#include "udl_connector.h"
	#include "udl_drv.h"		#include "udl_drv.h"

	/* dummy connector to just get EDID,		/* dummy connector to just get EDID,
	@@ -56,30 +57,17 @@ static u8 udl_get_edid(struct udl_device udl)

	static int udl_get_modes(struct drm_connector *connector)		static int udl_get_modes(struct drm_connector *connector)
	{		{
	struct udl_device *udl = connector->dev->dev_private;		struct udl_drm_connector *udl_connector =
	struct edid *edid;		container_of(connector,
	int ret;		struct udl_drm_connector,
			connector);
	edid = (struct edid *)udl_get_edid(udl);
	if (!edid) {		drm_mode_connector_update_edid_property(connector, udl_connector->edid);
	drm_mode_connector_update_edid_property(connector, NULL);		if (udl_connector->edid)
			return drm_add_edid_modes(connector, udl_connector->edid);
	return 0;		return 0;
	}		}

	/*
	* We only read the main block, but if the monitor reports extension
	* blocks then the drm edid code expects them to be present, so patch
	* the extension count to 0.
	*/
	edid->checksum += edid->extensions;
	edid->extensions = 0;

	drm_mode_connector_update_edid_property(connector, edid);
	ret = drm_add_edid_modes(connector, edid);
	kfree(edid);
	return ret;
	}

	static int udl_mode_valid(struct drm_connector *connector,		static int udl_mode_valid(struct drm_connector *connector,
	struct drm_display_mode *mode)		struct drm_display_mode *mode)
	{		{
	@@ -96,8 +84,33 @@ static int udl_mode_valid(struct drm_connector *connector,
	static enum drm_connector_status		static enum drm_connector_status
	udl_detect(struct drm_connector *connector, bool force)		udl_detect(struct drm_connector *connector, bool force)
	{		{
	if (drm_dev_is_unplugged(connector->dev))		struct edid *edid;
			struct udl_device *udl = connector->dev->dev_private;
			struct udl_drm_connector *udl_connector =
			container_of(connector,
			struct udl_drm_connector,
			connector);

			if (udl_connector->edid != NULL) {
			kfree(udl_connector->edid);
			udl_connector->edid = NULL;
			}

			edid = (struct edid *)udl_get_edid(udl);
			if (!edid \|\| !memchr_inv(edid, 0, EDID_LENGTH))
	return connector_status_disconnected;		return connector_status_disconnected;

			udl_connector->edid = edid;

			/*
			* We only read the main block, but if the monitor reports extension
			* blocks then the drm edid code expects them to be present, so patch
			* the extension count to 0.
			*/
			udl_connector->edid->checksum +=
			udl_connector->edid->extensions;
			udl_connector->edid->extensions = 0;

	return connector_status_connected;		return connector_status_connected;
	}		}

	@@ -117,8 +130,14 @@ static int udl_connector_set_property(struct drm_connector *connector,

	static void udl_connector_destroy(struct drm_connector *connector)		static void udl_connector_destroy(struct drm_connector *connector)
	{		{
			struct udl_drm_connector *udl_connector =
			container_of(connector,
			struct udl_drm_connector,
			connector);

	drm_connector_unregister(connector);		drm_connector_unregister(connector);
	drm_connector_cleanup(connector);		drm_connector_cleanup(connector);
			kfree(udl_connector->edid);
	kfree(connector);		kfree(connector);
	}		}

	@@ -138,17 +157,22 @@ static const struct drm_connector_funcs udl_connector_funcs = {

	int udl_connector_init(struct drm_device dev, struct drm_encoder encoder)		int udl_connector_init(struct drm_device dev, struct drm_encoder encoder)
	{		{
			struct udl_drm_connector *udl_connector;
	struct drm_connector *connector;		struct drm_connector *connector;

	connector = kzalloc(sizeof(struct drm_connector), GFP_KERNEL);		udl_connector = kzalloc(sizeof(struct udl_drm_connector), GFP_KERNEL);
	if (!connector)		if (!udl_connector)
	return -ENOMEM;		return -ENOMEM;

	drm_connector_init(dev, connector, &udl_connector_funcs, DRM_MODE_CONNECTOR_DVII);		connector = &udl_connector->connector;
			drm_connector_init(dev, connector, &udl_connector_funcs,
			DRM_MODE_CONNECTOR_DVII);
	drm_connector_helper_add(connector, &udl_connector_helper_funcs);		drm_connector_helper_add(connector, &udl_connector_helper_funcs);

	drm_connector_register(connector);		drm_connector_register(connector);
	drm_mode_connector_attach_encoder(connector, encoder);		drm_mode_connector_attach_encoder(connector, encoder);
			connector->polled = DRM_CONNECTOR_POLL_HPD \|
			DRM_CONNECTOR_POLL_CONNECT \| DRM_CONNECTOR_POLL_DISCONNECT;

	return 0;		return 0;
	}		}

drivers/gpu/drm/udl/udl_connector.h

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			#ifndef __UDL_CONNECTOR_H__
			#define __UDL_CONNECTOR_H__

			#include <drm/drm_crtc.h>

			struct udl_drm_connector {
			struct drm_connector connector;
			/* last udl_detect edid */
			struct edid *edid;
			};


			#endif //__UDL_CONNECTOR_H__

drivers/gpu/drm/udl/udl_drv.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,9 @@
	static int udl_usb_suspend(struct usb_interface *interface,		static int udl_usb_suspend(struct usb_interface *interface,
	pm_message_t message)		pm_message_t message)
	{		{
			struct drm_device *dev = usb_get_intfdata(interface);

			drm_kms_helper_poll_disable(dev);
	return 0;		return 0;
	}		}

	@@ -21,6 +24,7 @@ static int udl_usb_resume(struct usb_interface *interface)
	{		{
	struct drm_device *dev = usb_get_intfdata(interface);		struct drm_device *dev = usb_get_intfdata(interface);

			drm_kms_helper_poll_enable(dev);
	udl_modeset_restore(dev);		udl_modeset_restore(dev);
	return 0;		return 0;
	}		}

drivers/gpu/drm/udl/udl_main.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11,6 +11,7 @@
	* more details.		* more details.
	*/		*/
	#include <drm/drmP.h>		#include <drm/drmP.h>
			#include <drm/drm_crtc_helper.h>
	#include "udl_drv.h"		#include "udl_drv.h"

	/* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */		/* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */
	@@ -350,6 +351,8 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags)
	if (ret)		if (ret)
	goto err_fb;		goto err_fb;

			drm_kms_helper_poll_init(dev);

	return 0;		return 0;
	err_fb:		err_fb:
	udl_fbdev_cleanup(dev);		udl_fbdev_cleanup(dev);
	@@ -371,6 +374,8 @@ void udl_driver_unload(struct drm_device *dev)
	{		{
	struct udl_device *udl = dev->dev_private;		struct udl_device *udl = dev->dev_private;

			drm_kms_helper_poll_fini(dev);

	if (udl->urbs.count)		if (udl->urbs.count)
	udl_free_urb_list(dev);		udl_free_urb_list(dev);