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-09-20 05:15:09 +00:00
parent de73a2419b
commit e9d0cc1e24
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
53 changed files with 145 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sys/dev/pci/drm/apple/iomfb_template.c
View file

@ -796,7 +796,7 @@ void DCP_FW_NAME(iomfb_poweron)(struct apple_dcp *dcp)
struct dcp_wait_cookie *cookie;
int ret;
u32 handle;
dev_err(dcp->dev, "dcp_poweron() starting\n");
dev_info(dcp->dev, "dcp_poweron() starting\n");
cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
if (!cookie)
@ -938,7 +938,7 @@ void DCP_FW_NAME(iomfb_poweroff)(struct apple_dcp *dcp)
kref_put(&poff_cookie->refcount, release_wait_cookie);
dev_err(dcp->dev, "dcp_poweroff() done\n");
dev_info(dcp->dev, "dcp_poweroff() done\n");
}
static void last_client_closed_sleep(struct apple_dcp *dcp, void *out, void *cookie)
@ -983,7 +983,7 @@ void DCP_FW_NAME(iomfb_sleep)(struct apple_dcp *dcp)
dev_warn(dcp->dev, "setDCPPower(0) timeout %u ms\n", 1000);
kref_put(&cookie->refcount, release_wait_cookie);
dev_err(dcp->dev, "dcp_sleep() done\n");
dev_info(dcp->dev, "dcp_sleep() done\n");
}
static void dcpep_cb_hotplug(struct apple_dcp *dcp, u64 *connected)

2
sys/dev/pci/drm/i915/display/intel_hdcp.c
View file

@ -2165,7 +2165,6 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
struct intel_digital_port *dig_port,
const struct intel_hdcp_shim *shim)
{
STUB();
return -ENOSYS;
#ifdef notyet
struct drm_i915_private *i915 = to_i915(connector->base.dev);
@ -2225,7 +2224,6 @@ void intel_hdcp_component_init(struct drm_i915_private *i915)
if (!is_hdcp2_supported(i915))
return;
STUB();
#ifdef notyet
mutex_lock(&i915->display.hdcp.hdcp_mutex);
drm_WARN_ON(&i915->drm, i915->display.hdcp.comp_added);

2
sys/dev/pci/drm/i915/i915_driver.c
View file

@ -2274,7 +2274,7 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux)
& (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE))
== (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE)) {
dev_priv->primary = 1;
dev_priv->console = vga_is_console(pa->pa_iot, -1);;
dev_priv->console = vga_is_console(pa->pa_iot, -1);
vga_console_attached = 1;
}