Commit Graph

860021 Commits

Author SHA1 Message Date
Ziyuan Xu
cb1e7516e7 ARM: dts: rv1126-bat-ipc-v10: use the correct IRCUT driver
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ic7b05568ebd972e7b47cec2d6a95ab4657f3b761
2020-11-06 14:34:40 +08:00
Ziyuan Xu
481f37137d media: i2c: rk_ircut: add AP1511A IR filter switch support
The AP1511A is different from the BA6208.

ENB: low-active enable
FBC: Forward/Backward control

ENB     FBC     OUT1    OUT2
H       X       L       L
L       H       H       L
H       L       L       H

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ieba00ed509b8d886dc22d8f0018a8282f3c73040
2020-11-06 14:34:40 +08:00
Andy Yan
924cd5bb04 drm/rockchip: vop2: Fix some compile warning
Fix warning:

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:542: warning: Function
parameter or member 'phys_id' not described in
'vop2_find_win_by_phys_id'
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:542: warning: Function
parameter or member 'vop2' not described in 'vop2_find_win_by_phys_id'

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3503
vop2_plane_create_name_property() warn: should '1 << (win->win_id)' be a
64 bit type?
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c:3509
vop2_plane_create_name_property() warn: should '1 << (win->win_id)' be a
64 bit type?

Fixes: efe0578ec8 ("drm/rockchip: Add support for vop2")
Change-Id: Ia52eac3fcf2ddeff825b5fdaa26adcf26c71a7af
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-06 10:50:13 +08:00
Weiguo Hu
9c6de47581 net: rockchip_wlan: rtl8822bs: solve WARNING on nl80211_send_chandef
WARNING: CPU: 3 PID: 516 at net/wireless/nl80211.c:2880 nl80211_send_chandef+0x16c/0x180
Call trace:
  nl80211_send_chandef
  nl80211_ch_switch_notify
  cfg80211_ch_switch_started_notify
  rtw_cfg80211_ch_switch_notify
  rtw_chk_start_clnt_join
  join_cmd_hdl
  rtw_cmd_thread
  kthread

Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
Change-Id: I922c8bd3af5de802dd7f2ee46738ff3fe07ca2af
2020-11-06 09:52:26 +08:00
Zhangbin Tong
925dbb9edc ARM: dts: rv1126: Add shared dma memory pool inactive optional property
The ISP and CMA need the operating system must not active the region.

Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
Change-Id: Id27f453f8f1734d992d0e5ae9c38a01b0f7686fe
2020-11-06 08:57:36 +08:00
Andy Yan
d837fdcdab drm/rockchip: register vop2 platform driver
Change-Id: Id34b88f47b785bf8372d1710a280d294347d6693
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 19:38:15 +08:00
Andy Yan
efe0578ec8 drm/rockchip: Add support for vop2
Rockchip vop2 build on a unified architecture with
multi video output ports support.

For RK3568:
* 3 Video Port, every video port can drive a display timing independently.
* 6 graphic window: Cluster win x 2, Esmart win x 2, Smart wind x 2.
* 6 windows can be divided into 3 groups for independent overlay for
  3 Video Ports.
* RGB/eDP/HDMI/MIPI get display timing from 1 of the 3 Video Ports.

+----------+   +-------------+
|  Cluster |   | Sel 1 from 6|   +--------------------+
|  window0 |   |    Layer0   |   |n from 6|           |
+----------+   +-------------+   |        |Video Port0|
+----------+   +-------------+   |Overlay |           |
|  Cluster |   | Sel 1 from 6|   +--------+-----------+
|  window1 |   |    Layer1   |
+----------+   +-------------+
+----------+   +-------------+
|  Esmart  |   | Sel 1 from 6|
|  window0 |   |   Layer2    |   +--------------------+
+----------+   +-------------+   |n from 6|           |
+----------+   +-------------+   |        |Video Port1|
|  Esmart  |   | Sel 1 from 6|   |Overlay |           |
|  Window1 |   |   Layer3    |   +--------+-----------+
+----------+   +-------------+
+----------+   +-------------+
|  Smart   |   | Sel 1 from 6|
|  Window0 |   |    Layer4   |   +--------------------+
+----------+   +-------------+   |n from 6|           |
+----------+   +-------------+   |        |Video Port2|
|  Smart   |   | Sel 1 from 6|   |Overlay |           |
|  Window1 |   |    Layer5   |   +--------+-----------+
+----------+   +-------------+

