Merge tag 'drm-misc-fixes-2017-01-13' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes (78337c06) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/drm_modes.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1460,6 +1460,13 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev,
		return NULL;

		mode->type \|= DRM_MODE_TYPE_USERDEF;
		/* fix up 1368x768: GFT/CVT can't express 1366 width due to alignment */
		if (cmd->xres == 1366 && mode->hdisplay == 1368) {
		mode->hdisplay = 1366;
		mode->hsync_start--;
		mode->hsync_end--;
		drm_mode_set_name(mode);
		}
		drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
		return mode;
		}

drivers/gpu/drm/drm_probe_helper.c

+31 −32

Original line number	Diff line number	Diff line
		@@ -115,24 +115,27 @@ static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector)

		#define DRM_OUTPUT_POLL_PERIOD (10*HZ)
		/**
		* drm_kms_helper_poll_enable_locked - re-enable output polling.
		* drm_kms_helper_poll_enable - re-enable output polling.
		* @dev: drm_device
		*
		* This function re-enables the output polling work without
		* locking the mode_config mutex.
		* This function re-enables the output polling work, after it has been
		* temporarily disabled using drm_kms_helper_poll_disable(), for example over
		* suspend/resume.
		*
		* Drivers can call this helper from their device resume implementation. It is
		* an error to call this when the output polling support has not yet been set
		* up.
		*
		* This is like drm_kms_helper_poll_enable() however it is to be
		* called from a context where the mode_config mutex is locked
		* already.
		* Note that calls to enable and disable polling must be strictly ordered, which
		* is automatically the case when they're only call from suspend/resume
		* callbacks.
		*/
		void drm_kms_helper_poll_enable_locked(struct drm_device *dev)
		void drm_kms_helper_poll_enable(struct drm_device *dev)
		{
		bool poll = false;
		struct drm_connector *connector;
		unsigned long delay = DRM_OUTPUT_POLL_PERIOD;

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

		if (!dev->mode_config.poll_enabled \|\| !drm_kms_helper_poll)
		return;

		@@ -143,14 +146,24 @@ void drm_kms_helper_poll_enable_locked(struct drm_device *dev)
		}

		if (dev->mode_config.delayed_event) {
		/*
		* FIXME:
		*
		* Use short (1s) delay to handle the initial delayed event.
		* This delay should not be needed, but Optimus/nouveau will
		* fail in a mysterious way if the delayed event is handled as
		* soon as possible like it is done in
		* drm_helper_probe_single_connector_modes() in case the poll
		* was enabled before.
		*/
		poll = true;
		delay = 0;
		delay = HZ;
		}

		if (poll)
		schedule_delayed_work(&dev->mode_config.output_poll_work, delay);
		}
		EXPORT_SYMBOL(drm_kms_helper_poll_enable_locked);
		EXPORT_SYMBOL(drm_kms_helper_poll_enable);

		static enum drm_connector_status
		drm_connector_detect(struct drm_connector *connector, bool force)
		@@ -277,7 +290,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,

		/* Re-enable polling in case the global poll config changed. */
		if (drm_kms_helper_poll != dev->mode_config.poll_running)
		drm_kms_helper_poll_enable_locked(dev);
		drm_kms_helper_poll_enable(dev);

		dev->mode_config.poll_running = drm_kms_helper_poll;

		@@ -469,8 +482,12 @@ static void output_poll_execute(struct work_struct *work)
		* This function disables the output polling work.
		*
		* Drivers can call this helper from their device suspend implementation. It is
		* not an error to call this even when output polling isn't enabled or arlready
		* disabled.
		* not an error to call this even when output polling isn't enabled or already
		* disabled. Polling is re-enabled by calling drm_kms_helper_poll_enable().
		*
		* Note that calls to enable and disable polling must be strictly ordered, which
		* is automatically the case when they're only call from suspend/resume
		* callbacks.
		*/
		void drm_kms_helper_poll_disable(struct drm_device *dev)
		{
		@@ -480,24 +497,6 @@ void drm_kms_helper_poll_disable(struct drm_device *dev)
		}
		EXPORT_SYMBOL(drm_kms_helper_poll_disable);

		/**
		* drm_kms_helper_poll_enable - re-enable output polling.
		* @dev: drm_device
		*
		* This function re-enables the output polling work.
		*
		* Drivers can call this helper from their device resume implementation. It is
		* an error to call this when the output polling support has not yet been set
		* up.
		*/
		void drm_kms_helper_poll_enable(struct drm_device *dev)
		{
		mutex_lock(&dev->mode_config.mutex);
		drm_kms_helper_poll_enable_locked(dev);
		mutex_unlock(&dev->mode_config.mutex);
		}
		EXPORT_SYMBOL(drm_kms_helper_poll_enable);

		/**
		* drm_kms_helper_poll_init - initialize and enable output polling
		* @dev: drm_device

drivers/gpu/drm/i915/intel_hotplug.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ static void intel_hpd_irq_storm_disable(struct drm_i915_private *dev_priv)

		/* Enable polling and queue hotplug re-enabling. */
		if (hpd_disabled) {
		drm_kms_helper_poll_enable_locked(dev);
		drm_kms_helper_poll_enable(dev);
		mod_delayed_work(system_wq, &dev_priv->hotplug.reenable_work,
		msecs_to_jiffies(HPD_STORM_REENABLE_DELAY));
		}
		@@ -511,7 +511,7 @@ static void i915_hpd_poll_init_work(struct work_struct *work)
		}

		if (enabled)
		drm_kms_helper_poll_enable_locked(dev);
		drm_kms_helper_poll_enable(dev);

		mutex_unlock(&dev->mode_config.mutex);

include/drm/drm_crtc_helper.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -73,6 +73,5 @@ extern void drm_kms_helper_hotplug_event(struct drm_device *dev);

		extern void drm_kms_helper_poll_disable(struct drm_device *dev);
		extern void drm_kms_helper_poll_enable(struct drm_device *dev);
		extern void drm_kms_helper_poll_enable_locked(struct drm_device *dev);

		#endif