sync with OpenBSD -current
This commit is contained in:
parent
c8d0379fc6
commit
2b1f2f8516
GPG Key ID:
F42C07F07E2E35B7
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: asn1time.c,v 1.24 2024/02/18 17:13:29 tb Exp $ */
|
||||
/* $OpenBSD: asn1time.c,v 1.25 2024/02/18 22:17:01 tb Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
|
||||
* Copyright (c) 2024 Google Inc.
|
||||
|
|
@ -699,8 +699,6 @@ asn1_time_overflow(void)
|
|||
if (memcmp(©, &max_time, sizeof(max_time)) != 0) {
|
||||
fprintf(stderr, "FAIL: maximally adjusted copy didn't match "
|
||||
"max_time\n");
|
||||
hexdump((unsigned char *)&max_time, sizeof(max_time));
|
||||
hexdump((unsigned char *)©, sizeof(copy));
|
||||
goto err;
|
||||
}
|
||||
if (!OPENSSL_gmtime_adj(©, 0, -valid_time_range)) {
|
||||
|
|
|
|||
|
|
@ -206,28 +206,32 @@ void dcn21_set_abm_immediate_disable(struct pipe_ctx *pipe_ctx)
|
|||
void dcn21_set_pipe(struct pipe_ctx *pipe_ctx)
|
||||
{
|
||||
struct abm *abm = pipe_ctx->stream_res.abm;
|
||||
uint32_t otg_inst = pipe_ctx->stream_res.tg->inst;
|
||||
struct timing_generator *tg = pipe_ctx->stream_res.tg;
|
||||
struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;
|
||||
struct dmcu *dmcu = pipe_ctx->stream->ctx->dc->res_pool->dmcu;
|
||||
uint32_t otg_inst;
|
||||
|
||||
if (!abm && !tg && !panel_cntl)
|
||||
return;
|
||||
|
||||
otg_inst = tg->inst;
|
||||
|
||||
if (dmcu) {
|
||||
dce110_set_pipe(pipe_ctx);
|
||||
return;
|
||||
}
|
||||
|
||||
if (abm && panel_cntl) {
|
||||
if (abm->funcs && abm->funcs->set_pipe_ex) {
|
||||
abm->funcs->set_pipe_ex(abm,
|
||||
if (abm->funcs && abm->funcs->set_pipe_ex) {
|
||||
abm->funcs->set_pipe_ex(abm,
|
||||
otg_inst,
|
||||
SET_ABM_PIPE_NORMAL,
|
||||
panel_cntl->inst,
|
||||
panel_cntl->pwrseq_inst);
|
||||
} else {
|
||||
dmub_abm_set_pipe(abm, otg_inst,
|
||||
SET_ABM_PIPE_NORMAL,
|
||||
panel_cntl->inst,
|
||||
panel_cntl->pwrseq_inst);
|
||||
}
|
||||
} else {
|
||||
dmub_abm_set_pipe(abm, otg_inst,
|
||||
SET_ABM_PIPE_NORMAL,
|
||||
panel_cntl->inst,
|
||||
panel_cntl->pwrseq_inst);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -237,34 +241,35 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx,
|
|||
{
|
||||
struct dc_context *dc = pipe_ctx->stream->ctx;
|
||||
struct abm *abm = pipe_ctx->stream_res.abm;
|
||||
struct timing_generator *tg = pipe_ctx->stream_res.tg;
|
||||
struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;
|
||||
uint32_t otg_inst;
|
||||
|
||||
if (!abm && !tg && !panel_cntl)
|
||||
return false;
|
||||
|
||||
otg_inst = tg->inst;
|
||||
|
||||
if (dc->dc->res_pool->dmcu) {
|
||||
dce110_set_backlight_level(pipe_ctx, backlight_pwm_u16_16, frame_ramp);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (abm != NULL) {
|
||||
uint32_t otg_inst = pipe_ctx->stream_res.tg->inst;
|
||||
|
||||
if (abm && panel_cntl) {
|
||||
if (abm->funcs && abm->funcs->set_pipe_ex) {
|
||||
abm->funcs->set_pipe_ex(abm,
|
||||
otg_inst,
|
||||
SET_ABM_PIPE_NORMAL,
|
||||
panel_cntl->inst,
|
||||
panel_cntl->pwrseq_inst);
|
||||
} else {
|
||||
dmub_abm_set_pipe(abm,
|
||||
otg_inst,
|
||||
SET_ABM_PIPE_NORMAL,
|
||||
panel_cntl->inst,
|
||||
panel_cntl->pwrseq_inst);
|
||||
}
|
||||
}
|
||||
if (abm->funcs && abm->funcs->set_pipe_ex) {
|
||||
abm->funcs->set_pipe_ex(abm,
|
||||
otg_inst,
|
||||
SET_ABM_PIPE_NORMAL,
|
||||
panel_cntl->inst,
|
||||
panel_cntl->pwrseq_inst);
|
||||
} else {
|
||||
dmub_abm_set_pipe(abm,
|
||||
otg_inst,
|
||||
SET_ABM_PIPE_NORMAL,
|
||||
panel_cntl->inst,
|
||||
panel_cntl->pwrseq_inst);
|
||||
}
|
||||
|
||||
if (abm && abm->funcs && abm->funcs->set_backlight_level_pwm)
|
||||
if (abm->funcs && abm->funcs->set_backlight_level_pwm)
|
||||
abm->funcs->set_backlight_level_pwm(abm, backlight_pwm_u16_16,
|
||||
frame_ramp, 0, panel_cntl->inst);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -996,7 +996,7 @@ static struct stream_encoder *dcn301_stream_encoder_create(enum engine_id eng_id
|
|||
vpg = dcn301_vpg_create(ctx, vpg_inst);
|
||||
afmt = dcn301_afmt_create(ctx, afmt_inst);
|
||||
|
||||
if (!enc1 || !vpg || !afmt) {
|
||||
if (!enc1 || !vpg || !afmt || eng_id >= ARRAY_SIZE(stream_enc_regs)) {
|
||||
kfree(enc1);
|
||||
kfree(vpg);
|
||||
kfree(afmt);
|
||||
|
|
|
|||
|
|
@ -2850,8 +2850,7 @@ static int handle_mmio(struct intel_gvt_mmio_table_iter *iter, u32 offset,
|
|||
for (i = start; i < end; i += 4) {
|
||||
p = intel_gvt_find_mmio_info(gvt, i);
|
||||
if (p) {
|
||||
WARN(1, "dup mmio definition offset %x\n",
|
||||
info->offset);
|
||||
WARN(1, "dup mmio definition offset %x\n", i);
|
||||
|
||||
/* We return -EEXIST here to make GVT-g load fail.
|
||||
* So duplicated MMIO can be found as soon as
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2061 2024/02/05 19:07:45 deraadt Exp $
|
||||
$OpenBSD: pcidevs,v 1.2062 2024/02/19 03:00:37 kevlo Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -8647,10 +8647,14 @@ product REALTEK RTL8187SE 0x8199 8187SE
|
|||
product REALTEK RTL8723AE 0x8723 8723AE
|
||||
product REALTEK RTL8821AE 0x8821 8821AE
|
||||
product REALTEK RTL8852AE 0x8852 8852AE
|
||||
product REALTEK RTL8852AE_VT 0xa85a 8852AE-VT
|
||||
product REALTEK RTL8852BE 0xb852 8852BE
|
||||
product REALTEK RTL8852BE_2 0xb85b 8852BE
|
||||
product REALTEK RTL8723BE 0xb723 8723BE
|
||||
product REALTEK RTL8822BE 0xb822 8822BE
|
||||
product REALTEK RTL8821CE 0xc821 8821CE
|
||||
product REALTEK RTL8822CE 0xc822 8822CE
|
||||
product REALTEK RTL8852CE 0xc852 8852CE
|
||||
|
||||
/* Red Hat products */
|
||||
product REDHAT PPB 0x0001 Qemu PCI-PCI
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2061 2024/02/05 19:07:45 deraadt Exp
|
||||
* OpenBSD: pcidevs,v 1.2062 2024/02/19 03:00:37 kevlo Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -8652,10 +8652,14 @@
|
|||
#define PCI_PRODUCT_REALTEK_RTL8723AE 0x8723 /* 8723AE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8821AE 0x8821 /* 8821AE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8852AE 0x8852 /* 8852AE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8852AE_VT 0xa85a /* 8852AE-VT */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8852BE 0xb852 /* 8852BE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8852BE_2 0xb85b /* 8852BE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8723BE 0xb723 /* 8723BE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8822BE 0xb822 /* 8822BE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8821CE 0xc821 /* 8821CE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8822CE 0xc822 /* 8822CE */
|
||||
#define PCI_PRODUCT_REALTEK_RTL8852CE 0xc852 /* 8852CE */
|
||||
|
||||
/* Red Hat products */
|
||||
#define PCI_PRODUCT_REDHAT_PPB 0x0001 /* Qemu PCI-PCI */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2061 2024/02/05 19:07:45 deraadt Exp
|
||||
* OpenBSD: pcidevs,v 1.2062 2024/02/19 03:00:37 kevlo Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -31171,6 +31171,18 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8852AE,
|
||||
"8852AE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8852AE_VT,
|
||||
"8852AE-VT",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8852BE,
|
||||
"8852BE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8852BE_2,
|
||||
"8852BE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8723BE,
|
||||
"8723BE",
|
||||
|
|
@ -31187,6 +31199,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8822CE,
|
||||
"8822CE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8852CE,
|
||||
"8852CE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_PPB,
|
||||
"Qemu PCI-PCI",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: wskbd.c,v 1.117 2023/11/23 15:02:57 deraadt Exp $ */
|
||||
/* $OpenBSD: wskbd.c,v 1.118 2024/02/18 20:17:48 anton Exp $ */
|
||||
/* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -1229,8 +1229,11 @@ getkeyrepeat:
|
|||
|
||||
case WSKBDIO_GETENCODINGS:
|
||||
uedp = (struct wskbd_encoding_data *)data;
|
||||
for (count = 0; sc->id->t_keymap.keydesc[count].name; count++)
|
||||
;
|
||||
count = 0;
|
||||
if (sc->id->t_keymap.keydesc != NULL) {
|
||||
while (sc->id->t_keymap.keydesc[count].name)
|
||||
count++;
|
||||
}
|
||||
if (uedp->nencodings > count)
|
||||
uedp->nencodings = count;
|
||||
for (i = 0; i < uedp->nencodings; i++) {
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ static struct timespec ArchMTimeMember(const char *, const char *, bool);
|
|||
static FILE *ArchFindMember(const char *, const char *, struct ar_hdr *, const char *);
|
||||
static void ArchTouch(const char *, const char *);
|
||||
#if defined(__svr4__) || defined(__SVR4) || \
|
||||
(defined(__OpenBSD__) && defined(__ELF__))
|
||||
(defined(__SecBSD__) && defined(__ELF__))
|
||||
#define SVR4ARCHIVES
|
||||
#endif
|
||||
static bool parse_archive(Buffer, const char **, Lst, SymTable *);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user