LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2015-03-16  2:30 Stephen Rothwell
  2015-03-16 13:43 ` Xi Ruoyao
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2015-03-16  2:30 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Xi Ruoyao, Jani Nikula, Matt Roper,
	Damien Lespiau

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from
the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure
plane->state->fb stays in sync with plane->fb"), f55548b5af87
("drm/i915: Don't try to reference the fb in
get_initial_plane_config()") and presumably others from the drm tree.

Same patch summary, different authors, committers and added function.

I fixed it up (I effectively used the drm tree version) and can carry
the fix as necessary (no action is required).

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

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2015-03-16  2:30 linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell
@ 2015-03-16 13:43 ` Xi Ruoyao
  2015-03-16 15:04   ` [Intel-gfx] " Jani Nikula
  0 siblings, 1 reply; 44+ messages in thread
From: Xi Ruoyao @ 2015-03-16 13:43 UTC (permalink / raw)
  To: Stephen Rothwell, Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Jani Nikula, Matt Roper, Damien Lespiau


On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from
> the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure
> plane->state->fb stays in sync with plane->fb"), f55548b5af87
> ("drm/i915: Don't try to reference the fb in
> get_initial_plane_config()") and presumably others from the drm tree.
>
> Same patch summary, different authors, committers and added function.
>
> I fixed it up (I effectively used the drm tree version) and can carry
> the fix as necessary (no action is required).
>
My patch with commit 2dccc9898d45 is for Linux 4.0-rcN. It has no 
relationship
  with linux-next since Matt Roper's afd65eb4cc05 has solved this long 
long ago.

So, 2dccc9898d45 should not be tagged with for-linux-next-fixes (in 
repository
http://cgit.freedesktop.org/drm-intel/). I think it caused the mess of 
version
control.

BTW, there is still one thing should be done in linux-next. We should 
change
Matt's update_state_fb to use drm_atomic_set_fb_for_plane since the logic of
Matt's code is duplicated with drm_atomic_set_fb_for_plane.

-- 
Xi Ruoyao
School of Aerospace Science and Technology
Xidian University, Xi'an, China


^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2015-03-16 13:43 ` Xi Ruoyao
@ 2015-03-16 15:04   ` Jani Nikula
  0 siblings, 0 replies; 44+ messages in thread
From: Jani Nikula @ 2015-03-16 15:04 UTC (permalink / raw)
  To: Xi Ruoyao, Stephen Rothwell, Dave Airlie, Daniel Vetter,
	intel-gfx, dri-devel
  Cc: linux-next, linux-kernel

On Mon, 16 Mar 2015, Xi Ruoyao <xry111@outlook.com> wrote:
> On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote:
>> Hi Dave,
>>
>> Today's linux-next merge of the drm tree got a conflict in
>> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
>> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from
>> the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure
>> plane->state->fb stays in sync with plane->fb"), f55548b5af87
>> ("drm/i915: Don't try to reference the fb in
>> get_initial_plane_config()") and presumably others from the drm tree.
>>
>> Same patch summary, different authors, committers and added function.
>>
>> I fixed it up (I effectively used the drm tree version) and can carry
>> the fix as necessary (no action is required).
>>
> My patch with commit 2dccc9898d45 is for Linux 4.0-rcN. It has no 
> relationship
>   with linux-next since Matt Roper's afd65eb4cc05 has solved this long 
> long ago.

The relationship is that -next will eventually merge to Linus' master,
so Matt's commit will conflict with yours. Your commit is taking the
fast path to the kernel. But you don't have to worry about it, it's all
taken care of. And per what Stephen says, he has done the right thing.

> BTW, there is still one thing should be done in linux-next. We should 
> change
> Matt's update_state_fb to use drm_atomic_set_fb_for_plane since the logic of
> Matt's code is duplicated with drm_atomic_set_fb_for_plane.

Patches welcome in intel-gfx list; the audience here is too wide. ;)

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2020-05-08  3:50 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-05-08  3:50 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/gem/i915_gem_domain.c

between commit:

  47bf7b7a7151 ("drm/i915/gem: Remove object_is_locked assertion from unpin_from_display_plane")

from the drm-intel-fixes tree and commit:

  9da0ea09639f ("drm/i915/gem: Drop cached obj->bind_count")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/gem/i915_gem_domain.c
index 4f96c8788a2e,af43e82f45c7..000000000000
--- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
@@@ -368,7 -368,8 +368,7 @@@ static void i915_gem_object_bump_inacti
  	struct drm_i915_private *i915 = to_i915(obj->base.dev);
  	struct i915_vma *vma;
  
- 	if (!atomic_read(&obj->bind_count))
 -	GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
+ 	if (list_empty(&obj->vma.list))
  		return;
  
  	mutex_lock(&i915->ggtt.vm.mutex);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2020-05-07  2:43 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-05-07  2:43 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Peter Jones,
	Wambui Karuga

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/display/intel_fbc.c

between commit:

  82152d424b6c ("Make the "Reducing compressed framebufer size" message be DRM_INFO_ONCE()")

from the drm-intel-fixes tree and commit:

  97ed48b5c8b1 ("drm/i915/fbc: convert to drm_device based logging macros.")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/display/intel_fbc.c
index c125ca9ab9b3,56bcd6c52a02..000000000000
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@@ -485,7 -485,9 +485,8 @@@ static int intel_fbc_alloc_cfb(struct d
  	if (!ret)
  		goto err_llb;
  	else if (ret > 1) {
- 		DRM_INFO_ONCE("Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n");
 -		drm_info(&dev_priv->drm,
++		drm_info_once(&dev_priv->drm,
+ 			 "Reducing the compressed framebuffer size. This may lead to less power savings than a non-reduced-size. Try to increase stolen memory size if available in BIOS.\n");
 -
  	}
  
  	fbc->threshold = ret;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2020-01-22  0:37 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-01-22  0:37 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Matthew Auld

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/i915_gem_gtt.c

between commit:

  ecc4d2a52df6 ("drm/i915/userptr: fix size calculation")

from the drm-intel-fixes tree and commit:

  2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")

from the drm tree.

I fixed it up (I used the latter version of the file and applied teh
following merge fix patch) and can carry the fix as necessary. This is
now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your
tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Jan 2020 11:33:32 +1100
Subject: [PATCH] fix up for "drm/i915/userptr: fix size calculation"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 1 +
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index f10b2c41571c..f4fec7eb4064 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -131,6 +131,7 @@ static void gen6_ppgtt_insert_entries(struct i915_address_space *vm,
 
 	vaddr = kmap_atomic_px(i915_pt_entry(pd, act_pt));
 	do {
+		GEM_BUG_ON(iter.sg->length < I915_GTT_PAGE_SIZE);
 		vaddr[act_pte] = pte_encode | GEN6_PTE_ADDR_ENCODE(iter.dma);
 
 		iter.dma += I915_GTT_PAGE_SIZE;
diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
index 077b8f7cf6cb..4d1de2d97d5c 100644
--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
@@ -379,6 +379,7 @@ gen8_ppgtt_insert_pte(struct i915_ppgtt *ppgtt,
 	pd = i915_pd_entry(pdp, gen8_pd_index(idx, 2));
 	vaddr = kmap_atomic_px(i915_pt_entry(pd, gen8_pd_index(idx, 1)));
 	do {
+		GEM_BUG_ON(iter->sg->length < I915_GTT_PAGE_SIZE);
 		vaddr[gen8_pd_index(idx, 0)] = pte_encode | iter->dma;
 
 		iter->dma += I915_GTT_PAGE_SIZE;
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2020-01-08  1:04 Stephen Rothwell
@ 2020-01-08  2:28 ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-01-08  2:28 UTC (permalink / raw)
  To: Dave Airlie, DRI, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson

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

Hi all,

On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>  -		hw_flags = 0;
>  +		/* For resource streamer on HSW+ and power context elsewhere */
>  +		BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
>  +		BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
>  +
>  +		flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
> - 		if (!i915_gem_context_is_kernel(rq->gem_context))
> + 		if (!test_bit(CONTEXT_VALID_BIT, &ce->flags))

I see from the drm-intel tree that this should have not have the '!'.
I have fixed up my resolution for tomorrow (and it has been fixed for
today's linux-next in the merge of the drm-intel tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2020-01-08  1:15 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-01-08  1:15 UTC (permalink / raw)
  To: Dave Airlie, DRI, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Manasi Navare, Ville Syrjälä

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/display/intel_display.c

between commit:

  2b2c4a83d69d ("drm/i915/dp: Disable Port sync mode correctly on teardown")

from the drm-intel-fixes tree and commit:

  773b4b54351c ("drm/i915: Move stuff from haswell_crtc_disable() into encoder .post_disable()")

from the drm tree.

I fixed it up (I applied the change to icl_disable_transcoder_port_sync()
from the former commit in its new location - see patch below) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 8 Jan 2020 12:12:45 +1100
Subject: [PATCH] drm/i915: fixup for "drm/i915/dp: Disable Port sync mode
 correctly on teardown"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index c9ba7d7f3787..e535a3b85575 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3860,8 +3860,6 @@ static void icl_disable_transcoder_port_sync(const struct intel_crtc_state *old_
 {
 	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	i915_reg_t reg;
-	u32 trans_ddi_func_ctl2_val;
 
 	if (old_crtc_state->master_transcoder == INVALID_TRANSCODER)
 		return;
@@ -3869,10 +3867,7 @@ static void icl_disable_transcoder_port_sync(const struct intel_crtc_state *old_
 	DRM_DEBUG_KMS("Disabling Transcoder Port Sync on Slave Transcoder %s\n",
 		      transcoder_name(old_crtc_state->cpu_transcoder));
 
-	reg = TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder);
-	trans_ddi_func_ctl2_val = ~(PORT_SYNC_MODE_ENABLE |
-				    PORT_SYNC_MODE_MASTER_SELECT_MASK);
-	I915_WRITE(reg, trans_ddi_func_ctl2_val);
+	I915_WRITE(TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder), 0);
 }
 
 static void intel_ddi_post_disable(struct intel_encoder *encoder,
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2020-01-08  1:10 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2020-01-08  1:10 UTC (permalink / raw)
  To: Dave Airlie, DRI, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/i915_drv.h

between commit:

  ce69e553b9a4 ("drm/i915/gt: Restore coarse power gating")

from the drm-intel-fixes tree and commit:

  90eb7d2aa3ce ("drm/i915: Simplify NEEDS_WaRsDisableCoarsePowerGating")

from the drm tree.

I fixed it up (I have no idea about this, so I just used the latter
version) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2020-01-08  1:04 Stephen Rothwell
  2020-01-08  2:28 ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2020-01-08  1:04 UTC (permalink / raw)
  To: Dave Airlie, DRI, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/gt/intel_ring_submission.c

between commit:

  103309977589 ("drm/i915/gt: Do not restore invalid RS state")

from the drm-intel-fixes tree and commit:

  3cd6e8860ecd ("drm/i915/gen7: Re-enable full-ppgtt for ivb & hsw")
  f997056d5b17 ("drm/i915/gt: Push the flush_pd before the set-context")
  f70de8d2ca6b ("drm/i915/gt: Track the context validity explicitly")
  902eb748e5c3 ("drm/i915/gt: Tidy up full-ppgtt on Ivybridge")

from the drm tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 93026217c121,81f872f9ef03..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@@ -1574,28 -1602,20 +1594,26 @@@ static int switch_context(struct i915_r
  
  	GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
  
- 	if (vm) {
- 		ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
- 		if (ret)
- 			return ret;
- 	}
+ 	ret = switch_mm(rq, vm_alias(ce));
+ 	if (ret)
+ 		return ret;
  
  	if (ce->state) {
 -		u32 hw_flags;
 +		u32 flags;
  
  		GEM_BUG_ON(rq->engine->id != RCS0);
  
 -		hw_flags = 0;
 +		/* For resource streamer on HSW+ and power context elsewhere */
 +		BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
 +		BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != MI_RESTORE_EXT_STATE_EN);
 +
 +		flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
- 		if (!i915_gem_context_is_kernel(rq->gem_context))
+ 		if (!test_bit(CONTEXT_VALID_BIT, &ce->flags))
 -			hw_flags = MI_RESTORE_INHIBIT;
 +			flags |= MI_RESTORE_EXT_STATE_EN;
 +		else
 +			flags |= MI_RESTORE_INHIBIT;
  
 -		ret = mi_set_context(rq, hw_flags);
 +		ret = mi_set_context(rq, flags);
  		if (ret)
  			return ret;
  	}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2019-10-31  0:33 Stephen Rothwell
@ 2019-11-08  0:42 ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2019-11-08  0:42 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Ville Syrjälä

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

Hi all,

This is now a conflict between the drm tree and Linus' tree.

On Thu, 31 Oct 2019 11:33:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
> 
>   drivers/gpu/drm/i915/i915_drv.h
> 
> between commit:
> 
>   59cd826fb5e7 ("drm/i915: Fix PCH reference clock for FDI on HSW/BDW")
> 
> from the drm-intel-fixes tree and commit:
> 
>   7d423af9bfb1 ("drm/i915: Implement a better i945gm vblank irq vs. C-states workaround")
> 
> from the drm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/gpu/drm/i915/i915_drv.h
> index 953e1d12c23c,8882c0908c3b..000000000000
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@@ -1704,34 -1339,17 +1339,19 @@@ struct drm_i915_private 
>   	struct {
>   		struct notifier_block pm_notifier;
>   
> - 		/**
> - 		 * We leave the user IRQ off as much as possible,
> - 		 * but this means that requests will finish and never
> - 		 * be retired once the system goes idle. Set a timer to
> - 		 * fire periodically while the ring is running. When it
> - 		 * fires, go retire requests.
> - 		 */
> - 		struct delayed_work retire_work;
> - 
> - 		/**
> - 		 * When we detect an idle GPU, we want to turn on
> - 		 * powersaving features. So once we see that there
> - 		 * are no more requests outstanding and no more
> - 		 * arrive within a small period of time, we fire
> - 		 * off the idle_work.
> - 		 */
> - 		struct work_struct idle_work;
> + 		struct i915_gem_contexts {
> + 			spinlock_t lock; /* locks list */
> + 			struct list_head list;
> + 
> + 			struct llist_head free_list;
> + 			struct work_struct free_work;
> + 		} contexts;
>   	} gem;
>   
>  +	u8 pch_ssc_use;
>  +
> - 	/* For i945gm vblank irq vs. C3 workaround */
> - 	struct {
> - 		struct work_struct work;
> - 		struct pm_qos_request pm_qos;
> - 		u8 c3_disable_latency;
> - 		u8 enabled;
> - 	} i945gm_vblank;
> + 	/* For i915gm/i945gm vblank irq workaround */
> + 	u8 vblank_enabled;
>   
>   	/* perform PHY state sanity checks? */
>   	bool chv_phy_assert[2];

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2019-10-31  0:33 Stephen Rothwell
  2019-11-08  0:42 ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2019-10-31  0:33 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Ville Syrjälä

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

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/i915_drv.h

between commit:

  59cd826fb5e7 ("drm/i915: Fix PCH reference clock for FDI on HSW/BDW")

from the drm-intel-fixes tree and commit:

  7d423af9bfb1 ("drm/i915: Implement a better i945gm vblank irq vs. C-states workaround")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/i915_drv.h
index 953e1d12c23c,8882c0908c3b..000000000000
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -1704,34 -1339,17 +1339,19 @@@ struct drm_i915_private 
  	struct {
  		struct notifier_block pm_notifier;
  
- 		/**
- 		 * We leave the user IRQ off as much as possible,
- 		 * but this means that requests will finish and never
- 		 * be retired once the system goes idle. Set a timer to
- 		 * fire periodically while the ring is running. When it
- 		 * fires, go retire requests.
- 		 */
- 		struct delayed_work retire_work;
- 
- 		/**
- 		 * When we detect an idle GPU, we want to turn on
- 		 * powersaving features. So once we see that there
- 		 * are no more requests outstanding and no more
- 		 * arrive within a small period of time, we fire
- 		 * off the idle_work.
- 		 */
- 		struct work_struct idle_work;
+ 		struct i915_gem_contexts {
+ 			spinlock_t lock; /* locks list */
+ 			struct list_head list;
+ 
+ 			struct llist_head free_list;
+ 			struct work_struct free_work;
+ 		} contexts;
  	} gem;
  
 +	u8 pch_ssc_use;
 +
- 	/* For i945gm vblank irq vs. C3 workaround */
- 	struct {
- 		struct work_struct work;
- 		struct pm_qos_request pm_qos;
- 		u8 c3_disable_latency;
- 		u8 enabled;
- 	} i945gm_vblank;
+ 	/* For i915gm/i945gm vblank irq workaround */
+ 	u8 vblank_enabled;
  
  	/* perform PHY state sanity checks? */
  	bool chv_phy_assert[2];

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2018-01-05  1:00 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2018-01-05  1:00 UTC (permalink / raw)
  To: Dave Airlie, DRI, Daniel Vetter, Intel Graphics
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Lucas De Marchi, Jani Nikula, Rodrigo Vivi,
	Ville Syrjälä

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_cdclk.c

between commit:

  30414f3010af ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl")

from the drm-intel-fixes tree and commit:

  2aa97491da8a ("drm/i915: Use cdclk_state->voltage on SKL/KBL/CFL")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_cdclk.c
index 60cf4e58389a,9c5ceb98d48f..000000000000
--- a/drivers/gpu/drm/i915/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/intel_cdclk.c
@@@ -917,11 -994,9 +988,9 @@@ static void skl_set_cdclk(struct drm_i9
  {
  	int cdclk = cdclk_state->cdclk;
  	int vco = cdclk_state->vco;
- 	u32 freq_select, pcu_ack, cdclk_ctl;
 -	u32 freq_select;
++	u32 freq_select, cdclk_ctl;
  	int ret;
  
- 	WARN_ON((cdclk == 24000) != (vco == 0));
- 
  	mutex_lock(&dev_priv->pcu_lock);
  	ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL,
  				SKL_CDCLK_PREPARE_FOR_CHANGE,
@@@ -934,8 -1009,16 +1003,16 @@@
  		return;
  	}
  
 -	/* set CDCLK_CTL */
 +	/* Choose frequency for this cdclk */
  	switch (cdclk) {
+ 	default:
+ 		WARN_ON(cdclk != dev_priv->cdclk.hw.ref);
+ 		WARN_ON(vco != 0);
+ 		/* fall through */
+ 	case 308571:
+ 	case 337500:
+ 		freq_select = CDCLK_FREQ_337_308;
+ 		break;
  	case 450000:
  	case 432000:
  		freq_select = CDCLK_FREQ_450_432;

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-07-21  1:26 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-07-21  1:26 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Maarten Lankhorst, Jani Nikula, Mahesh Kumar

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_pm.c

between commit:

  9cc5bb18bd0a ("drm/i915: Fix bad comparison in skl_compute_plane_wm")

from the drm-intel-fixes tree and commit:

  eac2cb81fb87 ("drm/i915: cleanup fixed-point wrappers naming")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_pm.c
index 40b224b44d1b,ee2a349cfe68..000000000000
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -4463,11 -4459,11 +4459,11 @@@ static int skl_compute_plane_wm(const s
  		if ((cpp * cstate->base.adjusted_mode.crtc_htotal / 512 < 1) &&
  		    (plane_bytes_per_line / 512 < 1))
  			selected_result = method2;
 -		else if ((ddb_allocation && ddb_allocation /
 -			fixed16_to_u32_round_up(plane_blocks_per_line)) >= 1)
 +		else if (ddb_allocation >=
- 			 fixed_16_16_to_u32_round_up(plane_blocks_per_line))
- 			selected_result = min_fixed_16_16(method1, method2);
++			 fixed16_to_u32_round_up(plane_blocks_per_line))
+ 			selected_result = min_fixed16(method1, method2);
  		else if (latency >= linetime_us)
- 			selected_result = min_fixed_16_16(method1, method2);
+ 			selected_result = min_fixed16(method1, method2);
  		else
  			selected_result = method1;
  	}

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-06-14  0:56 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-06-14  0:56 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Ville Syrjälä,
	Jani Nikula, Mahesh Kumar, Matt Roper

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_pm.c

between commit:

  1c2d6bbf0433 ("drm/i915: Fix SKL+ watermarks for 90/270 rotation")

from the drm-intel-fixes tree and commit:

  7084b50bdd8f ("drm/i915/skl+: calculate pixel_rate & relative_data_rate in fixed point")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_pm.c
index 078fd1bfa5ea,936eef1634c7..000000000000
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -3373,31 -3841,26 +3841,32 @@@ skl_plane_downscale_amount(const struc
  
  	/* n.b., src is 16.16 fixed point, dst is whole integer */
  	if (plane->id == PLANE_CURSOR) {
 +		/*
 +		 * Cursors only support 0/180 degree rotation,
 +		 * hence no need to account for rotation here.
 +		 */
- 		src_w = pstate->base.src_w;
- 		src_h = pstate->base.src_h;
+ 		src_w = pstate->base.src_w >> 16;
+ 		src_h = pstate->base.src_h >> 16;
  		dst_w = pstate->base.crtc_w;
  		dst_h = pstate->base.crtc_h;
  	} else {
 +		/*
 +		 * Src coordinates are already rotated by 270 degrees for
 +		 * the 90/270 degree plane rotation cases (to match the
 +		 * GTT mapping), hence no need to account for rotation here.
 +		 */
- 		src_w = drm_rect_width(&pstate->base.src);
- 		src_h = drm_rect_height(&pstate->base.src);
+ 		src_w = drm_rect_width(&pstate->base.src) >> 16;
+ 		src_h = drm_rect_height(&pstate->base.src) >> 16;
  		dst_w = drm_rect_width(&pstate->base.dst);
  		dst_h = drm_rect_height(&pstate->base.dst);
  	}
  
- 	downscale_h = max(src_h / dst_h, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);
- 	downscale_w = max(src_w / dst_w, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);
 -	if (drm_rotation_90_or_270(pstate->base.rotation))
 -		swap(dst_w, dst_h);
 -
+ 	fp_w_ratio = fixed_16_16_div(src_w, dst_w);
+ 	fp_h_ratio = fixed_16_16_div(src_h, dst_h);
+ 	downscale_w = max_fixed_16_16(fp_w_ratio, u32_to_fixed_16_16(1));
+ 	downscale_h = max_fixed_16_16(fp_h_ratio, u32_to_fixed_16_16(1));
  
- 	/* Provide result in 16.16 fixed point */
- 	return (uint64_t)downscale_w * downscale_h >> 16;
+ 	return mul_fixed16(downscale_w, downscale_h);
  }
  
  static unsigned int

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-06-14  0:50 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-06-14  0:50 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Ville Syrjälä,
	Jani Nikula, Robert Foss

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_display.c

between commit:

  9a775e0308b5 ("drm/i915: Fix scaling check for 90/270 degree plane rotation")

from the drm-intel-fixes tree and commit:

  c2c446ad2943 ("drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI")

from the drm tree.

I fixed it up (the former removed an instance of that was changed by the
latter) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-06-09  2:26 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-06-09  2:26 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Jani Nikula,
	Chris Wilson

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_engine_cs.c

between commit:

  ef6c4d75e353 ("drm/i915: fix warning for unused variable")

from the drm-intel-fixes tree and commit:

  a8e9a419c337 ("drm/i915: Lie and treat all engines as idle if wedged")

from the drm tree.

I fixed it up (I used the drm tree version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-06-08  2:53 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-06-08  2:53 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jon Bloomfield, Chris Wilson

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/i915_drv.h

between commit:

  d86b18a06cf3 ("drm/i915: Serialize GTT/Aperture accesses on BXT")
(which is also commit 0ef34ad6222a in the drm tree)

from the drm-intel-fixes tree and commit:

  80debff8d9af ("drm/i915: Consolidate #ifdef CONFIG_INTEL_IOMMU")

from the drm tree.

I fixed it up (I used the drm tree version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-03-30  1:14 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-03-30  1:14 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Chris Wilson,
	Jani Nikula, Tvrtko Ursulin

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_ringbuffer.h

between commit:

  dd68f2ba0720 ("drm/i915/execlists: Wrap tail pointer after reset tweaking")

from the drm-intel-fixes tree and commit:

  73dec95e6ba3 ("drm/i915: Emit to ringbuffer directly")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.h
index 8cb2078c5bfc,847aea554464..000000000000
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@@ -522,19 -525,14 +525,20 @@@ intel_ring_advance(struct drm_i915_gem_
  }
  
  static inline u32
 +intel_ring_wrap(const struct intel_ring *ring, u32 pos)
 +{
 +	return pos & (ring->size - 1);
 +}
 +
- static inline u32 intel_ring_offset(struct intel_ring *ring, void *addr)
++static inline u32
+ intel_ring_offset(struct drm_i915_gem_request *req, void *addr)
  {
  	/* Don't write ring->size (equivalent to 0) as that hangs some GPUs. */
- 	u32 offset = addr - ring->vaddr;
- 	return intel_ring_wrap(ring, offset);
+ 	u32 offset = addr - req->ring->vaddr;
+ 	GEM_BUG_ON(offset > req->ring->size);
 -	return offset & (req->ring->size - 1);
++	return intel_ring_wrap(req->ring, offset);
  }
  
- int __intel_ring_space(int head, int tail, int size);
  void intel_ring_update_space(struct intel_ring *ring);
  
  void intel_engine_init_global_seqno(struct intel_engine_cs *engine, u32 seqno);

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-03-30  1:08 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-03-30  1:08 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Chris Wilson,
	Jani Nikula

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_lrc.c

between commit:

  dd68f2ba0720 ("drm/i915/execlists: Wrap tail pointer after reset tweaking")

from the drm-intel-fixes tree and commit:

  944a36d472be ("drm/i915: Assert that the request->tail is always qword aligned")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/intel_lrc.c
index 91555d4e9129,77168e673e0a..000000000000
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@@ -1440,9 -1268,8 +1268,10 @@@ static void reset_common_ring(struct in
  	GEM_BUG_ON(request->ctx != port[0].request->ctx);
  
  	/* Reset WaIdleLiteRestore:bdw,skl as well */
 -	request->tail = request->wa_tail - WA_TAIL_DWORDS * sizeof(u32);
 +	request->tail =
 +		intel_ring_wrap(request->ring,
 +				request->wa_tail - WA_TAIL_DWORDS*sizeof(u32));
+ 	GEM_BUG_ON(!IS_ALIGNED(request->tail, 8));
  }
  
  static int intel_logical_ring_emit_pdps(struct drm_i915_gem_request *req)

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-03-22  0:00 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-03-22  0:00 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: linux-next, linux-kernel, Chris Wilson, Jani Nikula

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/i915_gem_shrinker.c

between commit:

  3d3d18f086cd ("drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker)")

from the drm-intel-fixes tree and commit:

  519d52498156 ("drm/i915: i915_gem_shrink_all() needs an awake device")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/i915_gem_shrinker.c
index d5d2b4c6ed38,006a8b908f77..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@@ -263,7 -264,9 +264,9 @@@ unsigned long i915_gem_shrink_all(struc
  				I915_SHRINK_BOUND |
  				I915_SHRINK_UNBOUND |
  				I915_SHRINK_ACTIVE);
+ 	intel_runtime_pm_put(dev_priv);
+ 
 -	rcu_barrier(); /* wait until our RCU delayed slab frees are completed */
 +	synchronize_rcu(); /* wait for our earlier RCU delayed slab frees */
  
  	return freed;
  }

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-03-21 23:57 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-03-21 23:57 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: linux-next, linux-kernel, Changbin Du, Jani Nikula,
	Mika Kuoppala, Chris Wilson

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/i915_gem_context.c

between commit:

  590379aef2e3 ("drm/i915: make context status notifier head be per engine")

from the drm-intel-fixes tree and commits:

  2355cf088d46 ("drm/i915: Create context desc template when context is created")
  949e8ab3a94b ("drm/i915: Use the size/type of address space to make decisions")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/i915_gem_context.c
index e2d83b6d376b,baceca14f5e0..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@@ -309,8 -316,9 +316,8 @@@ __create_hw_context(struct drm_i915_pri
  
  	i915_gem_context_set_bannable(ctx);
  	ctx->ring_size = 4 * PAGE_SIZE;
- 	ctx->desc_template = GEN8_CTX_ADDRESSING_MODE(dev_priv) <<
- 			     GEN8_CTX_ADDRESSING_MODE_SHIFT;
+ 	ctx->desc_template =
+ 		default_desc_template(dev_priv, dev_priv->mm.aliasing_ppgtt);
 -	ATOMIC_INIT_NOTIFIER_HEAD(&ctx->status_notifier);
  
  	/* GuC requires the ring to be placed above GUC_WOPCM_TOP. If GuC is not
  	 * present or not in use we still need a small bias as ring wraparound

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2017-03-21  0:28 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2017-03-21  0:28 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, Intel Graphics, DRI
  Cc: linux-next, linux-kernel, Tvrtko Ursulin, Tina Zhang, Zhenyu Wang

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/gvt/cmd_parser.c

between commit:

  695fbc08d80f ("drm/i915/gvt: replace the gvt_err with gvt_vgpu_err")

from the drm-intel-fixes tree and commit:

  73dec95e6ba3 ("drm/i915: Emit to ringbuffer directly")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/gvt/cmd_parser.c
index 2b92cc8a7d1a,81076d8ec41a..000000000000
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@@ -1673,8 -1644,8 +1673,8 @@@ static int perform_bb_shadow(struct par
  	ret = copy_gma_to_hva(s->vgpu, s->vgpu->gtt.ggtt_mm,
  			      gma, gma + bb_size,
  			      dst);
- 	if (ret) {
+ 	if (ret < 0) {
 -		gvt_err("fail to copy guest ring buffer\n");
 +		gvt_vgpu_err("fail to copy guest ring buffer\n");
  		goto unmap_src;
  	}
  
@@@ -2668,26 -2633,23 +2665,24 @@@ static int shadow_workload_ring_buffer(
  	/* head > tail --> copy head <-> top */
  	if (gma_head > gma_tail) {
  		ret = copy_gma_to_hva(vgpu, vgpu->gtt.ggtt_mm,
- 				gma_head, gma_top,
- 				workload->shadow_ring_buffer_va);
- 		if (ret) {
+ 				      gma_head, gma_top, cs);
+ 		if (ret < 0) {
+ 			gvt_err("fail to copy guest ring buffer\n");
 +			gvt_vgpu_err("fail to copy guest ring buffer\n");
  			return ret;
  		}
- 		copy_len = gma_top - gma_head;
+ 		cs += ret / sizeof(u32);
  		gma_head = workload->rb_start;
  	}
  
  	/* copy head or start <-> tail */
- 	ret = copy_gma_to_hva(vgpu, vgpu->gtt.ggtt_mm,
- 			gma_head, gma_tail,
- 			workload->shadow_ring_buffer_va + copy_len);
- 	if (ret) {
+ 	ret = copy_gma_to_hva(vgpu, vgpu->gtt.ggtt_mm, gma_head, gma_tail, cs);
+ 	if (ret < 0) {
 -		gvt_err("fail to copy guest ring buffer\n");
 +		gvt_vgpu_err("fail to copy guest ring buffer\n");
  		return ret;
  	}
- 	ring->tail += workload->rb_len;
- 	intel_ring_advance(ring);
+ 	cs += ret / sizeof(u32);
+ 	intel_ring_advance(workload->req, cs);
  	return 0;
  }
  
@@@ -2743,8 -2703,8 +2738,8 @@@ static int shadow_indirect_ctx(struct i
  				wa_ctx->workload->vgpu->gtt.ggtt_mm,
  				guest_gma, guest_gma + ctx_size,
  				map);
- 	if (ret) {
+ 	if (ret < 0) {
 -		gvt_err("fail to copy guest indirect ctx\n");
 +		gvt_vgpu_err("fail to copy guest indirect ctx\n");
  		goto unmap_src;
  	}
  

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2016-06-14  2:10 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2016-06-14  2:10 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Ville Syrjälä, Chris Wilson

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_display.c

between commit:

  a5aac5ab876a ("drm/i915: Check VBT for port presence in addition to the strap on VLV/CHV")

from the drm-intel-fixes tree and commit:

  457c52d87e5d ("drm/i915: Only ignore eDP ports that are connected")
	(which is also in the drm-intel-fixes tree)

from the drm tree.

I fixed it up (I used the version form the drm-intel-fixes tree) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2015-12-22 23:06 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2015-12-22 23:06 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Maarten Lankhorst,
	Ville Syrjälä,
	Jani Nikula

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_display.c

between commit:

  57a2af6bbc7a ("drm/i915: Kill intel_crtc->cursor_bo")

from the drm-intel-fixes tree and commit:

  6285262259ca ("drm/i915: Only run commit when crtc is active, v2.")

from the drm 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_display.c
index beb0374a19f1,bda6b9c82e66..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -6322,13 -6351,12 +6366,14 @@@ static void intel_crtc_disable_noatomic
  		return;
  
  	if (to_intel_plane_state(crtc->primary->state)->visible) {
- 		intel_crtc_wait_for_pending_flips(crtc);
+ 		WARN_ON(intel_crtc->unpin_work);
+ 
  		intel_pre_disable_primary(crtc);
 +
 +		intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
 +		to_intel_plane_state(crtc->primary->state)->visible = false;
  	}
  
 -	intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
  	dev_priv->display.crtc_disable(crtc);
  	intel_crtc->active = false;
  	intel_update_watermarks(crtc);
@@@ -13809,9 -14051,10 +14077,8 @@@ intel_commit_cursor_plane(struct drm_pl
  		addr = obj->phys_handle->busaddr;
  
  	intel_crtc->cursor_addr = addr;
 -	intel_crtc->cursor_bo = obj;
  
- 	if (crtc->state->active)
- 		intel_crtc_update_cursor(crtc, state->visible);
 -update:
+ 	intel_crtc_update_cursor(crtc, state->visible);
  }
  
  static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2015-12-09  2:35 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2015-12-09  2:35 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Mika Kuoppala, Jani Nikula

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_pm.c

between commits:

  344df9809f45 ("drm/i915/skl: Disable coarse power gating up until F0")
  6704d4552853 ("drm/i915/skl: Double RC6 WRL always on")

from the drm-intel-fixes tree and commit:

  e87a005d90c3 ("drm/i915: add helpers for platform specific revision id range checks")

from the drm tree.

I fixed it up (I think - 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_pm.c
index f091ad12d694,96f45d7b3e4b..000000000000
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -4823,8 -4707,9 +4706,9 @@@ static void gen9_enable_rc6(struct drm_
  	 * 3b: Enable Coarse Power Gating only when RC6 is enabled.
  	 * WaRsDisableCoarsePowerGating:skl,bxt - Render/Media PG need to be disabled with RC6.
  	 */
- 	if ((IS_BROXTON(dev) && (INTEL_REVID(dev) < BXT_REVID_B0)) ||
- 	    ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && (INTEL_REVID(dev) <= SKL_REVID_F0)))
+ 	if (IS_BXT_REVID(dev, 0, BXT_REVID_A1) ||
+ 	    ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) &&
 -	     IS_SKL_REVID(dev, 0, SKL_REVID_E0)))
++	     IS_SKL_REVID(dev, 0, SKL_REVID_F0)))
  		I915_WRITE(GEN9_PG_ENABLE, 0);
  	else
  		I915_WRITE(GEN9_PG_ENABLE, (rc6_mask & GEN6_RC_CTL_RC6_ENABLE) ?

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2015-12-03 14:51 Mark Brown
@ 2015-12-03 15:49 ` Jani Nikula
  0 siblings, 0 replies; 44+ messages in thread
