Commit Graph

854753 Commits

Author SHA1 Message Date
Algea Cao
116ce33a4e Revert "drm: support atomic update flush for connector"
This reverts commit 5111545068.

For compatibility with GKI, connector atomic_begin/atomic_flush
should be removed.

Change-Id: I00b66338fd8a79230a71419ed476bf80e8496e2b
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-08-27 14:30:35 +08:00
Algea Cao
ea989a9d00 Revert "drm: introduce atomic_begin for connector"
This reverts commit 401fc0060c.

For compatibility with GKI, connector atomic_begin/atomic_flush
should be removed.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibff527242a2938027e0f7871a84e549513d5c2ea
2020-08-27 14:30:17 +08:00
Algea Cao
327eddb701 drm: Remove global property HDR_PANEL_METADATA
HDR_PANEL_METADATA has been hdmi private property, so remove
HDR_PANEL_METADATA in mode_config.

Fixes: 97fd2e42b6 ("drm: Add HDR panel metadata property")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia534d61d78edcdd2260b41d1c5a076f19034bf75
2020-08-27 14:23:18 +08:00
Algea Cao
0976d53030 drm: Remove hdr_metadata_changed
For compatibility with GKI, hdr_metadata_changed should be removed.

Fixes: 2beb3925b7 ("drm: bridge: dw-hdmi: support Dynamic Range and Mastering Infoframe")
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia1981a44507bbd58e5677a9ebfc0053afd228d19
2020-08-27 14:23:10 +08:00
Algea Cao
38e112d31c drm/bridge: synopsys: dw-hdmi: Check whether color has changed in connector atomic_check
For compatibility with GKI, connector atomic_begin/atomic_flush should
be removed. If hdmi color format has changed, set flag mode_changed
true and start a modeset to config hdmi.

We check whether color format has changed in
dw_hdmi_connector_atomic_check(), but color format variable update in
dw_hdmi_rockchip_encoder_atomic_check(), It runs after
dw_hdmi_connector_atomic_check(). That will lead to misjudgments when
determining whether color format has changed.

To solve this problem, we introduce get_color_changed(). When color
properties are set and color format is changed, get_color_changed()
return true.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Id1fbe80171856f91efa5ae40a0e0608a92ebcbf7
2020-08-27 14:22:49 +08:00
Algea Cao
8f146c3559 drm: rockchip: dw-hdmi: Change HDR_PANEL_METADATA to private property
For compatibility with GKI, HDR_PANEL_METADATA can't be a global
property. So change HDR_PANEL_METADATA to Rockchip private property.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I7926683a5dc6274e6cab2151e476344fa897b66c
2020-08-27 14:22:49 +08:00
Algea Cao
94db4743ea drm/bridge: synopsys: dw-hdmi: Check if hdr output metadata has changed in atomic_check
For compatibility with GKI, remove hdr_metadata_changed. Check
if hdr output metadata has changed in dw_hdmi_connector_atomic_check.
If hdr output metadata has changed, modeset will begin.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I160bd64eabbc6fc827e61e85ede771484d967626
2020-08-27 14:22:49 +08:00
Sean Paul
1251fc7ab0 UPSTREAM: drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state
Everyone who implements connector_helper_funcs->atomic_check reaches
into the connector state to get the atomic state. Instead of continuing
this pattern, change the callback signature to just give atomic state
and let the driver determine what it does and does not need from it.

Eventually all atomic functions should do this, but that's just too much
busy work for me.

Changes in v3:
- Added to the set
Changes in v4:
- None
Changes in v5:
- intel_digital_connector_atomic_check declaration moved to i915_atomic.h

