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

Merge tag 'drm-intel-next-fixes-2015-08-16' of... 

Merge tag 'drm-intel-next-fixes-2015-08-16' of git://anongit.freedesktop.org/drm-intel into drm-next

Bunch more fixes for 4.3, most of it skl fallout. It's not quite all yet,
there's still a few more patches pending to enable DDI-E correctly on skl.
Also included the dpms atomic work from Maarten since atomic is just a
pain and not including would cause piles of conflicts right from the
start.

* tag 'drm-intel-next-fixes-2015-08-16' of git://anongit.freedesktop.org/drm-intel: (67 commits)
  drm/i915: Per-DDI I_boost override
  drm/i915/skl: WaIgnoreDDIAStrap is forever, always init DDI A
  drm/i915: fix checksum write for automated test reply
  drm/i915: Contain the WA_REG macro
  drm/i915: Remove the failed context from the fpriv->context_idr
  drm/i915: Report IOMMU enabled status for GPU hangs
  drm/i915: Check idle to active before processing CSQ
  drm/i915: Set alternate aux for DDI-E
  drm/i915: Set power domain for DDI-E
  drm/i915: fix stolen bios_reserved checks
  drm/i915: Use masked write for Context Status Buffer Pointer
  drm/i915/skl WaDisableSbeCacheDispatchPortSharing
  drm/i915: Spam less on dp aux send/receive problems
  drm/i915: Handle return value in intel_pin_and_fence_fb_obj, v2.
  drm/i915: Only update mode related state if a modeset happened.
  drm/i915: Remove connectors_active.
  drm/i915: Remove connectors_active from intel_dp.c, v2.
  drm/i915: Remove connectors_active from sanitization, v2.
  drm/i915: Get rid of dpms handling.
  drm/i915: Make crtc checking use the atomic state, v2.
  ...
parents 4eebf60b 75067dde

Documentation/DocBook/drm.tmpl

+17 −1
Original line number Diff line number Diff line
@@ -3982,7 +3982,6 @@ int num_ioctls;</synopsis> 
        <title>Interrupt Handling</title>

!Pdrivers/gpu/drm/i915/i915_irq.c interrupt handling

!Fdrivers/gpu/drm/i915/i915_irq.c intel_irq_init intel_irq_init_hw intel_hpd_init

!Fdrivers/gpu/drm/i915/i915_irq.c intel_irq_fini

!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_disable_interrupts

!Fdrivers/gpu/drm/i915/i915_irq.c intel_runtime_pm_enable_interrupts

      </sect2>
@@ -4197,6 +4196,23 @@ int num_ioctls;</synopsis> 
        <title>Global GTT views</title>

!Pdrivers/gpu/drm/i915/i915_gem_gtt.c Global GTT views

!Idrivers/gpu/drm/i915/i915_gem_gtt.c

      </sect2>

      <sect2>

        <title>GTT Fences and Swizzling</title>

!Idrivers/gpu/drm/i915/i915_gem_fence.c

        <sect3>

          <title>Global GTT Fence Handling</title>

!Pdrivers/gpu/drm/i915/i915_gem_fence.c fence register handling

        </sect3>

        <sect3>

          <title>Hardware Tiling and Swizzling Details</title>

!Pdrivers/gpu/drm/i915/i915_gem_fence.c tiling swizzling details

        </sect3>

      </sect2>

      <sect2>

        <title>Object Tiling IOCTLs</title>

!Idrivers/gpu/drm/i915/i915_gem_tiling.c

!Pdrivers/gpu/drm/i915/i915_gem_tiling.c buffer object tiling

      </sect2>

      <sect2>

        <title>Buffer Object Eviction</title>

drivers/gpu/drm/i915/Makefile

+10 −9
Original line number Diff line number Diff line
@@ -6,12 +6,13 @@ 


# core driver code

i915-y := i915_drv.o \

	  i915_irq.o \

	  i915_params.o \

          i915_suspend.o \

	  i915_sysfs.o \

	  intel_csr.o \

	  intel_pm.o \

	  intel_runtime_pm.o \

	  intel_csr.o

	  intel_runtime_pm.o



i915-$(CONFIG_COMPAT)   += i915_ioc32.o

i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
@@ -20,21 +21,20 @@ i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o 
i915-y += i915_cmd_parser.o \

	  i915_gem_batch_pool.o \

	  i915_gem_context.o \

	  i915_gem_render_state.o \

	  i915_gem_debug.o \

	  i915_gem_dmabuf.o \

	  i915_gem_evict.o \

	  i915_gem_execbuffer.o \

	  i915_gem_fence.o \

	  i915_gem_gtt.o \

	  i915_gem.o \

	  i915_gem_render_state.o \

	  i915_gem_shrinker.o \

	  i915_gem_stolen.o \

	  i915_gem_tiling.o \

	  i915_gem_userptr.o \

	  i915_gpu_error.o \

	  i915_irq.o \

	  i915_trace_points.o \

	  intel_hotplug.o \

	  intel_lrc.o \

	  intel_mocs.o \

	  intel_ringbuffer.o \
