shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1013c54dc1e12db382e058d34b1038e0c1cad361'

Browse Source 
* commit '1013c54dc1e12db382e058d34b1038e0c1cad361': (33 commits)
  input: touchscreen: gt1x: remove all usages of mm_segment_t
  Mali: bifrost: use task_tgid_vnr() and task_pid_vnr() to get tgid and pid
  MALI: rockchip: upgrade bifrost DDK to g18p0-01eac0, from g17p0-01eac0
  ARM: configs: rv1106: Add config for TEE support
  ARM: dts: rv1106: Add PSCI node
  ARM: dts: rv1106: Add Non-secure physical timer
  uapi/fec-config.h: Fix UAPI compile-test
  uapi/rk_vcm_head.h: Fix UAPI compile-test
  uapi/rk-camera-module.h: Fix UAPI compile-test
  uapi/rk-preisp.h: Fix UAPI compile-test
  uapi/rk-isp32-config.h: Fix UAPI compile-test
  uapi/rk-isp3-config.h: Fix UAPI compile-test
  uapi/rk-ispp-config.h: Fix UAPI compile-test
  uapi/rk-isp1-config.h: Fix UAPI compile-test
  uapi/rk-isp21-config.h: Fix UAPI compile-test
  uapi/rk-isp2-config.h: Fix UAPI compile-test
  uapi/rkcif-config.h: Fix UAPI compile-test
  uapi/rk-video-format.h: include types.h
  uapi/rockchip_drm.h: Fix UAPI compile-test
  uapi/dw_hdcp2.h: Fix UAPI compile-test
  ...

Fix drivers/gpu/arm/bifrost/csf/mali_kbase_csf_sync_debugfs.c fallthrough warning.
Fix drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c atomic_commit argument.

Change-Id: I9ca9fad9694e31a7373b567eb3681fa6d7834c40
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Tao Huang
2023-05-30 18:43:19 +08:00
parent d575f032bb 1013c54dc1
commit dd66c1b38f
117 changed files with 7109 additions and 5169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/uapi/misc/dw_hdcp2.h
View File

@@ -12,7 +12,7 @@
#include <linux/types.h>
#define HL_DRIVER_ALLOCATE_DYNAMIC_MEM 0xffffffff
// hl_drv_ioctl numbers
/* hl_drv_ioctl numbers */
enum {
HL_DRV_NR_MIN = 0x10,
HL_DRV_NR_INIT,
@@ -127,4 +127,4 @@ struct hl_drv_ioc_status {
#define RK_DRV_IOC_RESET _IOR('H', RK_DRV_NR_RESET, __u32)
#endif // _DW_HDCP_HOST_LIB_DRIVER_LINUX_IF_H_
#endif /* _DW_HDCP_HOST_LIB_DRIVER_LINUX_IF_H_ */

7
include/uapi/misc/rkflash_vendor_storage.h
View File

@@ -1,12 +1,13 @@
/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR MIT) */
/* Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd */
#include <linux/ioctl.h>
/* Copyright (c) 2023 Rockchip Electronics Co., Ltd */
#ifndef _RKFLASH_VENDOR_STORAGE
#define _RKFLASH_VENDOR_STORAGE
#include <linux/types.h>
#include <linux/ioctl.h>
struct RK_VENDOR_REQ {
__u32 tag;
__u16 id;