Commit Graph

840189 Commits

Author SHA1 Message Date
Hu Kejun
74c395ca97 arm64: dts: rockchip: rk3399-sapphire-excavator-edp: enable rkisp and ov13850
Change-Id: Id747ebc37b6e0ce71e3e84204c0f2acced4321d6
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-20 14:53:36 +08:00
Hu Kejun
600b243039 media: i2c: ov13850: synchronize with kernel4.4 and update to v01.01.01
Change-Id: I50716a51c39570e68b179fd1adceb5ebb0669520
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-20 14:40:03 +08:00
Zhen Chen
732afe7d96 Mali: bifrost: adjust source codes for kernel v4.19
Change-Id: I80aaaa2cd9b14607336b2db2dd5890a84f260561
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-06-20 14:15:33 +08:00
Zhen Chen
6230ae439e arm64: dts: rockchip: rk3399: modify gpu node for ARM Midgard driver
Change-Id: I46ff1b61787172a5b4ba5b378e00c6de4cfa7f8d
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-06-20 14:14:58 +08:00
Zhen Chen
89ad87fb8e Mali: midgard: adjust source codes for kernel v4.19
Parts of the modifications are borrowed from Mali Bifrost DDK r13.

Change-Id: I82c68041a3185063ae2d8a40a7a7c17feaab0733
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
2019-06-20 14:14:49 +08:00
Sandy Huang
a109506620 drm/rocckhip: driver: add support dmc and use rockchip atomic_commit
Change-Id: I30f7937d23a8092fc01d6d0baacb949264c7af0b
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-06-20 12:01:26 +08:00
Sandy Huang
3145e8695c drm/rockchip: driver: add debug and bandwidth calc function
Change-Id: I6273b05f4a1943000494a54a785bdec43b35cfb3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-06-20 12:01:26 +08:00
Sandy Huang
35c52e2194 drm/rockchip: driver: add support more property
Change-Id: If2cbc617d9346713efaf7dc4dd5c393e8605f91d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-06-20 12:01:26 +08:00
Sandy Huang
8166dc7eb5 arm64: dts: rk3399: update display for rk3399-sapphire-excavator-edp
Change-Id: I6a30a25ce0bd5ace9ea8df3e0d9c1c9d8268ddb0
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-06-20 12:01:26 +08:00
Sandy Huang
3250b1136a arm64: dts: rockchip: rk3399: delete set assigned clk for vop aclk and hclk
Change-Id: Iae51005277107b14755d0fd152fe4dbadeae33ce
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2019-06-20 12:01:26 +08:00
Zhixiong Lin
08cb205af1 arm64: dts: rockchip: rk3328: Modify gpu compatible
Mali driver only search the first compatible property.

Change-Id: If21b59d19a50e48a02157f49a6a97d7e71a41e7d
Signed-off-by: Zhixiong Lin <zhixiong.lin@rock-chips.com>
2019-06-20 10:36:04 +08:00
Zhixiong Lin
414f9ff2d8 MALI: utgard: Add implementation of mali sync timeline based on CONFIG_SYNC_FILE
Mali sync timeline in Utgard DDK r7p0-00rel1 depends on CONFIG_SYNC.
But, CONFIG_SYNC is no longer supported by kernel v4.19.
This modification is from ARM release:DX910-SW-99002-r9p0-01rel0.tgz

Change-Id: I2f2b36c57132ebc49cc8235b2d071ed6ed540825
Signed-off-by: Zhixiong Lin <zhixiong.lin@rock-chips.com>
2019-06-19 19:56:13 +08:00
Zhixiong Lin
853f921190 arm64: dts: rockchip: rk3328: correct gpu node
Change-Id: I2076871896094deba82f047397c6b03af15bd9a9
Signed-off-by: Zhixiong Lin <zhixiong.lin@rock-chips.com>
2019-06-19 18:35:54 +08:00
Zhixiong Lin
3b4356fdb4 MALI: utgard: adapter 4.19 timmer and memory interface
Change-Id: Ic5dc26292ee350aaa138409447bf5501ad0e316d
Signed-off-by: Zhixiong Lin <zhixiong.lin@rock-chips.com>
2019-06-19 14:32:47 +08:00
Jon Lin
97fcbe7e97 drivers: rkflash: add new spi nor flash
MX25L51245G08G