Change-Id: I4c42d655f75903066888b6aea92e926192b000c2
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 19:32:42 +08:00
Sean Paul
8d7cdbbea2 UPSTREAM: drm: Describe pixel_blend_mode in drm_plane_state
Adds docs for pixel_blend_mode in drm_plane_state. Fixes the warning
found by kbuild test robot:

htmldocs: include/drm/drm_plane.h:189: warning: Function parameter or member 'pixel_blend_mode' not described in 'drm_plane_state'

Change-Id: Ife448dca43ae262ecfccf312fe94142f0eaac5e0
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Lowry Li <lowry.li@arm.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20180831150934.202332-1-sean@poorly.run
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit b972cece94)
2020-11-05 18:55:12 +08:00
Lowry Li
e254a8b9df BACKPORT: drm: Add per-plane pixel blend mode property
Pixel blend modes represent the alpha blending equation
selection, describing how the pixels from the current
plane are composited with the background.

Adds a pixel_blend_mode to drm_plane_state and a
blend_mode_property to drm_plane, and related support
functions.

Defines three blend modes in drm_blend.h.

Changes since v1:
 - Moves the blending equation into the DOC comment
 - Refines the comments of drm_plane_create_blend_mode_property to not
   enumerate the #defines, but instead the string values
 - Uses fg.* instead of pixel.* and plane_alpha instead of plane.alpha
Changes since v2:
 - Refines the comments of drm_plane_create_blend_mode_property:
      1) Puts the descriptions (after the ":") on a new line
      2) Adds explaining why @supported_modes need PREMUL as default
Changes since v3:
 - Refines drm_plane_create_blend_mode_property(). drm_property_add_enum()
   can calculate the index itself just fine, so no point in having the
   caller pass it in.
 - Since the current DRM assumption is that alpha is premultiplied
   as default, define DRM_MODE_BLEND_PREMULTI as 0 will be better.
 - Refines some comments.
Changes since v4:
 - Adds comments in drm_blend.h.
 - Removes setting default value in drm_plane_create_blend_mode_property()
   as it is already in __drm_atomic_helper_plane_reset().
 - Fixes to use state->pixel_blend_mode instead of using
   plane->state->pixel_blend_mode in reset function.
 - Rebases on drm-misc-next.

Change-Id: I021908dc42aef01e4b7c70f99904ccabffa4adfe
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Lowry Li <lowry.li@arm.com>
Signed-off-by: Ayan Kumar Halder <ayan.halder@arm.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/245734/
(cherry picked from commit a5ec8332d4)
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 18:54:32 +08:00
Ding Wei
538613c26c video: rockchip: mpp: add missing element in translate table for vp8e
Change-Id: I5160dd95fb1fb4d0a6e630d44ee1a82828bdfc0a
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-11-05 18:45:43 +08:00
Andy Yan
d79af335fb drm/rockchip: rgb: Add support for rk3568 rgb interface
RK3568 has one rgb output interface.

Change-Id: I17a14681f3e0b872ea129de9e9f80a0527863911
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-05 18:41:19 +08:00
Ziyuan Xu
8f48866b4e ARM: configs: rv1126-battery.config: enable Aschip PIR Sensor support
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: If6bf90de03495c40bd94f5b004570ce593c2ef41
2020-11-05 16:57:06 +08:00
Ziyuan Xu
a84fb5e9b3 ARM: dts: rv1126-bat-ipc-v10: add pir device to adjust sensibility
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I2ed3fbc9dc73321164a03314255b86ee58bc4acd
2020-11-05 16:57:06 +08:00
Ziyuan Xu
633fa7b962 misc: add Aschip PIR Sensor drivers
We can adjust the sensibility of the Aschip's PIR sensor via pulse gpio,
and the timing should be precise.

