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-12 06:29:20 +00:00
parent b321f55ead
commit 302c0be22f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
43 changed files with 456 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2080,7 +2080,6 @@ inteldrm_doswitch(void *v)
{
struct inteldrm_softc *dev_priv = v;
struct rasops_info *ri = &dev_priv->ro;
struct drm_device *dev = &dev_priv->drm;
rasops_show_screen(ri, dev_priv->switchcookie, 0, NULL, NULL);
intel_fbdev_restore_mode(dev_priv);
@ -2094,7 +2093,6 @@ inteldrm_enter_ddb(void *v, void *cookie)
{
struct inteldrm_softc *dev_priv = v;
struct rasops_info *ri = &dev_priv->ro;
struct drm_device *dev = &dev_priv->drm;
if (cookie == ri->ri_active)
return;
@ -2252,11 +2250,9 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux)
struct drm_device *dev;
struct pci_attach_args *pa = aux;
const struct pci_device_id *id;
struct intel_device_info *info, *device_info;
struct intel_runtime_info *runtime;
struct intel_device_info *info;
extern int vga_console_attached;
int mmio_bar, mmio_size, mmio_type;
int ret;
dev_priv->pa = pa;
dev_priv->pc = pa->pa_pc;
@ -2309,8 +2305,10 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux)
/* uc_expand_default_options() with no GuC submission */
if (GRAPHICS_VER(dev_priv) >= 12 &&
!IS_TIGERLAKE(dev_priv) && !IS_ROCKETLAKE(dev_priv) &&
!IS_XEHPSDV(dev_priv) && !IS_PONTEVECCHIO(dev_priv))
(INTEL_INFO(dev_priv)->platform != INTEL_TIGERLAKE) &&
(INTEL_INFO(dev_priv)->platform != INTEL_ROCKETLAKE) &&
(INTEL_INFO(dev_priv)->platform != INTEL_XEHPSDV) &&
(INTEL_INFO(dev_priv)->platform != INTEL_PONTEVECCHIO))
dev_priv->params.enable_guc = ENABLE_GUC_LOAD_HUC;
mmio_bar = (GRAPHICS_VER(dev_priv) == 2) ? 0x14 : 0x10;
@ -2394,8 +2392,10 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux)
void
inteldrm_forcedetach(struct inteldrm_softc *dev_priv)
{
#ifdef notyet
struct pci_softc *psc = (struct pci_softc *)dev_priv->sc_dev.dv_parent;
pcitag_t tag = dev_priv->tag;
#endif
extern int vga_console_attached;
if (dev_priv->primary) {
@ -2420,7 +2420,6 @@ inteldrm_attachhook(struct device *self)
struct rasops_info *ri = &dev_priv->ro;
struct wsemuldisplaydev_attach_args aa;
const struct pci_device_id *id = dev_priv->id;
struct drm_device *dev = &dev_priv->drm;
int orientation_quirk;
if (inteldrm_refcnt == 0) {
@ -2629,7 +2628,6 @@ inteldrm_firmware_backlight(struct inteldrm_softc *dev_priv,
void
inteldrm_init_backlight(struct inteldrm_softc *dev_priv)
{
struct drm_device *dev = &dev_priv->drm;
struct wsdisplay_param dp;
dp.param = WSDISPLAYIO_PARAM_BRIGHTNESS;

2
sys/dev/pci/drm/include/linux/ioport.h
View file

@ -10,6 +10,7 @@
struct resource {
u_long start;
u_long end;
const char *name;
};
static inline resource_size_t
@ -22,6 +23,7 @@ resource_size(const struct resource *r)
(struct resource) { \
.start = (_start), \
.end = (_start) + (_size) - 1, \
.name = NULL, \
}
#endif