Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2020-06-26  1:43 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2020-06-26  1:43 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Nirmoy Das,
	Christian König


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

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c

between commit:

  eaad0c3aa978 ("drm/amdgpu: rename direct to immediate for VM updates")

from the Linus' and commit:

  b1a8ef952a25 ("drm/amdgpu: move ttm bo->offset to amdgpu_bo")

from the drm-misc 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/amd/amdgpu/amdgpu_vm_sdma.c
index 28bdfb3ac33d,2a7a6f62d627..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
@@@ -144,8 -141,8 +144,8 @@@ static void amdgpu_vm_sdma_copy_ptes(st
  
  	src += p->num_dw_left * 4;
  
- 	pe += amdgpu_gmc_sign_extend(bo->tbo.offset);
+ 	pe += amdgpu_bo_gpu_offset_no_check(bo);
 -	trace_amdgpu_vm_copy_ptes(pe, src, count, p->direct);
 +	trace_amdgpu_vm_copy_ptes(pe, src, count, p->immediate);
  
  	amdgpu_vm_copy_pte(p->adev, ib, pe, src, count);
  }
@@@ -171,8 -168,8 +171,8 @@@ static void amdgpu_vm_sdma_set_ptes(str
  {
  	struct amdgpu_ib *ib = p->job->ibs;
  
- 	pe += amdgpu_gmc_sign_extend(bo->tbo.offset);
+ 	pe += amdgpu_bo_gpu_offset_no_check(bo);
 -	trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags, p->direct);
 +	trace_amdgpu_vm_set_ptes(pe, addr, count, incr, flags, p->immediate);
  	if (count < 3) {
  		amdgpu_vm_write_pte(p->adev, ib, pe, addr | flags,
  				    count, incr);

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2020-06-29  1:14 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2020-06-29  1:14 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Nirmoy Das,
	Thomas Zimmermann, Ben Skeggs, Dave Airlie, James Jones,
	Ralph Campbell


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

Hi all,

Today's linux-next merge of the drm-misc tree got conflicts in:

  drivers/gpu/drm/nouveau/dispnv04/crtc.c
  drivers/gpu/drm/nouveau/dispnv04/overlay.c
  drivers/gpu/drm/nouveau/dispnv50/base507c.c
  drivers/gpu/drm/nouveau/dispnv50/wndw.c
  drivers/gpu/drm/nouveau/nouveau_dmem.c
  drivers/gpu/drm/nouveau/nouveau_fbcon.c

between commits:

  183405879255 ("drm/nouveau/kms: Remove field nvbo from struct nouveau_framebuffer")
  c586f30bf74c ("drm/nouveau/kms: Add format mod prop to base/ovly/nvdisp")
  1d7f940c3a16 ("drm/nouveau/nouveau/hmm: fix nouveau_dmem_chunk allocations")

from Linus' tree and commit:

  0dc9b286b8d2 ("drm/nouveau: don't use ttm bo->offset v3")

from the drm-misc 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/nouveau/dispnv04/crtc.c
index 640738f3196c,cc6ab3c2eec7..000000000000
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@@ -840,12 -839,13 +840,12 @@@ nv04_crtc_do_mode_set_base(struct drm_c
  	 */
  	if (atomic) {
  		drm_fb = passed_fb;
 -		fb = nouveau_framebuffer(passed_fb);
  	} else {
  		drm_fb = crtc->primary->fb;
 -		fb = nouveau_framebuffer(crtc->primary->fb);
  	}
  
 -	nv_crtc->fb.offset = fb->nvbo->offset;
 +	nvbo = nouveau_gem_object(drm_fb->obj[0]);
- 	nv_crtc->fb.offset = nvbo->bo.offset;
++	nv_crtc->fb.offset = nvbo->offset;
  
  	if (nv_crtc->lut.depth != drm_fb->format->depth) {
  		nv_crtc->lut.depth = drm_fb->format->depth;
diff --cc drivers/gpu/drm/nouveau/dispnv04/overlay.c
index 6248fd1dbc6d,9529bd9053e7..000000000000
--- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c
@@@ -152,7 -150,7 +152,7 @@@ nv10_update_plane(struct drm_plane *pla
  	nvif_mask(dev, NV_PCRTC_ENGINE_CTRL + soff2, NV_CRTC_FSEL_OVERLAY, 0);
  
  	nvif_wr32(dev, NV_PVIDEO_BASE(flip), 0);
- 	nvif_wr32(dev, NV_PVIDEO_OFFSET_BUFF(flip), nvbo->bo.offset);
 -	nvif_wr32(dev, NV_PVIDEO_OFFSET_BUFF(flip), nv_fb->nvbo->offset);
++	nvif_wr32(dev, NV_PVIDEO_OFFSET_BUFF(flip), nvbo->offset);
  	nvif_wr32(dev, NV_PVIDEO_SIZE_IN(flip), src_h << 16 | src_w);
  	nvif_wr32(dev, NV_PVIDEO_POINT_IN(flip), src_y << 16 | src_x);
  	nvif_wr32(dev, NV_PVIDEO_DS_DX(flip), (src_w << 20) / crtc_w);
@@@ -174,7 -172,7 +174,7 @@@
  	if (format & NV_PVIDEO_FORMAT_PLANAR) {
  		nvif_wr32(dev, NV_PVIDEO_UVPLANE_BASE(flip), 0);
  		nvif_wr32(dev, NV_PVIDEO_UVPLANE_OFFSET_BUFF(flip),
- 			nvbo->bo.offset + fb->offsets[1]);
 -			nv_fb->nvbo->offset + fb->offsets[1]);
++			nvbo->offset + fb->offsets[1]);
  	}
  	nvif_wr32(dev, NV_PVIDEO_FORMAT(flip), format | fb->pitches[0]);
  	nvif_wr32(dev, NV_PVIDEO_STOP, 0);
@@@ -399,7 -396,7 +399,7 @@@ nv04_update_plane(struct drm_plane *pla
  
  	for (i = 0; i < 2; i++) {
  		nvif_wr32(dev, NV_PVIDEO_BUFF0_START_ADDRESS + 4 * i,
- 			  nvbo->bo.offset);
 -			  nv_fb->nvbo->offset);
++			  nvbo->offset);
  		nvif_wr32(dev, NV_PVIDEO_BUFF0_PITCH_LENGTH + 4 * i,
  			  fb->pitches[0]);
  		nvif_wr32(dev, NV_PVIDEO_BUFF0_OFFSET + 4 * i, 0);
diff --cc drivers/gpu/drm/nouveau/dispnv50/base507c.c
index 511258bfbcbc,b60aa987d7b4..000000000000
--- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
@@@ -274,9 -273,9 +274,9 @@@ base507c_new_(const struct nv50_wndw_fu
  	if (*pwndw = wndw, ret)
  		return ret;
  
 -	ret = nv50_dmac_create(&drm->client.device, &disp->disp->object,
 +	ret = nv50_dmac_create(&drm->client.device, &disp->disp.object,
  			       &oclass, head, &args, sizeof(args),
- 			       disp50->sync->bo.offset, &wndw->wndw);
 -			       disp->sync->offset, &wndw->wndw);
++			       disp50->sync->offset, &wndw->wndw);
  	if (ret) {
  		NV_ERROR(drm, "base%04x allocation failed: %d\n", oclass, ret);
  		return ret;
diff --cc drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 99b9b681736d,ee0fd817185e..000000000000
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@@ -521,12 -507,11 +521,12 @@@ nv50_wndw_prepare_fb(struct drm_plane *
  			return PTR_ERR(ctxdma);
  		}
  
 -		asyw->image.handle[0] = ctxdma->object.handle;
 +		if (asyw->visible)
 +			asyw->image.handle[0] = ctxdma->object.handle;
  	}
  
 -	asyw->state.fence = dma_resv_get_excl_rcu(fb->nvbo->bo.base.resv);
 -	asyw->image.offset[0] = fb->nvbo->offset;
 +	asyw->state.fence = dma_resv_get_excl_rcu(nvbo->bo.base.resv);
- 	asyw->image.offset[0] = nvbo->bo.offset;
++	asyw->image.offset[0] = nvbo->offset;
  
  	if (wndw->func->prepare) {
  		asyh = nv50_head_atom_get(asyw->state.state, asyw->state.crtc);
diff --cc drivers/gpu/drm/nouveau/nouveau_dmem.c
index e5c230d9ae24,f13086a32f0f..000000000000
--- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
@@@ -75,32 -72,25 +75,32 @@@ struct nouveau_dmem_migrate 
  
  struct nouveau_dmem {
  	struct nouveau_drm *drm;
 -	struct dev_pagemap pagemap;
  	struct nouveau_dmem_migrate migrate;
 -	struct list_head chunk_free;
 -	struct list_head chunk_full;
 -	struct list_head chunk_empty;
 +	struct list_head chunks;
  	struct mutex mutex;
 +	struct page *free_pages;
 +	spinlock_t lock;
  };
  
 -static inline struct nouveau_dmem *page_to_dmem(struct page *page)
 +static struct nouveau_dmem_chunk *nouveau_page_to_chunk(struct page *page)
  {
 -	return container_of(page->pgmap, struct nouveau_dmem, pagemap);
 +	return container_of(page->pgmap, struct nouveau_dmem_chunk, pagemap);
 +}
 +
 +static struct nouveau_drm *page_to_drm(struct page *page)
 +{
 +	struct nouveau_dmem_chunk *chunk = nouveau_page_to_chunk(page);
 +
 +	return chunk->drm;
  }
  
 -static unsigned long nouveau_dmem_page_addr(struct page *page)
 +unsigned long nouveau_dmem_page_addr(struct page *page)
  {
 -	struct nouveau_dmem_chunk *chunk = page->zone_device_data;
 -	unsigned long idx = page_to_pfn(page) - chunk->pfn_first;
 +	struct nouveau_dmem_chunk *chunk = nouveau_page_to_chunk(page);
 +	unsigned long off = (page_to_pfn(page) << PAGE_SHIFT) -
 +				chunk->pagemap.res.start;
  
- 	return chunk->bo->bo.offset + off;
 -	return (idx << PAGE_SHIFT) + chunk->bo->offset;
++	return chunk->bo->offset + off;
  }
  
  static void nouveau_dmem_page_free(struct page *page)
diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 3d11b84d4cf9,1341c6fca3ed..000000000000
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@@ -393,7 -393,7 +393,7 @@@ nouveau_fbcon_create(struct drm_fb_help
  
  	/* To allow resizeing without swapping buffers */
  	NV_INFO(drm, "allocated %dx%d fb: 0x%llx, bo %p\n",
- 		fb->width, fb->height, nvbo->bo.offset, nvbo);
 -		fb->base.width, fb->base.height, fb->nvbo->offset, nvbo);
++		fb->width, fb->height, nvbo->offset, nvbo);
  
  	vga_switcheroo_client_fb_set(dev->pdev, info);
  	return 0;

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2020-06-17  0:46 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2020-06-17  0:46 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Thomas Zimmermann, Ben Skeggs, Emil Velikov


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

Hi all,

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

  drivers/gpu/drm/nouveau/nouveau_display.c

between commit:

  183405879255 ("drm/nouveau/kms: Remove field nvbo from struct nouveau_framebuffer")

from Linus' tree and commit:

  cdc194cebd71 ("drm/nouveau: remove _unlocked suffix in drm_gem_object_put_unlocked")

from the drm-misc tree.

I fixed it up (the former just removed one of the functions modified
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

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2020-04-16  1:25 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2020-04-16  1:25 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sam Ravnborg,
	Linus Torvalds, Joe Perches


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

Hi all,

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

  MAINTAINERS

between commits:

  4400b7d68f6e ("MAINTAINERS: sort entries by entry name")
  3b50142d8528 ("MAINTAINERS: sort field names for all entries")

from Linus' tree and commits:

  5304058b1526 ("dt-bindings: display: convert arm,versatile-tft-panel to DT Schema")
  c1eb28405d3a ("dt-bindings: display: convert boe,himax8279d to DT Schema")
  1aa3bf853cb4 ("dt-bindings: display: convert raydium,rm67191 to DT Schema")
  8b9e7ace123d ("dt-bindings: display: convert olimex,lcd-olinuxino to DT Schema")

from the drm-misc 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 MAINTAINERS
index a7f3c96eb61e,ccd0ccfce4eb..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5037,14 -5019,32 +5037,14 @@@ M:	Sumit Semwal <sumit.semwal@linaro.or
  L:	linux-media@vger.kernel.org
  L:	dri-devel@lists.freedesktop.org
  L:	linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 +S:	Maintained
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
 +F:	Documentation/driver-api/dma-buf.rst
  F:	drivers/dma-buf/
 +F:	include/linux/*fence.h
  F:	include/linux/dma-buf*
  F:	include/linux/dma-resv.h
- K:	dma_(buf|fence|resv)
 -F:	include/linux/*fence.h
 -F:	Documentation/driver-api/dma-buf.rst
+ K:	\bdma_(?:buf|fence|resv)\b
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
 -
 -DMA-BUF HEAPS FRAMEWORK
 -M:	Sumit Semwal <sumit.semwal@linaro.org>
 -R:	Andrew F. Davis <afd@ti.com>
 -R:	Benjamin Gaignard <benjamin.gaignard@linaro.org>
 -R:	Liam Mark <lmark@codeaurora.org>
 -R:	Laura Abbott <labbott@redhat.com>
 -R:	Brian Starkey <Brian.Starkey@arm.com>
 -R:	John Stultz <john.stultz@linaro.org>
 -S:	Maintained
 -L:	linux-media@vger.kernel.org
 -L:	dri-devel@lists.freedesktop.org
 -L:	linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 -F:	include/uapi/linux/dma-heap.h
 -F:	include/linux/dma-heap.h
 -F:	drivers/dma-buf/dma-heap.c
 -F:	drivers/dma-buf/heaps/*
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:	Vinod Koul <vkoul@kernel.org>
@@@ -5255,10 -5226,15 +5255,10 @@@ F:	drivers/gpu/drm/pl111
  
  DRM DRIVER FOR ARM VERSATILE TFT PANELS
  M:	Linus Walleij <linus.walleij@linaro.org>
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
  S:	Maintained
 -F:	drivers/gpu/drm/panel/panel-arm-versatile.c
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
- F:	Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
+ F:	Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml
 -
 -DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 -M:	Dave Airlie <airlied@redhat.com>
 -S:	Odd Fixes
 -F:	drivers/gpu/drm/ast/
 +F:	drivers/gpu/drm/panel/panel-arm-versatile.c
  
  DRM DRIVER FOR ASPEED BMC GFX
  M:	Joel Stanley <joel@jms.id.au>
@@@ -5283,8 -5254,8 +5283,8 @@@ F:	drivers/gpu/drm/bochs
  DRM DRIVER FOR BOE HIMAX8279D PANELS
  M:	Jerry Han <hanxu5@huaqin.corp-partner.google.com>
  S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
 -F:	drivers/gpu/drm/panel/panel-boe-himax8279d.c
+ F:	Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml
 +F:	drivers/gpu/drm/panel/panel-boe-himax8279d.c
  
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
  M:	Linus Walleij <linus.walleij@linaro.org>
@@@ -5301,8 -5272,8 +5301,8 @@@ F:	drivers/gpu/drm/panel/panel-feixin-k
  DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
  M:	Jagan Teki <jagan@amarulasolutions.com>
  S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 -F:	drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+ F:	Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
 +F:	drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
  DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
  M:	Hans de Goede <hdegoede@redhat.com>
@@@ -5384,8 -5355,8 +5384,8 @@@ F:	include/uapi/drm/nouveau_drm.
  DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS
  M:	Stefan Mavrodiev <stefan@olimex.com>
  S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
 -F:	drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+ F:	Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
 +F:	drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
  
  DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
  M:	Noralf Trønnes <noralf@tronnes.org>
@@@ -5418,12 -5395,6 +5418,12 @@@ S:	Orphan / Obsolet
  F:	drivers/gpu/drm/r128/
  F:	include/uapi/drm/r128_drm.h
  
 +DRM DRIVER FOR RAYDIUM RM67191 PANELS
 +M:	Robert Chiras <robert.chiras@nxp.com>
 +S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt
++F:	Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
 +F:	drivers/gpu/drm/panel/panel-raydium-rm67191.c
 +
  DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
  M:	Guido Günther <agx@sigxcpu.org>
  R:	Purism Kernel Team <kernel@puri.sm>
@@@ -5441,18 -5412,18 +5441,18 @@@ S:	Orphan / Obsolet
  F:	drivers/gpu/drm/sis/
  F:	include/uapi/drm/sis_drm.h
  
 -DRM DRIVER FOR SITRONIX ST7701 PANELS
 -M:	Jagan Teki <jagan@amarulasolutions.com>
 -S:	Maintained
 -F:	drivers/gpu/drm/panel/panel-sitronix-st7701.c
 -F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 -
  DRM DRIVER FOR SITRONIX ST7586 PANELS
  M:	David Lechner <david@lechnology.com>
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
  S:	Maintained
 -F:	drivers/gpu/drm/tiny/st7586.c
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
  F:	Documentation/devicetree/bindings/display/sitronix,st7586.txt
 +F:	drivers/gpu/drm/tiny/st7586.c
 +
 +DRM DRIVER FOR SITRONIX ST7701 PANELS
 +M:	Jagan Teki <jagan@amarulasolutions.com>
 +S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
++F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 +F:	drivers/gpu/drm/panel/panel-sitronix-st7701.c
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
  M:	David Lechner <david@lechnology.com>

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2020-04-15  1:46 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2020-04-15  1:46 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Linus Torvalds, Joe Perches, Jagan Teki, Sam Ravnborg


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

Hi all,

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

  MAINTAINERS

between commitis:

  4400b7d68f6e ("MAINTAINERS: sort entries by entry name")
  3b50142d8528 ("MAINTAINERS: sort field names for all entries")

from Linus' tree and commits:

  8edb69970739 ("MAINTAINERS: Better regex for dma_buf|fence|resv")
  7fd9681e8fd0 ("MAINTAINERS: Update feiyang,st7701 panel bindings converted as YAML")

from the drm-misc 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 MAINTAINERS
index c3cd17dbcb88,50b068f3580a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5037,14 -5019,32 +5037,14 @@@ M:	Sumit Semwal <sumit.semwal@linaro.or
  L:	linux-media@vger.kernel.org
  L:	dri-devel@lists.freedesktop.org
  L:	linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 +S:	Maintained
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
 +F:	Documentation/driver-api/dma-buf.rst
  F:	drivers/dma-buf/
 +F:	include/linux/*fence.h
  F:	include/linux/dma-buf*
  F:	include/linux/dma-resv.h
- K:	dma_(buf|fence|resv)
 -F:	include/linux/*fence.h
 -F:	Documentation/driver-api/dma-buf.rst
+ K:	\bdma_(?:buf|fence|resv)\b
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
 -
 -DMA-BUF HEAPS FRAMEWORK
 -M:	Sumit Semwal <sumit.semwal@linaro.org>
 -R:	Andrew F. Davis <afd@ti.com>
 -R:	Benjamin Gaignard <benjamin.gaignard@linaro.org>
 -R:	Liam Mark <lmark@codeaurora.org>
 -R:	Laura Abbott <labbott@redhat.com>
 -R:	Brian Starkey <Brian.Starkey@arm.com>
 -R:	John Stultz <john.stultz@linaro.org>
 -S:	Maintained
 -L:	linux-media@vger.kernel.org
 -L:	dri-devel@lists.freedesktop.org
 -L:	linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 -F:	include/uapi/linux/dma-heap.h
 -F:	include/linux/dma-heap.h
 -F:	drivers/dma-buf/dma-heap.c
 -F:	drivers/dma-buf/heaps/*
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:	Vinod Koul <vkoul@kernel.org>
@@@ -5301,8 -5272,8 +5301,8 @@@ F:	drivers/gpu/drm/panel/panel-feixin-k
  DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
  M:	Jagan Teki <jagan@amarulasolutions.com>
  S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 -F:	drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+ F:	Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
 +F:	drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
  DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
  M:	Hans de Goede <hdegoede@redhat.com>
@@@ -5441,18 -5412,18 +5441,18 @@@ S:	Orphan / Obsolet
  F:	drivers/gpu/drm/sis/
  F:	include/uapi/drm/sis_drm.h
  
 -DRM DRIVER FOR SITRONIX ST7701 PANELS
 -M:	Jagan Teki <jagan@amarulasolutions.com>
 -S:	Maintained
 -F:	drivers/gpu/drm/panel/panel-sitronix-st7701.c
 -F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 -
  DRM DRIVER FOR SITRONIX ST7586 PANELS
  M:	David Lechner <david@lechnology.com>
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
  S:	Maintained
 -F:	drivers/gpu/drm/tiny/st7586.c
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
  F:	Documentation/devicetree/bindings/display/sitronix,st7586.txt
 +F:	drivers/gpu/drm/tiny/st7586.c
 +
 +DRM DRIVER FOR SITRONIX ST7701 PANELS
 +M:	Jagan Teki <jagan@amarulasolutions.com>
 +S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
++F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 +F:	drivers/gpu/drm/panel/panel-sitronix-st7701.c
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
  M:	David Lechner <david@lechnology.com>

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2019-12-16  0:51 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2019-12-16  0:51 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sean Paul,
	Lyude Paul


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

Hi all,

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

  include/drm/drm_dp_mst_helper.h

between commit:

  14692a3637d4 ("drm/dp_mst: Add probe_lock")

from the Linus' tree and commit:

  f79489074c59 ("drm/dp_mst: Clear all payload id tables downstream when initializing")

from the drm-misc 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 include/drm/drm_dp_mst_helper.h
index d5fc90b30487,a448d701dc7e..000000000000
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@@ -565,18 -495,18 +566,25 @@@ struct drm_dp_mst_topology_mgr 
  	 */
  	struct mutex lock;
  
 +	/**
 +	 * @probe_lock: Prevents @work and @up_req_work, the only writers of
 +	 * &drm_dp_mst_port.mstb and &drm_dp_mst_branch.ports, from racing
 +	 * while they update the topology.
 +	 */
 +	struct mutex probe_lock;
 +
  	/**
- 	 * @mst_state: If this manager is enabled for an MST capable port. False
- 	 * if no MST sink/branch devices is connected.
+ 	 * @mst_state: If this manager is enabled for an MST capable port.
+ 	 * False if no MST sink/branch devices is connected.
  	 */
- 	bool mst_state;
+ 	bool mst_state : 1;
+ 
+ 	/**
+ 	 * @payload_id_table_cleared: Whether or not we've cleared the payload
+ 	 * ID table for @mst_primary. Protected by @lock.
+ 	 */
+ 	bool payload_id_table_cleared : 1;
+ 
  	/**
  	 * @mst_primary: Pointer to the primary/first branch device.
  	 */

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2019-12-16  0:46 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2019-12-16  0:46 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Sean Paul,
	Lyude Paul


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

Hi all,

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

  drivers/gpu/drm/drm_dp_mst_topology.c

between commit:

  14692a3637d4 ("drm/dp_mst: Add probe_lock")
  3f9b3f02dda5 ("drm/dp_mst: Protect drm_dp_mst_port members with locking")
  6f85f73821f6 ("drm/dp_mst: Add basic topology reprobing when resuming")

from Linus' tree and commits:

  f79489074c59 ("drm/dp_mst: Clear all payload id tables downstream when initializing")

from the drm-misc 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/drm_dp_mst_topology.c
index 273dd80fabf3,1770754bcd4a..000000000000
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@@ -74,8 -61,13 +74,13 @@@ static int drm_dp_send_dpcd_write(struc
  				  struct drm_dp_mst_port *port,
  				  int offset, int size, u8 *bytes);
  
 -static void drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
 -				     struct drm_dp_mst_branch *mstb);
 +static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
 +				    struct drm_dp_mst_branch *mstb);
+ 
+ static void
+ drm_dp_send_clear_payload_id_table(struct drm_dp_mst_topology_mgr *mgr,
+ 				   struct drm_dp_mst_branch *mstb);
+ 
  static int drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,
  					   struct drm_dp_mst_branch *mstb,
  					   struct drm_dp_mst_port *port);
@@@ -2515,15 -2179,15 +2533,19 @@@ static int drm_dp_check_and_send_link_a
  
  static void drm_dp_mst_link_probe_work(struct work_struct *work)
  {
 -	struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, work);
 +	struct drm_dp_mst_topology_mgr *mgr =
 +		container_of(work, struct drm_dp_mst_topology_mgr, work);
 +	struct drm_device *dev = mgr->dev;
  	struct drm_dp_mst_branch *mstb;
  	int ret;
+ 	bool clear_payload_id_table;
  
 +	mutex_lock(&mgr->probe_lock);
 +
  	mutex_lock(&mgr->lock);
+ 	clear_payload_id_table = !mgr->payload_id_table_cleared;
+ 	mgr->payload_id_table_cleared = true;
+ 
  	mstb = mgr->mst_primary;
  	if (mstb) {
  		ret = drm_dp_mst_topology_try_get_mstb(mstb);
@@@ -2531,17 -2195,24 +2553,30 @@@
  			mstb = NULL;
  	}
  	mutex_unlock(&mgr->lock);
 -	if (!mstb)
 +	if (!mstb) {
 +		mutex_unlock(&mgr->probe_lock);
  		return;
 +	}
  
+ 	/*
+ 	 * Certain branch devices seem to incorrectly report an available_pbn
+ 	 * of 0 on downstream sinks, even after clearing the
+ 	 * DP_PAYLOAD_ALLOCATE_* registers in
+ 	 * drm_dp_mst_topology_mgr_set_mst(). Namely, the CableMatters USB-C
+ 	 * 2x DP hub. Sending a CLEAR_PAYLOAD_ID_TABLE message seems to make
+ 	 * things work again.
+ 	 */
+ 	if (clear_payload_id_table) {
+ 		DRM_DEBUG_KMS("Clearing payload ID table\n");
+ 		drm_dp_send_clear_payload_id_table(mgr, mstb);
+ 	}
+ 
 -	drm_dp_check_and_send_link_address(mgr, mstb);
 +	ret = drm_dp_check_and_send_link_address(mgr, mstb);
  	drm_dp_mst_topology_put_mstb(mstb);
 +
 +	mutex_unlock(&mgr->probe_lock);
 +	if (ret)
 +		drm_kms_helper_hotplug_event(dev);
  }
  
  static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr,