For example:
    min: echo 4 > /proc/pir/sensibility
    max: echo 100 > /proc/pir/sensibility

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Id3e644fc38d9be24f97351df665e27fc4ff9d545
2020-11-05 16:57:02 +08:00
Wu Liangqing
8f27813ae3 arm64: dts: rockchip: enable mipi_dphy0 for rk3566-rk817-tablet
Change-Id: Ib313ea6cf07f9f818d76ab3a93f1b8af129fbb8c
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-05 15:19:05 +08:00
Wu Liangqing
c1a1dce150 arm64: dts: rockchip: rk3568 init board for evb
Change-Id: Ie77bbb4bc64c4720bd752b51b4629d4ae5c7d880
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-05 15:03:32 +08:00
Sugar Zhang
9c07a12f01 ASoC: rockchip: i2s-tdm: Add support for frame inversion
Change-Id: I4d6d626018b1555f65684cc6a3c16045894bd868
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-05 14:36:16 +08:00
Sugar Zhang
baddcc7c35 ASoC: rockchip: i2s-tdm: Clean code
Change-Id: Ib4af14213873dac609d195976bd639bd6270e419
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-05 14:36:16 +08:00
Ziyuan Xu
bd60226a17 ARM: dts: rv1126-bat-ipc-v10: tune suitable memory for isp/ispp
For SC210IOT (1080p normal raw10) sensor:
isp_reserved size = 5 * dmatx_buffer + 5 * isp_ispp_buffer + 3*1024*1024
dmatx_buffer = ALIGN(width * bpp / 8, 256) * height = 2560 *1080
isp_ispp_buffer =
    ALIGN(width, 16) * ALIGN(height, 16) * (1/16 + ((is_yuv422) ? 2 : 1.5)) +
    ALIGN(width, 64) * ALIGN(height, 128) / 16
    = 1920*1088 * 1.5625 + 1920 * 1088 * 0.0625

isp_reserved(CMA) size = 32.3 MB
CMA buffer should be aligned as 4MB, isp_reserved size should be 36MB
for SC210IOT.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I839c7ffd179f35f6d6b9b581eda0837e631420bd
2020-11-05 14:35:41 +08:00
Elaine Zhang
10d9a7d483 arm64: dts: rockchip: rk3399-evb-ind: remove regulator-xxx-microvolt for SWITCH pmic node
Switch is just a function of switching. There is no voltage setting
function. Voltage getting is the supply voltage.

Fixes: 3fc99e38fd ("regulator: resolve supply after creating regulator")
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ia45677a24fbfb831226563c56bcb26885bb17db1
2020-11-05 14:17:56 +08:00
Ziyuan Xu
798f90523f mmc: fixes vendor_storage initialization failure
The key parameter (this_card) is invalid if the mmc_host drivers were
built as module.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I250ce59591da542d7fc1e4afcd6d8442a82b1d17
2020-11-05 14:13:13 +08:00
Wu Liangqing
d47ae5dcbe arm64: dts: rockchip: add RK3566 tablet board devicetree
Change-Id: I592a71d68ff3f606a64c9a9c540d8b778042e987
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-05 11:24:33 +08:00
Sandy Huang
200cf09a01 drm/rockchip: rgb: add support interlace mode and output_if flag
BT656 typical output mode is 480i and 576i, so add connector interlace allowed.

Change-Id: I6c832a1e7fd8cca69da5f6cfdd9681d72696d67a
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-05 11:12:59 +08:00
Zhenke Fan
863a31e8e0 ARM: dts: rv1126-rmsl-ddr3-v1: remove rk1608 pwren_gpio
rk1608 and ov02k10 use the same pwren gpio

Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I111897611f2094ea6919b20caffcdbe74714ac0a
2020-11-05 10:15:10 +08:00
Andy Yan
1c82b603e3 arm64: dts: rockchip: rk3568: Add display subsystem dt node
The data route from vop vp to interface is shown as bellow.

                                 +---------+
                        +------->+  HDMI   |
                        |        +---------+
+--------------+        |
|              |        |        +---------+
|     VP0      +------->-------->+   eDP   |
|              |        |        +---------+
+--------------+        |
                        |        +---------+
                        +------->+   DSI   |
                                 +---------+

                                 +---------+
                         +------>+  HDMI   |
                         |       +---------+
                         |
                         |       +---------+
+-------------+          +------>+   eDP   |
|             |          |       +---------+
|     VP1     +--------->+
|             |          |       +---------+
+-------------+          +------>+   DSI   |
                         |       +---------+
                         |
                         |       +---------+
                         +------>+   LVDS  |
                                 +---------+

                                 +---------+
                         +------>+   LVDS  |
                         |       +---------+
+------------+           |
|            |           |
|     VP2    +---------->-
|            |           |
+------------+           |
                         |       +---------------+
                         +------>+RGB/BT656/1120 |
                                 +---------------+