Link to v3: https://patchwork.freedesktop.org/patch/msgid/20190502194956.218441-5-sean@poorly.run
Link to v4: https://patchwork.freedesktop.org/patch/msgid/20190508160920.144739-5-sean@poorly.run

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: Eric Anholt <eric@anholt.net>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> [for rcar lvds]
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190611160844.257498-5-sean@poorly.run
(cherry picked from commit 6f3b62781b)
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: If3349ad733f31acb28b8f31260592342564e17f8
2020-08-27 14:22:49 +08:00
Algea Cao
655029432a drm: rockchip: dw-hdmi: Fix switch from 4K-60/50Hz to lower resolution failed
The resolution below 4K-60/50Hz don't support YUV420. If switch from
4K-60/50Hz in YUV420 to lower resolution may cause display err.
So if resolution below 4K-60/50Hz, color format should be
RGB/YUV444/YUV422.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ib96303f3bef1a1b269a9ac8845951b6a895ec5b8
2020-08-27 14:22:49 +08:00
Hu Kejun
b729a0215e media: rockchip: isp: support hal to control hdrtmo on/off
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ib637029333c426385a4d8f7b6da491ab3dfc4a34
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-27 11:59:57 +08:00
Weiwen Chen
1b969b78ea ARM: dts: rockchip: rv1126-evb-ddr3-v12-spi-nand: modify rootfs to mtd:2
The UBIFS file system does not need misc partition,
So modify the mtd of rootfs to 2.

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ibc0dc84357daf6e917f1989205af5674f4ddeb25
2020-08-27 08:54:03 +08:00
Hu Kejun
9d4fa15b74 media: platform: rockchip: cif: fix fmt/crop for isp is not correct
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I8ca4b38f6d857d82d77842989099a560e3f4212e
2020-08-26 18:17:35 +08:00
Cai YiWei
481df435bd media: rockchip: ispp: add clk rate set for rv1126
Change-Id: I1aec52812324285285bdff9524d55ef1197384ab
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-26 18:17:35 +08:00
Cai YiWei
eba5bf0b2b media: rockchip: isp: add more clk rate for rv1126
Change-Id: Icdf8ea47535d80e80e2f309bbbc4110c27495b62
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-26 18:17:35 +08:00
Zhenke Fan
9ea9c1eae3 ARM: dts: rv1126-ai-cam: support imx378
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I5369d261c97550c92efb94b3bddd9f4b3b5e378a
2020-08-26 17:53:21 +08:00
YouMin Chen
8d3917b810 PM / devfreq: rockchip_dmc: rv1126 support set ddr frequency by DCF
Change-Id: I6f5fdbbfd2a3986212a9c5bf9771ca408657705e
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-08-26 17:03:17 +08:00
YouMin Chen
9d27410ede ARM: dts: rv1126: add dcf for ddr set frequency
Change-Id: I1f18a453f05074efa8d8b88d90485c14c8f8d4ae
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-08-26 16:54:33 +08:00
YouMin Chen
c491befc29 dt-bindings: memory: update the define value about ds and odt for rv1126
Change-Id: Icbe34023412f3350cae978faae0444c557121274
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-08-26 15:43:55 +08:00
Mark Huang
217acdfff2 ARM: dts: rv1126: add ai camera spi nand board support
Change-Id: Ibb0657277c951121d9ebc2caccdc55ee74cb4d57
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
2020-08-26 15:32:01 +08:00
Zhenke Fan
797d705c90 media: i2c: add imx378 sensor driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I10da914805897d470de0827a3079d3fa8e197972
2020-08-26 14:55:30 +08:00
Allon Huang
48864969a6 media: rockchip: cif: fix dvp raw buf size err
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Idc5cb1659c2a4be6d2719f91ebd9f16738645eaa
2020-08-26 14:08:27 +08:00
William Wu
103c761ec7 usb: gadget: f_rndis: handle the packet filter class request
This patch handles the class specific control request
"USB_CDC_SET_ETHERNET_PACKET_FILTER" for rndis. Actually,
the cdc_filter is not rndis specific, so we don't really
set the cdc_filter to the wValue of setup request for
rndis, and just return value 0 for the setup request to
avoid usb controllers stall ep0.

Change-Id: I42f9835a9812b8dfa640562b8555bc5f9b022256
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-08-26 11:11:46 +08:00
Yiqing Zeng
8042970b65 media: i2c: imx415 support 10bit 3840x2160@20fps HDR DOL3
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Ic962b7ce82069f9e2f63c89fc327e1a713bc7366
2020-08-25 20:47:49 +08:00
Elaine Zhang
ff1b15e1a6 net: can: rockchip: modify the usleep to udelay
usleep cannot be used in interrupts,
use udelay instead of usleep.

Generally, the reset time is 5 cycles(PCLK).

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7cf1cac018aa2b440ed79dcb4e8fb77607930bb0
2020-08-25 18:44:16 +08:00
Yao Xiao
917892f92a net: rockchip_wlan: update rtl8189fs to "v5.7.10_36835.20200519"
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I56bab74599002b265ffa6fe336fa9ee042f8d111
2020-08-25 18:07:05 +08:00
Yao Xiao
f0c670e9c8 net: rockchip_wlan: update rtl8723ds to "v5.10.1-20-g5af20e016.20200310_beta"
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Ic8cc188184e1d0a5336993643b0265077d152535
2020-08-25 17:49:34 +08:00
Nickey Yang
8f0432334d media: i2c: add gc2093 sensor driver
Galaxycore GC2093 is a 1920x1080 image sensor,
Support liner and HDR mode.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I7c185847147b1f603000648eaa524ddcef94366c
2020-08-25 15:18:36 +08:00
Yu YongZhen
c6f3c8d969 ARM: configs: rv1126-spi-nor.config: add cif driver
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
Change-Id: Ia12ed82f75be27ef4662d1e6679538be3ba684cd
2020-08-25 14:46:02 +08:00
Cai YiWei
0c27e7e4a5 media: rockchip: isp and ispp version to v0.1.3
Change-Id: Ib1afcd69a66d786fc5bb884510ea7d94cb6dd56b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-25 12:07:38 +08:00
Hu Kejun
fb8191d684 media: platform: rockchip: cif: update version to v0.1.7
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I5c9809ee241b6b09bab573ca2bfe023187b7cd65
2020-08-25 11:24:30 +08:00
Hu Kejun
e396a4da89 ARM: dts: rv1126: 38x38 board: use vicap to get data from sensor
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I9a68c4f3a3e9a6e19685f99d988ed00286b72482
2020-08-25 11:24:18 +08:00
Hu Kejun
624f752e2f ARM: dts: rv1126: add isp_reserved to rkcif_mipi_lvds/rkcif_dvp
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I6e652c0c6963dadba7bd275270bebaafd8875766
2020-08-25 11:24:04 +08:00
Hu Kejun
672c39e381 media: platform: cif: handle reserved memory for dvp/mipi_lvds device
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ied588e717d879dff9c0a2baa9c45bcebfcf2800b
2020-08-25 11:23:01 +08:00
Allon Huang
790eee2211 media: rockchip: cif: support hdr_x3 mode
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I51bca04810f3084e9ba9f446a639e27150bf10d8
2020-08-25 11:22:25 +08:00
Hu Kejun
b57822c42e media: platform: cif: add check isr function pointer is valid or not
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I56acf134f8241ae7308f232b98a96f7a556a4840
2020-08-25 10:58:43 +08:00
Zefa Chen
73a31cda08 media: i2c: imx415 support enum format by aiq
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib4163057e718ca832a156a44f448c110c99e7d17
2020-08-25 10:53:43 +08:00
Ren Jianing
05c86e9eef usb: dwc3: gadget: fix bug of clac_trbs_left at isoc in transfer
This patch clear the HWO bit in trb_ctrl by software when requests
are moved to queued list.

There are some cases which can lead to missed isoc event in dwc3
endpoint interrupt. For example, in uac+uvc mode, if PC start to
playpack audio or open uvc preview while captureing audio, a lot of
control transfer will bring missed isoc event and we will unmap all
request in started list and move them to queued list. Without this
patch, the number of trbs left will be incorrectle calculated as 0
and no trbs will be prepared at next transfer.

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: Idca5cd10f291962a480fc7e01e2186beaae2efb9
2020-08-25 09:52:08 +08:00
Cai YiWei
6d3bead414 media: rockchip: isp: add cru reset for rv1126
Change-Id: Ib94a0b082e4e060eb861bfcc608c47689bb4f301
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-24 18:32:32 +08:00
Cai YiWei
212d27f52d ARM: dts: rv1126: isp add cru reset
Change-Id: Iab117b7c42a3c324b91f4c572b8ed8f3bf3ede99
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-24 18:32:31 +08:00
Cai YiWei
762ff9a1b2 media: rockchip: ispp: fix reg write err for fec
Change-Id: Ie2e68abaef2d3ab22ee70eee7548f4fdadcf38f9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-24 15:20:36 +08:00
Cai YiWei
c97d8e5484 media: rockchip: isp: mi lum burst to 16 for dmatx
Change-Id: I005d2d30a2ec0a6b1bec6f8c81866739da40818f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-24 15:20:31 +08:00
Xing Zheng
ba129dcdbd HACK-TO-REVERT: ASoC: simple-card: using clk_id to judge stream
The clk_id is not used on rockchip platform, and there are
mclk_tx and mclk_rx on rockchip i2s driver, so we need to
use clk_id to stream to judge whether is playback or capture
now.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I4f5b9229c599344477990ab80bce7edfc6d25b45
2020-08-24 14:31:32 +08:00
Cai YiWei
f8373b4e3e media: rockchip: isp: adjust hurry priority to middle
Change-Id: I3ec12623b3a9529479c181b0cdf4b84e33c9cf2c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-08-24 11:15:44 +08:00
Wang Panzhenzhuan
e6f03e192b media: i2c: gc8034 optimize drivers for cts issues
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I942e5690acd729aacf9b3d39925a3166ec1c9695
2020-08-24 10:55:36 +08:00
Wang Panzhenzhuan
8b82f490da media: i2c: gc5035 optimize drivers for cts issues
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I84f2cd30efe770ccedf3f43ee97e5062981ce603
2020-08-24 10:55:36 +08:00
Wang Panzhenzhuan
00ffc1d2b4 media: i2c: gc5025 optimize drivers for cts issues
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I0ab557b5844ff593cea2df9666efe2e2a7d515a9
2020-08-24 10:55:36 +08:00
Hu Kejun
478c67e24b media: rockchip: isp: fix picture of hdr is abnormal in muti-visual isp when run second time
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I73b0c38bbf889005a67157da2c85c29c9a489cd8
2020-08-24 10:26:55 +08:00
Hu Kejun
4cdd2bc3a1 phy: rockchip: mipi-dphy-rx: change dphy selection when stream start for rk1126
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ied1b01617e6ac07ef665a5ad08d31812f98e997b
2020-08-24 10:26:33 +08:00
Hu Kejun
300943521d media: rockchip: cif: fix link to mipi and lvds is enabled at the same time
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I1d1006e05ffb444175c1f59fb2fdd872da748699
2020-08-24 10:26:33 +08:00
Hu Kejun
87cf1277ad ARM: dts: rv1109-evb-ddr3-v12-facial-gate: add interface node for cif and isp
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ie840233820d738c7efa8b7ede88e9877ce6f366c
2020-08-24 10:26:33 +08:00