Change-Id: Iaf9e33000d36c8a0f91597eb31afd18bf82ea99a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-06-18 15:17:29 +08:00
Hu Kejun
06b6202281 media: camera: add RKMODULE_LSC_CFG ioctl
Change-Id: I0076ec2c34f766ec803d113143c553cbc439142e
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:12:33 +08:00
Hu Kejun
61a69ffd93 media: camera: add header for otp information
Change-Id: I903df1fb2ee26b5d771a3cfe2876e7afd837d1de
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Xu Hongfei
302d7359f9 phy: phy-rockchip-mipi-rx: increase the check whether the sensor is null
Change-Id: Ic80a97e5bf195ee236f7869755b88e825e57744e
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
97e05b42e3 phy: rockchip: mipi-rx: update sensor mbus when stream start
Change-Id: I5ced164e38b3869da0d3ec12ed180b75ccd924a3
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
7eda28531c phy: rockchip: mipi-dphy-rx: csi_mipidphy add stream off
Change-Id: Ifee3d6fb80425fc505ed716cbcbe6cc48a9e02bb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
9bb6d55511 media: rockchip: isp1: fix raw patch wrong RG10 format
Change-Id: I6037a34e97c6a109f01fe7610c87438c715e0af6
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
a44dd078a2 media: rockchip: isp1: fix kernel reboot in monkey test
1. use the same mutex to serialize the calls from user application.
2. keep iommu attached state when last video is closed,
because the user application may still access the buffer allocated
 by v4l2 driver.

Change-Id: I667a42a07672e5d30cc4383e9f54388fe1b91f1c
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
91a84844c7 media: rockchip: isp1: change version to v0.1.4
Change-Id: I37d78df7af00cb3deef45fd133f637c3d305f858
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
52776875ff media: rockchip: isp1: add pipeline power management
Change-Id: Iefc3224102d3b6f5b7a8f414a51072a8d30b916b
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
97896c849a media: rockchip: isp1: add dmarx patch
support read 8/16bit bayer raw and yuv422 format
from memory to isp.

Change-Id: I771a1a9c366a6721323815e811668472996a3355
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
aa6525d8f9 media: rockchip: isp1: enable af awb irq
enable AWB AF irq, to send measurement alone.
AEC and HIST need to get together, do it in
frame end.

Change-Id: I7d955eccfd4080865fa4c4f260a1e3c44f9585e1
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
390b8cc37c media: rockchip: isp1: fix diff isp ver to get frame num
Change-Id: Ibfbd97afd61c199c544698963aa9b1795ec5daf8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
deb72b1b15 media: rockchip: isp1: clear unready subdevice when kernel boot complete
Change-Id: I497719e6e8f2ef25a9d6402c16733bf4318d06d7
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
f8b513bdb4 media: rockchip: isp1: fix wrong RG10 format
Change-Id: Ibf4f36cd6e63b0cdf59237ad48b3847c403e0dc3
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
633535034a media: rockchip: isp1: fix reset on too high isp_clk rate will result in bus dead
Change-Id: I4e99c011a599901dbc1aaba147dcc77df9692fd1
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
589a7543e7 media: rockchip: isp1: change version to v0.1.1
Change-Id: I3b13c01a69ea07e15dcf4b2ef1d04d2f46fd1ea2
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
b96f293bbd media: rockchip: isp1: use tasklet to get 3A states
Change-Id: I48b86cf19dd203bad32e7412c722056a6c917059
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
74a83a1195 media: rockchip: isp1: raw patch with default sensor fmt&size
Change-Id: I057ee38a9369e8e3f26e5899113f9f88585b1e7a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
9d6f714628 media: rockchip: isp1: check for capture S_FMT
Change-Id: I10e75e18cd9f42ac02b4fd0f049851cdf96e8ccf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
5e87c5a6f5 media: rockchip: isp1: stop mipi with shutdown lane
isp_mipi_ctrl[8:11] control synopsys dphy's SHUTDOWNZ
and RSTZ. stop mipi and dphy together.

Change-Id: Ief50ab81f5f960e414a880e43b772ee47752742b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
a8df7f5d8b media: rockchip: isp1: stop isp when too many errors are reported
when use hdmi-in chip with isp, it needs to pull out/plug in hdmi cable
when stream is on.
many error logs are reported in interrupt function when pull out/plug in
hdmi cable, then the system will be dead.
so we stop isp when too many error logs are reported.