Change-Id: Ifd505a53303817b8f0785d5f0c5f22bcca590305
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-05 10:07:35 +08:00
Huang zhibao
9edc011523 ARM: dts: rockchip: add rv1126-ai-cam-plus
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I6599ee46bb9c23cebf3a66d4f07b70a4eebc8b5e
2020-11-04 18:24:32 +08:00
Sandy Huang
f64bc11207 phy/rockchip: inno-video-combo-phy: add support rk3568 lvds
Change-Id: I0021eec263aa6436f7e2055a3a361cc2728fd858
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-04 16:07:50 +08:00
Sugar Zhang
c4ad3526a2 ASoC: rockchip: i2s_tdm: Fix wrong reset id
Change-Id: I6960a341e05b7e46760964203579e72d078c3101
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-04 15:52:50 +08:00
Xing Zheng
6578e192ef ASoC: rockchip: i2s_tdm: add support handle 'io-multiplex' property
Some i2s bus GPIOs maybe designed multiplex, the default
is input, we need to configure IN/OUT dynamically.

Change-Id: I2e0f0f972d6f9fa3fc8e8fc9f5dfd5d4e6deaee1
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2020-11-04 15:52:32 +08:00
Sugar Zhang
fe27c204eb ASoC: rockchip: i2s-tdm: Fix BUG scheduling while atomic
BUG: scheduling while atomic: mediaserver/664/0x00000002
CPU: 0 PID: 664 Comm: mediaserver Tainted: G O 4.19.111 #36
Hardware name: Generic DT based system
[<b010f408>] (unwind_backtrace) from [<b010b96c>] (show_stack+0x10/0x14)
[<b010b96c>] (show_stack) from [<b08157c4>] (dump_stack+0x90/0xa4)
[<b08157c4>] (dump_stack) from [<b0147bb0>] (_schedule_bug+0x64/0x84)
[<b0147bb0>] (_schedule_bug) from [<b082b93c>] (_schedule+0x4a4/0x580)
[<b082b93c>] (_schedule) from [<b082ba68>] (schedule+0x50/0xb4)
[<b082ba68>] (schedule) from [<b082bebc>] (schedule_preempt_disabled+0x28/0x40)
[<b082bebc>] (schedule_preempt_disabled) from [<b082d020>] (_mutex_lock.constprop.7+0x534/0x5c0)
[<b082d020>] (_mutex_lock.constprop.7) from [<b03e5ba4>] (clk_prepare_lock+0x50/0xf8)
[<b03e5ba4>] (clk_prepare_lock) from [<b03e9204>] (clk_set_rate+0x18/0x88)
[<b03e9204>] (clk_set_rate) from [<b068a0dc>] (rockchip_i2s_tdm_hw_params+0x88/0x798)
[<b068a0dc>] (rockchip_i2s_tdm_hw_params) from [<b0680758>] (soc_dai_hw_params+0x58/0xa4)
[<b0680758>] (soc_dai_hw_params) from [<b0680914>] (soc_pcm_hw_params+0x170/0x55c)
[<b0680914>] (soc_pcm_hw_params) from [<b0668540>] (snd_pcm_hw_params+0x124/0x3ac)
[<b0668540>] (snd_pcm_hw_params) from [<b0669ae4>] (snd_pcm_ioctl+0x764/0xcbc)
[<b0669ae4>] (snd_pcm_ioctl) from [<b0220c38>] (do_vfs_ioctl+0xac/0x798)
[<b0220c38>] (do_vfs_ioctl) from [<b0221358>] (ksys_ioctl+0x34/0x58)
[<b0221358>] (ksys_ioctl) from [<b0101000>] (ret_fast_syscall+0x0/0x4c)
Exception stack(0xdbda3fa8 to 0xdbda3ff0)

Fixes: 61559b25ba ("ASoC: rockchip: i2s: Set clk rate when master mode")
Change-Id: I266efee0f9e5d99ff6d358c4f12e7b9dc7eb6bf8
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-04 15:16:53 +08:00
William Wu
a7e892c783 phy: rockchip: inno-combphy: remove redundant param_exped
The function param_read() and param_exped() do the same thing,
so this patch uses the more general param_read() instead of
the param_exped(), and delete the param_exped() directly.