@@@ -2856,9 -2503,30 +2891,31 @@@ out
  	if (ret <= 0)
  		mstb->link_address_sent = false;
  	kfree(txmsg);
 +	return ret < 0 ? ret : changed;
  }
  
+ void drm_dp_send_clear_payload_id_table(struct drm_dp_mst_topology_mgr *mgr,
+ 					struct drm_dp_mst_branch *mstb)
+ {
+ 	struct drm_dp_sideband_msg_tx *txmsg;
+ 	int len, ret;
+ 
+ 	txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ 	if (!txmsg)
+ 		return;
+ 
+ 	txmsg->dst = mstb;
+ 	len = build_clear_payload_id_table(txmsg);
+ 
+ 	drm_dp_queue_down_tx(mgr, txmsg);
+ 
+ 	ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);
+ 	if (ret > 0 && txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK)
+ 		DRM_DEBUG_KMS("clear payload table id nak received\n");
+ 
+ 	kfree(txmsg);
+ }
+ 
  static int
  drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,
  				struct drm_dp_mst_branch *mstb,

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-23 16:10   ` Rob Herring
@ 2019-05-24  7:12     ` Maxime Ripard
  0 siblings, 0 replies; 37+ messages in thread
From: Maxime Ripard @ 2019-05-24  7:12 UTC (permalink / raw)
  To: Rob Herring
  Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, Marco Felsch,
	Jyri Sarha, Linux Kernel Mailing List, Linux Next Mailing List,
	DRI, Thierry Reding

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

