shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge 7a58944173 ("Bluetooth: L2CAP: accept zero as a special value for MTU auto-selection") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.129

Change-Id: I13037a8418b21d6b3bcda013167f75353e393153
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-03-11 11:03:24 +00:00
parent 15e832da23 7a58944173
commit 0a07f883ce
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
View File

@@ -160,6 +160,10 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms,
formats = komeda_get_layer_fourcc_list(&mdev->fmt_tbl, formats = komeda_get_layer_fourcc_list(&mdev->fmt_tbl,
kwb_conn->wb_layer->layer_type, kwb_conn->wb_layer->layer_type,
&n_formats); &n_formats);
if (!formats) {
kfree(kwb_conn);
return -ENOMEM;
}
err = drm_writeback_connector_init(&kms->base, wb_conn, err = drm_writeback_connector_init(&kms->base, wb_conn,
&komeda_wb_connector_funcs, &komeda_wb_connector_funcs,

4
drivers/gpu/drm/i915/display/skl_universal_plane.c
View File

@@ -100,8 +100,6 @@ static const u32 icl_sdr_y_plane_formats[] = {
DRM_FORMAT_Y216, DRM_FORMAT_Y216,
DRM_FORMAT_XYUV8888, DRM_FORMAT_XYUV8888,
DRM_FORMAT_XVYU2101010, DRM_FORMAT_XVYU2101010,
DRM_FORMAT_XVYU12_16161616,
DRM_FORMAT_XVYU16161616,
}; };
static const u32 icl_sdr_uv_plane_formats[] = { static const u32 icl_sdr_uv_plane_formats[] = {
@@ -128,8 +126,6 @@ static const u32 icl_sdr_uv_plane_formats[] = {
DRM_FORMAT_Y216, DRM_FORMAT_Y216,
DRM_FORMAT_XYUV8888, DRM_FORMAT_XYUV8888,
DRM_FORMAT_XVYU2101010, DRM_FORMAT_XVYU2101010,
DRM_FORMAT_XVYU12_16161616,
DRM_FORMAT_XVYU16161616,
}; };
static const u32 icl_hdr_plane_formats[] = { static const u32 icl_hdr_plane_formats[] = {

20
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
View File

@@ -4764,12 +4764,20 @@ static inline void guc_log_context(struct drm_printer *p,
{ {
drm_printf(p, "GuC lrc descriptor %u:\n", ce->guc_id.id); drm_printf(p, "GuC lrc descriptor %u:\n", ce->guc_id.id);
drm_printf(p, "\tHW Context Desc: 0x%08x\n", ce->lrc.lrca); drm_printf(p, "\tHW Context Desc: 0x%08x\n", ce->lrc.lrca);
drm_printf(p, "\t\tLRC Head: Internal %u, Memory %u\n", if (intel_context_pin_if_active(ce)) {
ce->ring->head, drm_printf(p, "\t\tLRC Head: Internal %u, Memory %u\n",
ce->lrc_reg_state[CTX_RING_HEAD]); ce->ring->head,
drm_printf(p, "\t\tLRC Tail: Internal %u, Memory %u\n", ce->lrc_reg_state[CTX_RING_HEAD]);
ce->ring->tail, drm_printf(p, "\t\tLRC Tail: Internal %u, Memory %u\n",
ce->lrc_reg_state[CTX_RING_TAIL]); ce->ring->tail,
ce->lrc_reg_state[CTX_RING_TAIL]);
intel_context_unpin(ce);
} else {
drm_printf(p, "\t\tLRC Head: Internal %u, Memory not pinned\n",
ce->ring->head);
drm_printf(p, "\t\tLRC Tail: Internal %u, Memory not pinned\n",
ce->ring->tail);
}
drm_printf(p, "\t\tContext Pin Count: %u\n", drm_printf(p, "\t\tContext Pin Count: %u\n",
atomic_read(&ce->pin_count)); atomic_read(&ce->pin_count));
drm_printf(p, "\t\tGuC ID Ref Count: %u\n", drm_printf(p, "\t\tGuC ID Ref Count: %u\n",

7
net/bluetooth/l2cap_sock.c
View File

@@ -728,12 +728,12 @@ static bool l2cap_valid_mtu(struct l2cap_chan *chan, u16 mtu)
{ {
switch (chan->scid) { switch (chan->scid) {
case L2CAP_CID_ATT: case L2CAP_CID_ATT:
if (mtu < L2CAP_LE_MIN_MTU) if (mtu && mtu < L2CAP_LE_MIN_MTU)
return false; return false;
break; break;
default: default:
if (mtu < L2CAP_DEFAULT_MIN_MTU) if (mtu && mtu < L2CAP_DEFAULT_MIN_MTU)
return false; return false;
} }
@@ -1866,7 +1866,8 @@ static struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
chan = l2cap_chan_create(); chan = l2cap_chan_create();
if (!chan) { if (!chan) {
sk_free(sk); sk_free(sk);
sock->sk = NULL; if (sock)
sock->sk = NULL;
return NULL; return NULL;
} }