From: Jani Nikula @ 2015-12-03 15:49 UTC (permalink / raw)
  To: Mark Brown, Dave Airlie, Ville Syrjälä, Imre Deak
  Cc: linux-next, linux-kernel, dri-devel

On Thu, 03 Dec 2015, Mark Brown <broonie@kernel.org> wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
> Introduce a gmbus power domain") from the drm-intel-fixes tree and commit 
> 69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed
> during HDMI detect") from the drm tree.
>
> I fixed it up (again resulting in a null diff) and can carry the fix as
> necessary (no action is required).

Both of these were due to backporting of five patches from our -next
aiming at v4.5 to our -fixes aiming at v4.4. Some more details in my
pull request to Dave [1].

BR,
Jani.


[1] http://mid.gmane.org/87mvtr1t6n.fsf@intel.com


-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2015-12-03 14:47 Mark Brown
@ 2015-12-03 14:52 ` Imre Deak
  0 siblings, 0 replies; 44+ messages in thread
From: Imre Deak @ 2015-12-03 14:52 UTC (permalink / raw)
  To: Mark Brown, Dave Airlie, Patrik Jakobsson; +Cc: linux-next, linux-kernel

On to, 2015-12-03 at 14:47 +0000, Mark Brown wrote:
> Hi Dave,
> 
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/i915_drv.h and
> drivers/gpu/drm/i915/i915_debugfs.c between
> commit ac9b8236551d ("drm/i915: Introduce a gmbus power domain") from
> the
> drm-intel-fixes tree and commit dfa5762793a40b4b03 ("drm/i915: Add a
> modeset
> power domain") from the drm tree.
> 
> I notice that the modeset commit is missing a signoff from Imre who
> is the
> committer by the way, the commiter should have a signoff.

Yes, sorry for that, I simply forgot to add those (it's also missing
from a few others around the one you found). I'll make sure to sign off
such commits in the future.

--Imre

> I fixed it up (resulting in a null diff) and can carry the fix as
> necessary (no
> action is required).



^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2015-12-03 14:51 Mark Brown
  2015-12-03 15:49 ` Jani Nikula
  0 siblings, 1 reply; 44+ messages in thread
