linux-next: manual merge of the drm-intel tree with the tree

linux-next: manual merge of the drm-intel tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict which I'm not really sure of and commit b47d1189da119e ("drm/i915: Use dev_priv as first argument of for_each_pipe()") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

@@ -3923,7 +3942,9 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
 
 	I915_WRITE(VLV_MASTER_IER, 0);
 
-	for_each_pipe(pipe)
+	intel_hpd_irq_uninstall(dev_priv);
+
+	for_each_pipe(dev_priv, pipe)
 		I915_WRITE(PIPESTAT(pipe), 0xffff);
 
 	I915_WRITE(HWSTAM, 0xffffffff);

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the drm-intel tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict which I'm not really sure of and commit b47d1189da119e ("drm/i915: Use dev_priv as first argument of for_each_pipe()") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

@@ -3923,7 +3942,9 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
 
 	I915_WRITE(VLV_MASTER_IER, 0);
 
-	for_each_pipe(pipe)
+	intel_hpd_irq_uninstall(dev_priv);
+
+	for_each_pipe(dev_priv, pipe)
 		I915_WRITE(PIPESTAT(pipe), 0xffff);
 
 	I915_WRITE(HWSTAM, 0xffffffff);

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the drm-intel tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]

On Wed, Sep 03, 2014 at 02:31:46PM +0100, Mark Brown wrote:

> @@ -3923,7 +3942,9 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
>  
>  	I915_WRITE(VLV_MASTER_IER, 0);
>  
> -	for_each_pipe(pipe)
> +	intel_hpd_irq_uninstall(dev_priv);
> +
> +	for_each_pipe(dev_priv, pipe)
>  		I915_WRITE(PIPESTAT(pipe), 0xffff);
>  
>  	I915_WRITE(HWSTAM, 0xffffffff);

...or actually this since the above doesn't build, I was too hasty:


@@ -3923,7 +3942,9 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
 
 	I915_WRITE(VLV_MASTER_IER, 0);
 