On Thu, May 23, 2019 at 11:10:39AM -0500, Rob Herring wrote:
> On Thu, May 23, 2019 at 6:54 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the drm-misc tree got a conflict in:
> > >
> > >   Documentation/devicetree/bindings/vendor-prefixes.txt
> > >
> > > between commit:
> > >
> > >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> > >
> > > from Linus' tree and commits:
> > >
> > >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> > >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
> > >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> > >
> > > from the drm-misc tree.
> > >
> > > I fixed it up (I deleted the file and added the 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.
> >
> > I just took your patch and pushed a temp branch there:
> > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
> >
> > Rob, Stephen, are you ok with the change? If so, I'll push it.
>
> The 'tfc' line is missing a ':' on the end.

That's on me, sorry.

> Does the file pass dt_binding_check like that?

No, it didn't but I overlooked it somehow. I've pushed that patch with
the extra semi-column.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

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

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-23 11:53 ` Maxime Ripard
  2019-05-23 13:04   ` Stephen Rothwell
@ 2019-05-23 16:10   ` Rob Herring
  2019-05-24  7:12     ` Maxime Ripard
  1 sibling, 1 reply; 37+ messages in thread
From: Rob Herring @ 2019-05-23 16:10 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, Marco Felsch,
	Jyri Sarha, Linux Kernel Mailing List, Linux Next Mailing List,
	DRI, Thierry Reding

On Thu, May 23, 2019 at 6:54 AM Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
> >
> >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> >
> > from Linus' tree and commits:
> >
> >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
> >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> >
> > from the drm-misc tree.
> >
> > I fixed it up (I deleted the file and added the 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.
>
> I just took your patch and pushed a temp branch there:
> https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
>
> Rob, Stephen, are you ok with the change? If so, I'll push it.

The 'tfc' line is missing a ':' on the end. Does the file pass
dt_binding_check like that?

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-23 13:11     ` Daniel Vetter
@ 2019-05-23 14:16       ` Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2019-05-23 14:16 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: Maxime Ripard, Intel Graphics, Linux Kernel Mailing List,
	Jyri Sarha, Marco Felsch, Linux Next Mailing List, Sean Paul,
	DRI, Thierry Reding

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

Hi Daniel,

On Thu, 23 May 2019 15:11:15 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> That commit is on top of drm-misc, and somehow the .txt version has
> been resurrect in drm-misc-next (so needs to be re-deleted too).

My mistake, the conflict went away (due to the back merge) so my
scripts assumed the file no longer needed deleting.  I didn't actually
check to see if it was still there.

-- 
Cheers,
Stephen Rothwell

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

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

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-23 13:04   ` Stephen Rothwell
@ 2019-05-23 13:11     ` Daniel Vetter
  2019-05-23 14:16       ` Stephen Rothwell
  0 siblings, 1 reply; 37+ messages in thread
From: Daniel Vetter @ 2019-05-23 13:11 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Maxime Ripard, Intel Graphics, DRI, Linux Kernel Mailing List,
	Jyri Sarha, Marco Felsch, Linux Next Mailing List,
	Thierry Reding, Sean Paul

On Thu, May 23, 2019 at 3:04 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Maxime,
>
> On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard <maxime.ripard@bootlin.com> wrote:
> >
> > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the drm-misc tree got a conflict in:
> > >
> > >   Documentation/devicetree/bindings/vendor-prefixes.txt
> > >
> > > between commit:
> > >
> > >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> > >
> > > from Linus' tree and commits:
> > >
> > >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> > >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
> > >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> > >
> > > from the drm-misc tree.
> >
> > I just took your patch and pushed a temp branch there:
> > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
> >
> > Rob, Stephen, are you ok with the change? If so, I'll push it.
>
> All that needs to be done is for my patch (slightly corrected) needs to
> be applied to the drm-misc tree.  That tree already has the back merge
> of Linus' tree and the txt file has been removed (my patch should have
> been applied as part of the merge resolution but doing it later is fine).

That commit is on top of drm-misc, and somehow the .txt version has
been resurrect in drm-misc-next (so needs to be re-deleted too).
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-23 11:53 ` Maxime Ripard
@ 2019-05-23 13:04   ` Stephen Rothwell
  2019-05-23 13:11     ` Daniel Vetter
  2019-05-23 16:10   ` Rob Herring
  1 sibling, 1 reply; 37+ messages in thread
From: Stephen Rothwell @ 2019-05-23 13:04 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
	Jyri Sarha, Marco Felsch, Linux Next Mailing List,
	Thierry Reding, Sean Paul


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

Hi Maxime,

On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
> >
> >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> >
> > from Linus' tree and commits:
> >
> >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
> >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> >
> > from the drm-misc tree.
> 
> I just took your patch and pushed a temp branch there:
> https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
> 
> Rob, Stephen, are you ok with the change? If so, I'll push it.

All that needs to be done is for my patch (slightly corrected) needs to
be applied to the drm-misc tree.  That tree already has the back merge
of Linus' tree and the txt file has been removed (my patch should have
been applied as part of the merge resolution but doing it later is fine).

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-21  0:51 Stephen Rothwell
  2019-05-23  0:27 ` Stephen Rothwell
  2019-05-23  8:10 ` Maxime Ripard
@ 2019-05-23 11:53 ` Maxime Ripard
  2019-05-23 13:04   ` Stephen Rothwell
  2019-05-23 16:10   ` Rob Herring
  2 siblings, 2 replies; 37+ messages in thread
From: Maxime Ripard @ 2019-05-23 11:53 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List,
	Jyri Sarha, Marco Felsch, Linux Next Mailing List, DRI,
	Thierry Reding

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

On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
>   Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
>   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
>
> from Linus' tree and commits:
>
>   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
>   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
>   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
>
> from the drm-misc tree.
>
> I fixed it up (I deleted the file and added the 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.

I just took your patch and pushed a temp branch there:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next&id=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90

Rob, Stephen, are you ok with the change? If so, I'll push it.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-23  8:10 ` Maxime Ripard
@ 2019-05-23  9:34   ` Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2019-05-23  9:34 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
	Jyri Sarha, Marco Felsch, Linux Next Mailing List,
	Thierry Reding, Sean Paul


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

Hi Maxime,

On Thu, 23 May 2019 10:10:22 +0200 Maxime Ripard <maxime.ripard@bootlin.com> wrote:
>
> Hi Stephen,
> 
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
> >
> >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> >
> > from Linus' tree and commits:
> >
> >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
> >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> >
> > from the drm-misc tree.
> >
> > I fixed it up (I deleted the file and added the 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.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 21 May 2019 10:48:36 +1000
> > Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > index 83ca4816a78b..749e3c3843d0 100644
> > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > @@ -287,6 +287,8 @@ patternProperties:
> >      description: Everest Semiconductor Co. Ltd.
> >    "^everspin,.*":
> >      description: Everspin Technologies, Inc.
> > +  "^evervision,.*":
> > +    description: Evervision Electronics Co. Ltd.
> >    "^exar,.*":
> >      description: Exar Corporation
> >    "^excito,.*":
> > @@ -851,6 +853,8 @@ patternProperties:
> >      description: Shenzhen Techstar Electronics Co., Ltd.
> >    "^terasic,.*":
> >      description: Terasic Inc.
> > +  "^tfc,.*":
> > +    description: Three Five Corp
> >    "^thine,.*":
> >      description: THine Electronics, Inc.
> >    "^ti,.*":
> > @@ -925,6 +929,8 @@ patternProperties:
> >      description: Voipac Technologies s.r.o.
> >    "^vot,.*":
> >      description: Vision Optical Technology Co., Ltd.
> > +  "^vxt,.*"
> > +    description: VXT Ltd  
> 
> I'm not sure whether or not you can change it, but this breaks the
> users of that file.
> 
> What you want is:
> 
> - "^vxt,.*"
> + "^vxt,.*:"

I have fixed my version (but I put the ':' after the '"' like the
others).

Thanks for letting me know.
-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-21  0:51 Stephen Rothwell
  2019-05-23  0:27 ` Stephen Rothwell
@ 2019-05-23  8:10 ` Maxime Ripard
  2019-05-23  9:34   ` Stephen Rothwell
  2019-05-23 11:53 ` Maxime Ripard
  2 siblings, 1 reply; 37+ messages in thread
From: Maxime Ripard @ 2019-05-23  8:10 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
	Jyri Sarha, Marco Felsch, Linux Next Mailing List,
	Thierry Reding


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

Hi Stephen,

On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
>   Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
>   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
>
> from Linus' tree and commits:
>
>   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
>   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
>   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
>
> from the drm-misc tree.
>
> I fixed it up (I deleted the file and added the 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 21 May 2019 10:48:36 +1000
> Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 83ca4816a78b..749e3c3843d0 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -287,6 +287,8 @@ patternProperties:
>      description: Everest Semiconductor Co. Ltd.
>    "^everspin,.*":
>      description: Everspin Technologies, Inc.
> +  "^evervision,.*":
> +    description: Evervision Electronics Co. Ltd.
>    "^exar,.*":
>      description: Exar Corporation
>    "^excito,.*":
> @@ -851,6 +853,8 @@ patternProperties:
>      description: Shenzhen Techstar Electronics Co., Ltd.
>    "^terasic,.*":
>      description: Terasic Inc.
> +  "^tfc,.*":
> +    description: Three Five Corp
>    "^thine,.*":
>      description: THine Electronics, Inc.
>    "^ti,.*":
> @@ -925,6 +929,8 @@ patternProperties:
>      description: Voipac Technologies s.r.o.
>    "^vot,.*":
>      description: Vision Optical Technology Co., Ltd.
> +  "^vxt,.*"
> +    description: VXT Ltd

I'm not sure whether or not you can change it, but this breaks the
users of that file.

What you want is:

- "^vxt,.*"
+ "^vxt,.*:"

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2019-05-21  0:51 Stephen Rothwell
@ 2019-05-23  0:27 ` Stephen Rothwell
  2019-05-23  8:10 ` Maxime Ripard
  2019-05-23 11:53 ` Maxime Ripard
  2 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2019-05-23  0:27 UTC (permalink / raw)
  To: Sean Paul
  Cc: Daniel Vetter, Intel Graphics, DRI, Linux Next Mailing List,
	Linux Kernel Mailing List, Rob Herring, Fabio Estevam,
	Thierry Reding, Jyri Sarha, Marco Felsch


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

Hi Sean,

On Tue, 21 May 2019 10:51:51 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   Documentation/devicetree/bindings/vendor-prefixes.txt
> 
> between commit:
> 
>   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> 
> from Linus' tree and commits:
> 
>   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
>   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
>   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> 
> from the drm-misc tree.
> 
> I fixed it up (I deleted the file and added the 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 21 May 2019 10:48:36 +1000
> Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 83ca4816a78b..749e3c3843d0 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -287,6 +287,8 @@ patternProperties:
>      description: Everest Semiconductor Co. Ltd.
>    "^everspin,.*":
>      description: Everspin Technologies, Inc.
> +  "^evervision,.*":
> +    description: Evervision Electronics Co. Ltd.
>    "^exar,.*":
>      description: Exar Corporation
>    "^excito,.*":
> @@ -851,6 +853,8 @@ patternProperties:
>      description: Shenzhen Techstar Electronics Co., Ltd.
>    "^terasic,.*":
>      description: Terasic Inc.
> +  "^tfc,.*":
> +    description: Three Five Corp
>    "^thine,.*":
>      description: THine Electronics, Inc.
>    "^ti,.*":
> @@ -925,6 +929,8 @@ patternProperties:
>      description: Voipac Technologies s.r.o.
>    "^vot,.*":
>      description: Vision Optical Technology Co., Ltd.
> +  "^vxt,.*"
> +    description: VXT Ltd
>    "^wd,.*":
>      description: Western Digital Corp.
>    "^wetek,.*":
> -- 
> 2.20.1

In doing a back merge of Linus' tree into the drm-misc tree, you seem
to have missed the above merge fixup and so lost some of the changes
from the above commits.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2019-05-21  0:51 Stephen Rothwell
  2019-05-23  0:27 ` Stephen Rothwell
                   ` (2 more replies)
  0 siblings, 3 replies; 37+ messages in thread
From: Stephen Rothwell @ 2019-05-21  0:51 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Rob Herring,
	Fabio Estevam, Thierry Reding, Jyri Sarha, Marco Felsch


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

Hi all,

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

  Documentation/devicetree/bindings/vendor-prefixes.txt

between commit:

  8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")

from Linus' tree and commits:

  b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
  b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC S9700RTWV43TR-01B")
  fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")

from the drm-misc tree.

I fixed it up (I deleted the file and added the 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.

-- 
Cheers,
Stephen Rothwell

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 21 May 2019 10:48:36 +1000
Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 83ca4816a78b..749e3c3843d0 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -287,6 +287,8 @@ patternProperties:
     description: Everest Semiconductor Co. Ltd.
   "^everspin,.*":
     description: Everspin Technologies, Inc.
+  "^evervision,.*":
+    description: Evervision Electronics Co. Ltd.
   "^exar,.*":
     description: Exar Corporation
   "^excito,.*":
@@ -851,6 +853,8 @@ patternProperties:
     description: Shenzhen Techstar Electronics Co., Ltd.
   "^terasic,.*":
     description: Terasic Inc.
+  "^tfc,.*":
+    description: Three Five Corp
   "^thine,.*":
     description: THine Electronics, Inc.
   "^ti,.*":
@@ -925,6 +929,8 @@ patternProperties:
     description: Voipac Technologies s.r.o.
   "^vot,.*":
     description: Vision Optical Technology Co., Ltd.
+  "^vxt,.*"
+    description: VXT Ltd
   "^wd,.*":
     description: Western Digital Corp.
   "^wetek,.*":
-- 
2.20.1

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2019-01-11  0:14 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2019-01-11  0:14 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Sebastian Reichel, Tomi Valkeinen, Ville Syrjälä


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

Hi all,

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

  drivers/gpu/drm/omapdrm/omap_encoder.c

between commit:

  3c613a3bddd3 ("drm/omap: fix incorrect union usage")

from Linus' tree and commit:

  13d0add333af ("drm/edid: Pass connector to AVI infoframe functions")

from the drm-misc 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/omapdrm/omap_encoder.c
index 933ebc9f9faa,4566e0a75cb8..000000000000
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@@ -52,37 -52,6 +52,37 @@@ static const struct drm_encoder_funcs o
  	.destroy = omap_encoder_destroy,
  };
  
 +static void omap_encoder_hdmi_mode_set(struct drm_encoder *encoder,
 +				       struct drm_display_mode *adjusted_mode)
 +{
 +	struct drm_device *dev = encoder->dev;
 +	struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
 +	struct omap_dss_device *dssdev = omap_encoder->output;
 +	struct drm_connector *connector;
 +	bool hdmi_mode;
 +
 +	hdmi_mode = false;
 +	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
 +		if (connector->encoder == encoder) {
 +			hdmi_mode = omap_connector_get_hdmi_mode(connector);
 +			break;
 +		}
 +	}
 +
 +	if (dssdev->ops->hdmi.set_hdmi_mode)
 +		dssdev->ops->hdmi.set_hdmi_mode(dssdev, hdmi_mode);
 +
 +	if (hdmi_mode && dssdev->ops->hdmi.set_infoframe) {
 +		struct hdmi_avi_infoframe avi;
 +		int r;
 +
- 		r = drm_hdmi_avi_infoframe_from_display_mode(&avi, adjusted_mode,
- 							     false);
++		r = drm_hdmi_avi_infoframe_from_display_mode(&avi, connector,
++							     adjusted_mode);
 +		if (r == 0)
 +			dssdev->ops->hdmi.set_infoframe(dssdev, &avi);
 +	}
 +}
 +
  static void omap_encoder_mode_set(struct drm_encoder *encoder,
  				  struct drm_display_mode *mode,
  				  struct drm_display_mode *adjusted_mode)

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

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2018-03-15  3:14 Stephen Rothwell
@ 2018-03-23  0:45 ` Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2018-03-23  0:45 UTC (permalink / raw)
  To: DRI, Dave Airlie
  Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List,
	Hans de Goede, Linux-Next Mailing List

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

Hi all,

On Thu, 15 Mar 2018 14:14:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   sound/pci/hda/hda_intel.c
> 
> between commits:
> 
>   1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist")
>   40088dc4e1ea ("ALSA: hda - Revert power_save option default value")
> 
> from Linus' tree and commit:
> 
>   07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller")
> 
> from the drm-misc 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 sound/pci/hda/hda_intel.c
> index d5017adf9feb,ec4e6b829ee2..000000000000
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@@ -2219,8 -2201,8 +2223,9 @@@ static int azx_probe_continue(struct az
>   	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
>   	struct hdac_bus *bus = azx_bus(chip);
>   	struct pci_dev *pci = chip->pci;
> + 	struct hda_codec *codec;
>   	int dev = chip->dev_index;
>  +	int val;
>   	int err;
>   
>   	hda->probe_continued = 1;
> @@@ -2302,21 -2284,16 +2307,30 @@@
>   	chip->running = 1;
>   	azx_add_card_list(chip);
>   
>  +	val = power_save;
>  +#ifdef CONFIG_PM
>  +	if (pm_blacklist) {
>  +		const struct snd_pci_quirk *q;
>  +
>  +		q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);
>  +		if (q && val) {
>  +			dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n",
>  +				 q->subvendor, q->subdevice);
>  +			val = 0;
>  +		}
>  +	}
>  +#endif /* CONFIG_PM */
> ++
> + 	/*
> + 	 * The discrete GPU cannot power down unless the HDA controller runtime
> + 	 * suspends, so activate runtime PM on codecs even if power_save == 0.
> + 	 */
> + 	if (use_vga_switcheroo(hda))
> + 		list_for_each_codec(codec, &chip->bus)
> + 			codec->auto_runtime_pm = 1;
> + 
>  -	snd_hda_set_power_save(&chip->bus, power_save * 1000);
>  +	snd_hda_set_power_save(&chip->bus, val * 1000);
> - 	if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo)
> + 	if (azx_has_pm_runtime(chip))
>   		pm_runtime_put_autosuspend(&pci->dev);
>   
>   out_free:

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

-- 
Cheers,
Stephen Rothwell

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

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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2018-03-20  1:08 Stephen Rothwell
@ 2018-03-23  0:43 ` Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2018-03-23  0:43 UTC (permalink / raw)
  To: DRI, Dave Airlie
  Cc: Maxime Ripard, Daniel Vetter, Intel Graphics,
	Linux Kernel Mailing List, Chen-Yu Tsai, Linux-Next Mailing List

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

Hi all,

On Tue, 20 Mar 2018 12:08:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/sun4i/sun4i_tcon.h
> 
> between commit:
> 
>   e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit")
> 
> from Linus' tree and commit:
> 
>   6664e9dc5383 ("drm/sun4i: Add support for A80 TCONs")
> 
> from the drm-misc 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/sun4i/sun4i_tcon.h
> index abdc6ad6b384,d3a945b7bb60..000000000000
> --- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
> +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
> @@@ -176,7 -176,7 +176,8 @@@ struct sun4i_tcon_quirks 
>   	bool	has_channel_1;	/* a33 does not have channel 1 */
>   	bool	has_lvds_alt;	/* Does the LVDS clock have a parent other than the TCON clock? */
>   	bool	needs_de_be_mux; /* sun6i needs mux to select backend */
>  +	bool	supports_lvds;   /* Does the TCON support an LVDS output? */
> + 	bool    needs_edp_reset; /* a80 edp reset needed for tcon0 access */
>   
>   	/* callback to handle tcon muxing options */
>   	int	(*set_mux)(struct sun4i_tcon *, const struct drm_encoder *);

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

-- 
Cheers,
Stephen Rothwell

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

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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2018-03-20  1:08 Stephen Rothwell
  2018-03-23  0:43 ` Stephen Rothwell
  0 siblings, 1 reply; 37+ messages in thread
From: Stephen Rothwell @ 2018-03-20  1:08 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Chen-Yu Tsai,
	Maxime Ripard


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

Hi all,

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

  drivers/gpu/drm/sun4i/sun4i_tcon.h

between commit:

  e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit")

from Linus' tree and commit:

  6664e9dc5383 ("drm/sun4i: Add support for A80 TCONs")

from the drm-misc 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/sun4i/sun4i_tcon.h
index abdc6ad6b384,d3a945b7bb60..000000000000
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
+++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
@@@ -176,7 -176,7 +176,8 @@@ struct sun4i_tcon_quirks 
  	bool	has_channel_1;	/* a33 does not have channel 1 */
  	bool	has_lvds_alt;	/* Does the LVDS clock have a parent other than the TCON clock? */
  	bool	needs_de_be_mux; /* sun6i needs mux to select backend */
 +	bool	supports_lvds;   /* Does the TCON support an LVDS output? */
+ 	bool    needs_edp_reset; /* a80 edp reset needed for tcon0 access */
  
  	/* callback to handle tcon muxing options */
  	int	(*set_mux)(struct sun4i_tcon *, const struct drm_encoder *);

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

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2018-03-15  3:14 Stephen Rothwell
  2018-03-23  0:45 ` Stephen Rothwell
  0 siblings, 1 reply; 37+ messages in thread
From: Stephen Rothwell @ 2018-03-15  3:14 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Hans de Goede, Linux-Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

  sound/pci/hda/hda_intel.c

between commits:

  1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist")
  40088dc4e1ea ("ALSA: hda - Revert power_save option default value")

from Linus' tree and commit:

  07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller")

from the drm-misc 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 sound/pci/hda/hda_intel.c
index d5017adf9feb,ec4e6b829ee2..000000000000
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -2219,8 -2201,8 +2223,9 @@@ static int azx_probe_continue(struct az
  	struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
  	struct hdac_bus *bus = azx_bus(chip);
  	struct pci_dev *pci = chip->pci;
+ 	struct hda_codec *codec;
  	int dev = chip->dev_index;
 +	int val;
  	int err;
  
  	hda->probe_continued = 1;
@@@ -2302,21 -2284,16 +2307,30 @@@
  	chip->running = 1;
  	azx_add_card_list(chip);
  
 +	val = power_save;
 +#ifdef CONFIG_PM
 +	if (pm_blacklist) {
 +		const struct snd_pci_quirk *q;
 +
 +		q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);
 +		if (q && val) {
 +			dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n",
 +				 q->subvendor, q->subdevice);
 +			val = 0;
 +		}
 +	}
 +#endif /* CONFIG_PM */
++
+ 	/*
+ 	 * The discrete GPU cannot power down unless the HDA controller runtime
+ 	 * suspends, so activate runtime PM on codecs even if power_save == 0.
+ 	 */
+ 	if (use_vga_switcheroo(hda))
+ 		list_for_each_codec(codec, &chip->bus)
+ 			codec->auto_runtime_pm = 1;
+ 
 -	snd_hda_set_power_save(&chip->bus, power_save * 1000);
 +	snd_hda_set_power_save(&chip->bus, val * 1000);
- 	if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo)
+ 	if (azx_has_pm_runtime(chip))
  		pm_runtime_put_autosuspend(&pci->dev);
  
  out_free:

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

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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2017-09-22  2:24 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2017-09-22  2:24 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Maarten Lankhorst, Chris Wilson

Hi all,

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

  drivers/gpu/drm/i915/intel_display.c

between commit:

  fd70075f82b7 ("drm/i915: Trim struct_mutex usage for kms")

from Linus' tree and commits:

  21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.")
  669c9215afea ("drm/atomic: Make async plane update checks work as intended, v2.")

from the drm-misc tree.

I fixed it up (I basically used the latter version of the changes to
intel_legacy_cursor_update()) 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] 37+ messages in thread

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2017-08-02  2:23 Stephen Rothwell
@ 2017-08-10  2:06 ` Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2017-08-10  2:06 UTC (permalink / raw)
  To: Dave Airlie
  Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI,
	Linux-Next Mailing List, Ben Skeggs

Hi Dave,

On Wed, 2 Aug 2017 12:23:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/nouveau/nv50_display.c
> 
> between commit:
> 
>   4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to modeset actions")
> 
> from Linus' tree and commit:
> 
>   3c847d6cdadb ("drm/nouveau: Convert nouveau to use new iterator macros, v2.")
> 
> from the drm-misc 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/nouveau/nv50_display.c
> index 9d40b2a8be4d,bd1199b67eb4..000000000000
> --- a/drivers/gpu/drm/nouveau/nv50_display.c
> +++ b/drivers/gpu/drm/nouveau/nv50_display.c
> @@@ -3941,8 -3933,6 +3942,8 @@@ nv50_disp_atomic_commit_tail(struct drm
>   
>   		NV_ATOMIC(drm, "%s: clr %04x (set %04x)\n", crtc->name,
>   			  asyh->clr.mask, asyh->set.mask);
> - 		if (crtc_state->active && !asyh->state.active)
> ++		if (new_crtc_state->active && !asyh->state.active)
>  +			drm_crtc_vblank_off(crtc);
>   
>   		if (asyh->clr.mask) {
>   			nv50_head_flush_clr(head, asyh, atom->flush_disable);
> @@@ -4028,13 -4018,11 +4029,13 @@@
>   			nv50_head_flush_set(head, asyh);
>   			interlock_core = 1;
>   		}
>  -	}
>   
>  -	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
>  -		if (new_crtc_state->event)
>  -			drm_crtc_vblank_get(crtc);
>  +		if (asyh->state.active) {
> - 			if (!crtc_state->active)
> ++			if (!new_crtc_state->active)
>  +				drm_crtc_vblank_on(crtc);
>  +			if (asyh->state.event)
>  +				drm_crtc_vblank_get(crtc);
>  +		}
>   	}
>   
>   	/* Update plane(s). */
> @@@ -4077,18 -4065,16 +4078,18 @@@
>   			NV_ERROR(drm, "%s: timeout\n", plane->name);
>   	}
>   
> - 	for_each_crtc_in_state(state, crtc, crtc_state, i) {
> - 		if (crtc->state->event) {
> + 	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
> + 		if (new_crtc_state->event) {
>   			unsigned long flags;
>   			/* Get correct count/ts if racing with vblank irq */
>  -			drm_crtc_accurate_vblank_count(crtc);
>  +			if (crtc->state->active)
>  +				drm_crtc_accurate_vblank_count(crtc);
>   			spin_lock_irqsave(&crtc->dev->event_lock, flags);
> - 			drm_crtc_send_vblank_event(crtc, crtc->state->event);
> + 			drm_crtc_send_vblank_event(crtc, new_crtc_state->event);
>   			spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
> - 			crtc->state->event = NULL;
> + 			new_crtc_state->event = NULL;
>  -			drm_crtc_vblank_put(crtc);
>  +			if (crtc->state->active)
>  +				drm_crtc_vblank_put(crtc);
>   		}
>   	}
>   

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

-- 
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2017-08-02  2:23 Stephen Rothwell
  2017-08-10  2:06 ` Stephen Rothwell
  0 siblings, 1 reply; 37+ messages in thread
