From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Date: Mon, 17 Dec 2018 15:34:24 +0000 (-0500)
Subject: Merge tag 'v4.20-rc7' into patchwork
X-Git-Tag: Ubuntu-5.10.0-12.13~6396^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4bd257d884902b81493cf11531915009ab5787cf;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'v4.20-rc7' into patchwork

Linux 4.20-rc7

* tag 'v4.20-rc7': (403 commits)
  Linux 4.20-rc7
  scripts/spdxcheck.py: always open files in binary mode
  checkstack.pl: fix for aarch64
  userfaultfd: check VM_MAYWRITE was set after verifying the uffd is registered
  fs/iomap.c: get/put the page in iomap_page_create/release()
  hugetlbfs: call VM_BUG_ON_PAGE earlier in free_huge_page()
  memblock: annotate memblock_is_reserved() with __init_memblock
  psi: fix reference to kernel commandline enable
  arch/sh/include/asm/io.h: provide prototypes for PCI I/O mapping in asm/io.h
  mm/sparse: add common helper to mark all memblocks present
  mm: introduce common STRUCT_PAGE_MAX_SHIFT define
  alpha: fix hang caused by the bootmem removal
  XArray: Fix xa_alloc when id exceeds max
  drm/vmwgfx: Protect from excessive execbuf kernel memory allocations v3
  MAINTAINERS: Daniel for drm co-maintainer
  drm/amdgpu: drop fclk/gfxclk ratio setting
  IB/core: Fix oops in netdev_next_upper_dev_rcu()
  dm thin: bump target version
  drm/vmwgfx: remove redundant return ret statement
  drm/i915: Flush GPU relocs harder for gen3
  ...
---

4bd257d884902b81493cf11531915009ab5787cf
diff --cc drivers/media/platform/vicodec/vicodec-core.c
index 2b7daff63425,13fb69c58967..0d7876f5acf0
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@@ -1006,14 -997,23 +1006,21 @@@ static int vicodec_start_streaming(stru
  
  	q_data->sequence = 0;
  
- 	if (!V4L2_TYPE_IS_OUTPUT(q->type))
+ 	if (!V4L2_TYPE_IS_OUTPUT(q->type)) {
+ 		if (!ctx->is_enc) {
+ 			state->width = q_data->width;
+ 			state->height = q_data->height;
+ 		}
  		return 0;
+ 	}
  
- 	state->width = q_data->width;
- 	state->height = q_data->height;
+ 	if (ctx->is_enc) {
+ 		state->width = q_data->width;
+ 		state->height = q_data->height;
+ 	}
  	state->ref_frame.width = state->ref_frame.height = 0;
 -	state->ref_frame.luma = kvmalloc(size + 2 * size / chroma_div,
 -					 GFP_KERNEL);
 -	ctx->comp_max_size = size + 2 * size / chroma_div +
 -			     sizeof(struct fwht_cframe_hdr);
 +	state->ref_frame.luma = kvmalloc(total_planes_size, GFP_KERNEL);
 +	ctx->comp_max_size = total_planes_size + sizeof(struct fwht_cframe_hdr);
  	state->compressed_frame = kvmalloc(ctx->comp_max_size, GFP_KERNEL);
  	if (!state->ref_frame.luma || !state->compressed_frame) {
  		kvfree(state->ref_frame.luma);