-	for_each_pipe(pipe)
+
+	for_each_pipe(dev_priv, pipe)
 		I915_WRITE(PIPESTAT(pipe), 0xffff);
 
 	I915_WRITE(HWSTAM, 0xffffffff);

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the drm-intel tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2991 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/i915_gem_context.c between commit 691e6415c891
("drm/i915: Always use kref tracking for all contexts") from the
drm-intel-fixes tree and commit ad2ac08bf34b ("drm/i915: Make contexts
non-snooped on non-LLC platforms") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/i915_gem_context.c
index d72db15afa02,30b355afb362..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@@ -231,32 -232,40 +231,40 @@@ __create_hw_context(struct drm_device *
  		return ERR_PTR(-ENOMEM);
  
  	kref_init(&ctx->ref);
 -	ctx->obj = i915_gem_alloc_object(dev, dev_priv->hw_context_size);
 -	INIT_LIST_HEAD(&ctx->link);
 -	if (ctx->obj == NULL) {
 -		kfree(ctx);
 -		DRM_DEBUG_DRIVER("Context object allocated failed\n");
 -		return ERR_PTR(-ENOMEM);
 -	}
 +	list_add_tail(&ctx->link, &dev_priv->context_list);
  
 -	/*
 -	 * Try to make the context utilize L3 as well as LLC.
 -	 *
 -	 * On VLV we don't have L3 controls in the PTEs so we
 -	 * shouldn't touch the cache level, especially as that
 -	 * would make the object snooped which might have a
 -	 * negative performance impact.
 -	 */
 -	if (INTEL_INFO(dev)->gen >= 7 && !IS_VALLEYVIEW(dev)) {
 -		ret = i915_gem_object_set_cache_level(ctx->obj,
 -						      I915_CACHE_L3_LLC);
 -		/* Failure shouldn't ever happen this early */
 -		if (WARN_ON(ret))
 +	if (dev_priv->hw_context_size) {
 +		ctx->obj = i915_gem_alloc_object(dev, dev_priv->hw_context_size);
 +		if (ctx->obj == NULL) {
 +			ret = -ENOMEM;
  			goto err_out;
 -	}
 +		}
  
- 		if (INTEL_INFO(dev)->gen >= 7) {
 -	list_add_tail(&ctx->link, &dev_priv->context_list);
++		/*
++		 * Try to make the context utilize L3 as well as LLC.
++		 *
++		 * On VLV we don't have L3 controls in the PTEs so we
++		 * shouldn't touch the cache level, especially as that
++		 * would make the object snooped which might have a
++		 * negative performance impact.
++		 */
++		if (INTEL_INFO(dev)->gen >= 7 && !IS_VALLEYVIEW(dev)) {
 +			ret = i915_gem_object_set_cache_level(ctx->obj,
 +							      I915_CACHE_L3_LLC);
 +			/* Failure shouldn't ever happen this early */
 +			if (WARN_ON(ret))
 +				goto err_out;
 +		}
 +	}
  
  	/* Default context will never have a file_priv */
 -	if (file_priv == NULL)
 -		return ctx;
 -
 -	ret = idr_alloc(&file_priv->context_idr, ctx, DEFAULT_CONTEXT_ID, 0,
 -			GFP_KERNEL);
 -	if (ret < 0)
 -		goto err_out;
 +	if (file_priv != NULL) {
 +		ret = idr_alloc(&file_priv->context_idr, ctx,
 +				DEFAULT_CONTEXT_ID, 0, GFP_KERNEL);
 +		if (ret < 0)
 +			goto err_out;
 +	} else
 +		ret = DEFAULT_CONTEXT_ID;
  
  	ctx->file_priv = file_priv;
  	ctx->id = ret;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the drm-intel tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2991 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/i915_gem_context.c between commit 691e6415c891
("drm/i915: Always use kref tracking for all contexts") from the
drm-intel-fixes tree and commit ad2ac08bf34b ("drm/i915: Make contexts
non-snooped on non-LLC platforms") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/i915_gem_context.c
index d72db15afa02,30b355afb362..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@@ -231,32 -232,40 +231,40 @@@ __create_hw_context(struct drm_device *
  		return ERR_PTR(-ENOMEM);
  
  	kref_init(&ctx->ref);
 -	ctx->obj = i915_gem_alloc_object(dev, dev_priv->hw_context_size);
 -	INIT_LIST_HEAD(&ctx->link);
 -	if (ctx->obj == NULL) {
 -		kfree(ctx);
 -		DRM_DEBUG_DRIVER("Context object allocated failed\n");
 -		return ERR_PTR(-ENOMEM);
 -	}
 +	list_add_tail(&ctx->link, &dev_priv->context_list);
  
 -	/*
 -	 * Try to make the context utilize L3 as well as LLC.
 -	 *
 -	 * On VLV we don't have L3 controls in the PTEs so we
 -	 * shouldn't touch the cache level, especially as that
 -	 * would make the object snooped which might have a
 -	 * negative performance impact.
 -	 */
 -	if (INTEL_INFO(dev)->gen >= 7 && !IS_VALLEYVIEW(dev)) {
 -		ret = i915_gem_object_set_cache_level(ctx->obj,
 -						      I915_CACHE_L3_LLC);
 -		/* Failure shouldn't ever happen this early */
 -		if (WARN_ON(ret))
 +	if (dev_priv->hw_context_size) {
 +		ctx->obj = i915_gem_alloc_object(dev, dev_priv->hw_context_size);
 +		if (ctx->obj == NULL) {
 +			ret = -ENOMEM;
  			goto err_out;
 -	}
 +		}
  
- 		if (INTEL_INFO(dev)->gen >= 7) {
 -	list_add_tail(&ctx->link, &dev_priv->context_list);
++		/*
++		 * Try to make the context utilize L3 as well as LLC.
++		 *
++		 * On VLV we don't have L3 controls in the PTEs so we
++		 * shouldn't touch the cache level, especially as that
++		 * would make the object snooped which might have a
++		 * negative performance impact.
++		 */
++		if (INTEL_INFO(dev)->gen >= 7 && !IS_VALLEYVIEW(dev)) {
 +			ret = i915_gem_object_set_cache_level(ctx->obj,
 +							      I915_CACHE_L3_LLC);
 +			/* Failure shouldn't ever happen this early */
 +			if (WARN_ON(ret))
 +				goto err_out;
 +		}
 +	}
  
  	/* Default context will never have a file_priv */
 -	if (file_priv == NULL)
 -		return ctx;
 -
 -	ret = idr_alloc(&file_priv->context_idr, ctx, DEFAULT_CONTEXT_ID, 0,
 -			GFP_KERNEL);
 -	if (ret < 0)
 -		goto err_out;
 +	if (file_priv != NULL) {
 +		ret = idr_alloc(&file_priv->context_idr, ctx,
 +				DEFAULT_CONTEXT_ID, 0, GFP_KERNEL);
 +		if (ret < 0)
 +			goto err_out;
 +	} else
 +		ret = DEFAULT_CONTEXT_ID;
  
  	ctx->file_priv = file_priv;
  	ctx->id = ret;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the drm-intel tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2503 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in  between commit 27d50c82714f6 ("ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>") from  tree and commit 2fae6a860ca9 ("drm/i915: Go OCD on the Makefile") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc drivers/gpu/drm/i915/Makefile
index f33902ff2c22,077e81b1065d..b1445b73465b
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@@ -12,49 -23,50 +23,49 @@@ i915-y += i915_cmd_parser.o 
  	  i915_gem_evict.o \
  	  i915_gem_execbuffer.o \
  	  i915_gem_gtt.o \
+ 	  i915_gem.o \
  	  i915_gem_stolen.o \
  	  i915_gem_tiling.o \
- 	  i915_params.o \
- 	  i915_sysfs.o \
+ 	  i915_gpu_error.o \
+ 	  i915_irq.o \
  	  i915_trace_points.o \
- 	  i915_ums.o \
+ 	  intel_ringbuffer.o \
+ 	  intel_uncore.o
+ 
+ # modesetting core code
+ i915-y += intel_bios.o \
  	  intel_display.o \
- 	  intel_crt.o \
- 	  intel_lvds.o \
- 	  intel_dsi.o \
- 	  intel_dsi_cmd.o \
- 	  intel_dsi_pll.o \
- 	  intel_bios.o \
- 	  intel_ddi.o \
- 	  intel_dp.o \
- 	  intel_hdmi.o \
- 	  intel_sdvo.o \
  	  intel_modes.o \
- 	  intel_panel.o \
- 	  intel_pm.o \
- 	  intel_i2c.o \
- 	  intel_tv.o \
- 	  intel_dvo.o \
- 	  intel_ringbuffer.o \
 -	  intel_opregion.o \
  	  intel_overlay.o \
- 	  intel_sprite.o \
  	  intel_sideband.o \
- 	  intel_uncore.o \
+ 	  intel_sprite.o
 -i915-$(CONFIG_ACPI)		+= intel_acpi.o
++i915-$(CONFIG_ACPI)		+= intel_acpi.o intel_opregion.o
+ i915-$(CONFIG_DRM_I915_FBDEV)	+= intel_fbdev.o
+ 
+ # modesetting output/encoder code
+ i915-y += dvo_ch7017.o \
  	  dvo_ch7xxx.o \
- 	  dvo_ch7017.o \
  	  dvo_ivch.o \
- 	  dvo_tfp410.o \
- 	  dvo_sil164.o \
  	  dvo_ns2501.o \
- 	  i915_gem_dmabuf.o
- 
- i915-$(CONFIG_COMPAT)   += i915_ioc32.o
- 
- i915-$(CONFIG_ACPI)	+= intel_acpi.o intel_opregion.o
- 
- i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
+ 	  dvo_sil164.o \
+ 	  dvo_tfp410.o \
+ 	  intel_crt.o \
+ 	  intel_ddi.o \
+ 	  intel_dp.o \
+ 	  intel_dsi_cmd.o \
+ 	  intel_dsi.o \
+ 	  intel_dsi_pll.o \
+ 	  intel_dvo.o \
+ 	  intel_hdmi.o \
+ 	  intel_i2c.o \
+ 	  intel_lvds.o \
+ 	  intel_panel.o \
+ 	  intel_sdvo.o \
+ 	  intel_tv.o
  
- i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
+ # legacy horrors
+ i915-y += i915_dma.o \
+ 	  i915_ums.o
  
  obj-$(CONFIG_DRM_I915)  += i915.o
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the drm-intel tree with the tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2503 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in  between commit 27d50c82714f6 ("ACPI / i915: Fix incorrect <acpi/acpi.h> inclusions via <linux/acpi_io.h>") from  tree and commit 2fae6a860ca9 ("drm/i915: Go OCD on the Makefile") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc drivers/gpu/drm/i915/Makefile
index f33902ff2c22,077e81b1065d..b1445b73465b
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@@ -12,49 -23,50 +23,49 @@@ i915-y += i915_cmd_parser.o 
  	  i915_gem_evict.o \
  	  i915_gem_execbuffer.o \
  	  i915_gem_gtt.o \
+ 	  i915_gem.o \
  	  i915_gem_stolen.o \
  	  i915_gem_tiling.o \
- 	  i915_params.o \
- 	  i915_sysfs.o \
+ 	  i915_gpu_error.o \
+ 	  i915_irq.o \
  	  i915_trace_points.o \
- 	  i915_ums.o \
+ 	  intel_ringbuffer.o \
+ 	  intel_uncore.o
+ 
+ # modesetting core code
+ i915-y += intel_bios.o \
  	  intel_display.o \
- 	  intel_crt.o \
- 	  intel_lvds.o \
- 	  intel_dsi.o \
- 	  intel_dsi_cmd.o \
- 	  intel_dsi_pll.o \
- 	  intel_bios.o \
- 	  intel_ddi.o \
- 	  intel_dp.o \
- 	  intel_hdmi.o \
- 	  intel_sdvo.o \
  	  intel_modes.o \
- 	  intel_panel.o \
- 	  intel_pm.o \
- 	  intel_i2c.o \
- 	  intel_tv.o \
- 	  intel_dvo.o \
- 	  intel_ringbuffer.o \
 -	  intel_opregion.o \
  	  intel_overlay.o \
- 	  intel_sprite.o \
  	  intel_sideband.o \
- 	  intel_uncore.o \
+ 	  intel_sprite.o
 -i915-$(CONFIG_ACPI)		+= intel_acpi.o
++i915-$(CONFIG_ACPI)		+= intel_acpi.o intel_opregion.o
+ i915-$(CONFIG_DRM_I915_FBDEV)	+= intel_fbdev.o
+ 
+ # modesetting output/encoder code
+ i915-y += dvo_ch7017.o \
  	  dvo_ch7xxx.o \
- 	  dvo_ch7017.o \
  	  dvo_ivch.o \
- 	  dvo_tfp410.o \
- 	  dvo_sil164.o \
  	  dvo_ns2501.o \
- 	  i915_gem_dmabuf.o
- 
- i915-$(CONFIG_COMPAT)   += i915_ioc32.o
- 
- i915-$(CONFIG_ACPI)	+= intel_acpi.o intel_opregion.o
- 
- i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
+ 	  dvo_sil164.o \
+ 	  dvo_tfp410.o \
+ 	  intel_crt.o \
+ 	  intel_ddi.o \
+ 	  intel_dp.o \
+ 	  intel_dsi_cmd.o \
+ 	  intel_dsi.o \
+ 	  intel_dsi_pll.o \
+ 	  intel_dvo.o \
+ 	  intel_hdmi.o \
+ 	  intel_i2c.o \
+ 	  intel_lvds.o \
+ 	  intel_panel.o \
+ 	  intel_sdvo.o \
+ 	  intel_tv.o
  
- i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
+ # legacy horrors
+ i915-y += i915_dma.o \
+ 	  i915_ums.o
  
  obj-$(CONFIG_DRM_I915)  += i915.o
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the drm-intel tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit 4e6b788c3f23 ("drm/i915:
Disable dp aux irq on g4x") from the drm-intel-fixes tree and commit
5ed12a19078b ("drm/i915: Factor out a function returning the AUX_CTL
value to start a send") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_dp.c
index 2f517b85b3f4,0ef269053751..000000000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -403,9 -458,8 +458,8 @@@ intel_dp_aux_ch(struct intel_dp *intel_
  	uint32_t aux_clock_divider;
  	int i, ret, recv_bytes;
  	uint32_t status;
- 	int try, precharge, clock = 0;
+ 	int try, clock = 0;
 -	bool has_aux_irq = true;
 +	bool has_aux_irq = HAS_AUX_IRQ(dev);
- 	uint32_t timeout;
  
  	/* dp aux is extremely sensitive to irq latency, hence request the
  	 * lowest possible wakeup latency and so prevent the cpu from going into

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the drm-intel tree with the tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1128 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit 4e6b788c3f23 ("drm/i915:
Disable dp aux irq on g4x") from the drm-intel-fixes tree and commit
5ed12a19078b ("drm/i915: Factor out a function returning the AUX_CTL
value to start a send") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_dp.c
index 2f517b85b3f4,0ef269053751..000000000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -403,9 -458,8 +458,8 @@@ intel_dp_aux_ch(struct intel_dp *intel_
  	uint32_t aux_clock_divider;
  	int i, ret, recv_bytes;
  	uint32_t status;
- 	int try, precharge, clock = 0;
+ 	int try, clock = 0;
 -	bool has_aux_irq = true;
 +	bool has_aux_irq = HAS_AUX_IRQ(dev);
- 	uint32_t timeout;
  
  	/* dp aux is extremely sensitive to irq latency, hence request the
  	 * lowest possible wakeup latency and so prevent the cpu from going into

[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx