fix the variable naming conflict with "lock" when CONFIG_ROCKCHIP_SARADC_TEST_CHN enabled
Change-Id: I9f2925fb6e4be642cacf8e5d5c764e33d13b9cc4
Signed-off-by: Simon Xue <xxm@rock-chips.com>
According to the eDP v1.3 chapter 3.6 Table 3-15, Alternative
Scramble Seed Reset(ASSR) is a recommended way for eDP Sink devices
to support Display Authentication and Content Protection as Method
3a, while Method 1 HDCP is normally not expected in an eDP Sink
device.
In addition, the ASSR support capability should be the bit 0 of
DPCD register 0000Dh according to the eDP v1.4 'Revision History'
table 2:
......
Table 3-4: Corrected reference to DPCD Address 0000Dh, bit 0 (was bit 4)
......
Change-Id: Iafad97755fd4c9e688c47164d099b290af905036
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
For some connector drivers, such as dw-dp, &drm_bridge_funcs.atomic_check()
helps to select output_mode, color_range and so on, which will be
determined in the following &drm_encoder_helper_funcs.atomic_check().
In order to get the exact display mode for the mode comparison
between U-boot and Kernel, add the full bridge atomic check process
in rockchip_drm_mode_fixup().
Without this patch, the mode comparison will fail if the DP logo
display is enabled in YUV420 mode for RK3576, because the display
mode of uboot has been fixed while the display mode of kernel has
not, due to the incorrect conn_state->output_mode.
The related workaround is:
/*
* For RK3576 YUV420 output, hden signal introduce one cycle delay,
* so we need to adjust hfp and hbp to compatible with this design.
*/
if (vop2->version == VOP_VERSION_RK3576 &&
conn_state->output_mode == ROCKCHIP_OUT_MODE_YUV420) {
mode->crtc_hsync_start += 2;
mode->crtc_hsync_end += 2;
}
Fixes: c4642391b1 ("drm/rockchip: vop2: adjust hfp and hbp for YUV420 output")
Change-Id: I3193bfa2bca7c14f5c7308f94e7d23160618be0c
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
This is the 6.1.118 stable release
* tag 'v6.1.118': (264 commits)
Linux 6.1.118
9p: fix slab cache name creation for real
fs/ntfs3: Fix general protection fault in run_is_mapped_full
platform/x86: x86-android-tablets: Fix use after free on platform_device_register() errors
mm: krealloc: Fix MTE false alarm in __do_krealloc
Bluetooth: L2CAP: Fix uaf in l2cap_connect
ext4: fix timer use-after-free on failed mount
drm/amdkfd: amdkfd_free_gtt_mem clear the correct pointer
uprobe: avoid out-of-bounds memory access of fetching args
uprobes: encapsulate preparation of uprobe args buffer
io_uring: fix possible deadlock in io_register_iowq_max_workers()
md/raid10: improve code of mrdev in raid10_sync_request
net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition
LoongArch: Use "Exception return address" to comment ERA
HID: lenovo: Add support for Thinkpad X1 Tablet Gen 3 keyboard
HID: multitouch: Add quirk for Logitech Bolt receiver w/ Casa touchpad
fs: Fix uninitialized value issue in from_kuid and from_kgid
bpf: Fix mismatched RCU unlock flavour in bpf_out_neigh_v6
vDPA/ifcvf: Fix pci_read_config_byte() return code handling
nvme: make keep-alive synchronous operation
...
Change-Id: I444ffa78df5ea265e328ff158178c4e640030da8
Conflicts:
arch/arm/boot/dts/rk3036.dtsi
This reverts commit 00b877ac98.
Replaced by commit fd4e062fbc ("net: arc: fix the device for dma_map_single/dma_unmap_single").
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I098b78b5794ea395ca9ced29ee027e66e24f8ed4
Fix the unexpected '\n' in the middle of the log.
Fixes: c6b6f4232c ("drm/rockchip: vop2: Add human readable log output info")
Change-Id: Ifc857fb67187d9afd189cb7ff1e4dff0f31c9ab3
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Pass the full state to CRTC atomic enable/disable/flush and plane atomic
update.
Relevant commits:
commit 351f950db4 ("drm/atomic: Pass the full state to CRTC atomic enable/disable")
commit f6ebe9f9c9 ("drm/atomic: Pass the full state to CRTC atomic begin and flush")
commit 977697e20b ("drm/atomic: Pass the full state to planes atomic disable and update")
Change-Id: I3a523d02d80c0248c7065b408985737d5b83a3f8
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