@@ -48,11 +48,14 @@ i915-y += intel_renderstate_gen6.o \ 


# modesetting core code

i915-y += intel_audio.o \

	  intel_atomic.o \

	  intel_atomic_plane.o \

	  intel_bios.o \

	  intel_display.o \

	  intel_fbc.o \

	  intel_fifo_underrun.o \

	  intel_frontbuffer.o \

	  intel_hotplug.o \

	  intel_modes.o \

	  intel_overlay.o \

	  intel_psr.o \
@@ -68,15 +71,13 @@ i915-y += dvo_ch7017.o \ 
	  dvo_ns2501.o \

	  dvo_sil164.o \

	  dvo_tfp410.o \

	  intel_atomic.o \

	  intel_atomic_plane.o \

	  intel_crt.o \

	  intel_ddi.o \

	  intel_dp.o \

	  intel_dp_mst.o \

	  intel_dp.o \

	  intel_dsi.o \

	  intel_dsi_pll.o \

	  intel_dsi_panel_vbt.o \

	  intel_dsi_pll.o \

	  intel_dvo.o \

	  intel_hdmi.o \

	  intel_i2c.o \

drivers/gpu/drm/i915/i915_cmd_parser.c

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ static const struct drm_i915_cmd_descriptor render_cmds[] = { 
	CMD(  MI_ARB_ON_OFF,                    SMI,    F,  1,      R  ),

	CMD(  MI_PREDICATE,                     SMI,    F,  1,      S  ),

	CMD(  MI_TOPOLOGY_FILTER,               SMI,    F,  1,      S  ),

	CMD(  MI_DISPLAY_FLIP,                  SMI,   !F,  0xFF,   R  ),

	CMD(  MI_SET_APPID,                     SMI,    F,  1,      S  ),

	CMD(  MI_DISPLAY_FLIP,                  SMI,   !F,  0xFF,   R  ),

	CMD(  MI_SET_CONTEXT,                   SMI,   !F,  0xFF,   R  ),

	CMD(  MI_URB_CLEAR,                     SMI,   !F,  0xFF,   S  ),

	CMD(  MI_STORE_DWORD_IMM,               SMI,   !F,  0x3F,   B,
@@ -564,7 +564,7 @@ static bool validate_cmds_sorted(struct intel_engine_cs *ring, 


		for (j = 0; j < table->count; j++) {

			const struct drm_i915_cmd_descriptor *desc =

				&table->table[i];

				&table->table[j];

			u32 curr = desc->cmd.value & desc->cmd.mask;



			if (curr < previous) {

drivers/gpu/drm/i915/i915_debugfs.c

+26 −81
Original line number Diff line number Diff line
@@ -3645,74 +3645,40 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source, 
	return 0;

}



static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev)

static void hsw_trans_edp_pipe_A_crc_wa(struct drm_device *dev, bool enable)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *crtc =

		to_intel_crtc(dev_priv->pipe_to_crtc_mapping[PIPE_A]);

	struct intel_crtc_state *pipe_config;

	struct drm_atomic_state *state;

	int ret = 0;



	drm_modeset_lock_all(dev);

	pipe_config = to_intel_crtc_state(crtc->base.state);



	/*

	 * If we use the eDP transcoder we need to make sure that we don't

	 * bypass the pfit, since otherwise the pipe CRC source won't work. Only

	 * relevant on hsw with pipe A when using the always-on power well

	 * routing.

	 */

	if (pipe_config->cpu_transcoder == TRANSCODER_EDP &&

	    !pipe_config->pch_pfit.enabled) {

		bool active = pipe_config->base.active;



		if (active) {

			intel_crtc_control(&crtc->base, false);

			pipe_config = to_intel_crtc_state(crtc->base.state);

		}



		pipe_config->pch_pfit.force_thru = true;



		intel_display_power_get(dev_priv,

					POWER_DOMAIN_PIPE_PANEL_FITTER(PIPE_A));



		if (active)

			intel_crtc_control(&crtc->base, true);

	}

	drm_modeset_unlock_all(dev);

	state = drm_atomic_state_alloc(dev);

	if (!state) {

		ret = -ENOMEM;

		goto out;

	}



static void hsw_undo_trans_edp_pipe_A_crc_wa(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *crtc =

		to_intel_crtc(dev_priv->pipe_to_crtc_mapping[PIPE_A]);

	struct intel_crtc_state *pipe_config;



	drm_modeset_lock_all(dev);

	/*

	 * If we use the eDP transcoder we need to make sure that we don't

	 * bypass the pfit, since otherwise the pipe CRC source won't work. Only

	 * relevant on hsw with pipe A when using the always-on power well

	 * routing.

	 */

	pipe_config = to_intel_crtc_state(crtc->base.state);

	if (pipe_config->pch_pfit.force_thru) {

		bool active = pipe_config->base.active;



		if (active) {

			intel_crtc_control(&crtc->base, false);

			pipe_config = to_intel_crtc_state(crtc->base.state);

	state->acquire_ctx = drm_modeset_legacy_acquire_ctx(&crtc->base);

	pipe_config = intel_atomic_get_crtc_state(state, crtc);

	if (IS_ERR(pipe_config)) {

		ret = PTR_ERR(pipe_config);

		goto out;

	}



		pipe_config->pch_pfit.force_thru = false;



		intel_display_power_put(dev_priv,

					POWER_DOMAIN_PIPE_PANEL_FITTER(PIPE_A));

	pipe_config->pch_pfit.force_thru = enable;

	if (pipe_config->cpu_transcoder == TRANSCODER_EDP &&

	    pipe_config->pch_pfit.enabled != enable)

		pipe_config->base.connectors_changed = true;



		if (active)

			intel_crtc_control(&crtc->base, true);

	}

	ret = drm_atomic_commit(state);

out:

	drm_modeset_unlock_all(dev);

	WARN(ret, "Toggling workaround to %i returns %i\n", enable, ret);

	if (ret)

		drm_atomic_state_free(state);

}



static int ivb_pipe_crc_ctl_reg(struct drm_device *dev,
@@ -3732,7 +3698,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev, 
		break;

	case INTEL_PIPE_CRC_SOURCE_PF:

		if (IS_HASWELL(dev) && pipe == PIPE_A)

			hsw_trans_edp_pipe_A_crc_wa(dev);

			hsw_trans_edp_pipe_A_crc_wa(dev, true);



		*val = PIPE_CRC_ENABLE | PIPE_CRC_SOURCE_PF_IVB;

		break;
@@ -3844,7 +3810,7 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe, 
		else if (IS_VALLEYVIEW(dev))

			vlv_undo_pipe_scramble_reset(dev, pipe);

		else if (IS_HASWELL(dev) && pipe == PIPE_A)

			hsw_undo_trans_edp_pipe_A_crc_wa(dev);

			hsw_trans_edp_pipe_A_crc_wa(dev, false);



		hsw_enable_ips(crtc);

	}
@@ -4030,24 +3996,14 @@ static ssize_t i915_displayport_test_active_write(struct file *file, 
{

	char *input_buffer;

	int status = 0;

	struct seq_file *m;

	struct drm_device *dev;

	struct drm_connector *connector;

	struct list_head *connector_list;

	struct intel_dp *intel_dp;

	int val = 0;



	m = file->private_data;

	if (!m) {

		status = -ENODEV;

		return status;

	}

	dev = m->private;

	dev = ((struct seq_file *)file->private_data)->private;



	if (!dev) {

		status = -ENODEV;

		return status;

	}

	connector_list = &dev->mode_config.connector_list;



	if (len == 0)
@@ -4071,9 +4027,7 @@ static ssize_t i915_displayport_test_active_write(struct file *file, 
		    DRM_MODE_CONNECTOR_DisplayPort)

			continue;



		if (connector->connector_type ==

		    DRM_MODE_CONNECTOR_DisplayPort &&

		    connector->status == connector_status_connected &&

		if (connector->status == connector_status_connected &&

		    connector->encoder != NULL) {

			intel_dp = enc_to_intel_dp(connector->encoder);

			status = kstrtoint(input_buffer, 10, &val);
@@ -4105,9 +4059,6 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data) 
	struct list_head *connector_list = &dev->mode_config.connector_list;

	struct intel_dp *intel_dp;



	if (!dev)

		return -ENODEV;



	list_for_each_entry(connector, connector_list, head) {



		if (connector->connector_type !=
@@ -4152,9 +4103,6 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data) 
	struct list_head *connector_list = &dev->mode_config.connector_list;

	struct intel_dp *intel_dp;



	if (!dev)

		return -ENODEV;



	list_for_each_entry(connector, connector_list, head) {



		if (connector->connector_type !=
@@ -4194,9 +4142,6 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data) 
	struct list_head *connector_list = &dev->mode_config.connector_list;

	struct intel_dp *intel_dp;



	if (!dev)

		return -ENODEV;



	list_for_each_entry(connector, connector_list, head) {



		if (connector->connector_type !=

drivers/gpu/drm/i915/i915_dma.c

+0 −10
Original line number Diff line number Diff line
@@ -1274,13 +1274,3 @@ const struct drm_ioctl_desc i915_ioctls[] = { 
};



int i915_max_ioctl = ARRAY_SIZE(i915_ioctls);
 


/*

 * This is really ugly: Because old userspace abused the linux agp interface to

 * manage the gtt, we need to claim that all intel devices are agp.  For

 * otherwise the drm core refuses to initialize the agp support code.

 */

int i915_driver_device_is_agp(struct drm_device *dev)

{

	return 1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE