This is the 6.1.115 stable release
* tag 'v6.1.115': (2780 commits)
Linux 6.1.115
xfrm: validate new SA's prefixlen using SA family when sel.family is unset
arm64/uprobes: change the uprobe_opcode_t typedef to fix the sparse warning
ACPI: PRM: Clean up guid type in struct prm_handler_info
platform/x86: dell-wmi: Ignore suspend notifications
ASoC: qcom: Fix NULL Dereference in asoc_qcom_lpass_cpu_platform_probe()
net: phy: dp83822: Fix reset pin definitions
serial: protect uart_port_dtr_rts() in uart_shutdown() too
selinux: improve error checking in sel_write_load()
drm/amd/display: Disable PSR-SU on Parade 08-01 TCON too
hv_netvsc: Fix VF namespace also in synthetic NIC NETDEV_REGISTER event
xfrm: fix one more kernel-infoleak in algo dumping
LoongArch: Get correct cores_per_package for SMT systems
ALSA: hda/realtek: Add subwoofer quirk for Acer Predator G9-593
KVM: arm64: Don't eagerly teardown the vgic on init error
KVM: nSVM: Ignore nCR3[4:0] when loading PDPTEs from memory
openat2: explicitly return -E2BIG for (usize > PAGE_SIZE)
nilfs2: fix kernel bug due to missing clearing of buffer delay flag
ACPI: button: Add DMI quirk for Samsung Galaxy Book2 to fix initial lid detection issue
ACPI: PRM: Find EFI_MEMORY_RUNTIME block for PRM handler and context
...
Change-Id: Iee600c49a5c914b79141c62cda38e787e429a167
Conflicts:
arch/arm64/boot/dts/rockchip/rk356x.dtsi
drivers/gpio/gpio-rockchip.c
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
drivers/media/i2c/imx335.c
drivers/pci/controller/dwc/pcie-dw-rockchip.c
drivers/spi/spi-rockchip.c
drivers/spi/spidev.c
drivers/usb/dwc3/gadget.c
drivers/usb/host/xhci.h
This reverts commit 6732e1af29.
Replaced by commit 4e1813e52f ("exfat: fix memory leak in exfat_load_bitmap()").
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I323d80bccfc1c1fa021d9b86433a766f7bbebe5b
Some panel resolution is less than 2560 but pixel clock/fps is
relatively large, In this scene, VOP aclk need enter advance mode to
make sure VOP performance is enough. 4kp60 line duration is roughly
equal to 7500 ns, so we add a condition(linedur_ns < 7500) to enter
VOP aclk advance mode.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I50e15e8b05cfcf3c92704b8d96287099ce851686
Use flag CLK_MUX_ROUND_CLOSEST to be able to round the divider
to the closest one instead than roundup.
e.g. clk_set_rate 6150144 (6144000 * 1.001)
Before:
clk_get_rate - 6144000
After:
clk_get_rate - 6150145
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ic3d1ed3f4de0abf0c7e4c1027a68c2d2cb681029
This property is used to report the supported color format for each
resolution to userspace.
Change-Id: Ib2e8c712d7590b1cff77d03eb789bc49c18d6e74
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
The dolby core work at 1 pixel rate and the vop work at 2 pixel rate,
so the aclk_vop_doby : aclk_vop = 2 : 1 when enter dolby mode,
Non dovi mode clk tree:
aclk_vop_root 750000000
aclk_vop 750000000
aclk_vop_doby 750000000
aclk_vop_div2_src 375000000
Dovi mode clk tree:
aclk_vop_root 750000000
aclk_vop_doby 750000000
aclk_vop_div2_src 375000000
aclk_vop 375000000
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I649fd6263245a93c67a577262a95d23328880d06
The dolby vision will be supported by RK3588*-*V* SOCs,
e.g., RK3588S2-DV.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I1e8cf8f0e2b1521b858704df9a88261cec038ebb
DRM_MODE_BLEND_PIXEL_NONE usual be set at ARGB format and pixel alpha
is 0xff, no need to do blend, but vop2 platform at the following
scene, the cluster win1 and win0 do blend first, the blend result
with esmart do blend, we can't direct to close layer_mix0, because
the cluster win0 some area will do blend with esmart, so we keep
layer0 mix alpha be enabled and set as premutli mode.
zpos layer
2 cluster win1[ARGB/BLEND_COVERAGE] -->|
1 cluster win0[ARGB/BLEND_PIXEL_NONE]-->|cluster mix-->|
0 esmart[ARGB/BLEND_PIXEL_NONE] -->|layer0 mix
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I4ae75a9b443ea965527fd656821016acca35afe1
ROCKCHIP_DRM_CRTC_FEATURE_NEXT_HDR will be instead of by
ROCKCHIP_DRM_CRTC_FEATURE_DOVI,
VOP_FEATURE_NEXT_HDR will be instead of by VOP_FEATURE_DOVI.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ifae130599bc1a966ae316de002df3a1a3fec9d5a
We only need to ignore rk3588/rk3576 esmart pd turn on/off at
vop2_win_disable(), the following splice win reset should
be run.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I617f73786d93398965f5dcfac32f6fa76ee2e42e
This may be used by android solid color layer, userspace can set
plane BACKGROUND prop to assigned color, the plane will display
this color and no need to access DDR.
The color value should layout as following:
Enable:
val = BIT(31) | R << 16 | G << 8 | B;/* R/G/B can be 0 ~ 0xff */
For example, set a pure red color:
modetest -w 125:BACKGROUND:2164195328
Disable:
modetest -w 125:BACKGROUND:0
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ie1e077594e385e8ddd244f7c33b6182309a5c134
Guarantee the data is written before flexbus starts transmission.
Change-Id: I24e7e1b9e7f0fcd57b9269746251a05801007f3e
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Guarantee flexbus has completed transmission before reading.
Change-Id: I38d600a9feb1c0e586e70ec8cb581f803cf7902d
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
The irq for PWM v1-v3 used to be exclusively associated with oneshot
mode, but capture mode also needs interrupt, which does not depend on
CONFIG_PWM_ROCKCHIP_ONESHOT.
Change-Id: Iaf0e01ec7c5d02d2d379776cba41841d59c46d20
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Although the previous patch helps to avoid display flashing during
the uboot/kernel logo switching, it forgot to set the
&rockchip_tve.tv_format in &drm_encoder_helper_funcs.mode_set()
which is needed in later &drm_encoder_helper_funcs.enable() process.
Fixes: e3b31a037d ("drm/rockchip: tve: add .loader_protect() support for tve")
Change-Id: Ib4e81f0c9ab64c1c2db9bd19209a6f108cae70e9
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
The f_uvc code includes an interrupt endpoint against the VideoControl
interface. According to section 2.4.2 of the UVC specification however
this endpoint is optional in at least some cases:
"This endpoint is optional, but may be mandatory under certain
conditions"
The conditions enumerated are whether...
1. The device supports hardware triggers
2. The device implements any AutoUpdate controls
3. The device implements any Asynchronous controls
As all of those things are implementation dependent, this endpoint
might be unnecessary for some users. Further to that it is unusable
in the current implementation as there is no mechanism within the
UVC gadget driver that allows data to be sent over that endpoint.
Disable the interrupt endpoint by default, but check whether the
user has asked for it to be enabled in configfs and continue to
generate it if so.
Change-Id: If7389f94d406d0c6f79229afbe9b63bee80ca74e
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Link: https://lore.kernel.org/r/20230130105045.120886-4-dan.scally@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit 130c4dcbe8)
The f_uvc code defines an endpoint named "uvc_control_ep" but it
is configured with a non-zero endpoint address and has its
bmAttributes flagged as USB_ENDPOINT_XFER_INT - this cannot be the
VideoControl interface's control endpoint, as the default endpoint
0 is used for that purpose. This is instead the optional interrupt
endpoint that can be contained by a VideoControl interface. There
is also a Class-specific VC Interrupt Endpoint Descriptor and a
SuperSpeed companion descriptor that are also for the VC interface's
interrupt endpoint but are named as though they are for the control
endpoint.
Rename the variables to make that clear.
Change-Id: Iee00e91954dcd67fbec867e067c7e528bfb2c217
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Link: https://lore.kernel.org/r/20230130105045.120886-2-dan.scally@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit 3078212caf)
drivers/input/touchscreen/gsl_point_id.c:2187:6: warning: no previous prototype for 'gsl_ReportPressure' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:2209:6: warning: no previous prototype for 'gsl_TouchNear' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:2317:6: warning: no previous prototype for 'gsl_DataInit' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:2595:14: warning: no previous prototype for 'gsl_version_id' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:2601:14: warning: no previous prototype for 'gsl_mask_tiaoping' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:2647:6: warning: no previous prototype for 'gsl_alg_id_main' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:2697:5: warning: no previous prototype for 'gsl_obtain_gesture' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:3001:6: warning: no previous prototype for 'gsl_GestureExtern' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:3076:14: warning: no previous prototype for 'gsl_GestureBuffer' [-Wmissing-prototypes]
drivers/input/touchscreen/gsl_point_id.c:549:5: warning: no previous prototype for 'abs' [-Wmissing-prototypes]
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I85aba64c02e93734df77e806b96f264bf91e244b
drivers/input/touchscreen/gt1x/gt1x_tools.c:104:6: warning: no previous prototype for gt1x_deinit_tool_nodeâ [-Wmissing-prototypes]
drivers/input/touchscreen/gt1x/gt1x_tools.c:79:5: warning: no previous prototype for gt1x_init_tool_nodeâ [-Wmissing-prototypes]
drivers/input/touchscreen/gt1x/gt1x_update.c:199:5: warning: no previous prototype for gt1x_i2c_write_with_readbackâ [-Wmissing-prototypes]
drivers/input/touchscreen/gt1x/gt1x_update.c:218:5: warning: no previous prototype for getUintâ [-Wmissing-prototypes]
drivers/input/touchscreen/gt1x/gt1x_update.c:750:5: warning: no previous prototype for __gt1x_hold_ss51_dsp_20â [-Wmissing-prototypes]
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic689a12dd469e7a4a6f306cbbad065903cf90891
drivers/mtd/spi-nor/core.c:736:5: warning: no previous prototype for ‘spi_nor_wait_till_ready_with_msleep’ [-Wmissing-prototypes]
Fixes a7b3870670 ("mtd: spi-nor: core: Change to use msleep for erase ops")
Change-Id: If2add4f5614f5337b5bd872db8a1b5149b7c4221
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
HDMI avmute is sent via GCP. If HDMI want to use
the avmute function, GCP must be sent.
Change-Id: Id844ea93c5296e1a5cf200f9ccf7bd2effd13e82
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Set to the minimum value of the vcom voltage to make the regulator
happy.
Change-Id: I32d7c52eda3ee7c40047d2dd7630f3d9303323e7
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