Change-Id: Ic19eddfc952954a11a176b91c16ce4c9b6372418
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
f65d50ae61 media: rockchip: isp1: add macro to switch between old mipi and new mipi
Change-Id: I878099d6a38f00a255a7b99ff9f2a3c5770226e5
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
f3d7bf1467 media: rockchip: isp1: check first iq param is set or not
Change-Id: I334874c58f7788e7ea4309cbf2eee4f400a41cd7
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
05e44de8e5 media: rockchip: isp1: support iesharp/demosaiclp/wdr
Change-Id: Id27d87c15d455d00ff8bfe09b470929c5746d511
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Wang Panzhenzhuan
b4d4f850d9 media: rockchip: isp1: fix high fps preview blurred bug
fix following camera err:
    rkisp1: CIF_ISP_PIC_SIZE_ERROR (0x00000002)

Change-Id: I6168d352d521cf75d7537ffe70a9af6f2ec07282
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
f54a286cbf media: rockchip: isp1: rk3368 only support mainpath
Change-Id: Ieb819cec2869a18b5343d39bf950d154bae96964
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Cai YiWei
044afbd6a3 media: rockchip: isp1: add check for get_remote_sensor
Change-Id: Ic09b394daa96aa8227b327f1e59713a359be8c18
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
a1e42f742f media: rockchip: isp1: fix compile failure on kernel-4.19
Change-Id: I2f4705c826cd8368eed207d7b2ed9b6717bdaa7d
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Sakari Ailus
b3f60447fb UPSTREAM: media: v4l: uAPI: V4L2_BUF_TYPE_META_OUTPUT is an output buffer type
V4L2_BUF_TYPE_META_OUTPUT was added by commit 72148d1a57
("media: v4l: Add support for V4L2_BUF_TYPE_META_OUTPUT") but the patch
missed adding the type to the macro telling whether a given type is an
output type or not. Do that now. Getting this wrong leads to handling the
buffer as a capture buffer in a lot of places.

Fixes: 72148d1a57 ("media: v4l: Add support for V4L2_BUF_TYPE_META_OUTPUT")

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
(cherry picked from commit 4b837c6d7e)

Change-Id: I963f70c8ea7bfff8ce9818fda1d558780d99f697
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Sakari Ailus
53bc644bdd UPSTREAM: media: v4l: Add support for V4L2_BUF_TYPE_META_OUTPUT
The V4L2_BUF_TYPE_META_OUTPUT mirrors the V4L2_BUF_TYPE_META_CAPTURE with
the exception that it is an OUTPUT type. The use case for this is to pass
buffers to the device that are not image data but metadata. The formats,
just as the metadata capture formats, are typically device specific and
highly structured.

Change-Id: I88795d8f23606009626c4d64e0655d9c864c58f1
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Tested-by: Tian Shu Qiu <tian.shu.qiu@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
(cherry picked from commit 72148d1a57)
2019-06-18 15:02:33 +08:00
Hu Kejun
8a57478d1c media: i2c: ov13850: fix compile error on kernel-4.19
Change-Id: Ia098d904835d07780a6abc9cbdddbaa4a9d1a20d
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Hu Kejun
69f7ca1320 phy: rockchip: mipi-dphy-rx: fix compile error on kernel-4.19
Change-Id: Id883341c7d91dda5d45a36442bd504393dd8fd76
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-06-18 15:02:33 +08:00
Finley Xiao
9147d8ddd0 arm64: dts: rockchip: rk3399: modify gpu opp table
As gpu clock sources had been changed, the gpu frequencies also
should modifiy.
1. 297MHz is not support and replace it with 300MHz.
2. If enable tow vops, 500MHz is not support,
   so remove it from the default table.

Change-Id: If2a653571f0222e895f7df825eeb8ae43ce99332
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-06-14 22:00:23 +08:00
Finley Xiao
083e451bdd arm64: dts: rockchip: rk3399: Change opp's maximum voltage to 1250mV
Change-Id: I46daeb8000d23774d270ae51751330e06279da2c
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-06-14 21:59:52 +08:00
Finley Xiao
7ba0aa525e arm64: dts: rockchip: rk3399: add 528MHz and 600MHz for dmc
Only 200MHz, 300MHz, 400MHz, 528MHz, 600MHz, 666MHz, 732MHz and
800MHz are available at present.

Change-Id: I3a376b389fe6b06b3b32f0c695de2cbde05dfeea
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-06-14 21:59:26 +08:00