Change-Id: Ic097069c28a717ff5f70ceaa36a22ea1bd26b76f
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-04 11:52:51 +08:00
Liang Chen
36f9645063 arm64: dts: rockchip: add cpu opp-table for RK3568
Change-Id: I287e4cc6658684e6a878fea399c2025bb3b985df
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-11-04 10:42:38 +08:00
Jon Lin
6a1a1cf4e7 spi: rockchip: Add compatible string for rk3568
Change-Id: I3ebee7ebd129ccd43c23fade643a9f6f30d4d930
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-11-04 09:00:28 +08:00
Greg Kroah-Hartman
a7baccb95f UPSTREAM: Revert "block: ratelimit handle_bad_sector() message"
This reverts commit f86b9bf622 which is
commit f4ac712e4f upstream.

Jari Ruusu writes:

	Above change "block: ratelimit handle_bad_sector() message"
	upstream commit f4ac712e4f
	in 4.19.154 kernel is not completely OK.

	Removing casts from arguments 4 and 5 produces these compile warnings:

	...

	For 64 bit systems it is only compile time cosmetic warning. For 32 bit
	system + CONFIG_LBDAF=n it introduces bugs: output formats are "%llu" and
	passed parameters are 32 bits. That is not OK.

	Upstream kernels have hardcoded 64 bit sector_t. In older stable trees
	sector_t can be either 64 or 32 bit. In other words, backport of above patch
	needs to keep those original casts.

And Tetsuo Handa writes:
	Indeed, commit f4ac712e4f ("block: ratelimit handle_bad_sector() message")
	depends on commit 72deb455b5 ("block: remove CONFIG_LBDAF") which was merged
	into 5.2 kernel.

So let's revert it.

Change-Id: I5a83d4009db1aaed899b48724d757bb327b14a10
Reported-by: Jari Ruusu <jariruusu@users.sourceforge.net>
Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
 commit fd732693294f8d013ff14d5d1574acadb7fd9fc3)
2020-11-03 19:54:04 +08:00
Tao Huang
439d4e9999 Merge tag 'ASB-2020-11-05_4.19-stable' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2020-11-01
CVE-2020-0423

* tag 'ASB-2020-11-05_4.19-stable': (529 commits)
  ANDROID: GKI: Enable DEBUG_INFO_DWARF4
  UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller
  BACKPORT: xfrm/compat: Translate 32-bit user_policy from sockptr
  BACKPORT: xfrm/compat: Add 32=>64-bit messages translator
  UPSTREAM: xfrm/compat: Attach xfrm dumps to 64=>32 bit translator
  UPSTREAM: xfrm/compat: Add 64=>32-bit messages translator
  BACKPORT: xfrm: Provide API to register translator module
  ANDROID: Publish uncompressed Image on aarch64
  FROMLIST: crypto: arm64/poly1305-neon - reorder PAC authentication with SP update
  UPSTREAM: crypto: arm64/chacha - fix chacha_4block_xor_neon() for big endian
  UPSTREAM: crypto: arm64/chacha - fix hchacha_block_neon() for big endian
  Linux 4.19.154
  usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets.
  eeprom: at25: set minimum read/write access stride to 1
  USB: cdc-wdm: Make wdm_flush() interruptible and add wdm_fsync().
  usb: cdc-acm: add quirk to blacklist ETAS ES58X devices
  tty: serial: fsl_lpuart: fix lpuart32_poll_get_char
  net: korina: cast KSEG0 address to pointer in kfree
  ath10k: check idx validity in __ath10k_htt_rx_ring_fill_n()
  scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config()
  ...

Change-Id: I797efa1149f557c1dfab7856813cc40d1a4d60b2

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
	mm/page_alloc.c
2020-11-03 18:36:42 +08:00
Cai YiWei
274d447789 media: rockchip: isp/ispp to version v1.2.0
Change-Id: Ide1bab9c83d8f2375d17ef3ce9d9f0686adeca01
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-03 17:37:18 +08:00
Guochun Huang
78779053e9 phy/rockchip: mipi-dphy: support rk3568
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ica831e28362ca89869d951761b8562482d39f7ff
2020-11-03 16:45:43 +08:00
Sandy Huang
2631e39729 drm/rockchip: lvds: add support rk3568
support the following work mode:

1. vop video port  -> lvds0 -> dphy0  -> single channel lvds panel
2. vop video port  -> lvds1 -> dphy1  -> single channel lvds panel
                  |-> lvds0 -> dphy0-|
