Untitled
[envkernel] cobeta@ThinPad:~/linux$ git diff diff --git a/arch/arm64/boot/dts/qcom/sm7150-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/sm7150-xiaomi-common.dtsi index 7309de9f5810..a02c3c9e0346 100644 --- a/arch/arm64/boot/dts/qcom/sm7150-xiaomi-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sm7150-xiaomi-common.dtsi @@ -30,6 +30,7 @@ aliases { }; chosen { + bootargs = "PMOS_NOSPLASH console=tty0"; //stdout-path = "serial0:115200n8"; }; diff --git a/drivers/gpu/drm/panel/panel-k9a-36-02-0a-mp-dsc.c b/drivers/gpu/drm/panel/panel-k9a-36-02-0a-mp-dsc.c index 35ec6030a170..f2ea0baf12ef 100644 --- a/drivers/gpu/drm/panel/panel-k9a-36-02-0a-mp-dsc.c +++ b/drivers/gpu/drm/panel/panel-k9a-36-02-0a-mp-dsc.c @@ -348,8 +348,8 @@ static int k9a_36_02_0a_mp_dsc_probe(struct mipi_dsi_device *dsi) */ WARN_ON(1080 % ctx->dsc.slice_width); ctx->dsc.slice_count = 1080 / ctx->dsc.slice_width; - ctx->dsc.bits_per_component = 10; - ctx->dsc.bits_per_pixel = 10 << 4; /* 4 fractional bits */ + ctx->dsc.bits_per_component = 8; + ctx->dsc.bits_per_pixel = 8 << 4; /* 4 fractional bits */ ctx->dsc.block_pred_enable = true; ret = mipi_dsi_attach(dsi); diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 219604b5e43f..81148988c5ff 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -12,6 +12,7 @@ menuconfig INPUT_TOUCHSCREEN if INPUT_TOUCHSCREEN +source "drivers/input/touchscreen/st/Kconfig" source "drivers/input/touchscreen/gtx8/Kconfig" config TOUCHSCREEN_88PM860X diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 3d862695e90f..92a5dfb92215 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_TOUCHSCREEN_RM_TS) += raydium_i2c_ts.o obj-$(CONFIG_TOUCHSCREEN_S6SY761) += s6sy761.o obj-$(CONFIG_TOUCHSCREEN_SILEAD) += silead.o obj-$(CONFIG_TOUCHSCREEN_SIS_I2C) += sis_i2c.o :
Leave a Comment