From: Mark Brown @ 2015-12-03 14:51 UTC (permalink / raw)
  To: Dave Airlie, Jani Nikula, Ville Syrjälä, Imre Deak
  Cc: linux-next, linux-kernel, dri-devel

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
Introduce a gmbus power domain") from the drm-intel-fixes tree and commit 
69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed
during HDMI detect") from the drm tree.

I fixed it up (again resulting in a null diff) and can carry the fix as
necessary (no action is required).

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2015-12-03 14:47 Mark Brown
  2015-12-03 14:52 ` Imre Deak
  0 siblings, 1 reply; 44+ messages in thread
From: Mark Brown @ 2015-12-03 14:47 UTC (permalink / raw)
  To: Dave Airlie, Imre Deak, Patrik Jakobsson; +Cc: linux-next, linux-kernel

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_drv.h and drivers/gpu/drm/i915/i915_debugfs.c between
commit ac9b8236551d ("drm/i915: Introduce a gmbus power domain") from the
drm-intel-fixes tree and commit dfa5762793a40b4b03 ("drm/i915: Add a modeset
power domain") from the drm tree.

I notice that the modeset commit is missing a signoff from Imre who is the
committer by the way, the commiter should have a signoff.

I fixed it up (resulting in a null diff) and can carry the fix as necessary (no
action is required).

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2015-08-17  3:23 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2015-08-17  3:23 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Maarten Lankhorst, Jani Nikula

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/intel_atomic.c
  drivers/gpu/drm/i915/intel_display.c

between commits:

  f0fdc55db0c6 ("drm/i915: calculate primary visibility changes instead of calling from set_config")
  d2944cf21305 ("drm/i915: Commit planes on each crtc separately.")

from the drm-intel-fixes tree and commit:

  74c090b1bdc5 ("drm/i915: Use full atomic modeset.")

and maybe others from the drm tree.

I fixed it up (both these former commits are based on commits in the
latter tree, so I just used the latter tree versions) and can carry the
fix as necessary (no action is required).

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2015-06-05  8:03 ` Jani Nikula
@ 2015-06-09  1:58   ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2015-06-09  1:58 UTC (permalink / raw)
  To: Jani Nikula
  Cc: mpe, Dave Airlie, Daniel Vetter, intel-gfx, dri-devel,
	linux-next, linux-kernel, Nick Hoath, Ville Syrjälä,
	Damien Lespiau

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