3. vop video port |                  |-> dual channel lvds panel
	          |-> lvds1 -> dphy1-|

                  |-> lvds0 -> dphy0  -> single chanenl lvds panel0
4. vop video port |
	          |-> lvds1 -> dphy1  -> single chanenl lvds panel1

5. vop video port0 -> lvds0 -> dphy0  -> single chanenl lvds panel0
   vop video port1 -> lvds1 -> dphy1  -> single channel lvds panel1

Change-Id: I4e9a677fc2a3f265cb67ee9fb79f720f5e806924
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-03 15:43:35 +08:00
Sugar Zhang
6f16cbd3e6 clk: rockchip: rv1126: Fix MCLK_I2Sx_OUT2TO rate
This patch allows user to set MCLK_I2Sx_OUT2IO freq
by CLK_SET_RATE_PARENT.

Change-Id: Ie8f3163726d34c7cf3ee206bbc1d0866049d6eda
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-03 15:40:06 +08:00
Xu Hongfei
cb3d3f5e4c media: rockchip: isp: enable LDCH in 2th frame
LDCH will compete with LSC/3DLUT for the DDR bus,
which may cause LDCH to read the map table exception.
so isp enable LDCH in 2th frame.

Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: If84139362ee9ca8de43714915f4387923cf21000
2020-11-03 15:27:53 +08:00
Ding Wei
d53bd4a922 video: rockchip: mpp: rkvenc issue for iommu irq repeat
when iommu pagefault, mark_irq to disable iommu interrupt,
then handle the fault, and unmark_irq to enable hardware.

Change-Id: Id40868bfab67ac27e12c181d83a8e70a09a1e498
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-11-03 10:03:44 +08:00
Vicent Chi
7e3569ff9f media: rockchip: cif: fixup crop size calculation
Change-Id: I0bc33acf0a9b096e19b92fc6f010044ae4aac9b5
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2020-11-03 09:32:10 +08:00
Zhenke Fan
bb0c5d7b4b media: spi: update 1608 driver
1. update safe read, limit max op size.
2. add dsp time init.
3. add dsp frame control msg.
4. support flip.
5. support file export/import, calib data read/write.
6. add align calculate func.

Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I714aec690d00c9aa6f7f4ef58c3616bfcbf238bb
2020-11-03 09:17:52 +08:00
Alistair Delva
974709e8bf ANDROID: GKI: Enable DEBUG_INFO_DWARF4
This is useful for debuggers, and is already the default for clang
(incidentally). Make sure it is on for all users/compilers.

Bug: 160841764
Change-Id: Ibb9a0c6900728d4cce3eccb57fb4c38268a89f24
Signed-off-by: Alistair Delva <adelva@google.com>
2020-11-02 18:58:17 +00:00
Daniel Vetter
d624a2b1ab UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller
slab does this already, and I want to use this in a memory allocation
tracker in drm for stuff that's tied to the lifetime of a drm_device,
not the underlying struct device. Kinda like devres, but for drm.

Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-2-daniel.vetter@ffwll.ch
(cherry picked from commit fd7cb5753e)
Bug: 163141236
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I10790befc779311a5f2ee441e4d073e51a5a7a62
2020-11-02 16:12:14 +00:00
Cai YiWei
9e8d6dd9f8 media: rockchip: ispp: fec read yuyv format
Change-Id: I026d3c1ba6c114c67d8e589dc11990e004dcd144
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-02 20:10:10 +08:00
Cai YiWei
29bb0fb6a2 media: rockchip: ispp: tnr/nr/fec sync to start
Change-Id: I54efdb97cea33b4abd5ed5513f05c5d23af9d0a1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-02 20:09:58 +08:00
Cai YiWei
228a86aac6 media: rockchip: isp: normal read back to enable hdr merge
Change-Id: I65ece8474522ca6c141728e4fcf08dc732f30ad4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-02 20:09:47 +08:00
Shunqing Chen
8b21466cd5 drm: rockchip: dw-hdmi: add RK3568 support
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I24ec9a60d915b71281362b0b2d67fb8c288cdd14
2020-11-02 16:57:15 +08:00
Cai YiWei
e1549bec10 ARM: dts: rv1126: monitor en to ispp
Change-Id: I1ec65cf63011e1618077c198591920efc00630c2
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-02 16:49:06 +08:00