Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffae7f0a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-i915-mst-support-next' of... 

Merge branch 'drm-i915-mst-support-next' of git://people.freedesktop.org/~airlied/linux into drm-next

Evil super powers maintainer abuse, get i915 mst support into -next.

* 'drm-i915-mst-support-next' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: mst topology dumper in debugfs (v0.2)
  drm/i915: add DP 1.2 MST support (v0.7)
  drm/i915: split conversion function out into separate function
  drm/i915: check connector->encoder before using it.
  i915: split some DP modesetting code into a separate function
  drm/i915: add some registers need for displayport MST support.
parents 8fa6a425 11bed958

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ i915-y += dvo_ch7017.o \ 
	  intel_crt.o \

	  intel_ddi.o \

	  intel_dp.o \

	  intel_dp_mst.o \

	  intel_dsi_cmd.o \

	  intel_dsi.o \

	  intel_dsi_pll.o \

drivers/gpu/drm/i915/i915_debugfs.c

+32 −7
Original line number Diff line number Diff line
@@ -2209,6 +2209,7 @@ static void intel_connector_info(struct seq_file *m, 
		seq_printf(m, "\tCEA rev: %d\n",

			   connector->display_info.cea_rev);

	}

	if (intel_encoder) {

		if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||

		    intel_encoder->type == INTEL_OUTPUT_EDP)

			intel_dp_info(m, intel_connector);
@@ -2216,6 +2217,7 @@ static void intel_connector_info(struct seq_file *m, 
			intel_hdmi_info(m, intel_connector);

		else if (intel_encoder->type == INTEL_OUTPUT_LVDS)

			intel_lvds_info(m, intel_connector);

	}



	seq_printf(m, "\tmodes:\n");

	list_for_each_entry(mode, &connector->modes, head)
@@ -2403,6 +2405,28 @@ struct pipe_crc_info { 
	enum pipe pipe;

};



static int i915_dp_mst_info(struct seq_file *m, void *unused)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_encoder *encoder;

	struct intel_encoder *intel_encoder;

	struct intel_digital_port *intel_dig_port;

	drm_modeset_lock_all(dev);

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		intel_encoder = to_intel_encoder(encoder);

		if (intel_encoder->type != INTEL_OUTPUT_DISPLAYPORT)

			continue;

		intel_dig_port = enc_to_dig_port(encoder);

		if (!intel_dig_port->dp.can_mst)

			continue;



		drm_dp_mst_dump_topology(m, &intel_dig_port->dp.mst_mgr);

	}

	drm_modeset_unlock_all(dev);

	return 0;

}



static int i915_pipe_crc_open(struct inode *inode, struct file *filep)

{

	struct pipe_crc_info *info = inode->i_private;
@@ -3904,6 +3928,7 @@ static const struct drm_info_list i915_debugfs_list[] = { 
	{"i915_display_info", i915_display_info, 0},

	{"i915_semaphore_status", i915_semaphore_status, 0},

	{"i915_shared_dplls_info", i915_shared_dplls_info, 0},

	{"i915_dp_mst_info", i915_dp_mst_info, 0},

};

#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)

drivers/gpu/drm/i915/i915_dma.c

+10 −0
Original line number Diff line number Diff line
@@ -1717,6 +1717,13 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
		goto out_mtrrfree;

	}



	dev_priv->dp_wq = alloc_ordered_workqueue("i915-dp", 0);

	if (dev_priv->dp_wq == NULL) {

		DRM_ERROR("Failed to create our dp workqueue.\n");

		ret = -ENOMEM;

		goto out_freewq;

	}



	intel_irq_init(dev);

	intel_uncore_sanitize(dev);
@@ -1792,6 +1799,8 @@ out_gem_unload: 
	intel_teardown_gmbus(dev);

	intel_teardown_mchbar(dev);

	pm_qos_remove_request(&dev_priv->pm_qos);

	destroy_workqueue(dev_priv->dp_wq);

out_freewq:

	destroy_workqueue(dev_priv->wq);

out_mtrrfree:

	arch_phys_wc_del(dev_priv->gtt.mtrr);
@@ -1892,6 +1901,7 @@ int i915_driver_unload(struct drm_device *dev) 
	intel_teardown_gmbus(dev);

	intel_teardown_mchbar(dev);



	destroy_workqueue(dev_priv->dp_wq);

	destroy_workqueue(dev_priv->wq);

	pm_qos_remove_request(&dev_priv->pm_qos);

drivers/gpu/drm/i915/i915_drv.c

+12 −1
Original line number Diff line number Diff line
@@ -518,7 +518,6 @@ static int i915_drm_freeze(struct drm_device *dev) 


		flush_delayed_work(&dev_priv->rps.delayed_resume_work);



		intel_runtime_pm_disable_interrupts(dev);



		intel_suspend_gt_powersave(dev);
@@ -532,6 +531,9 @@ static int i915_drm_freeze(struct drm_device *dev) 
		}

		drm_modeset_unlock_all(dev);



		intel_dp_mst_suspend(dev);

		intel_runtime_pm_disable_interrupts(dev);



		intel_modeset_suspend_hw(dev);

	}
@@ -646,6 +648,15 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) 


		intel_modeset_init_hw(dev);



		{

			unsigned long irqflags;

			spin_lock_irqsave(&dev_priv->irq_lock, irqflags);

			if (dev_priv->display.hpd_irq_setup)

				dev_priv->display.hpd_irq_setup(dev);

			spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

		}



		intel_dp_mst_resume(dev);

		drm_modeset_lock_all(dev);

		intel_modeset_setup_hw_state(dev, true);

		drm_modeset_unlock_all(dev);

drivers/gpu/drm/i915/i915_drv.h

+9 −0
Original line number Diff line number Diff line
@@ -1595,6 +1595,15 @@ struct drm_i915_private { 
	u32 short_hpd_port_mask;

	struct work_struct dig_port_work;



	/*

	 * if we get a HPD irq from DP and a HPD irq from non-DP

	 * the non-DP HPD could block the workqueue on a mode config

	 * mutex getting, that userspace may have taken. However

	 * userspace is waiting on the DP workqueue to run which is

	 * blocked behind the non-DP one.

	 */

	struct workqueue_struct *dp_wq;



	/* Old dri1 support infrastructure, beware the dragons ya fools entering

	 * here! */

	struct i915_dri1_state dri1;