SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-08-19 17:15:41 +00:00
parent c78abe7784
commit eb9d621948
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
270 changed files with 666 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sys/dev/pci/drm/apple/apldcp.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: apldcp.c,v 1.2 2024/07/12 10:01:28 tobhe Exp $ */
/* $OpenBSD: apldcp.c,v 1.3 2024/08/18 10:50:22 kettenis Exp $ */
/*
* Copyright (c) 2023 Mark Kettenis <kettenis@openbsd.org>
*
@ -115,14 +115,13 @@ struct apple_rtkit_ep {
uint8_t ep;
};
static struct pool rtktask_pool;
struct apple_rtkit {
struct rtkit_state *state;
struct apple_rtkit_ep ep[64];
void *cookie;
struct platform_device *pdev;
const struct apple_rtkit_ops *ops;
struct pool task_pool;
struct taskq *tq;
};
@ -181,7 +180,7 @@ apple_rtkit_do_recv(void *arg)
struct apple_rtkit *rtk = rtkep->rtk;
rtk->ops->recv_message(rtk->cookie, rtkep->ep, rtktask->msg);
pool_put(&rtktask_pool, rtktask);
pool_put(&rtk->task_pool, rtktask);
}
void
@ -191,7 +190,7 @@ apple_rtkit_recv(void *cookie, uint64_t msg)
struct apple_rtkit *rtk = rtkep->rtk;
struct apple_rtkit_task *rtktask;
rtktask = pool_get(&rtktask_pool, PR_NOWAIT | PR_ZERO);
rtktask = pool_get(&rtk->task_pool, PR_NOWAIT | PR_ZERO);
KASSERT(rtktask != NULL);
rtktask->rtkep = rtkep;
@ -251,7 +250,7 @@ devm_apple_rtkit_init(struct device *dev, void *cookie,
return ERR_PTR(ENOMEM);
}
pool_init(&rtktask_pool, sizeof(struct apple_rtkit_task), 0, IPL_TTY,
pool_init(&rtk->task_pool, sizeof(struct apple_rtkit_task), 0, IPL_TTY,
0, "apldcp_rtkit", NULL);
rk = malloc(sizeof(*rk), M_DEVBUF, M_WAITOK | M_ZERO);

3
sys/dev/pci/drm/i915/gem/i915_gem_mman.c
View file

@ -753,8 +753,9 @@ vm_fault_gtt(struct i915_mmap_offset *mmo, struct uvm_faultinfo *ufi,
int srcu;
int ret;
obj_offset = entry->offset - drm_vma_node_start(&mmo->vma_node);
obj_offset = (entry->offset >> PAGE_SHIFT) - drm_vma_node_start(&mmo->vma_node);
page_offset = (vaddr - entry->start) >> PAGE_SHIFT;
page_offset += obj_offset;
trace_i915_gem_object_fault(obj, page_offset, true, write);