From 6df74fa7b7c816968a45301a0454bba147fa8dae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= Date: Sat, 18 Jan 2014 08:52:17 +0100 Subject: [PATCH] drm: Rename device to dev in struct drm_device Reducing differences with Linux --- sys/dev/drm/drm_agpsupport.c | 2 +- sys/dev/drm/drm_bufs.c | 4 +-- sys/dev/drm/drm_drv.c | 50 ++++++++++++++--------------- sys/dev/drm/drm_edid.c | 2 +- sys/dev/drm/drm_irq.c | 6 ++-- sys/dev/drm/drm_pci.c | 2 +- sys/dev/drm/i915/i915_dma.c | 12 +++---- sys/dev/drm/i915/i915_drv.c | 8 ++--- sys/dev/drm/i915/i915_gem.c | 2 +- sys/dev/drm/i915/i915_suspend.c | 4 +-- sys/dev/drm/i915/intel_display.c | 4 +-- sys/dev/drm/i915/intel_dp.c | 4 +-- sys/dev/drm/i915/intel_iic.c | 4 +-- sys/dev/drm/i915/intel_opregion.c | 4 +-- sys/dev/drm/i915/intel_panel.c | 4 +-- sys/dev/drm/i915/intel_sdvo.c | 6 ++-- sys/dev/drm/include/drm/drmP.h | 17 +++++----- sys/dev/drm/mga/mga_drv.c | 4 +-- sys/dev/drm/radeon/r600_cs.c | 2 +- sys/dev/drm/radeon/radeon_cp.c | 2 +- sys/dev/drm/radeon/radeon_device.c | 6 ++-- sys/dev/drm/radeon/radeon_display.c | 2 +- sys/dev/drm/radeon/radeon_gem.c | 8 ++--- sys/dev/drm/radeon/radeon_i2c.c | 24 +++++++------- sys/dev/drm/radeon/radeon_kms.c | 6 ++-- 25 files changed, 95 insertions(+), 94 deletions(-) diff --git a/sys/dev/drm/drm_agpsupport.c b/sys/dev/drm/drm_agpsupport.c index 838f8965d2..f52187a3ad 100644 --- a/sys/dev/drm/drm_agpsupport.c +++ b/sys/dev/drm/drm_agpsupport.c @@ -43,7 +43,7 @@ static int drm_device_find_capability(struct drm_device *dev, int cap) { - return (pci_find_extcap(dev->device, cap, NULL) == 0); + return (pci_find_extcap(dev->dev, cap, NULL) == 0); } int drm_device_is_agp(struct drm_device *dev) diff --git a/sys/dev/drm/drm_bufs.c b/sys/dev/drm/drm_bufs.c index 2f6120a122..e8d7211a2b 100644 --- a/sys/dev/drm/drm_bufs.c +++ b/sys/dev/drm/drm_bufs.c @@ -60,7 +60,7 @@ static int drm_alloc_resource(struct drm_device *dev, int resource) DRM_UNLOCK(dev); rid = PCIR_BAR(resource); - res = bus_alloc_resource_any(dev->device, SYS_RES_MEMORY, &rid, + res = bus_alloc_resource_any(dev->dev, SYS_RES_MEMORY, &rid, RF_SHAREABLE); DRM_LOCK(dev); if (res == NULL) { @@ -344,7 +344,7 @@ void drm_rmmap(struct drm_device *dev, struct drm_local_map *map) } if (map->bsr != NULL) { - bus_release_resource(dev->device, SYS_RES_MEMORY, map->rid, + bus_release_resource(dev->dev, SYS_RES_MEMORY, map->rid, map->bsr); } diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c index 4c67361f89..3536bccb63 100644 --- a/sys/dev/drm/drm_drv.c +++ b/sys/dev/drm/drm_drv.c @@ -261,19 +261,19 @@ int drm_attach(device_t kdev, drm_pci_id_list_t *idlist) dev = device_get_softc(kdev); if (!strcmp(device_get_name(kdev), "drmsub")) - dev->device = device_get_parent(kdev); + dev->dev = device_get_parent(kdev); else - dev->device = kdev; + dev->dev = kdev; - dev->pci_domain = pci_get_domain(dev->device); - dev->pci_bus = pci_get_bus(dev->device); - dev->pci_slot = pci_get_slot(dev->device); - dev->pci_func = pci_get_function(dev->device); + dev->pci_domain = pci_get_domain(dev->dev); + dev->pci_bus = pci_get_bus(dev->dev); + dev->pci_slot = pci_get_slot(dev->dev); + dev->pci_func = pci_get_function(dev->dev); - dev->pci_vendor = pci_get_vendor(dev->device); - dev->pci_device = pci_get_device(dev->device); - dev->pci_subvendor = pci_get_subvendor(dev->device); - dev->pci_subdevice = pci_get_subdevice(dev->device); + dev->pci_vendor = pci_get_vendor(dev->dev); + dev->pci_device = pci_get_device(dev->dev); + dev->pci_subvendor = pci_get_subvendor(dev->dev); + dev->pci_subdevice = pci_get_subdevice(dev->dev); id_entry = drm_find_description(dev->pci_vendor, dev->pci_device, idlist); @@ -282,12 +282,12 @@ int drm_attach(device_t kdev, drm_pci_id_list_t *idlist) if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) { if (drm_msi && !drm_msi_is_blacklisted(dev, dev->id_entry->driver_private)) { - msicount = pci_msi_count(dev->device); + msicount = pci_msi_count(dev->dev); DRM_DEBUG("MSI count = %d\n", msicount); if (msicount > 1) msicount = 1; - if (pci_alloc_msi(dev->device, &rid, msicount, -1) == 0) { + if (pci_alloc_msi(dev->dev, &rid, msicount, -1) == 0) { DRM_INFO("MSI enabled %d message(s)\n", msicount); dev->msi_enabled = 1; @@ -295,7 +295,7 @@ int drm_attach(device_t kdev, drm_pci_id_list_t *idlist) } } - dev->irqr = bus_alloc_resource_any(dev->device, SYS_RES_IRQ, + dev->irqr = bus_alloc_resource_any(dev->dev, SYS_RES_IRQ, &dev->irqrid, RF_SHAREABLE); if (!dev->irqr) { return (ENOENT); @@ -321,11 +321,11 @@ int drm_attach(device_t kdev, drm_pci_id_list_t *idlist) return (error); error: if (dev->irqr) { - bus_release_resource(dev->device, SYS_RES_IRQ, + bus_release_resource(dev->dev, SYS_RES_IRQ, dev->irqrid, dev->irqr); } if (dev->msi_enabled) { - pci_release_msi(dev->device); + pci_release_msi(dev->dev); } return (error); } @@ -354,10 +354,10 @@ int drm_detach(device_t kdev) dev = device_get_softc(kdev); drm_unload(dev); if (dev->irqr) { - bus_release_resource(dev->device, SYS_RES_IRQ, dev->irqrid, + bus_release_resource(dev->dev, SYS_RES_IRQ, dev->irqrid, dev->irqr); if (dev->msi_enabled) { - pci_release_msi(dev->device); + pci_release_msi(dev->dev); DRM_INFO("MSI released\n"); } } @@ -572,7 +572,7 @@ static int drm_load(struct drm_device *dev) /* Shared code returns -errno. */ retcode = -dev->driver->load(dev, dev->id_entry->driver_private); - if (pci_enable_busmaster(dev->device)) + if (pci_enable_busmaster(dev->dev)) DRM_ERROR("Request to enable bus-master failed.\n"); DRM_UNLOCK(dev); if (retcode != 0) @@ -644,7 +644,7 @@ static void drm_unload(struct drm_device *dev) for (i = 0; i < DRM_MAX_PCI_RESOURCE; i++) { if (dev->pcir[i] == NULL) continue; - bus_release_resource(dev->device, SYS_RES_MEMORY, + bus_release_resource(dev->dev, SYS_RES_MEMORY, dev->pcirid[i], dev->pcir[i]); dev->pcir[i] = NULL; } @@ -664,7 +664,7 @@ static void drm_unload(struct drm_device *dev) drm_mem_uninit(); - if (pci_disable_busmaster(dev->device)) + if (pci_disable_busmaster(dev->dev)) DRM_ERROR("Request to disable bus-master failed.\n"); lockuninit(&dev->vbl_lock); @@ -720,7 +720,7 @@ drm_open(struct dev_open_args *ap) if (retcode == 0) { atomic_inc(&dev->counts[_DRM_STAT_OPENS]); DRM_LOCK(dev); - device_busy(dev->device); + device_busy(dev->dev); if (!dev->open_count++) retcode = drm_firstopen(dev); DRM_UNLOCK(dev); @@ -753,7 +753,7 @@ int drm_close(struct dev_close_args *ap) */ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", - DRM_CURRENTPID, (long)dev->device, dev->open_count); + DRM_CURRENTPID, (long)dev->dev, dev->open_count); if (dev->driver->driver_features & DRIVER_GEM) drm_gem_release(dev, file_priv); @@ -816,7 +816,7 @@ int drm_close(struct dev_close_args *ap) */ atomic_inc(&dev->counts[_DRM_STAT_CLOSES]); - device_unbusy(dev->device); + device_unbusy(dev->dev); if (--dev->open_count == 0) { retcode = drm_lastclose(dev); } @@ -848,7 +848,7 @@ int drm_ioctl(struct dev_ioctl_args *ap) ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02lx, nr=0x%02x, dev 0x%lx, auth=%d\n", - DRM_CURRENTPID, cmd, nr, (long)dev->device, + DRM_CURRENTPID, cmd, nr, (long)dev->dev, file_priv->authenticated); switch (cmd) { @@ -911,7 +911,7 @@ int drm_ioctl(struct dev_ioctl_args *ap) (drm_debug & DRM_DEBUGBITS_FAILED_IOCTL) != 0) { kprintf( "pid %d, cmd 0x%02lx, nr 0x%02x/%1d, dev 0x%lx, auth %d, res %d\n", - DRM_CURRENTPID, cmd, nr, is_driver_ioctl, (long)dev->device, + DRM_CURRENTPID, cmd, nr, is_driver_ioctl, (long)dev->dev, file_priv->authenticated, retcode); } diff --git a/sys/dev/drm/drm_edid.c b/sys/dev/drm/drm_edid.c index 483918c052..07a883b1ba 100644 --- a/sys/dev/drm/drm_edid.c +++ b/sys/dev/drm/drm_edid.c @@ -1707,7 +1707,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) return 0; } if (!drm_edid_is_valid(edid)) { - device_printf(connector->dev->device, "%s: EDID invalid.\n", + device_printf(connector->dev->dev, "%s: EDID invalid.\n", drm_get_connector_name(connector)); return 0; } diff --git a/sys/dev/drm/drm_irq.c b/sys/dev/drm/drm_irq.c index 76f8656134..f5df28732e 100644 --- a/sys/dev/drm/drm_irq.c +++ b/sys/dev/drm/drm_irq.c @@ -94,7 +94,7 @@ drm_irq_install(struct drm_device *dev) DRM_UNLOCK(dev); /* Install handler */ - retcode = bus_setup_intr(dev->device, dev->irqr, INTR_MPSAFE, + retcode = bus_setup_intr(dev->dev, dev->irqr, INTR_MPSAFE, dev->driver->irq_handler, dev, &dev->irqh, &dev->irq_lock); if (retcode != 0) goto err; @@ -107,7 +107,7 @@ drm_irq_install(struct drm_device *dev) return (0); err: - device_printf(dev->device, "Error setting interrupt: %d\n", retcode); + device_printf(dev->dev, "Error setting interrupt: %d\n", retcode); dev->irq_enabled = 0; return (retcode); @@ -142,7 +142,7 @@ int drm_irq_uninstall(struct drm_device *dev) dev->driver->irq_uninstall(dev); DRM_UNLOCK(dev); - bus_teardown_intr(dev->device, dev->irqr, dev->irqh); + bus_teardown_intr(dev->dev, dev->irqr, dev->irqh); DRM_LOCK(dev); return 0; diff --git a/sys/dev/drm/drm_pci.c b/sys/dev/drm/drm_pci.c index cf5af0dcf1..f14bcf6060 100644 --- a/sys/dev/drm/drm_pci.c +++ b/sys/dev/drm/drm_pci.c @@ -138,7 +138,7 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask) if (!drm_device_is_pcie(dev)) return -EINVAL; - root = device_get_parent(dev->device); + root = device_get_parent(dev->dev); pos = 0; pci_find_extcap(root, PCIY_EXPRESS, &pos); diff --git a/sys/dev/drm/i915/i915_dma.c b/sys/dev/drm/i915/i915_dma.c index 5e5c4b7a6e..28d35d35a1 100644 --- a/sys/dev/drm/i915/i915_dma.c +++ b/sys/dev/drm/i915/i915_dma.c @@ -1091,10 +1091,10 @@ intel_alloc_mchbar_resource(struct drm_device *dev) #endif /* Get some space for it */ - vga = device_get_parent(dev->device); + vga = device_get_parent(dev->dev); dev_priv->mch_res_rid = 0x100; dev_priv->mch_res = BUS_ALLOC_RESOURCE(device_get_parent(vga), - dev->device, SYS_RES_MEMORY, &dev_priv->mch_res_rid, 0, ~0UL, + dev->dev, SYS_RES_MEMORY, &dev_priv->mch_res_rid, 0, ~0UL, MCHBAR_SIZE, RF_ACTIVE | RF_SHAREABLE, -1); if (dev_priv->mch_res == NULL) { DRM_ERROR("failed mchbar resource alloc\n"); @@ -1181,10 +1181,10 @@ intel_teardown_mchbar(struct drm_device *dev) } if (dev_priv->mch_res != NULL) { - vga = device_get_parent(dev->device); - BUS_DEACTIVATE_RESOURCE(device_get_parent(vga), dev->device, + vga = device_get_parent(dev->dev); + BUS_DEACTIVATE_RESOURCE(device_get_parent(vga), dev->dev, SYS_RES_MEMORY, dev_priv->mch_res_rid, dev_priv->mch_res); - BUS_RELEASE_RESOURCE(device_get_parent(vga), dev->device, + BUS_RELEASE_RESOURCE(device_get_parent(vga), dev->dev, SYS_RES_MEMORY, dev_priv->mch_res_rid, dev_priv->mch_res); dev_priv->mch_res = NULL; } @@ -1376,7 +1376,7 @@ i915_driver_unload_int(struct drm_device *dev, bool locked) if (dev_priv->tq != NULL) taskqueue_free(dev_priv->tq); - bus_generic_detach(dev->device); + bus_generic_detach(dev->dev); drm_rmmap(dev, dev_priv->mmio_map); intel_teardown_gmbus(dev); diff --git a/sys/dev/drm/i915/i915_drv.c b/sys/dev/drm/i915/i915_drv.c index 7c7b7547f1..eb91f32ccd 100644 --- a/sys/dev/drm/i915/i915_drv.c +++ b/sys/dev/drm/i915/i915_drv.c @@ -243,7 +243,7 @@ static int i915_drm_freeze(struct drm_device *dev) error = -i915_gem_idle(dev); if (error) { DRM_UNLOCK(dev); - device_printf(dev->device, + device_printf(dev->dev, "GEM idle failed, resume might fail\n"); return (error); } @@ -618,7 +618,7 @@ i965_reset_complete(struct drm_device *dev) { u8 gdrst; - gdrst = pci_read_config(dev->device, I965_GDRST, 1); + gdrst = pci_read_config(dev->dev, I965_GDRST, 1); return (gdrst & 0x1); } @@ -632,8 +632,8 @@ i965_do_reset(struct drm_device *dev, u8 flags) * well as the reset bit (GR/bit 0). Setting the GR bit * triggers the reset; when done, the hardware will clear it. */ - gdrst = pci_read_config(dev->device, I965_GDRST, 1); - pci_write_config(dev->device, I965_GDRST, gdrst | flags | 0x1, 1); + gdrst = pci_read_config(dev->dev, I965_GDRST, 1); + pci_write_config(dev->dev, I965_GDRST, gdrst | flags | 0x1, 1); return (_intel_wait_for(dev, i965_reset_complete(dev), 500, 1, "915rst")); diff --git a/sys/dev/drm/i915/i915_gem.c b/sys/dev/drm/i915/i915_gem.c index cc66a2dbff..14d96a87f3 100644 --- a/sys/dev/drm/i915/i915_gem.c +++ b/sys/dev/drm/i915/i915_gem.c @@ -300,7 +300,7 @@ i915_gem_do_init(struct drm_device *dev, unsigned long start, /* Take over this portion of the GTT */ intel_gtt_clear_range(start / PAGE_SIZE, (end-start) / PAGE_SIZE); - device_printf(dev->device, + device_printf(dev->dev, "taking over the fictitious range 0x%lx-0x%lx\n", dev->agp->base + start, dev->agp->base + start + mappable); error = -vm_phys_fictitious_reg_range(dev->agp->base + start, diff --git a/sys/dev/drm/i915/i915_suspend.c b/sys/dev/drm/i915/i915_suspend.c index 0ad565b548..e68c9cecf0 100644 --- a/sys/dev/drm/i915/i915_suspend.c +++ b/sys/dev/drm/i915/i915_suspend.c @@ -800,7 +800,7 @@ int i915_save_state(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; int i; - dev_priv->saveLBB = pci_read_config(dev->device, LBB, 1); + dev_priv->saveLBB = pci_read_config(dev->dev, LBB, 1); /* Hardware status page */ dev_priv->saveHWS = I915_READ(HWS_PGA); @@ -850,7 +850,7 @@ int i915_restore_state(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; int i; - pci_write_config(dev->device, LBB, dev_priv->saveLBB, 1); + pci_write_config(dev->dev, LBB, dev_priv->saveLBB, 1); /* Hardware status page */ diff --git a/sys/dev/drm/i915/intel_display.c b/sys/dev/drm/i915/intel_display.c index 9ccc8cbb71..d91e20dce7 100644 --- a/sys/dev/drm/i915/intel_display.c +++ b/sys/dev/drm/i915/intel_display.c @@ -3552,7 +3552,7 @@ static int i915gm_get_display_clock_speed(struct drm_device *dev) { u16 gcfgc = 0; - gcfgc = pci_read_config(dev->device, GCFGC, 2); + gcfgc = pci_read_config(dev->dev, GCFGC, 2); if (gcfgc & GC_LOW_FREQUENCY_ENABLE) return 133000; @@ -9224,7 +9224,7 @@ static void intel_init_quirks(struct drm_device *dev) device_t d; int i; - d = dev->device; + d = dev->dev; for (i = 0; i < DRM_ARRAY_SIZE(intel_quirks); i++) { q = &intel_quirks[i]; if (pci_get_device(d) == q->device && diff --git a/sys/dev/drm/i915/intel_dp.c b/sys/dev/drm/i915/intel_dp.c index cb0ee53d8f..4686050664 100644 --- a/sys/dev/drm/i915/intel_dp.c +++ b/sys/dev/drm/i915/intel_dp.c @@ -662,7 +662,7 @@ intel_dp_i2c_init(struct intel_dp *intel_dp, DRM_DEBUG_KMS("i2c_init %s\n", name); ironlake_edp_panel_vdd_on(intel_dp); - ret = iic_dp_aux_add_bus(intel_connector->base.dev->device, name, + ret = iic_dp_aux_add_bus(intel_connector->base.dev->dev, name, intel_dp_i2c_aux_ch, intel_dp, &intel_dp->dp_iic_bus, &intel_dp->adapter); ironlake_edp_panel_vdd_off(intel_dp, false); @@ -2271,7 +2271,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder) device_delete_child(intel_dp->dp_iic_bus, intel_dp->adapter); } - device_delete_child(dev->device, intel_dp->dp_iic_bus); + device_delete_child(dev->dev, intel_dp->dp_iic_bus); } drm_encoder_cleanup(encoder); if (is_edp(intel_dp)) { diff --git a/sys/dev/drm/i915/intel_iic.c b/sys/dev/drm/i915/intel_iic.c index 9d8852076d..5567ee15e1 100644 --- a/sys/dev/drm/i915/intel_iic.c +++ b/sys/dev/drm/i915/intel_iic.c @@ -611,7 +611,7 @@ intel_setup_gmbus(struct drm_device *dev) * gmbus may decide to force quirk transfer in the * attachment code. */ - dev_priv->bbbus_bridge[i] = device_add_child(dev->device, + dev_priv->bbbus_bridge[i] = device_add_child(dev->dev, "intel_iicbb", i); if (dev_priv->bbbus_bridge[i] == NULL) { DRM_ERROR("bbbus bridge %d creation failed\n", i); @@ -641,7 +641,7 @@ intel_setup_gmbus(struct drm_device *dev) dev_priv->bbbus[i] = iic_dev; - dev_priv->gmbus_bridge[i] = device_add_child(dev->device, + dev_priv->gmbus_bridge[i] = device_add_child(dev->dev, "intel_gmbus", i); if (dev_priv->gmbus_bridge[i] == NULL) { DRM_ERROR("gmbus bridge %d creation failed\n", i); diff --git a/sys/dev/drm/i915/intel_opregion.c b/sys/dev/drm/i915/intel_opregion.c index fa4b6c6f8a..0bd037b36c 100644 --- a/sys/dev/drm/i915/intel_opregion.c +++ b/sys/dev/drm/i915/intel_opregion.c @@ -383,7 +383,7 @@ blind_set: list_for_each_entry(connector, &dev->mode_config.connector_list, head) { int output_type = ACPI_OTHER_OUTPUT; if (i >= 8) { - device_printf(dev->device, + device_printf(dev->dev, "More than 8 outputs detected\n"); return; } @@ -501,7 +501,7 @@ int intel_opregion_setup(struct drm_device *dev) u32 asls, mboxes; int err = 0; - asls = pci_read_config(dev->device, PCI_ASLS, 4); + asls = pci_read_config(dev->dev, PCI_ASLS, 4); DRM_DEBUG("graphic opregion physical addr: 0x%x\n", asls); if (asls == 0) { DRM_DEBUG("ACPI OpRegion not supported!\n"); diff --git a/sys/dev/drm/i915/intel_panel.c b/sys/dev/drm/i915/intel_panel.c index 94afdca5c4..251584b673 100644 --- a/sys/dev/drm/i915/intel_panel.c +++ b/sys/dev/drm/i915/intel_panel.c @@ -210,7 +210,7 @@ u32 intel_panel_get_backlight(struct drm_device *dev) if (is_backlight_combination_mode(dev)) { u8 lbpc; - lbpc = pci_read_config(dev->device, PCI_LBPC, 1); + lbpc = pci_read_config(dev->dev, PCI_LBPC, 1); val *= lbpc; } } @@ -242,7 +242,7 @@ static void intel_panel_actually_set_backlight(struct drm_device *dev, u32 level lbpc = level * 0xfe / max + 1; level /= lbpc; - pci_write_config(dev->device, PCI_LBPC, lbpc, 4); + pci_write_config(dev->dev, PCI_LBPC, lbpc, 4); } tmp = I915_READ(BLC_PWM_CTL); diff --git a/sys/dev/drm/i915/intel_sdvo.c b/sys/dev/drm/i915/intel_sdvo.c index 7dcc58d910..18963d3f30 100644 --- a/sys/dev/drm/i915/intel_sdvo.c +++ b/sys/dev/drm/i915/intel_sdvo.c @@ -1854,7 +1854,7 @@ static void intel_sdvo_enc_destroy(struct drm_encoder *encoder) drm_mode_destroy(encoder->dev, intel_sdvo->sdvo_lvds_fixed_mode); - device_delete_child(intel_sdvo->base.base.dev->device, + device_delete_child(intel_sdvo->base.base.dev->dev, intel_sdvo->ddc_iic_bus); intel_encoder_destroy(encoder); } @@ -2540,7 +2540,7 @@ intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo, struct drm_device *dev, struct intel_sdvo_ddc_proxy_sc *sc; int ret; - sdvo->ddc_iic_bus = device_add_child(dev->device, + sdvo->ddc_iic_bus = device_add_child(dev->dev, "intel_sdvo_ddc_proxy", sdvo_reg); if (sdvo->ddc_iic_bus == NULL) { DRM_ERROR("cannot create ddc proxy bus %d\n", sdvo_reg); @@ -2551,7 +2551,7 @@ intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo, struct drm_device *dev, if (ret != 0) { DRM_ERROR("cannot attach proxy bus %d error %d\n", sdvo_reg, ret); - device_delete_child(dev->device, sdvo->ddc_iic_bus); + device_delete_child(dev->dev, sdvo->ddc_iic_bus); return (false); } sc = device_get_softc(sdvo->ddc_iic_bus); diff --git a/sys/dev/drm/include/drm/drmP.h b/sys/dev/drm/include/drm/drmP.h index 11125cf6be..62fac28ce7 100644 --- a/sys/dev/drm/include/drm/drmP.h +++ b/sys/dev/drm/include/drm/drmP.h @@ -904,7 +904,6 @@ struct drm_pending_vblank_event { * may contain multiple heads. */ struct drm_device { - struct drm_driver *driver; drm_pci_id_list_t *id_entry; /* PCI ID, name, and chipset private */ uint16_t pci_device; /* PCI device id */ @@ -914,7 +913,6 @@ struct drm_device { char *unique; /* Unique identifier: e.g., busid */ int unique_len; /* Length of unique field */ - device_t device; /* Device instance from newbus */ struct cdev *devnode; /* Device number for mknod */ int if_version; /* Highest interface version set */ @@ -984,14 +982,12 @@ struct drm_device { int sysctl_node_idx; drm_agp_head_t *agp; + + struct device *dev; /**< Device structure */ + drm_sg_mem_t *sg; /* Scatter gather memory */ unsigned long *ctx_bitmap; void *dev_private; - unsigned int agp_buffer_token; - drm_local_map_t *agp_buffer_map; - - struct drm_minor *control; /**< Control node for card */ - struct drm_minor *primary; /**< render type primary screen head */ void *drm_ttm_bdev; @@ -1015,8 +1011,13 @@ struct drm_device { struct list_head vblank_event_list; struct lock event_lock; - struct drm_mode_config mode_config; /**< Current mode config */ + struct drm_driver *driver; + struct drm_local_map *agp_buffer_map; + unsigned int agp_buffer_token; + struct drm_minor *control; /**< Control node for card */ + struct drm_minor *primary; /**< render type primary screen head */ + struct drm_mode_config mode_config; /**< Current mode config */ /** \name GEM information */ /*@{ */ diff --git a/sys/dev/drm/mga/mga_drv.c b/sys/dev/drm/mga/mga_drv.c index 49589a4bfe..2506c7b585 100644 --- a/sys/dev/drm/mga/mga_drv.c +++ b/sys/dev/drm/mga/mga_drv.c @@ -70,8 +70,8 @@ static int mga_driver_device_is_agp(struct drm_device * dev) * device is 0x0021 (HB6 Universal PCI-PCI bridge), we reject the * device. */ - bus = device_get_parent(device_get_parent(dev->device)); - if (pci_get_device(dev->device) == 0x0525 && + bus = device_get_parent(device_get_parent(dev->dev)); + if (pci_get_device(dev->dev) == 0x0525 && pci_get_vendor(bus) == 0x3388 && pci_get_device(bus) == 0x0021) return DRM_IS_NOT_AGP; diff --git a/sys/dev/drm/radeon/r600_cs.c b/sys/dev/drm/radeon/r600_cs.c index aa41bf9186..f7b3e51e11 100644 --- a/sys/dev/drm/radeon/r600_cs.c +++ b/sys/dev/drm/radeon/r600_cs.c @@ -2509,7 +2509,7 @@ int r600_cs_legacy(struct drm_device *dev, void *data, struct drm_file *filp, /* initialize parser */ memset(&parser, 0, sizeof(struct radeon_cs_parser)); parser.filp = filp; - parser.dev = dev->device; + parser.dev = dev->dev; parser.rdev = NULL; parser.family = family; parser.track = track; diff --git a/sys/dev/drm/radeon/radeon_cp.c b/sys/dev/drm/radeon/radeon_cp.c index b6216bd795..b16eb121c7 100644 --- a/sys/dev/drm/radeon/radeon_cp.c +++ b/sys/dev/drm/radeon/radeon_cp.c @@ -2092,7 +2092,7 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags) break; } - pci_enable_busmaster(dev->device); + pci_enable_busmaster(dev->dev); if (drm_device_is_agp(dev)) dev_priv->flags |= RADEON_IS_AGP; diff --git a/sys/dev/drm/radeon/radeon_device.c b/sys/dev/drm/radeon/radeon_device.c index 424d2e7ff0..99c65976e9 100644 --- a/sys/dev/drm/radeon/radeon_device.c +++ b/sys/dev/drm/radeon/radeon_device.c @@ -1005,7 +1005,7 @@ int radeon_device_init(struct radeon_device *rdev, int dma_bits; rdev->shutdown = false; - rdev->dev = ddev->device; + rdev->dev = ddev->dev; rdev->ddev = ddev; rdev->flags = flags; rdev->family = flags & RADEON_FAMILY_MASK; @@ -1328,7 +1328,7 @@ int radeon_suspend_kms(struct drm_device *dev) /* Shut down the device */ pci_disable_device(dev->pdev); #endif /* DUMBBELL_WIP */ - pci_set_powerstate(dev->device, PCI_POWERSTATE_D3); + pci_set_powerstate(dev->dev, PCI_POWERSTATE_D3); #ifdef DUMBBELL_WIP } console_lock(); @@ -1361,7 +1361,7 @@ int radeon_resume_kms(struct drm_device *dev) #ifdef DUMBBELL_WIP console_lock(); #endif /* DUMBBELL_WIP */ - pci_set_powerstate(dev->device, PCI_POWERSTATE_D0); + pci_set_powerstate(dev->dev, PCI_POWERSTATE_D0); pci_restore_state(device_get_parent(rdev->dev)); #ifdef DUMBBELL_WIP if (pci_enable_device(dev->pdev)) { diff --git a/sys/dev/drm/radeon/radeon_display.c b/sys/dev/drm/radeon/radeon_display.c index df52b31cff..e926ec4a3b 100644 --- a/sys/dev/drm/radeon/radeon_display.c +++ b/sys/dev/drm/radeon/radeon_display.c @@ -1112,7 +1112,7 @@ radeon_user_framebuffer_create(struct drm_device *dev, obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); if (obj == NULL) { - dev_err(dev->device, "No GEM object associated to handle 0x%08X, " + dev_err(dev->dev, "No GEM object associated to handle 0x%08X, " "can't create framebuffer\n", mode_cmd->handles[0]); return -ENOENT; } diff --git a/sys/dev/drm/radeon/radeon_gem.c b/sys/dev/drm/radeon/radeon_gem.c index 62b9b96245..c49b1e330a 100644 --- a/sys/dev/drm/radeon/radeon_gem.c +++ b/sys/dev/drm/radeon/radeon_gem.c @@ -466,7 +466,7 @@ int radeon_gem_va_ioctl(struct drm_device *dev, void *data, } if (args->offset < RADEON_VA_RESERVED_SIZE) { - dev_err(dev->device, + dev_err(dev->dev, "offset 0x%lX is in reserved area 0x%X\n", (unsigned long)args->offset, RADEON_VA_RESERVED_SIZE); @@ -480,13 +480,13 @@ int radeon_gem_va_ioctl(struct drm_device *dev, void *data, */ invalid_flags = RADEON_VM_PAGE_VALID | RADEON_VM_PAGE_SYSTEM; if ((args->flags & invalid_flags)) { - dev_err(dev->device, "invalid flags 0x%08X vs 0x%08X\n", + dev_err(dev->dev, "invalid flags 0x%08X vs 0x%08X\n", args->flags, invalid_flags); args->operation = RADEON_VA_RESULT_ERROR; return -EINVAL; } if (!(args->flags & RADEON_VM_PAGE_SNOOPED)) { - dev_err(dev->device, "only supported snooped mapping for now\n"); + dev_err(dev->dev, "only supported snooped mapping for now\n"); args->operation = RADEON_VA_RESULT_ERROR; return -EINVAL; } @@ -496,7 +496,7 @@ int radeon_gem_va_ioctl(struct drm_device *dev, void *data, case RADEON_VA_UNMAP: break; default: - dev_err(dev->device, "unsupported operation %d\n", + dev_err(dev->dev, "unsupported operation %d\n", args->operation); args->operation = RADEON_VA_RESULT_ERROR; return -EINVAL; diff --git a/sys/dev/drm/radeon/radeon_i2c.c b/sys/dev/drm/radeon/radeon_i2c.c index 6e266a1abd..6227ac9f81 100644 --- a/sys/dev/drm/radeon/radeon_i2c.c +++ b/sys/dev/drm/radeon/radeon_i2c.c @@ -1063,7 +1063,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, /* set the radeon hw i2c adapter */ ksnprintf(i2c->name, sizeof(i2c->name), "Radeon i2c hw bus %s", name); - iicbus_dev = device_add_child(dev->device, "radeon_hw_i2c", -1); + iicbus_dev = device_add_child(dev->dev, "radeon_hw_i2c", -1); if (iicbus_dev == NULL) { DRM_ERROR("Failed to create bridge for hw i2c %s\n", name); @@ -1076,14 +1076,14 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, if (ret != 0) { DRM_ERROR("Attach failed for bridge for hw i2c %s\n", name); - device_delete_child(dev->device, iicbus_dev); + device_delete_child(dev->dev, iicbus_dev); goto out_free; } i2c->adapter = device_find_child(iicbus_dev, "iicbus", -1); if (i2c->adapter == NULL) { DRM_ERROR("hw i2c bridge doesn't have iicbus child\n"); - device_delete_child(dev->device, iicbus_dev); + device_delete_child(dev->dev, iicbus_dev); goto out_free; } } else if (rec->hw_capable && @@ -1092,7 +1092,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, /* hw i2c using atom */ ksnprintf(i2c->name, sizeof(i2c->name), "Radeon i2c hw bus %s", name); - iicbus_dev = device_add_child(dev->device, "radeon_atom_hw_i2c", -1); + iicbus_dev = device_add_child(dev->dev, "radeon_atom_hw_i2c", -1); if (iicbus_dev == NULL) { DRM_ERROR("Failed to create bridge for hw i2c %s\n", name); @@ -1105,14 +1105,14 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, if (ret != 0) { DRM_ERROR("Attach failed for bridge for hw i2c %s\n", name); - device_delete_child(dev->device, iicbus_dev); + device_delete_child(dev->dev, iicbus_dev); goto out_free; } i2c->adapter = device_find_child(iicbus_dev, "iicbus", -1); if (i2c->adapter == NULL) { DRM_ERROR("hw i2c bridge doesn't have iicbus child\n"); - device_delete_child(dev->device, iicbus_dev); + device_delete_child(dev->dev, iicbus_dev); goto out_free; } } else { @@ -1121,7 +1121,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, /* set the radeon bit adapter */ ksnprintf(i2c->name, sizeof(i2c->name), "Radeon i2c bit bus %s", name); - iicbus_dev = device_add_child(dev->device, "radeon_iicbb", -1); + iicbus_dev = device_add_child(dev->dev, "radeon_iicbb", -1); if (iicbus_dev == NULL) { DRM_ERROR("Failed to create bridge for bb i2c %s\n", name); @@ -1134,14 +1134,14 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, if (ret != 0) { DRM_ERROR("Attach failed for bridge for bb i2c %s\n", name); - device_delete_child(dev->device, iicbus_dev); + device_delete_child(dev->dev, iicbus_dev); goto out_free; } iicbb_dev = device_find_child(iicbus_dev, "iicbb", -1); if (iicbb_dev == NULL) { DRM_ERROR("bb i2c bridge doesn't have iicbb child\n"); - device_delete_child(dev->device, iicbus_dev); + device_delete_child(dev->dev, iicbus_dev); goto out_free; } @@ -1149,7 +1149,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, if (i2c->adapter == NULL) { DRM_ERROR( "bbbus bridge doesn't have iicbus grandchild\n"); - device_delete_child(dev->device, iicbus_dev); + device_delete_child(dev->dev, iicbus_dev); goto out_free; } } @@ -1181,7 +1181,7 @@ struct radeon_i2c_chan *radeon_i2c_create_dp(struct drm_device *dev, i2c->rec = *rec; i2c->dev = dev; ksnprintf(i2c->name, sizeof(i2c->name), "Radeon aux bus %s", name); - ret = iic_dp_aux_add_bus(dev->device, i2c->name, + ret = iic_dp_aux_add_bus(dev->dev, i2c->name, radeon_dp_i2c_aux_ch, i2c, &i2c->iic_bus, &i2c->adapter); if (ret) { @@ -1204,7 +1204,7 @@ void radeon_i2c_destroy(struct radeon_i2c_chan *i2c) int ret; get_mplock(); - ret = device_delete_child(i2c->dev->device, i2c->iic_bus); + ret = device_delete_child(i2c->dev->dev, i2c->iic_bus); rel_mplock(); KASSERT(ret == 0, ("unable to detach iic bus %s: %d", i2c->name, ret)); diff --git a/sys/dev/drm/radeon/radeon_kms.c b/sys/dev/drm/radeon/radeon_kms.c index fa93d05977..98a704c1e2 100644 --- a/sys/dev/drm/radeon/radeon_kms.c +++ b/sys/dev/drm/radeon/radeon_kms.c @@ -104,7 +104,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) */ r = radeon_device_init(rdev, dev, flags); if (r) { - dev_err(dev->device, "Fatal error during GPU init\n"); + dev_err(dev->dev, "Fatal error during GPU init\n"); goto out; } @@ -114,7 +114,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) */ r = radeon_modeset_init(rdev); if (r) - dev_err(dev->device, "Fatal error during modeset init\n"); + dev_err(dev->dev, "Fatal error during modeset init\n"); /* Call ACPI methods: require modeset init * but failure is not fatal @@ -122,7 +122,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) if (!r) { acpi_status = radeon_acpi_init(rdev); if (acpi_status) - dev_dbg(dev->device, + dev_dbg(dev->dev, "Error during ACPI methods call\n"); } -- 2.41.0