From: Stephen Rothwell @ 2017-08-02  2:23 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Ben Skeggs

Hi all,

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

  drivers/gpu/drm/nouveau/nv50_display.c

between commit:

  4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to modeset actions")

from Linus' tree and commit:

  3c847d6cdadb ("drm/nouveau: Convert nouveau to use new iterator macros, v2.")

from the drm-misc 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/nouveau/nv50_display.c
index 9d40b2a8be4d,bd1199b67eb4..000000000000
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@@ -3941,8 -3933,6 +3942,8 @@@ nv50_disp_atomic_commit_tail(struct drm
  
  		NV_ATOMIC(drm, "%s: clr %04x (set %04x)\n", crtc->name,
  			  asyh->clr.mask, asyh->set.mask);
- 		if (crtc_state->active && !asyh->state.active)
++		if (new_crtc_state->active && !asyh->state.active)
 +			drm_crtc_vblank_off(crtc);
  
  		if (asyh->clr.mask) {
  			nv50_head_flush_clr(head, asyh, atom->flush_disable);
@@@ -4028,13 -4018,11 +4029,13 @@@
  			nv50_head_flush_set(head, asyh);
  			interlock_core = 1;
  		}
 -	}
  
 -	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
 -		if (new_crtc_state->event)
 -			drm_crtc_vblank_get(crtc);
 +		if (asyh->state.active) {
- 			if (!crtc_state->active)
++			if (!new_crtc_state->active)
 +				drm_crtc_vblank_on(crtc);
 +			if (asyh->state.event)
 +				drm_crtc_vblank_get(crtc);
 +		}
  	}
  
  	/* Update plane(s). */