Hi Jani,

On Fri, 05 Jun 2015 11:03:20 +0300 Jani Nikula <jani.nikula@intel.com> wrote:
>
> On Fri, 05 Jun 2015, "mpe@ellerman.id.au" <michael@ozlabs.org> wrote:
> > Hi Dave,
> >
> > Today's linux-next merge of the drm tree got a conflict in
> > drivers/gpu/drm/i915/intel_ringbuffer.c between commit 4f47c99a9be7 ("drm/i915:
> > Move WaBarrierPerformanceFixDisable:skl to skl code from chv code") from the
> > drm-intel-fixes tree and commit b62adbd1ea1f ("drm/i915/bxt: Move
> > WaForceEnableNonCoherent to Skylake only") from the drm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Our tree seems to have the if blocks the other way round. I don't think
> it matters, but Ville, Damien, chime in if you think it does.

I have switched them around today.

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

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
       [not found] <20150605054634.E4FA3140218@ozlabs.org>
@ 2015-06-05  8:03 ` Jani Nikula
  2015-06-09  1:58   ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Jani Nikula @ 2015-06-05  8:03 UTC (permalink / raw)
  To: mpe@ellerman.id.au, Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Nick Hoath, Ville Syrjälä,
	Damien Lespiau

On Fri, 05 Jun 2015, "mpe@ellerman.id.au" <michael@ozlabs.org> wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_ringbuffer.c between commit 4f47c99a9be7 ("drm/i915:
> Move WaBarrierPerformanceFixDisable:skl to skl code from chv code") from the
> drm-intel-fixes tree and commit b62adbd1ea1f ("drm/i915/bxt: Move
> WaForceEnableNonCoherent to Skylake only") from the drm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Our tree seems to have the if blocks the other way round. I don't think
it matters, but Ville, Damien, chime in if you think it does.

BR
Jani.

>
> cheers
>
> diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
> index 005b5e04de4d,d934f857394d..000000000000
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@@ -1017,13 -1030,17 +1023,24 @@@ static int skl_init_workarounds(struct 
>   		WA_SET_BIT_MASKED(HIZ_CHICKEN,
>   				  BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
>   
>  +	if (INTEL_REVID(dev) == SKL_REVID_C0 ||
>  +	    INTEL_REVID(dev) == SKL_REVID_D0)
>  +		/* WaBarrierPerformanceFixDisable:skl */
>  +		WA_SET_BIT_MASKED(HDC_CHICKEN0,
>  +				  HDC_FENCE_DEST_SLM_DISABLE |
>  +				  HDC_BARRIER_PERFORMANCE_DISABLE);
>  +
> + 	if (INTEL_REVID(dev) <= SKL_REVID_D0) {
> + 		/*
> + 		 *Use Force Non-Coherent whenever executing a 3D context. This
> + 		 * is a workaround for a possible hang in the unlikely event
> + 		 * a TLB invalidation occurs during a PSD flush.
> + 		 */
> + 		/* WaForceEnableNonCoherent:skl */
> + 		WA_SET_BIT_MASKED(HDC_CHICKEN0,
> + 				  HDC_FORCE_NON_COHERENT);
> + 	}
> + 
>   	return skl_tune_iz_hashing(ring);
>   }
>   

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2014-12-03  8:24 ` Jani Nikula
@ 2014-12-03  8:28   ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-12-03  8:28 UTC (permalink / raw)
  To: Jani Nikula
  Cc: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel, linux-next,
	linux-kernel

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

Hi Jani,

On Wed, 03 Dec 2014 10:24:12 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>
> On Wed, 03 Dec 2014, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the drm tree got a conflict in
> > drivers/gpu/drm/i915/intel_display.c between commit b68362278af9
> > ("drm/i915: More cautious with pch fifo underruns") from the
> > drm-intel-fixes tree and commit a72e4c9f9a11 ("drm/i915: Use dev_priv
> > in public intel_fifo_underrun.c functions") from the drm tree.
> >
> > I fixed it up (I used the drm tree version) and can carry the fix as
> > necessary (no action is required).
> 
> b68362278af9 removes two lines of code; these should be removed in the
> resolved version too.

Thanks for the correction.  I will do that tomorrow.

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

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2014-12-03  2:27 Stephen Rothwell
@ 2014-12-03  8:24 ` Jani Nikula
  2014-12-03  8:28   ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Jani Nikula @ 2014-12-03  8:24 UTC (permalink / raw)
  To: Stephen Rothwell, Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel

On Wed, 03 Dec 2014, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit b68362278af9
> ("drm/i915: More cautious with pch fifo underruns") from the
> drm-intel-fixes tree and commit a72e4c9f9a11 ("drm/i915: Use dev_priv
> in public intel_fifo_underrun.c functions") from the drm tree.
>
> I fixed it up (I used the drm tree version) and can carry the fix as
> necessary (no action is required).

b68362278af9 removes two lines of code; these should be removed in the
resolved version too.

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2014-12-03  2:27 Stephen Rothwell
  2014-12-03  8:24 ` Jani Nikula
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2014-12-03  2:27 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Jani Nikula

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit b68362278af9
("drm/i915: More cautious with pch fifo underruns") from the
drm-intel-fixes tree and commit a72e4c9f9a11 ("drm/i915: Use dev_priv
in public intel_fifo_underrun.c functions") from the drm tree.

I fixed it up (I used the drm tree version) and can carry the fix as
necessary (no action is required).

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

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2014-11-17  3:04 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-11-17  3:04 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Jani Nikula

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_pm.c between commit 6bc55a67bd4b ("drm/i915:
drop WaSetupGtModeTdRowDispatch:snb") from the drm-intel-fixes tree and
commits (not sure which ones - the code seems to have been rearranged
quite a bit) from the drm tree.

I fixed it up (I applied the former patch by hand to the file from the
drm tree) and can carry the fix as necessary (no action is required).

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

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2014-07-23  2:38 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-07-23  2:38 UTC (permalink / raw)
  To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Hugh Dickins, Chris Wilson

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_render_state.c between commit
88b982873567 ("drm/i915: fix freeze with blank screen booting highmem")
from the drm-intel-fixes tree and commit 1ce826d436f3 ("drm/i915:
Simplify processing of the golden render context state") from the drm
tree.

I fixed it up (the latter appears to supercede the former, so I used
that) and can carry the fix as necessary (no action is required).

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

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2014-07-09  4:06 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-07-09  4:06 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Clint Taylor, Rodrigo Vivi

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_drv.h between commit 72f5fd2a9815
("drm/i915/vlv: T12 eDP panel timing enforcement during reboot") from
the drm-intel-fixes tree and commit 6118efe5968c ("drm/i915: move
psr_setup_done to psr struct") from the drm 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_drv.h
index f67340ed2c12,5f7c7bd94d90..000000000000
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -537,9 -541,6 +541,8 @@@ struct intel_dp 
  	unsigned long last_power_cycle;
  	unsigned long last_power_on;
  	unsigned long last_backlight_off;
- 	bool psr_setup_done;
 +	struct notifier_block edp_notifier;
 +
  	bool use_tps3;
  	struct intel_connector *attached_connector;
  

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2014-05-22  5:44 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-05-22  5:44 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Chris Wilson, Zhao Yakui

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_execbuffer.c between commit 4eda4e461109
("drm/i915: Prevent negative relocation deltas from wrapping") from the
drm-intel-fixes tree and commit a8ebba75b358 ("drm/i915: Use the coarse
ping-pong mechanism based on drm fd to dispatch the BSD command on BDW
GT3") from the drm 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_execbuffer.c
index 6651195edcad,47fe8ecef135..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@@ -1018,25 -1007,37 +1026,56 @@@ i915_reset_gen7_sol_offsets(struct drm_
  	return 0;
  }
  
 +static struct drm_i915_gem_object *
 +eb_get_batch(struct eb_vmas *eb)
 +{
 +	struct i915_vma *vma = list_entry(eb->vmas.prev, typeof(*vma), exec_list);
 +
 +	/*
 +	 * SNA is doing fancy tricks with compressing batch buffers, which leads
 +	 * to negative relocation deltas. Usually that works out ok since the
 +	 * relocate address is still positive, except when the batch is placed
 +	 * very low in the GTT. Ensure this doesn't happen.
 +	 *
 +	 * Note that actual hangs have only been observed on gen7, but for
 +	 * paranoia do it everywhere.
 +	 */
 +	vma->exec_entry->flags |= __EXEC_OBJECT_NEEDS_BIAS;
 +
 +	return vma->obj;
 +}
 +
+ /**
+  * Find one BSD ring to dispatch the corresponding BSD command.
+  * The Ring ID is returned.
+  */
+ static int gen8_dispatch_bsd_ring(struct drm_device *dev,
+ 				  struct drm_file *file)
+ {
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
+ 	struct drm_i915_file_private *file_priv = file->driver_priv;
+ 
+ 	/* Check whether the file_priv is using one ring */
+ 	if (file_priv->bsd_ring)
+ 		return file_priv->bsd_ring->id;
+ 	else {
+ 		/* If no, use the ping-pong mechanism to select one ring */
+ 		int ring_id;
+ 
+ 		mutex_lock(&dev->struct_mutex);
+ 		if (dev_priv->ring_index == 0) {
+ 			ring_id = VCS;
+ 			dev_priv->ring_index = 1;
+ 		} else {
+ 			ring_id = VCS2;
+ 			dev_priv->ring_index = 0;
+ 		}
+ 		file_priv->bsd_ring = &dev_priv->ring[ring_id];
+ 		mutex_unlock(&dev->struct_mutex);
+ 		return ring_id;
+ 	}
+ }
+ 
  static int
  i915_gem_do_execbuffer(struct drm_device *dev, void *data,
  		       struct drm_file *file,

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2014-05-22  5:40 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-05-22  5:40 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Chris Wilson

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem.c between commit f93e94efebbe ("drm/i915:
Fix dynamic allocation of physical handles") from the drm-intel-fixes
tree and commit c8725f3dc091 ("drm/i915: Do not call retire_requests
from wait_for_rendering") from the drm 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.c
index 3326770c9ed2,e1fa919017e2..000000000000
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -43,7 -43,14 +43,9 @@@ static void i915_gem_object_flush_cpu_w
  static __must_check int
  i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj,
  			       bool readonly);
+ static void
+ i915_gem_object_retire(struct drm_i915_gem_object *obj);
  
 -static int i915_gem_phys_pwrite(struct drm_device *dev,
 -				struct drm_i915_gem_object *obj,
 -				struct drm_i915_gem_pwrite *args,
 -				struct drm_file *file);
 -
  static void i915_gem_write_fence(struct drm_device *dev, int reg,
  				 struct drm_i915_gem_object *obj);
  static void i915_gem_object_update_fence(struct drm_i915_gem_object *obj,

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2014-05-07  3:24 Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2014-05-07  3:24 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, linux-kernel, Daniel Vetter, Jani Nikula

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_gtt.c between commit cfa7c862982b
("drm/i915: Sanitize the enable_ppgtt module option once") from the
drm-intel-fixes tree and commit 5db6c735ead5 ("drm/i915: dmesg output for
VT-d testing") from the drm 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_gtt.c
index 154b0f8bb88d,0d514ff9b94c..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@@ -62,62 -48,13 +62,9 @@@ static int sanitize_enable_ppgtt(struc
  	}
  #endif
  
 -	/* Full ppgtt disabled by default for now due to issues. */
 -	if (full)
 -		return HAS_PPGTT(dev) && (i915.enable_ppgtt == 2);
 -	else
 -		return HAS_ALIASING_PPGTT(dev);
 +	return HAS_ALIASING_PPGTT(dev) ? 1 : 0;
  }
  
- #define GEN6_PPGTT_PD_ENTRIES 512
- #define I915_PPGTT_PT_ENTRIES (PAGE_SIZE / sizeof(gen6_gtt_pte_t))
- typedef uint64_t gen8_gtt_pte_t;
- typedef gen8_gtt_pte_t gen8_ppgtt_pde_t;
- 
- /* PPGTT stuff */
- #define GEN6_GTT_ADDR_ENCODE(addr)	((addr) | (((addr) >> 28) & 0xff0))
- #define HSW_GTT_ADDR_ENCODE(addr)	((addr) | (((addr) >> 28) & 0x7f0))
- 
- #define GEN6_PDE_VALID			(1 << 0)
- /* gen6+ has bit 11-4 for physical addr bit 39-32 */
- #define GEN6_PDE_ADDR_ENCODE(addr)	GEN6_GTT_ADDR_ENCODE(addr)
- 
- #define GEN6_PTE_VALID			(1 << 0)
- #define GEN6_PTE_UNCACHED		(1 << 1)
- #define HSW_PTE_UNCACHED		(0)
- #define GEN6_PTE_CACHE_LLC		(2 << 1)
- #define GEN7_PTE_CACHE_L3_LLC		(3 << 1)
- #define GEN6_PTE_ADDR_ENCODE(addr)	GEN6_GTT_ADDR_ENCODE(addr)
- #define HSW_PTE_ADDR_ENCODE(addr)	HSW_GTT_ADDR_ENCODE(addr)
- 
- /* Cacheability Control is a 4-bit value. The low three bits are stored in *
-  * bits 3:1 of the PTE, while the fourth bit is stored in bit 11 of the PTE.
-  */
- #define HSW_CACHEABILITY_CONTROL(bits)	((((bits) & 0x7) << 1) | \
- 					 (((bits) & 0x8) << (11 - 3)))
- #define HSW_WB_LLC_AGE3			HSW_CACHEABILITY_CONTROL(0x2)
- #define HSW_WB_LLC_AGE0			HSW_CACHEABILITY_CONTROL(0x3)
- #define HSW_WB_ELLC_LLC_AGE0		HSW_CACHEABILITY_CONTROL(0xb)
- #define HSW_WB_ELLC_LLC_AGE3		HSW_CACHEABILITY_CONTROL(0x8)
- #define HSW_WT_ELLC_LLC_AGE0		HSW_CACHEABILITY_CONTROL(0x6)
- #define HSW_WT_ELLC_LLC_AGE3		HSW_CACHEABILITY_CONTROL(0x7)
- 
- #define GEN8_PTES_PER_PAGE		(PAGE_SIZE / sizeof(gen8_gtt_pte_t))
- #define GEN8_PDES_PER_PAGE		(PAGE_SIZE / sizeof(gen8_ppgtt_pde_t))
- 
- /* GEN8 legacy style addressis defined as a 3 level page table:
-  * 31:30 | 29:21 | 20:12 |  11:0
-  * PDPE  |  PDE  |  PTE  | offset
-  * The difference as compared to normal x86 3 level page table is the PDPEs are
-  * programmed via register.
-  */
- #define GEN8_PDPE_SHIFT			30
- #define GEN8_PDPE_MASK			0x3
- #define GEN8_PDE_SHIFT			21
- #define GEN8_PDE_MASK			0x1ff
- #define GEN8_PTE_SHIFT			12
- #define GEN8_PTE_MASK			0x1ff
- 
- #define PPAT_UNCACHED_INDEX		(_PAGE_PWT | _PAGE_PCD)
- #define PPAT_CACHED_PDE_INDEX		0 /* WB LLC */
- #define PPAT_CACHED_INDEX		_PAGE_PAT /* WB LLCeLLC */
- #define PPAT_DISPLAY_ELLC_INDEX		_PAGE_PCD /* WT eLLC */
  
  static void ppgtt_bind_vma(struct i915_vma *vma,
  			   enum i915_cache_level cache_level,
@@@ -2041,15 -1962,11 +1972,20 @@@ int i915_gem_gtt_init(struct drm_devic
  		 gtt->base.total >> 20);
  	DRM_DEBUG_DRIVER("GMADR size = %ldM\n", gtt->mappable_end >> 20);
  	DRM_DEBUG_DRIVER("GTT stolen size = %zdM\n", gtt->stolen_size >> 20);
 +	/*
 +	 * i915.enable_ppgtt is read-only, so do an early pass to validate the
 +	 * user's requested state against the hardware/driver capabilities.  We
 +	 * do this now so that we can print out any log messages once rather
 +	 * than every time we check intel_enable_ppgtt().
 +	 */
 +	i915.enable_ppgtt = sanitize_enable_ppgtt(dev, i915.enable_ppgtt);
 +	DRM_DEBUG_DRIVER("ppgtt mode: %i\n", i915.enable_ppgtt);
 +
+ #ifdef CONFIG_INTEL_IOMMU
+ 	if (intel_iommu_gfx_mapped)
+ 		DRM_INFO("VT-d active for gfx access\n");
+ #endif
+ 
  	return 0;
  }
  

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
  2013-10-28  5:46 Stephen Rothwell
@ 2013-10-28  6:12 ` Stephen Rothwell
  0 siblings, 0 replies; 44+ messages in thread
From: Stephen Rothwell @ 2013-10-28  6:12 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Jani Nikula, Daniel Vetter, intel-gfx,
	dri-devel, Rodrigo Vivi, Ben Widawsky

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

Hi Dave,

On Mon, 28 Oct 2013 16:46:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> @@@ -1486,8 -1542,8 +1562,8 @@@ static void intel_edp_psr_setup(struct 
>   	intel_edp_psr_write_vsc(intel_dp, &psr_vsc);
>   
>   	/* Avoid continuous PSR exit by masking memup and hpd */
>  -	I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP |
>  +	I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP |
> - 		   EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP);
> + 		   EDP_PSR_DEBUG_MASK_HPD);
>   
>   	intel_dp->psr_setup_done = true;
>   }

This last hunk is wrong.  I fixed it up to do the reverse of the above.

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

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

* linux-next: manual merge of the drm tree with the drm-intel-fixes tree
@ 2013-10-28  5:46 Stephen Rothwell
  2013-10-28  6:12 ` Stephen Rothwell
  0 siblings, 1 reply; 44+ messages in thread
From: Stephen Rothwell @ 2013-10-28  5:46 UTC (permalink / raw)
  To: Dave Airlie
  Cc: linux-next, linux-kernel, Jani Nikula, Daniel Vetter, intel-gfx,
	dri-devel, Rodrigo Vivi, Ben Widawsky

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit 0cc4b69960f3 ("drm/i915:
Mask LPSP to get PSR working even with Power Well in use by audio") from
Linus' tree and commit 52e1e223456e ("drm/i915/dp: workaround BIOS eDP
bpp clamping issue") from the drm-intel-fixes tree and commits
18442d087864 ("drm/i915: Fix port_clock and adjusted_mode.clock readout
all over") and 18b5992c3756 ("drm/i915: Calculate PSR register offsets
from base + gen") from the drm 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 1a431377d83b,1e3d2720d811..000000000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -1402,31 -1469,20 +1469,40 @@@ static void intel_dp_get_config(struct 
  			pipe_config->port_clock = 270000;
  	}
  
 +	if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp &&
 +	    pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {
 +		/*
 +		 * This is a big fat ugly hack.
 +		 *
 +		 * Some machines in UEFI boot mode provide us a VBT that has 18
 +		 * bpp and 1.62 GHz link bandwidth for eDP, which for reasons
 +		 * unknown we fail to light up. Yet the same BIOS boots up with
 +		 * 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as
 +		 * max, not what it tells us to use.
 +		 *
 +		 * Note: This will still be broken if the eDP panel is not lit
 +		 * up by the BIOS, and thus we can't get the mode at module
 +		 * load.
 +		 */
 +		DRM_DEBUG_KMS("pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
 +			      pipe_config->pipe_bpp, dev_priv->vbt.edp_bpp);
 +		dev_priv->vbt.edp_bpp = pipe_config->pipe_bpp;
 +	}
++
+ 	dotclock = intel_dotclock_calculate(pipe_config->port_clock,
+ 					    &pipe_config->dp_m_n);
+ 
+ 	if (HAS_PCH_SPLIT(dev_priv->dev) && port != PORT_A)
+ 		ironlake_check_encoder_dotclock(pipe_config, dotclock);
+ 
+ 	pipe_config->adjusted_mode.crtc_clock = dotclock;
  }
  
- static bool is_edp_psr(struct intel_dp *intel_dp)
+ static bool is_edp_psr(struct drm_device *dev)
  {
- 	return is_edp(intel_dp) &&
- 		intel_dp->psr_dpcd[0] & DP_PSR_IS_SUPPORTED;
+ 	struct drm_i915_private *dev_priv = dev->dev_private;
+ 
+ 	return dev_priv->psr.sink_support;
  }
  
  static bool intel_edp_is_psr_enabled(struct drm_device *dev)
@@@ -1486,8 -1542,8 +1562,8 @@@ static void intel_edp_psr_setup(struct 
  	intel_edp_psr_write_vsc(intel_dp, &psr_vsc);
  
  	/* Avoid continuous PSR exit by masking memup and hpd */
 -	I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP |
 +	I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP |
- 		   EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP);
+ 		   EDP_PSR_DEBUG_MASK_HPD);
  
  	intel_dp->psr_setup_done = true;
  }

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

^ permalink raw reply	[flat|nested] 44+ messages in thread

end of thread, other threads:[~2020-05-08  3:50 UTC | newest]

Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-16  2:30 linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell
2015-03-16 13:43 ` Xi Ruoyao
2015-03-16 15:04   ` [Intel-gfx] " Jani Nikula
  -- strict thread matches above, loose matches on Subject: below --
2020-05-08  3:50 Stephen Rothwell
2020-05-07  2:43 Stephen Rothwell
2020-01-22  0:37 Stephen Rothwell
2020-01-08  1:15 Stephen Rothwell
2020-01-08  1:10 Stephen Rothwell
2020-01-08  1:04 Stephen Rothwell
2020-01-08  2:28 ` Stephen Rothwell
2019-10-31  0:33 Stephen Rothwell
2019-11-08  0:42 ` Stephen Rothwell
2018-01-05  1:00 Stephen Rothwell
2017-07-21  1:26 Stephen Rothwell
2017-06-14  0:56 Stephen Rothwell
2017-06-14  0:50 Stephen Rothwell
2017-06-09  2:26 Stephen Rothwell
2017-06-08  2:53 Stephen Rothwell
2017-03-30  1:14 Stephen Rothwell
2017-03-30  1:08 Stephen Rothwell
2017-03-22  0:00 Stephen Rothwell
2017-03-21 23:57 Stephen Rothwell
2017-03-21  0:28 Stephen Rothwell
2016-06-14  2:10 Stephen Rothwell
2015-12-22 23:06 Stephen Rothwell
2015-12-09  2:35 Stephen Rothwell
2015-12-03 14:51 Mark Brown
2015-12-03 15:49 ` Jani Nikula
2015-12-03 14:47 Mark Brown
2015-12-03 14:52 ` Imre Deak
2015-08-17  3:23 Stephen Rothwell
     [not found] <20150605054634.E4FA3140218@ozlabs.org>
2015-06-05  8:03 ` Jani Nikula
2015-06-09  1:58   ` Stephen Rothwell
2014-12-03  2:27 Stephen Rothwell
2014-12-03  8:24 ` Jani Nikula
2014-12-03  8:28   ` Stephen Rothwell
2014-11-17  3:04 Stephen Rothwell
2014-07-23  2:38 Stephen Rothwell
2014-07-09  4:06 Stephen Rothwell
2014-05-22  5:44 Stephen Rothwell
2014-05-22  5:40 Stephen Rothwell
2014-05-07  3:24 Stephen Rothwell
2013-10-28  5:46 Stephen Rothwell
2013-10-28  6:12 ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).