@@@ -4077,18 -4065,16 +4078,18 @@@
  			NV_ERROR(drm, "%s: timeout\n", plane->name);
  	}
  
- 	for_each_crtc_in_state(state, crtc, crtc_state, i) {
- 		if (crtc->state->event) {
+ 	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+ 		if (new_crtc_state->event) {
  			unsigned long flags;
  			/* Get correct count/ts if racing with vblank irq */
 -			drm_crtc_accurate_vblank_count(crtc);
 +			if (crtc->state->active)
 +				drm_crtc_accurate_vblank_count(crtc);
  			spin_lock_irqsave(&crtc->dev->event_lock, flags);
- 			drm_crtc_send_vblank_event(crtc, crtc->state->event);
+ 			drm_crtc_send_vblank_event(crtc, new_crtc_state->event);
  			spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
- 			crtc->state->event = NULL;
+ 			new_crtc_state->event = NULL;
 -			drm_crtc_vblank_put(crtc);
 +			if (crtc->state->active)
 +				drm_crtc_vblank_put(crtc);
  		}
  	}
  
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2017-07-19  1:30 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2017-07-19  1:30 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Rodrigo Vivi,
	Navare, Manasi D, Jani Nikula

Hi all,

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

  drivers/gpu/drm/i915/i915_reg.h

between commit:

  c379b897ba1a ("drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming")

from Linus' tree and commit:

  5a8dd2af31a7 ("drm/i915/cnl: Fix RMW on ddi vswing sequence.")
(which is also commit 33b92c1e1f27 in Linus' tree)

from the drm-misc tree.

I fixed it up (I just used the version from Linus' 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] 37+ messages in thread

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2016-09-23  1:35 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2016-09-23  1:35 UTC (permalink / raw)
  To: Daniel Vetter, Intel Graphics, DRI
  Cc: linux-next, linux-kernel, Dave Airlie, Sean Paul

Hi all,

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

  drivers/gpu/drm/drm_crtc.c

between commit:

  6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET")

from Linus' tree and commit:

  43968d7b806d ("drm: Extract drm_plane.[hc]")

from the drm-misc tree.

I fixed it up (the latter incorporated the former, so I just used 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] 37+ messages in thread

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2016-06-07  1:32 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2016-06-07  1:32 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, Gustavo Padovan, linux-kernel, Sumit Semwal

Hi all,

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

  Documentation/DocBook/device-drivers.tmpl

between commit:

  eae1760fc838 ("doc: update/fixup dma-buf related DocBook")

from Linus' tree and commit:

  ddac4b5a6c08 ("Documentation: add fence-array to kernel DocBook")

from the drm-misc 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 Documentation/DocBook/device-drivers.tmpl
index 8c68768ebee5,5744ec7d2d30..000000000000
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@@ -128,44 -128,18 +128,46 @@@ X!Edrivers/base/interface.
  !Edrivers/base/platform.c
  !Edrivers/base/bus.c
       </sect1>
 -     <sect1><title>Device Drivers DMA Management</title>
 +     <sect1>
 +       <title>Buffer Sharing and Synchronization</title>
 +       <para>
 +         The dma-buf subsystem provides the framework for sharing buffers
 +         for hardware (DMA) access across multiple device drivers and
 +         subsystems, and for synchronizing asynchronous hardware access.
 +       </para>
 +       <para>
 +         This is used, for example, by drm "prime" multi-GPU support, but
 +         is of course not limited to GPU use cases.
 +       </para>
 +       <para>
 +         The three main components of this are: (1) dma-buf, representing
 +         a sg_table and exposed to userspace as a file descriptor to allow
 +         passing between devices, (2) fence, which provides a mechanism
 +         to signal when one device as finished access, and (3) reservation,
 +         which manages the shared or exclusive fence(s) associated with
 +         the buffer.
 +       </para>
 +       <sect2><title>dma-buf</title>
  !Edrivers/dma-buf/dma-buf.c
 +!Iinclude/linux/dma-buf.h
 +       </sect2>
 +       <sect2><title>reservation</title>
 +!Pdrivers/dma-buf/reservation.c Reservation Object Overview
 +!Edrivers/dma-buf/reservation.c
 +!Iinclude/linux/reservation.h
 +       </sect2>
 +       <sect2><title>fence</title>
  !Edrivers/dma-buf/fence.c
 -!Edrivers/dma-buf/seqno-fence.c
 -!Edrivers/dma-buf/fence-array.c
  !Iinclude/linux/fence.h
 +!Edrivers/dma-buf/seqno-fence.c
  !Iinclude/linux/seqno-fence.h
++!Edrivers/dma-buf/fence-array.c
+ !Iinclude/linux/fence-array.h
 -!Edrivers/dma-buf/reservation.c
 -!Iinclude/linux/reservation.h
  !Edrivers/dma-buf/sync_file.c
  !Iinclude/linux/sync_file.h
 +       </sect2>
 +     </sect1>
 +     <sect1><title>Device Drivers DMA Management</title>
  !Edrivers/base/dma-coherent.c
  !Edrivers/base/dma-mapping.c
       </sect1>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2016-03-31  0:15 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2016-03-31  0:15 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Christian König, Alex Deucher

Hi all,

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

  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

between commit:

  257bf15a4b97 ("drm/amdgpu: add slap cache for sync objects as well")

from Linus' tree and commit:

  44debe7a123c ("vgacon: dummy implementation for vgacon_text_force")

from the drm-misc 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/amd/amdgpu/amdgpu_drv.c
index f1e17d60055a,fba20bd59cfa..000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@@ -555,8 -539,6 +555,7 @@@ static struct pci_driver amdgpu_kms_pci
  
  static int __init amdgpu_init(void)
  {
 +	amdgpu_sync_init();
- #ifdef CONFIG_VGA_CONSOLE
  	if (vgacon_text_force()) {
  		DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
  		return -EINVAL;

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2016-03-29 23:49 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2016-03-29 23:49 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Maarten Lankhorst, Dave Airlie, Alexey Brodkin

Hi all,

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

  include/drm/drm_crtc.h

between commit:

  5fff80bbdb6b ("drm/atomic: Allow for holes in connector state, v2.")

from Linus' tree and commit:

  6c87e5c3ec6d ("drm: Rename drm_connector_unplug_all() to drm_connector_unregister_all()")

from the drm-misc 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 include/drm/drm_crtc.h
index e0170bf80bb0,12f2bd4cf38a..000000000000
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@@ -2254,13 -2252,9 +2254,13 @@@ int drm_connector_register(struct drm_c
  void drm_connector_unregister(struct drm_connector *connector);
  
  extern void drm_connector_cleanup(struct drm_connector *connector);
 -extern unsigned int drm_connector_index(struct drm_connector *connector);
 +static inline unsigned drm_connector_index(struct drm_connector *connector)
 +{
 +	return connector->connector_id;
 +}
 +
- /* helper to unplug all connectors from sysfs for device */
- extern void drm_connector_unplug_all(struct drm_device *dev);
+ /* helper to unregister all connectors from sysfs for device */
+ extern void drm_connector_unregister_all(struct drm_device *dev);
  
  extern int drm_bridge_add(struct drm_bridge *bridge);
  extern void drm_bridge_remove(struct drm_bridge *bridge);

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2015-12-16  0:38 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2015-12-16  0:38 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Thomas Hellstrom,
	Ville Syrjälä,
	Thierry Reding, Boris Brezillon

Hi all,

Today's linux-next merge of the drm-misc tree got conflicts in:

  drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
  drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
  drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

between commit:

  8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2")

from Linus' tree and commit:

  d7955fcff889 ("drm/vmwgfx: Constify function pointer structs")

from the drm-misc 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/vmwgfx/vmwgfx_ldu.c
index 78693a0a598c,2def684e61a4..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@@ -294,8 -294,8 +294,8 @@@ static int vmw_ldu_crtc_set_config(stru
  	return vmw_ldu_commit_list(dev_priv);
  }
  
- static struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
+ static const struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_ldu_crtc_destroy,
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 7ba5a00b3b68,ecac70af032a..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@@ -530,8 -530,8 +530,8 @@@ out_no_fence
  	return ret;
  }
  
- static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
+ static const struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_sou_crtc_destroy,
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index 58c38e7723d8,87fc00af8d28..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@@ -1040,8 -1040,8 +1040,8 @@@ out_finish
  /*
   *  Screen Target CRTC dispatch table
   */
- static struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
+ static const struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_stdu_crtc_destroy,

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

* Re: linux-next: manual merge of the drm-misc tree with Linus' tree
  2015-12-14  1:12 Stephen Rothwell
@ 2015-12-14  7:09 ` Thomas Hellstrom
  0 siblings, 0 replies; 37+ messages in thread
From: Thomas Hellstrom @ 2015-12-14  7:09 UTC (permalink / raw)
  To: Stephen Rothwell, Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel

On 12/14/2015 02:12 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got conflicts in:
>
>   drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
>   drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
>   drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
>
> between commit:
>
>   8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2")
>
> from Linus' tree and commit:
>
>   f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
FWIW, the fix looks correct to me.

/Thomas

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2015-12-14  1:12 Stephen Rothwell
  2015-12-14  7:09 ` Thomas Hellstrom
  0 siblings, 1 reply; 37+ messages in thread
From: Stephen Rothwell @ 2015-12-14  1:12 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: Thomas Hellstrom, linux-next, linux-kernel

Hi all,

Today's linux-next merge of the drm-misc tree got conflicts in:

  drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
  drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
  drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

between commit:

  8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2")

from Linus' tree and commit:

  f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks")

from the drm-misc 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/vmwgfx/vmwgfx_ldu.c
index 52caecb4502e,2aff5e51d926..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@@ -295,9 -295,7 +295,7 @@@ static int vmw_ldu_crtc_set_config(stru
  }
  
  static struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
- 	.save = vmw_du_crtc_save,
- 	.restore = vmw_du_crtc_restore,
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_ldu_crtc_destroy,
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 13926ff192e3,6bb7af37934a..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@@ -531,9 -531,7 +531,7 @@@ out_no_fence
  }
  
  static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
- 	.save = vmw_du_crtc_save,
- 	.restore = vmw_du_crtc_restore,
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_sou_crtc_destroy,
diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index f823fc3efed7,45e72c2f15cd..000000000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@@ -1041,9 -1041,7 +1041,7 @@@ out_finish
   *  Screen Target CRTC dispatch table
   */
  static struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
- 	.save = vmw_du_crtc_save,
- 	.restore = vmw_du_crtc_restore,
 -	.cursor_set = vmw_du_crtc_cursor_set,
 +	.cursor_set2 = vmw_du_crtc_cursor_set2,
  	.cursor_move = vmw_du_crtc_cursor_move,
  	.gamma_set = vmw_du_crtc_gamma_set,
  	.destroy = vmw_stdu_crtc_destroy,
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2015-09-12  3:15 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2015-09-12  3:15 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel

Hi all,

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

  drivers/gpu/drm/drm_dp_helper.c

between commits:

  79a2b161c12a ("drm/dp: Define AUX_RETRY_INTERVAL as 500 us")
  4efa83c8c786 ("drm/dp: Adjust i2c-over-aux retry count based on message size and i2c bus speed")
  f36203be608a ("drm/dp: Add dp_aux_i2c_speed_khz module param to set the assume i2c bus speed")

from Linus' tree and commit:

  68ec2a2a2481 ("drm/dp: Use I2C_WRITE_STATUS_UPDATE to drain partial I2C_WRITE requests")

from the drm-misc 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/drm_dp_helper.c
index 291734e87fca,5a55d905b8ee..000000000000
--- a/drivers/gpu/drm/drm_dp_helper.c
+++ b/drivers/gpu/drm/drm_dp_helper.c
@@@ -424,90 -422,19 +424,103 @@@ static u32 drm_dp_i2c_functionality(str
  	       I2C_FUNC_10BIT_ADDR;
  }
  
 +#define AUX_PRECHARGE_LEN 10 /* 10 to 16 */
 +#define AUX_SYNC_LEN (16 + 4) /* preamble + AUX_SYNC_END */
 +#define AUX_STOP_LEN 4
 +#define AUX_CMD_LEN 4
 +#define AUX_ADDRESS_LEN 20
 +#define AUX_REPLY_PAD_LEN 4
 +#define AUX_LENGTH_LEN 8
 +
 +/*
 + * Calculate the duration of the AUX request/reply in usec. Gives the
 + * "best" case estimate, ie. successful while as short as possible.
 + */
 +static int drm_dp_aux_req_duration(const struct drm_dp_aux_msg *msg)
 +{
 +	int len = AUX_PRECHARGE_LEN + AUX_SYNC_LEN + AUX_STOP_LEN +
 +		AUX_CMD_LEN + AUX_ADDRESS_LEN + AUX_LENGTH_LEN;
 +
 +	if ((msg->request & DP_AUX_I2C_READ) == 0)
 +		len += msg->size * 8;
 +
 +	return len;
 +}
 +
 +static int drm_dp_aux_reply_duration(const struct drm_dp_aux_msg *msg)
 +{
 +	int len = AUX_PRECHARGE_LEN + AUX_SYNC_LEN + AUX_STOP_LEN +
 +		AUX_CMD_LEN + AUX_REPLY_PAD_LEN;
 +
 +	/*
 +	 * For read we expect what was asked. For writes there will
 +	 * be 0 or 1 data bytes. Assume 0 for the "best" case.
 +	 */
 +	if (msg->request & DP_AUX_I2C_READ)
 +		len += msg->size * 8;
 +
 +	return len;
 +}
 +
 +#define I2C_START_LEN 1
 +#define I2C_STOP_LEN 1
 +#define I2C_ADDR_LEN 9 /* ADDRESS + R/W + ACK/NACK */
 +#define I2C_DATA_LEN 9 /* DATA + ACK/NACK */
 +
 +/*
 + * Calculate the length of the i2c transfer in usec, assuming
 + * the i2c bus speed is as specified. Gives the the "worst"
 + * case estimate, ie. successful while as long as possible.
 + * Doesn't account the the "MOT" bit, and instead assumes each
 + * message includes a START, ADDRESS and STOP. Neither does it
 + * account for additional random variables such as clock stretching.
 + */
 +static int drm_dp_i2c_msg_duration(const struct drm_dp_aux_msg *msg,
 +				   int i2c_speed_khz)
 +{
 +	/* AUX bitrate is 1MHz, i2c bitrate as specified */
 +	return DIV_ROUND_UP((I2C_START_LEN + I2C_ADDR_LEN +
 +			     msg->size * I2C_DATA_LEN +
 +			     I2C_STOP_LEN) * 1000, i2c_speed_khz);
 +}
 +
 +/*
 + * Deterine how many retries should be attempted to successfully transfer
 + * the specified message, based on the estimated durations of the
 + * i2c and AUX transfers.
 + */
 +static int drm_dp_i2c_retry_count(const struct drm_dp_aux_msg *msg,
 +			      int i2c_speed_khz)
 +{
 +	int aux_time_us = drm_dp_aux_req_duration(msg) +
 +		drm_dp_aux_reply_duration(msg);
 +	int i2c_time_us = drm_dp_i2c_msg_duration(msg, i2c_speed_khz);
 +
 +	return DIV_ROUND_UP(i2c_time_us, aux_time_us + AUX_RETRY_INTERVAL);
 +}
 +
 +/*
 + * FIXME currently assumes 10 kHz as some real world devices seem
 + * to require it. We should query/set the speed via DPCD if supported.
 + */
 +static int dp_aux_i2c_speed_khz __read_mostly = 10;
 +module_param_unsafe(dp_aux_i2c_speed_khz, int, 0644);
 +MODULE_PARM_DESC(dp_aux_i2c_speed_khz,
 +		 "Assumed speed of the i2c bus in kHz, (1-400, default 10)");
 +
+ static void drm_dp_i2c_msg_write_status_update(struct drm_dp_aux_msg *msg)
+ {
+ 	/*
+ 	 * In case of i2c defer or short i2c ack reply to a write,
+ 	 * we need to switch to WRITE_STATUS_UPDATE to drain the
+ 	 * rest of the message
+ 	 */
+ 	if ((msg->request & ~DP_AUX_I2C_MOT) == DP_AUX_I2C_WRITE) {
+ 		msg->request &= DP_AUX_I2C_MOT;
+ 		msg->request |= DP_AUX_I2C_WRITE_STATUS_UPDATE;
+ 	}
+ }
+ 
  /*
   * Transfer a single I2C-over-AUX message and handle various error conditions,
   * retrying the transaction as appropriate.  It is assumed that the
@@@ -595,7 -521,8 +610,8 @@@ static int drm_dp_i2c_do_msg(struct drm
  			aux->i2c_defer_count++;
  			if (defer_i2c < 7)
  				defer_i2c++;
 -			usleep_range(400, 500);
 +			usleep_range(AUX_RETRY_INTERVAL, AUX_RETRY_INTERVAL + 100);
+ 			drm_dp_i2c_msg_write_status_update(msg);
  			continue;
  
  		default:
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2015-08-14  2:06 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2015-08-14  2:06 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: Thierry Reding, linux-next, linux-kernel

Hi all,

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

  drivers/gpu/drm/drm_irq.c

between commit:

  209e4dbc8dcd ("drm/vblank: Use u32 consistently for vblank counters")

from Linus' tree and commit:

  b90180b057f7 ("drm/irq: More pipe/crtc consistency cleanups")

from the drm-misc 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/drm_irq.c
index ee14324522ce,70919d48f015..000000000000
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@@ -74,11 -74,11 +74,11 @@@ module_param_named(vblankoffdelay, drm_
  module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
  module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
  
- static void store_vblank(struct drm_device *dev, int crtc,
+ static void store_vblank(struct drm_device *dev, unsigned int pipe,
 -			 unsigned vblank_count_inc,
 +			 u32 vblank_count_inc,
  			 struct timeval *t_vblank)
  {
- 	struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+ 	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
  	u32 tslot;
  
  	assert_spin_locked(&dev->vblank_time_lock);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2015-08-03  2:11 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2015-08-03  2:11 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel
  Cc: linux-next, linux-kernel, Linus Torvalds, Maarten Lankhorst

Hi all,

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

  drivers/gpu/drm/drm_atomic_helper.c

between commit:

  27667f4744fc ("i915: temporary fix for DP MST docking station NULL pointer dereference")

from Linus' tree and commit:

  fc596660dd4e ("drm/atomic: add connectors_changed to separate it from mode_changed, v2")

from the drm-misc 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/drm_atomic_helper.c
index 90065c226fe5,0b475fae067d..000000000000
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@@ -230,12 -230,10 +230,12 @@@ update_connector_routing(struct drm_ato
  	}
  
  	connector_state->best_encoder = new_encoder;
 -	idx = drm_crtc_index(connector_state->crtc);
 +	if (connector_state->crtc) {
 +		idx = drm_crtc_index(connector_state->crtc);
  
 -	crtc_state = state->crtc_states[idx];
 -	crtc_state->connectors_changed = true;
 +		crtc_state = state->crtc_states[idx];
- 		crtc_state->mode_changed = true;
++		crtc_state->connectors_changed = true;
 +	}
  
  	DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] using [ENCODER:%d:%s] on [CRTC:%d]\n",
  			 connector->base.id,

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

* linux-next: manual merge of the drm-misc tree with Linus' tree
@ 2015-07-30  3:04 Stephen Rothwell
  0 siblings, 0 replies; 37+ messages in thread
From: Stephen Rothwell @ 2015-07-30  3:04 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel; +Cc: linux-next, linux-kernel

Hi all,

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

  drivers/gpu/drm/drm_crtc.c

between commit:

  5677d67ae394 ("drm: Stop resetting connector state to unknown")

from Linus' tree and commit:

  1c473be11958 ("drm: Fixup locking WARNINGs in drm_mode_config_reset")

from the drm-misc 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/drm_crtc.c
index c91c18b2b1d4,7d02e32b4e94..000000000000
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -5273,9 -5273,14 +5273,11 @@@ void drm_mode_config_reset(struct drm_d
  		if (encoder->funcs->reset)
  			encoder->funcs->reset(encoder);
  
+ 	mutex_lock(&dev->mode_config.mutex);
 -	drm_for_each_connector(connector, dev) {
 -		connector->status = connector_status_unknown;
 -
 +	drm_for_each_connector(connector, dev)
  		if (connector->funcs->reset)
  			connector->funcs->reset(connector);
 -	}
+ 	mutex_unlock(&dev->mode_config.mutex);
  }
  EXPORT_SYMBOL(drm_mode_config_reset);
  

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

end of thread, back to index

Thread overview: 37+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-26  1:43 linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2020-06-29  1:14 Stephen Rothwell
2020-06-17  0:46 Stephen Rothwell
2020-04-16  1:25 Stephen Rothwell
2020-04-15  1:46 Stephen Rothwell
2019-12-16  0:51 Stephen Rothwell
2019-12-16  0:46 Stephen Rothwell
2019-05-21  0:51 Stephen Rothwell
2019-05-23  0:27 ` Stephen Rothwell
2019-05-23  8:10 ` Maxime Ripard
2019-05-23  9:34   ` Stephen Rothwell
2019-05-23 11:53 ` Maxime Ripard
2019-05-23 13:04   ` Stephen Rothwell
2019-05-23 13:11     ` Daniel Vetter
2019-05-23 14:16       ` Stephen Rothwell
2019-05-23 16:10   ` Rob Herring
2019-05-24  7:12     ` Maxime Ripard
2019-01-11  0:14 Stephen Rothwell
2018-03-20  1:08 Stephen Rothwell
2018-03-23  0:43 ` Stephen Rothwell
2018-03-15  3:14 Stephen Rothwell
2018-03-23  0:45 ` Stephen Rothwell
2017-09-22  2:24 Stephen Rothwell
2017-08-02  2:23 Stephen Rothwell
2017-08-10  2:06 ` Stephen Rothwell
2017-07-19  1:30 Stephen Rothwell
2016-09-23  1:35 Stephen Rothwell
2016-06-07  1:32 Stephen Rothwell
2016-03-31  0:15 Stephen Rothwell
2016-03-29 23:49 Stephen Rothwell
2015-12-16  0:38 Stephen Rothwell
2015-12-14  1:12 Stephen Rothwell
2015-12-14  7:09 ` Thomas Hellstrom
2015-09-12  3:15 Stephen Rothwell
2015-08-14  2:06 Stephen Rothwell
2015-08-03  2:11 Stephen Rothwell
2015-07-30  3:04 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git