Various cleanup
Subsystems (2)
cover Various cleanup
This patch series aims to do some cleanup of our driver. Patch 1, 2, and 4 should be fairly non-controversial. Patch 3 and 5 does major cleanups of i915_sysfs and i915_debugfs, respectively. Due to the nature of these patches they are rather big, but that's mainly because they change the parameter passed to macros that are used a lot.
While the secondary benefits of this patch series (the primary of course being slightly cleaner code) might be a bit opaque, a move to always passing dev_priv to our feature macros (and thus allowing us to make those macros non-polymorphic) will save more than 30kB.
That's still a bit down the road though, but I've got a full patch series to accomplish this in a fairly straightforward manner.
This submission supersedes the previous one (from the 1st of August); it drops one patch, and adds two others.
David Weinehall (5):
drm/i915: Cosmetic fixes in i915_drv.h
drm/i915: Consistent struct device * naming
drm/i915: sysfs spring cleaning
drm/i915: pdev cleanup
drm/i915: debugfs spring cleaning
drivers/gpu/drm/i915/i915_debugfs.c | 704 ++++++++++++++------------------ drivers/gpu/drm/i915/i915_drv.c | 157 +++---- drivers/gpu/drm/i915/i915_drv.h | 22 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 10 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 17 +- drivers/gpu/drm/i915/i915_gpu_error.c | 9 +- drivers/gpu/drm/i915/i915_suspend.c | 6 +- drivers/gpu/drm/i915/i915_sysfs.c | 163 ++++---- drivers/gpu/drm/i915/intel_audio.c | 46 +-- drivers/gpu/drm/i915/intel_display.c | 25 +- drivers/gpu/drm/i915/intel_fbdev.c | 3 +- drivers/gpu/drm/i915/intel_guc_loader.c | 3 +- drivers/gpu/drm/i915/intel_i2c.c | 3 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 57 +-- drivers/gpu/drm/i915/intel_sdvo.c | 4 +- 15 files changed, 588 insertions(+), 641 deletions(-)
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/5 drm/i915: Cosmetic fixes in i915_drv.h
Fix minor whitespace issues plus a typo in i915_drv.h.
--- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -2552,7 +2552,7 @@ struct drm_i915_cmd_table {BUILD_BUG (); \ __p; \ }) -#define INTEL_INFO (p) (&__I915__(p)->info) +#define INTEL_INFO (p) (&__I915__(p)->info)#define INTEL_GEN (p) (INTEL_INFO(p)->gen)#define INTEL_DEVID (p) (INTEL_INFO(p)->device_id)
@@ -2846,7 +2846,7 @@ extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);extern int i915_resume_switcheroo (struct drm_device *dev);int intel_sanitize_enable_ppgtt (struct drm_i915_private *dev_priv, -int enable_ppgtt); +int enable_ppgtt);bool intel_sanitize_semaphores (struct drm_i915_private *dev_priv,int value);
@@ -3754,7 +3754,7 @@ __raw_write(64, q)#undef __raw_write/* These are untraced mmio-accessors that are only valid to be used inside -* criticial sections inside IRQ handlers where forcewake is explicitly +* critical sections inside IRQ handlers where forcewake is explicitly * controlled. * Think twice, and think again, before using these. * Note: Should only be used between intel_uncore_forcewake_irqlock() and
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/5] drm/i915: Cosmetic fixes in i915_drv.h
Quoted 3 lines · David Weinehall
Fix minor whitespace issues plus a typo in
i915_drv.h.Signed-off-by David Weinehall <[email protected]>
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915: Consistent struct device * naming
In reply to David WeinehallWe currently have a mix of struct device *device, struct device *kdev, and struct device *dev (the latter forcing us to refer to struct drm_device as something else than the normal dev).
To simplify things, always use kdev when referring to struct device.
While at it make dev_to_drm_minor() an inline function and for consistency rename it kdev_to_drm_minor().
--- drivers/gpu/drm/i915/i915_drv.c | 96 ++++++++++++++++----------------- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +-- drivers/gpu/drm/i915/i915_sysfs.c | 65 +++++++++++----------- drivers/gpu/drm/i915/intel_audio.c | 46 ++++++++-------- drivers/gpu/drm/i915/intel_runtime_pm.c | 37 +++++++------ 6 files changed, 128 insertions(+), 126 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +48 -48
@@ -77,7 +77,7 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, const char *fmt, ...) { static bool shown_bug_once; -struct device *dev = dev_priv->drm.dev; +struct device *kdev = dev_priv->drm.dev;bool is_error = level[1 ] <=KERN_ERR [1 ];bool is_debug = level[1 ] ==KERN_DEBUG [1 ];struct va_format vaf;
@@ -91,11 +91,11 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, vaf.fmt = fmt; vaf.va = &args; -dev_printk (level, dev,"[" DRM_NAME ":%ps] %pV" , +dev_printk (level, kdev,"[" DRM_NAME ":%ps] %pV" ,__builtin_return_address (0 ), &vaf);if (is_error && !shown_bug_once) { -dev_notice (dev,"%s" ,FDO_BUG_MSG ); +dev_notice (kdev,"%s" ,FDO_BUG_MSG ); shown_bug_once = true; }
@@ -1460,9 +1460,9 @@ out:return error; } -static int i915_drm_suspend_late (struct drm_device *drm_dev,bool hibernation) +static int i915_drm_suspend_late (struct drm_device *dev,bool hibernation) { -struct drm_i915_private *dev_priv =to_i915 (drm_dev); +struct drm_i915_private *dev_priv =to_i915 (dev);bool fw_csr;int ret;
@@ -1496,7 +1496,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) goto out; } -pci_disable_device (drm_dev->pdev); +pci_disable_device (dev->pdev);/* * During hibernation on some platforms the BIOS may try to access * the device even though it's already in D3 and hang the machine. So
@@ -1510,7 +1510,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)* Acer Aspire 1830T */ if (!(hibernation &&INTEL_INFO (dev_priv)->gen <6 )) -pci_set_power_state (drm_dev->pdev, PCI_D3hot); +pci_set_power_state (dev->pdev, PCI_D3hot); dev_priv->suspended_to_idle =suspend_to_idle (dev_priv);
@@ -1807,25 +1807,25 @@ error:return ret; } -static int i915_pm_suspend (struct device *dev) +static int i915_pm_suspend (struct device *kdev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct drm_device *drm_dev =pci_get_drvdata (pdev); +struct pci_dev *pdev =to_pci_dev (kdev); +struct drm_device *dev =pci_get_drvdata (pdev); -if (!drm_dev) { -dev_err (dev,"DRM not initialized, aborting suspend.\n" ); +if (!dev) { +dev_err (kdev,"DRM not initialized, aborting suspend.\n" );return -ENODEV ; } -if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF ) +if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -return i915_drm_suspend (drm_dev); +return i915_drm_suspend (dev); } -static int i915_pm_suspend_late (struct device *dev) +static int i915_pm_suspend_late (struct device *kdev) { -struct drm_device *drm_dev = &dev_to_i915 (dev)->drm; +struct drm_device *dev = &kdev_to_i915 (kdev)->drm;/* * We have a suspend ordering issue with the snd-hda driver also
@@ -1836,57 +1836,57 @@ static int i915_pm_suspend_late(struct device *dev)* FIXME: This should be solved with a special hdmi sink device or * similar so that power domains can be employed. */ -if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF ) +if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -return i915_drm_suspend_late (drm_dev, false); +return i915_drm_suspend_late (dev, false); } -static int i915_pm_poweroff_late (struct device *dev) +static int i915_pm_poweroff_late (struct device *kdev) { -struct drm_device *drm_dev = &dev_to_i915 (dev)->drm; +struct drm_device *dev = &kdev_to_i915 (kdev)->drm; -if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF ) +if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -return i915_drm_suspend_late (drm_dev, true); +return i915_drm_suspend_late (dev, true); } -static int i915_pm_resume_early (struct device *dev) +static int i915_pm_resume_early (struct device *kdev) { -struct drm_device *drm_dev = &dev_to_i915 (dev)->drm; +struct drm_device *dev = &kdev_to_i915 (kdev)->drm; -if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF ) +if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -return i915_drm_resume_early (drm_dev); +return i915_drm_resume_early (dev); } -static int i915_pm_resume (struct device *dev) +static int i915_pm_resume (struct device *kdev) { -struct drm_device *drm_dev = &dev_to_i915 (dev)->drm; +struct drm_device *dev = &kdev_to_i915 (kdev)->drm; -if (drm_dev->switch_power_state ==DRM_SWITCH_POWER_OFF ) +if (dev->switch_power_state ==DRM_SWITCH_POWER_OFF )return 0 ; -return i915_drm_resume (drm_dev); +return i915_drm_resume (dev); }/* freeze: before creating the hibernation_image */ -static int i915_pm_freeze (struct device *dev) +static int i915_pm_freeze (struct device *kdev) { -return i915_pm_suspend (dev); +return i915_pm_suspend (kdev); } -static int i915_pm_freeze_late (struct device *dev) +static int i915_pm_freeze_late (struct device *kdev) {int ret; - ret =i915_pm_suspend_late (dev); + ret =i915_pm_suspend_late (kdev);if (ret)return ret; - ret =i915_gem_freeze_late (dev_to_i915 (dev)); + ret =i915_gem_freeze_late (kdev_to_i915 (kdev));if (ret)return ret;
@@ -1894,25 +1894,25 @@ static int i915_pm_freeze_late(struct device *dev) }/* thaw: called after creating the hibernation image, but before turning off. */ -static int i915_pm_thaw_early (struct device *dev) +static int i915_pm_thaw_early (struct device *kdev) { -return i915_pm_resume_early (dev); +return i915_pm_resume_early (kdev); } -static int i915_pm_thaw (struct device *dev) +static int i915_pm_thaw (struct device *kdev) { -return i915_pm_resume (dev); +return i915_pm_resume (kdev); }/* restore: called after loading the hibernation image. */ -static int i915_pm_restore_early (struct device *dev) +static int i915_pm_restore_early (struct device *kdev) { -return i915_pm_resume_early (dev); +return i915_pm_resume_early (kdev); } -static int i915_pm_restore (struct device *dev) +static int i915_pm_restore (struct device *kdev) { -return i915_pm_resume (dev); +return i915_pm_resume (kdev); }/*
@@ -2274,9 +2274,9 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv,return ret; } -static int intel_runtime_suspend (struct device *device) +static int intel_runtime_suspend (struct device *kdev) { -struct pci_dev *pdev =to_pci_dev (device); +struct pci_dev *pdev =to_pci_dev (kdev);struct drm_device *dev =pci_get_drvdata (pdev);struct drm_i915_private *dev_priv =to_i915 (dev);int ret;
@@ -2302,7 +2302,7 @@ static int intel_runtime_suspend(struct device *device)* Bump the expiration timestamp, otherwise the suspend won't * be rescheduled. */ -pm_runtime_mark_last_busy (device); +pm_runtime_mark_last_busy (kdev);return -EAGAIN ; }
@@ -2381,9 +2381,9 @@ static int intel_runtime_suspend(struct device *device)return 0 ; } -static int intel_runtime_resume (struct device *device) +static int intel_runtime_resume (struct device *kdev) { -struct pci_dev *pdev =to_pci_dev (device); +struct pci_dev *pdev =to_pci_dev (kdev);struct drm_device *dev =pci_get_drvdata (pdev);struct drm_i915_private *dev_priv =to_i915 (dev);int ret =0 ;
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -2049,9 +2049,9 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) return container_of(dev, struct drm_i915_private, drm); } -static inline struct drm_i915_private *dev_to_i915 (struct device *dev) +static inline struct drm_i915_private *kdev_to_i915 (struct device *kdev) { -return to_i915 (dev_get_drvdata (dev)); +return to_i915 (dev_get_drvdata (kdev)); }static inline struct drm_i915_private *guc_to_i915 (struct intel_guc *guc)
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
@@ -324,16 +324,16 @@ static gen6_pte_t iris_pte_encode(dma_addr_t addr,static int __setup_page_dma (struct drm_device *dev,struct i915_page_dma *p,gfp_t flags) { -struct device *device = &dev->pdev->dev; +struct device *kdev = &dev->pdev->dev; p->page =alloc_page (flags);if (!p->page)return -ENOMEM ; - p->daddr =dma_map_page (device, + p->daddr =dma_map_page (kdev, p->page,0 ,4096 ,PCI_DMA_BIDIRECTIONAL ); -if (dma_mapping_error (device, p->daddr)) { +if (dma_mapping_error (kdev, p->daddr)) {__free_page (p->page);return -EINVAL ; }
drivers/gpu/drm/i915/i915_sysfs.c +34 -31
205 lines not on this page · raw message
drivers/gpu/drm/i915/intel_audio.c +23 -23
123 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +18 -19
@@ -2284,7 +2284,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)*/ void intel_power_domains_fini (struct drm_i915_private *dev_priv) { -struct device *device = &dev_priv->drm.pdev->dev; +struct device *kdev = &dev_priv->drm.pdev->dev;/* * The i915.ko module is still not prepared to be loaded when
@@ -2306,7 +2306,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)* the platform doesn't support runtime PM. */ if (!HAS_RUNTIME_PM (dev_priv)) -pm_runtime_put (device); +pm_runtime_put (kdev); }static void intel_power_domains_sync_hw (struct drm_i915_private *dev_priv)
@@ -2648,9 +2648,9 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)void intel_runtime_pm_get (struct drm_i915_private *dev_priv) {struct drm_device *dev = &dev_priv->drm; -struct device *device = &dev->pdev->dev; +struct device *kdev = &dev->pdev->dev; -pm_runtime_get_sync (device); +pm_runtime_get_sync (kdev);atomic_inc (&dev_priv->pm.wakeref_count);assert_rpm_wakelock_held (dev_priv);
@@ -2669,10 +2669,10 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)bool intel_runtime_pm_get_if_in_use (struct drm_i915_private *dev_priv) {struct drm_device *dev = &dev_priv->drm; -struct device *device = &dev->pdev->dev; +struct device *kdev = &dev->pdev->dev;if (IS_ENABLED (CONFIG_PM )) { -int ret =pm_runtime_get_if_in_use (device); +int ret =pm_runtime_get_if_in_use (kdev);/* * In cases runtime PM is disabled by the RPM core and we get
@@ -2711,10 +2711,10 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)void intel_runtime_pm_get_noresume (struct drm_i915_private *dev_priv) {struct drm_device *dev = &dev_priv->drm; -struct device *device = &dev->pdev->dev; +struct device *kdev = &dev->pdev->dev;assert_rpm_wakelock_held (dev_priv); -pm_runtime_get_noresume (device); +pm_runtime_get_noresume (kdev);atomic_inc (&dev_priv->pm.wakeref_count); }
@@ -2730,14 +2730,14 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)void intel_runtime_pm_put (struct drm_i915_private *dev_priv) {struct drm_device *dev = &dev_priv->drm; -struct device *device = &dev->pdev->dev; +struct device *kdev = &dev->pdev->dev;assert_rpm_wakelock_held (dev_priv);if (atomic_dec_and_test (&dev_priv->pm.wakeref_count))atomic_inc (&dev_priv->pm.atomic_seq); -pm_runtime_mark_last_busy (device); -pm_runtime_put_autosuspend (device); +pm_runtime_mark_last_busy (kdev); +pm_runtime_put_autosuspend (kdev); }/**
@@ -2753,10 +2753,10 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)void intel_runtime_pm_enable (struct drm_i915_private *dev_priv) {struct drm_device *dev = &dev_priv->drm; -struct device *device = &dev->pdev->dev; +struct device *kdev = &dev->pdev->dev; -pm_runtime_set_autosuspend_delay (device,10000 );/* 10s */ -pm_runtime_mark_last_busy (device); +pm_runtime_set_autosuspend_delay (kdev,10000 );/* 10s */ +pm_runtime_mark_last_busy (kdev);/* * Take a permanent reference to disable the RPM functionality and drop
@@ -2765,10 +2765,10 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)* platforms without RPM support. */ if (!HAS_RUNTIME_PM (dev)) { -pm_runtime_dont_use_autosuspend (device); -pm_runtime_get_sync (device); +pm_runtime_dont_use_autosuspend (kdev); +pm_runtime_get_sync (kdev); }else { -pm_runtime_use_autosuspend (device); +pm_runtime_use_autosuspend (kdev); }/*
@@ -2776,6 +2776,5 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)* We drop that here and will reacquire it during unloading in * intel_power_domains_fini(). */ -pm_runtime_put_autosuspend (device); +pm_runtime_put_autosuspend (kdev); } -
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/5] drm/i915: Consistent struct device * naming
Quoted 10 lines · David Weinehall
We currently have a mix of struct device *device, struct device *kdev, and struct device *dev (the latter forcing us to refer to struct
drm_deviceas something else than the normal dev).To simplify things, always use kdev when referring to struct device.
While at it make
dev_to_drm_minor()an inline function and for consistency rename itkdev_to_drm_minor().Signed-off-by David Weinehall <[email protected]>
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: sysfs spring cleaning
In reply to David WeinehallPass dev_priv instead of dev to all feature macros (IS_, HAS_, INTEL_, etc.). This has the side effect that a bunch of functions now get dev_priv passed instead of dev.
The main use of kdev_to_drm_minor() was as an intermediate step when extracting dev_priv, so make that helper do that bit too, and rename it kdev_to_i915_dm() (to differentiate it from kdev_to_i915(), which goes about this in a different, non-compatible, way).
All calls to INTEL_INFO()->gen have been replaced with INTEL_GEN().
--- drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_sysfs.c | 148 +++++++++++++++++--------------------- 3 files changed, 69 insertions(+), 87 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -1131,7 +1131,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)/* Reveal our presence to userspace */ if (drm_dev_register (dev,0 ) ==0 ) {i915_debugfs_register (dev_priv); -i915_setup_sysfs (dev); +i915_setup_sysfs (dev_priv); }else DRM_ERROR ("Failed to register driver for userspace access!\n" );
@@ -1168,7 +1168,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)acpi_video_unregister ();intel_opregion_unregister (dev_priv); -i915_teardown_sysfs (&dev_priv->drm); +i915_teardown_sysfs (dev_priv);i915_debugfs_unregister (dev_priv);drm_dev_unregister (&dev_priv->drm);
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -3531,8 +3531,8 @@ extern int i915_save_state(struct drm_device *dev);extern int i915_restore_state (struct drm_device *dev);/* i915_sysfs.c */ -void i915_setup_sysfs (struct drm_device *dev_priv); -void i915_teardown_sysfs (struct drm_device *dev_priv); +void i915_setup_sysfs (struct drm_i915_private *dev_priv); +void i915_teardown_sysfs (struct drm_i915_private *dev_priv);/* intel_i2c.c */ extern int intel_setup_gmbus (struct drm_device *dev);
drivers/gpu/drm/i915/i915_sysfs.c +65 -83
340 lines not on this page · raw message
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5] drm/i915: sysfs spring cleaning
drivers/gpu/drm/i915/i915_sysfs.c line 35
Quoted 2 lines · David Weinehall
drivers/gpu/drm/i915/i915_sysfs.c +1
-1-static inline struct drm_minor *kdev_to_drm_minor (struct device *kdev) +static inline struct drm_i915_private *kdev_to_i915_dm (struct device *kdev)
Grumble.
What is i915_dm?
minor_kdev_to_i915()kdev_minor_to_i915()
The latter I guess.
Otherwise, looks good.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5] drm/i915: sysfs spring cleaning
Quoted 6 lines · Chris Wilson
drivers/gpu/drm/i915/i915_sysfs.c line 35
Quoted 2 lines · David Weinehall
drivers/gpu/drm/i915/i915_sysfs.c +1
-1-static inline struct drm_minor *kdev_to_drm_minor (struct device *kdev) +static inline struct drm_i915_private *kdev_to_i915_dm (struct device *kdev)Grumble.
Quoted 6 lines
What is
i915_dm?
minor_kdev_to_i915()kdev_minor_to_i915()The latter I guess.
The latter does indeed sound better. I'll respin the patch.
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5 v2] drm/i915: sysfs spring cleaning
In reply to David WeinehallPass dev_priv instead of dev to all feature macros (IS_, HAS_, INTEL_, etc.). This has the side effect that a bunch of functions now get dev_priv passed instead of dev.
The main use of kdev_to_drm_minor() was as an intermediate step when extracting dev_priv, so make that helper do that bit too, and rename it kdev_to_i915_dm() (to differentiate it from kdev_to_i915(), which goes about this in a different, non-compatible, way).
All calls to INTEL_INFO()->gen have been replaced with INTEL_GEN().
v2: Rename kdev_to_i915_dm() to kdev_minor_to_i915() (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_sysfs.c | 148 +++++++++++++++++--------------------- 3 files changed, 69 insertions(+), 87 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
@@ -1131,7 +1131,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)/* Reveal our presence to userspace */ if (drm_dev_register (dev,0 ) ==0 ) {i915_debugfs_register (dev_priv); -i915_setup_sysfs (dev); +i915_setup_sysfs (dev_priv); }else DRM_ERROR ("Failed to register driver for userspace access!\n" );
@@ -1168,7 +1168,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)acpi_video_unregister ();intel_opregion_unregister (dev_priv); -i915_teardown_sysfs (&dev_priv->drm); +i915_teardown_sysfs (dev_priv);i915_debugfs_unregister (dev_priv);drm_dev_unregister (&dev_priv->drm);
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -3531,8 +3531,8 @@ extern int i915_save_state(struct drm_device *dev);extern int i915_restore_state (struct drm_device *dev);/* i915_sysfs.c */ -void i915_setup_sysfs (struct drm_device *dev_priv); -void i915_teardown_sysfs (struct drm_device *dev_priv); +void i915_setup_sysfs (struct drm_i915_private *dev_priv); +void i915_teardown_sysfs (struct drm_i915_private *dev_priv);/* intel_i2c.c */ extern int intel_setup_gmbus (struct drm_device *dev);
drivers/gpu/drm/i915/i915_sysfs.c +65 -83
340 lines not on this page · raw message
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: pdev cleanup
In reply to David WeinehallIn an effort to simplify things for a future push of dev_priv instead of dev wherever possible, always take pdev via dev_priv where feasible, eliminating the direct access from dev. Right now this only eliminates a few cases of dev, but it also obviates that we pass dev into a lot of functions where dev_priv would be the more obvious choice.
--- drivers/gpu/drm/i915/i915_debugfs.c | 5 +-- drivers/gpu/drm/i915/i915_drv.c | 59 +++++++++++++++++++-------------- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++- drivers/gpu/drm/i915/i915_gem_stolen.c | 17 +++++----- drivers/gpu/drm/i915/i915_gpu_error.c | 9 ++--- drivers/gpu/drm/i915/i915_suspend.c | 6 ++-- drivers/gpu/drm/i915/intel_display.c | 25 +++++++++----- drivers/gpu/drm/i915/intel_fbdev.c | 3 +- drivers/gpu/drm/i915/intel_guc_loader.c | 3 +- drivers/gpu/drm/i915/intel_i2c.c | 3 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 30 +++++++++-------- drivers/gpu/drm/i915/intel_sdvo.c | 4 ++- 12 files changed, 99 insertions(+), 69 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -2
@@ -2787,6 +2787,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;if (!HAS_RUNTIME_PM (dev_priv))seq_puts (m,"Runtime power management not supported\n" );
@@ -2801,8 +2802,8 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)seq_printf (m,"Device Power Management (CONFIG_PM) disabled\n" );#endif seq_printf (m,"PCI device power state: %s [%d]\n" , -pci_power_name (dev_priv->drm.pdev->current_state), - dev_priv->drm.pdev->current_state); +pci_power_name (pdev->current_state), + pdev->current_state);return 0 ; }
drivers/gpu/drm/i915/i915_drv.c +34 -25
224 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -1
@@ -348,10 +348,12 @@ static int setup_page_dma(struct drm_device *dev, struct i915_page_dma *p)static void cleanup_page_dma (struct drm_device *dev,struct i915_page_dma *p) { +struct pci_dev *pdev = dev->pdev; +if (WARN_ON (!p->page))return ; -dma_unmap_page (&dev->pdev->dev, p->daddr,4096 ,PCI_DMA_BIDIRECTIONAL ); +dma_unmap_page (&pdev->dev, p->daddr,4096 ,PCI_DMA_BIDIRECTIONAL );__free_page (p->page);memset (p,0 ,sizeof (*p)); }
drivers/gpu/drm/i915/i915_gem_stolen.c +9 -8
@@ -92,6 +92,7 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,static unsigned long i915_stolen_to_physical (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct resource *r;u32 base;
@@ -111,7 +112,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)if (INTEL_INFO (dev)->gen >=3 ) {u32 bsm; -pci_read_config_dword (dev->pdev,INTEL_BSM , &bsm); +pci_read_config_dword (pdev,INTEL_BSM , &bsm); base = bsm &INTEL_BSM_MASK ; }else if (IS_I865G (dev)) {
@@ -122,7 +123,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)* always at TOUD? Ie. is it always the last * one to be allocated by the BIOS? */ -pci_bus_read_config_word (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_word (pdev->bus,PCI_DEVFN (0 ,0 ),I865_TOUD , &toud); base = toud <<16 ;
@@ -131,13 +132,13 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)u32 tom;u8 tmp; -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I85X_ESMRAMC , &tmp);if (tmp &TSEG_ENABLE ) tseg_size =MB (1 ); -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,1 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,1 ),I85X_DRB3 , &tmp); tom = tmp *MB (32 );
@@ -147,7 +148,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)u32 tom;u8 tmp; -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I845_ESMRAMC , &tmp);if (tmp &TSEG_ENABLE ) {
@@ -161,7 +162,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) } } -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I830_DRB3 , &tmp); tom = tmp *MB (32 );
@@ -171,7 +172,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)u32 tom;u8 tmp; -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I830_ESMRAMC , &tmp);if (tmp &TSEG_ENABLE ) {
@@ -181,7 +182,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) tseg_size =KB (512 ); } -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I830_DRB3 , &tmp); tom = tmp *MB (32 );
drivers/gpu/drm/i915/i915_gpu_error.c +5 -4
@@ -328,6 +328,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, {struct drm_device *dev = error_priv->dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_error_state *error = error_priv->error;struct drm_i915_error_object *obj;int i, j, offset, elt;
@@ -358,11 +359,11 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, }err_printf (m,"Reset count: %u\n" , error->reset_count);err_printf (m,"Suspend count: %u\n" , error->suspend_count); -err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device); -err_printf (m,"PCI Revision: 0x%02x\n" , dev->pdev->revision); +err_printf (m,"PCI ID: 0x%04x\n" , pdev->device); +err_printf (m,"PCI Revision: 0x%02x\n" , pdev->revision);err_printf (m,"PCI Subsystem: %04x:%04x\n" , - dev->pdev->subsystem_vendor, - dev->pdev->subsystem_device); + pdev->subsystem_vendor, + pdev->subsystem_device);err_printf (m,"IOMMU enabled?: %d\n" , error->iommu);if (HAS_CSR (dev)) {
drivers/gpu/drm/i915/i915_suspend.c +4 -2
@@ -104,6 +104,7 @@ static void i915_restore_display(struct drm_device *dev)int i915_save_state (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;int i;mutex_lock (&dev->struct_mutex);
@@ -111,7 +112,7 @@ int i915_save_state(struct drm_device *dev)i915_save_display (dev);if (IS_GEN4 (dev)) -pci_read_config_word (dev->pdev,GCDGMBUS , +pci_read_config_word (pdev,GCDGMBUS , &dev_priv->regfile.saveGCDGMBUS);/* Cache mode state */
@@ -149,6 +150,7 @@ int i915_save_state(struct drm_device *dev)int i915_restore_state (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;int i;mutex_lock (&dev->struct_mutex);
@@ -156,7 +158,7 @@ int i915_restore_state(struct drm_device *dev)i915_gem_restore_fences (dev);if (IS_GEN4 (dev)) -pci_write_config_word (dev->pdev,GCDGMBUS , +pci_write_config_word (pdev,GCDGMBUS , dev_priv->regfile.saveGCDGMBUS);i915_restore_display (dev);
drivers/gpu/drm/i915/intel_display.c +16 -9
@@ -6813,9 +6813,10 @@ static int i9xx_misc_get_display_clock_speed(struct drm_device *dev)static int pnv_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;u16 gcfgc =0 ; -pci_read_config_word (dev->pdev,GCFGC , &gcfgc); +pci_read_config_word (pdev,GCFGC , &gcfgc);switch (gcfgc &GC_DISPLAY_CLOCK_MASK ) {case GC_DISPLAY_CLOCK_267_MHZ_PNV :
@@ -6837,9 +6838,10 @@ static int pnv_get_display_clock_speed(struct drm_device *dev)static int i915gm_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;u16 gcfgc =0 ; -pci_read_config_word (dev->pdev,GCFGC , &gcfgc); +pci_read_config_word (pdev,GCFGC , &gcfgc);if (gcfgc &GC_LOW_FREQUENCY_ENABLE )return 133333 ;
@@ -6861,6 +6863,7 @@ static int i865_get_display_clock_speed(struct drm_device *dev)static int i85x_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;u16 hpllcc =0 ;/*
@@ -6868,10 +6871,10 @@ static int i85x_get_display_clock_speed(struct drm_device *dev)* encoding is different :( * FIXME is this the right way to detect 852GM/852GMV? */ -if (dev->pdev->revision ==0x1 ) +if (pdev->revision ==0x1 )return 133333 ; -pci_bus_read_config_word (dev->pdev->bus, +pci_bus_read_config_word (pdev->bus,PCI_DEVFN (0 ,3 ),HPLLCC , &hpllcc);/* Assume that the hardware is in the high speed state. This
@@ -6972,10 +6975,11 @@ static unsigned int intel_hpll_vco(struct drm_device *dev)static int gm45_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;unsigned int cdclk_sel, vco =intel_hpll_vco (dev);uint16_t tmp =0 ; -pci_read_config_word (dev->pdev,GCFGC , &tmp); +pci_read_config_word (pdev,GCFGC , &tmp); cdclk_sel = (tmp >>12 ) &0x1 ;
@@ -6994,6 +6998,7 @@ static int gm45_get_display_clock_speed(struct drm_device *dev)static int i965gm_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;static const uint8_t div_3200[] = {16 ,10 ,8 };static const uint8_t div_4000[] = {20 ,12 ,10 };static const uint8_t div_5333[] = {24 ,16 ,14 };
@@ -7001,7 +7006,7 @@ static int i965gm_get_display_clock_speed(struct drm_device *dev)unsigned int cdclk_sel, vco =intel_hpll_vco (dev);uint16_t tmp =0 ; -pci_read_config_word (dev->pdev,GCFGC , &tmp); +pci_read_config_word (pdev,GCFGC , &tmp); cdclk_sel = ((tmp >>8 ) &0x1f ) -1 ;
@@ -7031,6 +7036,7 @@ fail:static int g33_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;static const uint8_t div_3200[] = {12 ,10 ,8 ,7 ,5 ,16 };static const uint8_t div_4000[] = {14 ,12 ,10 ,8 ,6 ,20 };static const uint8_t div_4800[] = {20 ,14 ,12 ,10 ,8 ,24 };
@@ -7039,7 +7045,7 @@ static int g33_get_display_clock_speed(struct drm_device *dev)unsigned int cdclk_sel, vco =intel_hpll_vco (dev);uint16_t tmp =0 ; -pci_read_config_word (dev->pdev,GCFGC , &tmp); +pci_read_config_word (pdev,GCFGC , &tmp); cdclk_sel = (tmp >>4 ) &0x7 ;
@@ -15470,15 +15476,16 @@ static void intel_init_quirks(struct drm_device *dev)static void i915_disable_vga (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;u8 sr1;i915_reg_t vga_reg =i915_vgacntrl_reg (dev);/* WaEnableVGAAccessThroughIOPort:ctg,elk,ilk,snb,ivb,vlv,hsw */ -vga_get_uninterruptible (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_get_uninterruptible (pdev,VGA_RSRC_LEGACY_IO );outb (SR01 ,VGA_SR_INDEX ); sr1 =inb (VGA_SR_DATA );outb (sr1 |1 <<5 ,VGA_SR_DATA ); -vga_put (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_put (pdev,VGA_RSRC_LEGACY_IO );udelay (300 );I915_WRITE (vga_reg,VGA_DISP_DISABLE );
drivers/gpu/drm/i915/intel_fbdev.c +2 -1
@@ -184,6 +184,7 @@ static int intelfb_create(struct drm_fb_helper *helper,struct intel_framebuffer *intel_fb = ifbdev->fb;struct drm_device *dev = helper->dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct fb_info *info;struct drm_framebuffer *fb;
@@ -284,7 +285,7 @@ static int intelfb_create(struct drm_fb_helper *helper, i915_gem_obj_ggtt_offset(obj), obj);mutex_unlock (&dev->struct_mutex); -vga_switcheroo_client_fb_set (dev->pdev, info); +vga_switcheroo_client_fb_set (pdev, info);return 0 ; out_destroy_fbi:
drivers/gpu/drm/i915/intel_guc_loader.c +2 -1
@@ -553,6 +553,7 @@ fail:static void guc_fw_fetch (struct drm_device *dev,struct intel_guc_fw *guc_fw) { +struct pci_dev *pdev = dev->pdev;struct drm_i915_gem_object *obj;const struct firmware *fw;struct guc_css_header *css;
@@ -562,7 +563,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)DRM_DEBUG_DRIVER ("before requesting firmware: GuC fw fetch status %s\n" ,intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status)); - err =request_firmware (&fw, guc_fw->guc_fw_path, &dev->pdev->dev); + err =request_firmware (&fw, guc_fw->guc_fw_path, &pdev->dev);if (err) goto fail;if (!fw)
drivers/gpu/drm/i915/intel_i2c.c +2 -1
@@ -633,6 +633,7 @@ static const struct i2c_algorithm gmbus_algorithm = {int intel_setup_gmbus (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct intel_gmbus *bus;unsigned int pin;int ret;
@@ -663,7 +664,7 @@ int intel_setup_gmbus(struct drm_device *dev)"i915 gmbus %s" , get_gmbus_pin(dev_priv, pin)->name); - bus->adapter.dev.parent = &dev->pdev->dev; + bus->adapter.dev.parent = &pdev->dev; bus->dev_priv = dev_priv; bus->adapter.algo = &gmbus_algorithm;
drivers/gpu/drm/i915/intel_runtime_pm.c +16 -14
@@ -287,6 +287,7 @@ void intel_display_set_init_power(struct drm_i915_private *dev_priv,*/ static void hsw_power_well_post_enable (struct drm_i915_private *dev_priv) { +struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_device *dev = &dev_priv->drm;/*
@@ -299,9 +300,9 @@ static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv)* sure vgacon can keep working normally without triggering interrupts * and error messages. */ -vga_get_uninterruptible (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_get_uninterruptible (pdev,VGA_RSRC_LEGACY_IO );outb (inb (VGA_MSR_READ ),VGA_MSR_WRITE ); -vga_put (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_put (pdev,VGA_RSRC_LEGACY_IO );if (IS_BROADWELL (dev)) gen8_irq_power_well_post_enable(dev_priv,
@@ -318,7 +319,7 @@ static void hsw_power_well_pre_disable(struct drm_i915_private *dev_priv)static void skl_power_well_post_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -struct drm_device *dev = &dev_priv->drm; +struct pci_dev *pdev = dev_priv->drm.pdev;/* * After we re-enable the power well, if we touch VGA register 0x3d5
@@ -331,9 +332,9 @@ static void skl_power_well_post_enable(struct drm_i915_private *dev_priv,* and error messages. */ if (power_well->data ==SKL_DISP_PW_2 ) { -vga_get_uninterruptible (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_get_uninterruptible (pdev,VGA_RSRC_LEGACY_IO );outb (inb (VGA_MSR_READ ),VGA_MSR_WRITE ); -vga_put (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_put (pdev,VGA_RSRC_LEGACY_IO );gen8_irq_power_well_post_enable (dev_priv,1 <<PIPE_C |1 <<PIPE_B );
@@ -2647,8 +2648,8 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_get (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;pm_runtime_get_sync (kdev);
@@ -2668,8 +2669,8 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)*/ bool intel_runtime_pm_get_if_in_use (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;if (IS_ENABLED (CONFIG_PM )) {int ret =pm_runtime_get_if_in_use (kdev);
@@ -2710,8 +2711,8 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_get_noresume (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;assert_rpm_wakelock_held (dev_priv);pm_runtime_get_noresume (kdev);
@@ -2729,8 +2730,8 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_put (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;assert_rpm_wakelock_held (dev_priv);if (atomic_dec_and_test (&dev_priv->pm.wakeref_count))
@@ -2752,8 +2753,9 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_enable (struct drm_i915_private *dev_priv) { +struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct device *kdev = &pdev->dev;pm_runtime_set_autosuspend_delay (kdev,10000 );/* 10s */ pm_runtime_mark_last_busy (kdev);
drivers/gpu/drm/i915/intel_sdvo.c +3 -1
@@ -2930,10 +2930,12 @@ static bool intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo, struct drm_device *dev) { + struct pci_dev *pdev = dev->pdev; + sdvo->ddc.owner =THIS_MODULE ; sdvo->ddc.class =I2C_CLASS_DDC ;snprintf (sdvo->ddc.name,I2C_NAME_SIZE ,"SDVO DDC proxy" ); - sdvo->ddc.dev.parent = &dev->pdev->dev; + sdvo->ddc.dev.parent = &pdev->dev; sdvo->ddc.algo_data = sdvo; sdvo->ddc.algo = &intel_sdvo_ddc_proxy;
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/5] drm/i915: pdev cleanup
Quoted 8 lines · David Weinehall
In an effort to simplify things for a future push of
dev_privinstead of dev wherever possible, always take pdev viadev_privwhere feasible, eliminating the direct access from dev. Right now this only eliminates a few cases of dev, but it also obviates that we pass dev into a lot of functions wheredev_privwould be the more obvious choice.Signed-off-by David Weinehall <[email protected]>
struct pci_dev *pdev improves consistency and pdev tends to be used frequently within functions, so
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/5 v2] drm/i915: pdev cleanup
In reply to David WeinehallIn an effort to simplify things for a future push of dev_priv instead of dev wherever possible, always take pdev via dev_priv where feasible, eliminating the direct access from dev. Right now this only eliminates a few cases of dev, but it also obviates that we pass dev into a lot of functions where dev_priv would be the more obvious choice.
v2: Rebase
--- drivers/gpu/drm/i915/i915_debugfs.c | 5 +-- drivers/gpu/drm/i915/i915_drv.c | 59 +++++++++++++++++++-------------- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++- drivers/gpu/drm/i915/i915_gem_stolen.c | 19 ++++++----- drivers/gpu/drm/i915/i915_gpu_error.c | 9 ++--- drivers/gpu/drm/i915/i915_suspend.c | 6 ++-- drivers/gpu/drm/i915/intel_display.c | 25 +++++++++----- drivers/gpu/drm/i915/intel_fbdev.c | 3 +- drivers/gpu/drm/i915/intel_guc_loader.c | 3 +- drivers/gpu/drm/i915/intel_i2c.c | 3 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 30 +++++++++-------- drivers/gpu/drm/i915/intel_sdvo.c | 4 ++- 12 files changed, 100 insertions(+), 70 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -2
@@ -2785,6 +2785,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)struct drm_info_node *node = m->private;struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;if (!HAS_RUNTIME_PM (dev_priv))seq_puts (m,"Runtime power management not supported\n" );
@@ -2799,8 +2800,8 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)seq_printf (m,"Device Power Management (CONFIG_PM) disabled\n" );#endif seq_printf (m,"PCI device power state: %s [%d]\n" , -pci_power_name (dev_priv->drm.pdev->current_state), - dev_priv->drm.pdev->current_state); +pci_power_name (pdev->current_state), + pdev->current_state);return 0 ; }
drivers/gpu/drm/i915/i915_drv.c +34 -25
224 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -1
@@ -348,10 +348,12 @@ static int setup_page_dma(struct drm_device *dev, struct i915_page_dma *p)static void cleanup_page_dma (struct drm_device *dev,struct i915_page_dma *p) { +struct pci_dev *pdev = dev->pdev; +if (WARN_ON (!p->page))return ; -dma_unmap_page (&dev->pdev->dev, p->daddr,4096 ,PCI_DMA_BIDIRECTIONAL ); +dma_unmap_page (&pdev->dev, p->daddr,4096 ,PCI_DMA_BIDIRECTIONAL );__free_page (p->page);memset (p,0 ,sizeof (*p)); }
drivers/gpu/drm/i915/i915_gem_stolen.c +10 -9
@@ -92,6 +92,7 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,static unsigned long i915_stolen_to_physical (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct resource *r;u32 base;
@@ -111,7 +112,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)if (INTEL_INFO (dev)->gen >=3 ) {u32 bsm; -pci_read_config_dword (dev->pdev,INTEL_BSM , &bsm); +pci_read_config_dword (pdev,INTEL_BSM , &bsm); base = bsm &INTEL_BSM_MASK ; }else if (IS_I865G (dev)) {
@@ -119,7 +120,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)u16 toud =0 ;u8 tmp; -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I845_ESMRAMC , &tmp);if (tmp &TSEG_ENABLE ) {
@@ -133,7 +134,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) } } -pci_bus_read_config_word (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_word (pdev->bus,PCI_DEVFN (0 ,0 ),I865_TOUD , &toud); base = (toud <<16 ) + tseg_size;
@@ -142,13 +143,13 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)u32 tom;u8 tmp; -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I85X_ESMRAMC , &tmp);if (tmp &TSEG_ENABLE ) tseg_size =MB (1 ); -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,1 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,1 ),I85X_DRB3 , &tmp); tom = tmp *MB (32 );
@@ -158,7 +159,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)u32 tom;u8 tmp; -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I845_ESMRAMC , &tmp);if (tmp &TSEG_ENABLE ) {
@@ -172,7 +173,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) } } -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I830_DRB3 , &tmp); tom = tmp *MB (32 );
@@ -182,7 +183,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev)u32 tom;u8 tmp; -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I830_ESMRAMC , &tmp);if (tmp &TSEG_ENABLE ) {
@@ -192,7 +193,7 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) tseg_size =KB (512 ); } -pci_bus_read_config_byte (dev->pdev->bus,PCI_DEVFN (0 ,0 ), +pci_bus_read_config_byte (pdev->bus,PCI_DEVFN (0 ,0 ),I830_DRB3 , &tmp); tom = tmp *MB (32 );
drivers/gpu/drm/i915/i915_gpu_error.c +5 -4
@@ -328,6 +328,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, {struct drm_device *dev = error_priv->dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_error_state *error = error_priv->error;struct drm_i915_error_object *obj;int i, j, offset, elt;
@@ -358,11 +359,11 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, }err_printf (m,"Reset count: %u\n" , error->reset_count);err_printf (m,"Suspend count: %u\n" , error->suspend_count); -err_printf (m,"PCI ID: 0x%04x\n" , dev->pdev->device); -err_printf (m,"PCI Revision: 0x%02x\n" , dev->pdev->revision); +err_printf (m,"PCI ID: 0x%04x\n" , pdev->device); +err_printf (m,"PCI Revision: 0x%02x\n" , pdev->revision);err_printf (m,"PCI Subsystem: %04x:%04x\n" , - dev->pdev->subsystem_vendor, - dev->pdev->subsystem_device); + pdev->subsystem_vendor, + pdev->subsystem_device);err_printf (m,"IOMMU enabled?: %d\n" , error->iommu);if (HAS_CSR (dev)) {
drivers/gpu/drm/i915/i915_suspend.c +4 -2
@@ -63,6 +63,7 @@ static void i915_restore_display(struct drm_device *dev)int i915_save_state (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;int i;mutex_lock (&dev->struct_mutex);
@@ -70,7 +71,7 @@ int i915_save_state(struct drm_device *dev)i915_save_display (dev);if (IS_GEN4 (dev)) -pci_read_config_word (dev->pdev,GCDGMBUS , +pci_read_config_word (pdev,GCDGMBUS , &dev_priv->regfile.saveGCDGMBUS);/* Cache mode state */
@@ -108,6 +109,7 @@ int i915_save_state(struct drm_device *dev)int i915_restore_state (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;int i;mutex_lock (&dev->struct_mutex);
@@ -115,7 +117,7 @@ int i915_restore_state(struct drm_device *dev)i915_gem_restore_fences (dev);if (IS_GEN4 (dev)) -pci_write_config_word (dev->pdev,GCDGMBUS , +pci_write_config_word (pdev,GCDGMBUS , dev_priv->regfile.saveGCDGMBUS);i915_restore_display (dev);
drivers/gpu/drm/i915/intel_display.c +16 -9
@@ -7282,9 +7282,10 @@ static int i9xx_misc_get_display_clock_speed(struct drm_device *dev)static int pnv_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;u16 gcfgc =0 ; -pci_read_config_word (dev->pdev,GCFGC , &gcfgc); +pci_read_config_word (pdev,GCFGC , &gcfgc);switch (gcfgc &GC_DISPLAY_CLOCK_MASK ) {case GC_DISPLAY_CLOCK_267_MHZ_PNV :
@@ -7306,9 +7307,10 @@ static int pnv_get_display_clock_speed(struct drm_device *dev)static int i915gm_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;u16 gcfgc =0 ; -pci_read_config_word (dev->pdev,GCFGC , &gcfgc); +pci_read_config_word (pdev,GCFGC , &gcfgc);if (gcfgc &GC_LOW_FREQUENCY_ENABLE )return 133333 ;
@@ -7330,6 +7332,7 @@ static int i865_get_display_clock_speed(struct drm_device *dev)static int i85x_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;u16 hpllcc =0 ;/*
@@ -7337,10 +7340,10 @@ static int i85x_get_display_clock_speed(struct drm_device *dev)* encoding is different :( * FIXME is this the right way to detect 852GM/852GMV? */ -if (dev->pdev->revision ==0x1 ) +if (pdev->revision ==0x1 )return 133333 ; -pci_bus_read_config_word (dev->pdev->bus, +pci_bus_read_config_word (pdev->bus,PCI_DEVFN (0 ,3 ),HPLLCC , &hpllcc);/* Assume that the hardware is in the high speed state. This
@@ -7441,10 +7444,11 @@ static unsigned int intel_hpll_vco(struct drm_device *dev)static int gm45_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;unsigned int cdclk_sel, vco =intel_hpll_vco (dev);uint16_t tmp =0 ; -pci_read_config_word (dev->pdev,GCFGC , &tmp); +pci_read_config_word (pdev,GCFGC , &tmp); cdclk_sel = (tmp >>12 ) &0x1 ;
@@ -7463,6 +7467,7 @@ static int gm45_get_display_clock_speed(struct drm_device *dev)static int i965gm_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;static const uint8_t div_3200[] = {16 ,10 ,8 };static const uint8_t div_4000[] = {20 ,12 ,10 };static const uint8_t div_5333[] = {24 ,16 ,14 };
@@ -7470,7 +7475,7 @@ static int i965gm_get_display_clock_speed(struct drm_device *dev)unsigned int cdclk_sel, vco =intel_hpll_vco (dev);uint16_t tmp =0 ; -pci_read_config_word (dev->pdev,GCFGC , &tmp); +pci_read_config_word (pdev,GCFGC , &tmp); cdclk_sel = ((tmp >>8 ) &0x1f ) -1 ;
@@ -7500,6 +7505,7 @@ fail:static int g33_get_display_clock_speed (struct drm_device *dev) { +struct pci_dev *pdev = dev->pdev;static const uint8_t div_3200[] = {12 ,10 ,8 ,7 ,5 ,16 };static const uint8_t div_4000[] = {14 ,12 ,10 ,8 ,6 ,20 };static const uint8_t div_4800[] = {20 ,14 ,12 ,10 ,8 ,24 };
@@ -7508,7 +7514,7 @@ static int g33_get_display_clock_speed(struct drm_device *dev)unsigned int cdclk_sel, vco =intel_hpll_vco (dev);uint16_t tmp =0 ; -pci_read_config_word (dev->pdev,GCFGC , &tmp); +pci_read_config_word (pdev,GCFGC , &tmp); cdclk_sel = (tmp >>4 ) &0x7 ;
@@ -15973,15 +15979,16 @@ static void intel_init_quirks(struct drm_device *dev)static void i915_disable_vga (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;u8 sr1;i915_reg_t vga_reg =i915_vgacntrl_reg (dev);/* WaEnableVGAAccessThroughIOPort:ctg,elk,ilk,snb,ivb,vlv,hsw */ -vga_get_uninterruptible (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_get_uninterruptible (pdev,VGA_RSRC_LEGACY_IO );outb (SR01 ,VGA_SR_INDEX ); sr1 =inb (VGA_SR_DATA );outb (sr1 |1 <<5 ,VGA_SR_DATA ); -vga_put (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_put (pdev,VGA_RSRC_LEGACY_IO );udelay (300 );I915_WRITE (vga_reg,VGA_DISP_DISABLE );
drivers/gpu/drm/i915/intel_fbdev.c +2 -1
@@ -183,6 +183,7 @@ static int intelfb_create(struct drm_fb_helper *helper,struct intel_framebuffer *intel_fb = ifbdev->fb;struct drm_device *dev = helper->dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct fb_info *info;struct drm_framebuffer *fb;
@@ -283,7 +284,7 @@ static int intelfb_create(struct drm_fb_helper *helper, i915_gem_obj_ggtt_offset(obj), obj);mutex_unlock (&dev->struct_mutex); -vga_switcheroo_client_fb_set (dev->pdev, info); +vga_switcheroo_client_fb_set (pdev, info);return 0 ; out_destroy_fbi:
drivers/gpu/drm/i915/intel_guc_loader.c +2 -1
@@ -565,6 +565,7 @@ fail:static void guc_fw_fetch (struct drm_device *dev,struct intel_guc_fw *guc_fw) { +struct pci_dev *pdev = dev->pdev;struct drm_i915_gem_object *obj;const struct firmware *fw;struct guc_css_header *css;
@@ -574,7 +575,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)DRM_DEBUG_DRIVER ("before requesting firmware: GuC fw fetch status %s\n" ,intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status)); - err =request_firmware (&fw, guc_fw->guc_fw_path, &dev->pdev->dev); + err =request_firmware (&fw, guc_fw->guc_fw_path, &pdev->dev);if (err) goto fail;if (!fw)
drivers/gpu/drm/i915/intel_i2c.c +2 -1
@@ -633,6 +633,7 @@ static const struct i2c_algorithm gmbus_algorithm = {int intel_setup_gmbus (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct pci_dev *pdev = dev_priv->drm.pdev;struct intel_gmbus *bus;unsigned int pin;int ret;
@@ -663,7 +664,7 @@ int intel_setup_gmbus(struct drm_device *dev)"i915 gmbus %s" , get_gmbus_pin(dev_priv, pin)->name); - bus->adapter.dev.parent = &dev->pdev->dev; + bus->adapter.dev.parent = &pdev->dev; bus->dev_priv = dev_priv; bus->adapter.algo = &gmbus_algorithm;
drivers/gpu/drm/i915/intel_runtime_pm.c +16 -14
@@ -287,6 +287,7 @@ void intel_display_set_init_power(struct drm_i915_private *dev_priv,*/ static void hsw_power_well_post_enable (struct drm_i915_private *dev_priv) { +struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_device *dev = &dev_priv->drm;/*
@@ -299,9 +300,9 @@ static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv)* sure vgacon can keep working normally without triggering interrupts * and error messages. */ -vga_get_uninterruptible (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_get_uninterruptible (pdev,VGA_RSRC_LEGACY_IO );outb (inb (VGA_MSR_READ ),VGA_MSR_WRITE ); -vga_put (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_put (pdev,VGA_RSRC_LEGACY_IO );if (IS_BROADWELL (dev)) gen8_irq_power_well_post_enable(dev_priv,
@@ -318,7 +319,7 @@ static void hsw_power_well_pre_disable(struct drm_i915_private *dev_priv)static void skl_power_well_post_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -struct drm_device *dev = &dev_priv->drm; +struct pci_dev *pdev = dev_priv->drm.pdev;/* * After we re-enable the power well, if we touch VGA register 0x3d5
@@ -331,9 +332,9 @@ static void skl_power_well_post_enable(struct drm_i915_private *dev_priv,* and error messages. */ if (power_well->data ==SKL_DISP_PW_2 ) { -vga_get_uninterruptible (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_get_uninterruptible (pdev,VGA_RSRC_LEGACY_IO );outb (inb (VGA_MSR_READ ),VGA_MSR_WRITE ); -vga_put (dev->pdev,VGA_RSRC_LEGACY_IO ); +vga_put (pdev,VGA_RSRC_LEGACY_IO );gen8_irq_power_well_post_enable (dev_priv,1 <<PIPE_C |1 <<PIPE_B );
@@ -2651,8 +2652,8 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_get (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;pm_runtime_get_sync (kdev);
@@ -2672,8 +2673,8 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)*/ bool intel_runtime_pm_get_if_in_use (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;if (IS_ENABLED (CONFIG_PM )) {int ret =pm_runtime_get_if_in_use (kdev);
@@ -2714,8 +2715,8 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_get_noresume (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;assert_rpm_wakelock_held (dev_priv);pm_runtime_get_noresume (kdev);
@@ -2733,8 +2734,8 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_put (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct pci_dev *pdev = dev_priv->drm.pdev; +struct device *kdev = &pdev->dev;assert_rpm_wakelock_held (dev_priv);if (atomic_dec_and_test (&dev_priv->pm.wakeref_count))
@@ -2756,8 +2757,9 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_enable (struct drm_i915_private *dev_priv) { +struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_device *dev = &dev_priv->drm; -struct device *kdev = &dev->pdev->dev; +struct device *kdev = &pdev->dev;pm_runtime_set_autosuspend_delay (kdev,10000 );/* 10s */ pm_runtime_mark_last_busy (kdev);
drivers/gpu/drm/i915/intel_sdvo.c +3 -1
@@ -2930,10 +2930,12 @@ static bool intel_sdvo_init_ddc_proxy(struct intel_sdvo *sdvo, struct drm_device *dev) { + struct pci_dev *pdev = dev->pdev; + sdvo->ddc.owner =THIS_MODULE ; sdvo->ddc.class =I2C_CLASS_DDC ;snprintf (sdvo->ddc.name,I2C_NAME_SIZE ,"SDVO DDC proxy" ); - sdvo->ddc.dev.parent = &dev->pdev->dev; + sdvo->ddc.dev.parent = &pdev->dev; sdvo->ddc.algo_data = sdvo; sdvo->ddc.algo = &intel_sdvo_ddc_proxy;
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Reviewed-byRe: [PATCH 4/5 v2] drm/i915: pdev cleanup
Quoted 10 lines · David Weinehall
In an effort to simplify things for a future push of
dev_privinstead of dev wherever possible, always take pdev viadev_privwhere feasible, eliminating the direct access from dev. Right now this only eliminates a few cases of dev, but it also obviates that we pass dev into a lot of functions wheredev_privwould be the more obvious choice.v2: Rebase
Signed-off-by David Weinehall <[email protected]>
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915: debugfs spring cleaning
In reply to David WeinehallJust like with sysfs, we do some major overhaul.
Pass dev_priv instead of dev to all feature macros (IS_, HAS_, INTEL_, etc.). This has the side effect that a bunch of functions now get dev_priv passed instead of dev.
All calls to INTEL_INFO()->gen have been replaced with INTEL_GEN().
We want access to to_i915(node->minor->dev) in a lot of places, so add the node_to_i915() helper to accomodate for this.
Finally, we have quite a few cases where we get a void * pointer, and need to cast it to drm_device *, only to run to_i915() on it. Add cast_to_i915() to do this.
--- drivers/gpu/drm/i915/i915_debugfs.c | 699 ++++++++++++++++-------------------- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 8 +- 3 files changed, 321 insertions(+), 388 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +313 -386
@@ -46,6 +46,11 @@ enum { PINNED_LIST, }; +static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) +{ +return to_i915 (node->minor->dev); +} +/* As the drm_debugfs_init() routines are called before dev->dev_private is * allocated we need to hook into the minor for release. */ static int
@@ -74,12 +79,11 @@ drm_add_fake_info_node(struct drm_minor *minor,static int i915_capabilities (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -const struct intel_device_info *info =INTEL_INFO (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +const struct intel_device_info *info =INTEL_INFO (dev_priv); -seq_printf (m,"gen: %d\n" , info->gen); -seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev)); +seq_printf (m,"gen: %d\n" ,INTEL_GEN (dev_priv)); +seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));#define PRINT_FLAG (x) seq_printf(m, #x ": %s\n", yesno(info->x))#define SEP_SEMICOLON ;DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG ,SEP_SEMICOLON );
@@ -136,13 +140,14 @@ static void describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_vma *vma;unsigned int frontbuffer_bits;int pin_count =0 ;enum intel_engine_id id; -lockdep_assert_held (&obj->base.dev->struct_mutex); +lockdep_assert_held (&dev->struct_mutex); seq_printf(m, "%pK: %c%c%c%c%c %8zdKiB %02x %02x [ ", &obj->base,
@@ -157,13 +162,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)for_each_engine_id (engine, dev_priv, id)seq_printf (m,"%x " ,i915_gem_active_get_seqno (&obj->last_read[id], - &obj->base.dev->struct_mutex)); + &dev->struct_mutex));seq_printf (m,"] %x %x%s%s%s" ,i915_gem_active_get_seqno (&obj->last_write, - &obj->base.dev->struct_mutex), + &dev->struct_mutex),i915_gem_active_get_seqno (&obj->last_fence, - &obj->base.dev->struct_mutex), -i915_cache_level_str (to_i915 (obj->base.dev), obj->cache_level), + &dev->struct_mutex), +i915_cache_level_str (dev_priv, obj->cache_level), obj->dirty ?" dirty" :"" , obj->madv ==I915_MADV_DONTNEED ?" purgeable" :"" );if (obj->base.name)
@@ -201,7 +206,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) } engine =i915_gem_active_get_engine (&obj->last_write, - &obj->base.dev->struct_mutex); + &dev->struct_mutex);if (engine)seq_printf (m," (%s)" , engine->name);
@@ -215,8 +220,8 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data)struct drm_info_node *node = m->private;uintptr_t list = (uintptr_t ) node->info_ent->data;struct list_head *head; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct i915_vma *vma;u64 total_obj_size, total_gtt_size;
@@ -274,9 +279,8 @@ static int obj_rank_by_stolen(void *priv,static int i915_gem_stolen_list_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;LIST_HEAD (stolen);
@@ -429,20 +433,21 @@ static int per_file_ctx_stats(int id, void *ptr, void *data)static void print_context_stats (struct seq_file *m,struct drm_i915_private *dev_priv) { +struct drm_device *dev = &dev_priv->drm;struct file_stats stats;struct drm_file *file;memset (&stats,0 ,sizeof (stats)); -mutex_lock (&dev_priv->drm.struct_mutex); +mutex_lock (&dev->struct_mutex);if (dev_priv->kernel_context)per_file_ctx_stats (0 , dev_priv->kernel_context, &stats); -list_for_each_entry (file, &dev_priv->drm.filelist, lhead) { +list_for_each_entry (file, &dev->filelist, lhead) {struct drm_i915_file_private *fpriv = file->driver_priv;idr_for_each (&fpriv->context_idr, per_file_ctx_stats, &stats); } -mutex_unlock (&dev_priv->drm.struct_mutex); +mutex_unlock (&dev->struct_mutex);print_file_stats (m,"[k]contexts" , stats); }
@@ -460,9 +465,8 @@ static void print_context_stats(struct seq_file *m,static int i915_gem_object_info (struct seq_file *m,void * data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;u32 count, mappable_count, purgeable_count;u64 size, mappable_size, purgeable_size;
@@ -583,9 +587,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data)static int i915_gem_gtt_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev;uintptr_t list = (uintptr_t ) node->info_ent->data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;int count, ret;
@@ -617,9 +621,8 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)static int i915_gem_pageflip_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;int ret;
@@ -666,7 +669,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) intel_crtc_get_vblank_counter(crtc));seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane)));else addr =I915_READ (DSPADDR (crtc->plane));
@@ -687,9 +690,8 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)static int i915_gem_batch_pool_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;struct intel_engine_cs *engine;int total =0 ;
@@ -732,9 +734,8 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)static int i915_gem_request_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct drm_i915_gem_request *req;int ret, any;
@@ -802,9 +803,8 @@ static void i915_ring_seqno_info(struct seq_file *m,static int i915_gem_seqno_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret;
@@ -825,9 +825,8 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)static int i915_interrupt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret, i, pipe;
@@ -836,7 +835,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev_priv)) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -875,7 +874,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (INTEL_INFO (dev)->gen >=8 ) { + }else if (INTEL_GEN (dev_priv) >=8 ) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -931,7 +930,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (IS_VALLEYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv)) {seq_printf (m,"Display IER:\t%08x\n" ,I915_READ (VLV_IER )); seq_printf(m, "Display IIR:\t%08x\n",
@@ -969,7 +968,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"DPINVGTT:\t%08x\n" ,I915_READ (DPINVGTT )); - }else if (!HAS_PCH_SPLIT (dev)) { + }else if (!HAS_PCH_SPLIT (dev_priv)) {seq_printf (m,"Interrupt enable: %08x\n" ,I915_READ (IER )); seq_printf(m, "Interrupt identity: %08x\n",
@@ -1001,7 +1000,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); }for_each_engine (engine, dev_priv) { -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , engine->name,I915_READ_IMR (engine));
@@ -1016,9 +1015,8 @@ static int i915_interrupt_info(struct seq_file *m, void *data)static int i915_gem_fence_regs_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i, ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1045,8 +1043,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)static int i915_hws_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node);struct intel_engine_cs *engine;const u32 *hws;int i;
@@ -1192,14 +1189,13 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,static int i915_frequency_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret =0 ;intel_runtime_pm_get (dev_priv); -if (IS_GEN5 (dev)) { +if (IS_GEN5 (dev_priv)) {u16 rgvswctl =I915_READ16 (MEMSWCTL );u16 rgvstat =I915_READ16 (MEMSTAT_ILK );
@@ -1209,7 +1205,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) MEMSTAT_VID_SHIFT);seq_printf (m,"Current P-state: %d\n" , (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); - }else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {u32 freq_sts;mutex_lock (&dev_priv->rps.hw_lock);
@@ -1236,7 +1232,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)"efficient (RPe) frequency: %d MHz\n" , intel_gpu_freq(dev_priv, dev_priv->rps.efficient_freq));mutex_unlock (&dev_priv->rps.hw_lock); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {u32 rp_state_limits;u32 gt_perf_status;u32 rp_state_cap;
@@ -1248,7 +1244,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)int max_freq; rp_state_limits =I915_READ (GEN6_RP_STATE_LIMITS ); -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { rp_state_cap =I915_READ (BXT_RP_STATE_CAP ); gt_perf_status =I915_READ (BXT_GT_PERF_STATUS ); }else {
@@ -1264,11 +1260,11 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); reqf =I915_READ (GEN6_RPNSWREQ ); -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) reqf >>=23 ;else { reqf &= ~GEN6_TURBO_DISABLE ; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) reqf >>=24 ;else reqf >>=25 ;
@@ -1286,9 +1282,9 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpdownei =I915_READ (GEN6_RP_CUR_DOWN_EI ) &GEN6_CURIAVG_MASK ; rpcurdown =I915_READ (GEN6_RP_CUR_DOWN ) &GEN6_CURBSYTAVG_MASK ; rpprevdown =I915_READ (GEN6_RP_PREV_DOWN ) &GEN6_CURBSYTAVG_MASK ; -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) cagf = (rpstat &GEN9_CAGF_MASK ) >>GEN9_CAGF_SHIFT ; -else if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cagf = (rpstat &HSW_CAGF_MASK ) >>HSW_CAGF_SHIFT ;else cagf = (rpstat &GEN6_CAGF_MASK ) >>GEN6_CAGF_SHIFT ;
@@ -1297,7 +1293,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev->struct_mutex); -if (IS_GEN6 (dev) ||IS_GEN7 (dev)) { +if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) { pm_ier =I915_READ (GEN6_PMIER ); pm_imr =I915_READ (GEN6_PMIMR ); pm_isr =I915_READ (GEN6_PMISR );
@@ -1315,7 +1311,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"pm_intr_keep: 0x%08x\n" , dev_priv->rps.pm_intr_keep);seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status);seq_printf (m,"Render p-state ratio: %d\n" , - (gt_perf_status & (IS_GEN9 (dev) ?0x1ff00 :0xff00 )) >>8 ); + (gt_perf_status & (IS_GEN9 (dev_priv) ?0x1ff00 :0xff00 )) >>8 );seq_printf (m,"Render p-state VID: %d\n" , gt_perf_status &0xff ); seq_printf(m, "Render p-state limit: %d\n",
@@ -1344,22 +1340,22 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Down threshold: %d%%\n" , dev_priv->rps.down_threshold); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>0 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Lowest (RPN) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (rp_state_cap &0xff00 ) >>8 ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Nominal (RP1) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>16 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>16 : rp_state_cap >>0 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));
@@ -1395,9 +1391,7 @@ out:static int i915_hangcheck_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_engine_cs *engine;u64 acthd[I915_NUM_ENGINES ];u32 seqno[I915_NUM_ENGINES ];
@@ -1466,9 +1460,8 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)static int ironlake_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rgvmodectl, rstdbyctl;u16 crstandvid;int ret;
@@ -1534,9 +1527,7 @@ static int ironlake_drpc_info(struct seq_file *m)static int i915_forcewake_domains (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_uncore_forcewake_domain *fw_domain;spin_lock_irq (&dev_priv->uncore.lock);
@@ -1552,9 +1543,7 @@ static int i915_forcewake_domains(struct seq_file *m, void *data)static int vlv_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 rpmodectl1, rcctl1, pw_status;intel_runtime_pm_get (dev_priv);
@@ -1592,9 +1581,8 @@ static int vlv_drpc_info(struct seq_file *m)static int gen6_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rpmodectl1, gt_core_status, rcctl1, rc6vids =0 ;u32 gen9_powergate_enable =0 , gen9_powergate_status =0 ;unsigned forcewake_count;
@@ -1624,7 +1612,7 @@ static int gen6_drpc_info(struct seq_file *m) rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL ); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { gen9_powergate_enable =I915_READ (GEN9_PG_ENABLE ); gen9_powergate_status =I915_READ (GEN9_PWRGT_DOMAIN_STATUS ); }
@@ -1646,7 +1634,7 @@ static int gen6_drpc_info(struct seq_file *m) yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));seq_printf (m,"RC6 Enabled: %s\n" ,yesno (rcctl1 &GEN6_RC_CTL_RC6_ENABLE )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Well Gating Enabled: %s\n" ,yesno (gen9_powergate_enable &GEN9_RENDER_PG_ENABLE )); seq_printf(m, "Media Well Gating Enabled: %s\n",
@@ -1680,7 +1668,7 @@ static int gen6_drpc_info(struct seq_file *m)seq_printf (m,"Core Power Down: %s\n" ,yesno (gt_core_status &GEN6_CORE_CPD_STATE_MASK )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Power Well: %s\n" , (gen9_powergate_status &GEN9_PWRGT_RENDER_STATUS_MASK ) ?"Up" :"Down" );
@@ -1710,12 +1698,11 @@ static int gen6_drpc_info(struct seq_file *m)static int i915_drpc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))return vlv_drpc_info (m); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )return gen6_drpc_info (m);else return ironlake_drpc_info (m);
@@ -1723,9 +1710,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)static int i915_frontbuffer_tracking (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);seq_printf (m,"FB tracking busy bits: 0x%08x\n" , dev_priv->fb_tracking.busy_bits);
@@ -1738,11 +1723,9 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)static int i915_fbc_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_FBC (dev)) { +if (!HAS_FBC (dev_priv)) {seq_puts (m,"FBC unsupported on this chipset\n" );return 0 ; }
@@ -1756,7 +1739,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)seq_printf (m,"FBC disabled: %s\n" , dev_priv->fbc.no_fbc_reason); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 )seq_printf (m,"Compressing: %s\n" ,yesno (I915_READ (FBC_STATUS2 ) &FBC_COMPRESSION_MASK ));
@@ -1772,7 +1755,7 @@ static int i915_fbc_fc_get(void *data, u64 *val)struct drm_device *dev = data;struct drm_i915_private *dev_priv =to_i915 (dev); -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ; *val = dev_priv->fbc.false_color;
@@ -1786,7 +1769,7 @@ static int i915_fbc_fc_set(void *data, u64 val)struct drm_i915_private *dev_priv =to_i915 (dev);u32 reg; -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ;mutex_lock (&dev_priv->fbc.lock);
@@ -1808,11 +1791,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_fbc_fc_fops,static int i915_ips_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_IPS (dev)) { +if (!HAS_IPS (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -1822,7 +1803,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)seq_printf (m,"Enabled by kernel parameter: %s\n" ,yesno (i915.enable_ips)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else {if (I915_READ (IPS_CTL ) &IPS_ENABLE )
@@ -1838,23 +1819,21 @@ static int i915_ips_status(struct seq_file *m, void *unused)static int i915_sr_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);bool sr_enabled = false;intel_runtime_pm_get (dev_priv); -if (HAS_PCH_SPLIT (dev)) +if (HAS_PCH_SPLIT (dev_priv)) sr_enabled =I915_READ (WM1_LP_ILK ) &WM1_LP_SR_EN ; -else if (IS_CRESTLINE (dev) ||IS_G4X (dev) || -IS_I945G (dev) ||IS_I945GM (dev)) +else if (IS_CRESTLINE (dev_priv) ||IS_G4X (dev_priv) || +IS_I945G (dev_priv) ||IS_I945GM (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF ) &FW_BLC_SELF_EN ; -else if (IS_I915GM (dev)) +else if (IS_I915GM (dev_priv)) sr_enabled =I915_READ (INSTPM ) &INSTPM_SELF_EN ; -else if (IS_PINEVIEW (dev)) +else if (IS_PINEVIEW (dev_priv)) sr_enabled =I915_READ (DSPFW3 ) &PINEVIEW_SELF_REFRESH_EN ; -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF_VLV ) &FW_CSPWRDWNEN ;intel_runtime_pm_put (dev_priv);
@@ -1867,13 +1846,12 @@ static int i915_sr_status(struct seq_file *m, void *unused)static int i915_emon_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;unsigned long temp, chipset, gfx;int ret; -if (!IS_GEN5 (dev)) +if (!IS_GEN5 (dev_priv))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1895,14 +1873,12 @@ static int i915_emon_status(struct seq_file *m, void *unused)static int i915_ring_freq_table (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);int ret =0 ;int gpu_freq, ia_freq;unsigned int max_gpu_freq, min_gpu_freq; -if (!HAS_CORE_RING_FREQ (dev)) { +if (!HAS_CORE_RING_FREQ (dev_priv)) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; }
@@ -1913,7 +1889,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) { +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;
@@ -1933,7 +1909,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) &ia_freq);seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" ,intel_gpu_freq (dev_priv, (gpu_freq * - (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );
@@ -1948,9 +1924,8 @@ out:static int i915_opregion (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_opregion *opregion = &dev_priv->opregion;int ret;
@@ -1969,10 +1944,7 @@ out:static int i915_vbt (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_opregion *opregion = &dev_priv->opregion; +struct intel_opregion *opregion = &node_to_i915 (m->private)->opregion;if (opregion->vbt)seq_write (m, opregion->vbt, opregion->vbt_size);
@@ -1982,8 +1954,8 @@ static int i915_vbt(struct seq_file *m, void *unused)static int i915_gem_framebuffer_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_framebuffer *fbdev_fb =NULL ;struct drm_framebuffer *drm_fb;int ret;
@@ -1993,8 +1965,8 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)return ret;#ifdef CONFIG_DRM_FBDEV_EMULATION -if (to_i915 (dev)->fbdev) { - fbdev_fb =to_intel_framebuffer (to_i915 (dev)->fbdev->helper.fb); +if (dev_priv->fbdev) { + fbdev_fb =to_intel_framebuffer (dev_priv->fbdev->helper.fb); seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ", fbdev_fb->base.width,
@@ -2039,9 +2011,8 @@ static void describe_ctx_ring(struct seq_file *m, struct intel_ring *ring)static int i915_context_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2136,9 +2107,8 @@ static void i915_dump_lrc_obj(struct seq_file *m,static int i915_dump_lrc (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2163,9 +2133,8 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)static int i915_execlists (struct seq_file *m,void *data) { -struct drm_info_node *node = (struct drm_info_node *)m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;u32 status_pointer;u8 read_pointer;
@@ -2266,9 +2235,8 @@ static const char *swizzle_string(unsigned swizzle)static int i915_swizzle_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2281,7 +2249,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)seq_printf (m,"bit6 swizzle for Y-tiling = %s\n" ,swizzle_string (dev_priv->mm.bit_6_swizzle_y)); -if (IS_GEN3 (dev) ||IS_GEN4 (dev)) { +if (IS_GEN3 (dev_priv) ||IS_GEN4 (dev_priv)) {seq_printf (m,"DDC = 0x%08x\n" ,I915_READ (DCC )); seq_printf(m, "DDC2 = 0x%08x\n",
@@ -2290,7 +2258,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ16(C0DRB3));seq_printf (m,"C1DRB3 = 0x%04x\n" ,I915_READ16 (C1DRB3 )); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"MAD_DIMM_C0 = 0x%08x\n" ,I915_READ (MAD_DIMM_C0 )); seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n",
@@ -2299,7 +2267,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ(MAD_DIMM_C2));seq_printf (m,"TILECTL = 0x%08x\n" ,I915_READ (TILECTL )); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )seq_printf (m,"GAMTARBMODE = 0x%08x\n" ,I915_READ (GAMTARBMODE ));else
@@ -2394,9 +2362,8 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)static int i915_ppgtt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;int ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2404,9 +2371,9 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )gen8_ppgtt_info (m, dev); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )gen6_ppgtt_info (m, dev);mutex_lock (&dev->filelist_mutex);
@@ -2446,9 +2413,8 @@ static int count_irq_waiters(struct drm_i915_private *i915)static int i915_rps_boost_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;seq_printf (m,"RPS enabled? %d\n" , dev_priv->rps.enabled);
@@ -2486,12 +2452,10 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)static int i915_llc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);const bool edram =INTEL_GEN (dev_priv) >8 ; -seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev))); +seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev_priv)));seq_printf (m,"%s: %lluMB\n" , edram ?"eDRAM" :"eLLC" ,intel_uncore_edram_size (dev_priv)/1024 /1024 );
@@ -2500,8 +2464,7 @@ static int i915_llc(struct seq_file *m, void *data)static int i915_guc_load_status_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;u32 tmp, i;
@@ -2572,9 +2535,8 @@ static void i915_guc_client_info(struct seq_file *m,static int i915_guc_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_guc guc;struct i915_guc_client client = {};struct intel_engine_cs *engine;
@@ -2622,9 +2584,7 @@ static int i915_guc_info(struct seq_file *m, void *data)static int i915_guc_log_dump (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct drm_i915_gem_object *log_obj = dev_priv->guc.log_obj;u32 *log;int i =0 , pg;
@@ -2650,15 +2610,13 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)static int i915_edp_psr_status (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 psrperf =0 ;u32 stat[3 ];enum pipe pipe;bool enabled = false; -if (!HAS_PSR (dev)) { +if (!HAS_PSR (dev_priv)) {seq_puts (m,"PSR not supported\n" );return 0 ; }
@@ -2675,7 +2633,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev)) +if (HAS_DDI (dev_priv)) enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ;else {for_each_pipe (dev_priv, pipe) {
@@ -2692,7 +2650,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"HW Enabled & Active bit: %s" ,yesno (enabled)); -if (!HAS_DDI (dev)) +if (!HAS_DDI (dev_priv))for_each_pipe (dev_priv, pipe) {if ((stat[pipe] ==VLV_EDP_PSR_ACTIVE_NORFB_UP ) || (stat[pipe] ==VLV_EDP_PSR_ACTIVE_SF_UPDATE ))
@@ -2704,7 +2662,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)* VLV/CHV PSR has no kind of performance counter * SKL+ Perf counter is reset to 0 everytime DC state is entered */ -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { psrperf =I915_READ (EDP_PSR_PERF_CNT ) &EDP_PSR_PERF_CNT_MASK ;
@@ -2718,8 +2676,8 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)static int i915_sink_crc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_connector *connector;struct intel_dp *intel_dp =NULL ;int ret;
@@ -2758,13 +2716,11 @@ out:static int i915_energy_uJ (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u64 power;u32 units; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;intel_runtime_pm_get (dev_priv);
@@ -2784,9 +2740,8 @@ static int i915_energy_uJ(struct seq_file *m, void *data)static int i915_runtime_pm_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct pci_dev *pdev = dev_priv->drm.pdev;if (!HAS_RUNTIME_PM (dev_priv))
@@ -2810,9 +2765,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)static int i915_power_domain_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct i915_power_domains *power_domains = &dev_priv->power_domains;int i;
@@ -2845,12 +2798,10 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)static int i915_dmc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_csr *csr; -if (!HAS_CSR (dev)) { +if (!HAS_CSR (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -2868,12 +2819,12 @@ static int i915_dmc_info(struct seq_file *m, void *unused)seq_printf (m,"version: %d.%d\n" ,CSR_VERSION_MAJOR (csr->version),CSR_VERSION_MINOR (csr->version)); -if (IS_SKYLAKE (dev) && csr->version >=CSR_VERSION (1 ,6 )) { +if (IS_SKYLAKE (dev_priv) && csr->version >=CSR_VERSION (1 ,6 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (SKL_CSR_DC3_DC5_COUNT ));seq_printf (m,"DC5 -> DC6 count: %d\n" ,I915_READ (SKL_CSR_DC5_DC6_COUNT )); - }else if (IS_BROXTON (dev) && csr->version >=CSR_VERSION (1 ,4 )) { + }else if (IS_BROXTON (dev_priv) && csr->version >=CSR_VERSION (1 ,4 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (BXT_CSR_DC3_DC5_COUNT )); }
@@ -2910,8 +2861,8 @@ static void intel_encoder_info(struct seq_file *m,struct intel_crtc *intel_crtc, struct intel_encoder *intel_encoder) { - struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; + struct drm_i915_private *dev_priv = node_to_i915(m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_connector *intel_connector;struct drm_encoder *encoder;
@@ -2937,8 +2888,8 @@ static void intel_encoder_info(struct seq_file *m,static void intel_crtc_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_encoder *intel_encoder;struct drm_plane_state *plane_state = crtc->primary->state;
@@ -3041,7 +2992,7 @@ static bool cursor_active(struct drm_device *dev, int pipe)struct drm_i915_private *dev_priv =to_i915 (dev);u32 state; -if (IS_845G (dev) ||IS_I865G (dev)) +if (IS_845G (dev_priv) ||IS_I865G (dev_priv)) state =I915_READ (CURCNTR (PIPE_A )) &CURSOR_ENABLE ;else state =I915_READ (CURCNTR (pipe)) &CURSOR_MODE ;
@@ -3107,8 +3058,8 @@ static const char *plane_rotation(unsigned int rotation)static void intel_plane_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_plane *intel_plane;for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) {
@@ -3170,9 +3121,8 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *intel_crtc)static int i915_display_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;struct drm_connector *connector;
@@ -3225,11 +3175,10 @@ static int i915_display_info(struct seq_file *m, void *unused)static int i915_semaphore_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine; -int num_rings =hweight32 (INTEL_INFO (dev)->ring_mask); +int num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask);enum intel_engine_id id;int j, ret;
@@ -3243,7 +3192,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)return ret;intel_runtime_pm_get (dev_priv); -if (IS_BROADWELL (dev)) { +if (IS_BROADWELL (dev_priv)) {struct page *page;uint64_t *seqno;
@@ -3298,9 +3247,8 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)static int i915_shared_dplls_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i;drm_modeset_lock_all (dev);
@@ -3328,9 +3276,8 @@ static int i915_wa_registers(struct seq_file *m, void *unused)int i;int ret;struct intel_engine_cs *engine; -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_workarounds *workarounds = &dev_priv->workarounds;enum intel_engine_id id;
@@ -3366,15 +3313,14 @@ static int i915_wa_registers(struct seq_file *m, void *unused)static int i915_ddb_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct skl_ddb_allocation *ddb;struct skl_ddb_entry *entry;enum pipe pipe;int plane; -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev_priv) <9 )return 0 ;drm_modeset_lock_all (dev);
@@ -3404,7 +3350,8 @@ static int i915_ddb_info(struct seq_file *m, void *unused) }static void drrs_status_per_crtc (struct seq_file *m, -struct drm_device *dev,struct intel_crtc *intel_crtc) +struct drm_device *dev, +struct intel_crtc *intel_crtc) {struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_drrs *drrs = &dev_priv->drrs;
@@ -3473,8 +3420,8 @@ static void drrs_status_per_crtc(struct seq_file *m,static int i915_drrs_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *intel_crtc;int active_crtc_cnt =0 ;
@@ -3503,8 +3450,8 @@ struct pipe_crc_info {static int i915_dp_mst_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *intel_encoder;struct intel_digital_port *intel_dig_port;struct drm_connector *connector;
@@ -3715,8 +3662,7 @@ static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)static int display_crc_ctl_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;int i;for (i =0 ; i <I915_MAX_PIPES ; i++)
@@ -3728,9 +3674,9 @@ static int display_crc_ctl_show(struct seq_file *m, void *data)static int display_crc_ctl_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -return single_open (file, display_crc_ctl_show, dev); +return single_open (file, display_crc_ctl_show, dev_priv); } static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
@@ -3753,9 +3699,11 @@ static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static int i9xx_pipe_crc_auto_source (struct drm_device *dev,enum pipe pipe, +static int i9xx_pipe_crc_auto_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source *source) { +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder;struct intel_crtc *crtc;struct intel_digital_port *dig_port;
@@ -3805,16 +3753,15 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,return ret; } -static int vlv_pipe_crc_ctl_reg (struct drm_device *dev, +static int vlv_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3832,7 +3779,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev, need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_CHERRYVIEW (dev)) +if (!IS_CHERRYVIEW (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_VLV ; need_stable_symbols = true;
@@ -3876,16 +3823,15 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int i9xx_pipe_crc_ctl_reg (struct drm_device *dev, +static int i9xx_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3895,24 +3841,24 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PIPE_I9XX ;break ;case INTEL_PIPE_CRC_SOURCE_TV : -if (!SUPPORTS_TV (dev)) +if (!SUPPORTS_TV (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_TV_PRE ;break ;case INTEL_PIPE_CRC_SOURCE_DP_B : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_B_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_C : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_C_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_G4X ; need_stable_symbols = true;
@@ -3936,7 +3882,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,if (need_stable_symbols) {uint32_t tmp =I915_READ (PORT_DFT2_G4X ); -WARN_ON (!IS_G4X (dev)); +WARN_ON (!IS_G4X (dev_priv));I915_WRITE (PORT_DFT_I9XX ,I915_READ (PORT_DFT_I9XX ) |DC_BALANCE_RESET );
@@ -3952,10 +3898,9 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static void vlv_undo_pipe_scramble_reset (struct drm_device *dev, +static void vlv_undo_pipe_scramble_reset (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp =I915_READ (PORT_DFT2_G4X );switch (pipe) {
@@ -4021,9 +3966,10 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static void hsw_trans_edp_pipe_A_crc_wa (struct drm_device *dev,bool enable) +static void hsw_trans_edp_pipe_A_crc_wa (struct drm_i915_private *dev_priv, +bool enable) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[PIPE_A ]);struct intel_crtc_state *pipe_config;
@@ -4057,7 +4003,7 @@ out:drm_atomic_state_free (state); } -static int ivb_pipe_crc_ctl_reg (struct drm_device *dev, +static int ivb_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val)
@@ -4073,8 +4019,8 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_SPRITE_IVB ;break ;case INTEL_PIPE_CRC_SOURCE_PF : -if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, true); +if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, true); *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PF_IVB ;break ;
@@ -4088,13 +4034,14 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int pipe_crc_set_source (struct drm_device *dev,enum pipe pipe, +static int pipe_crc_set_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source source) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; -struct intel_crtc *crtc =to_intel_crtc (intel_get_crtc_for_pipe (dev, - pipe)); +struct intel_crtc *crtc = +to_intel_crtc (intel_get_crtc_for_pipe (dev, pipe));enum intel_display_power_domain power_domain;u32 val =0 ;/* shut up gcc */ int ret;
@@ -4112,16 +4059,16 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,return -EIO ; } -if (IS_GEN2 (dev)) +if (IS_GEN2 (dev_priv)) ret =i8xx_pipe_crc_ctl_reg (&source, &val); -else if (INTEL_INFO (dev)->gen <5 ) - ret =i9xx_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) - ret =vlv_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_GEN5 (dev) ||IS_GEN6 (dev)) +else if (INTEL_GEN (dev_priv) <5 ) + ret =i9xx_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + ret =vlv_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_GEN5 (dev_priv) ||IS_GEN6 (dev_priv)) ret =ilk_pipe_crc_ctl_reg (&source, &val);else - ret =ivb_pipe_crc_ctl_reg (dev, pipe, &source, &val); + ret =ivb_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val);if (ret !=0 ) goto out;
@@ -4185,12 +4132,12 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,kfree (entries); -if (IS_G4X (dev)) +if (IS_G4X (dev_priv))g4x_undo_pipe_scramble_reset (dev, pipe); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) -vlv_undo_pipe_scramble_reset (dev, pipe); -else if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, false); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) +vlv_undo_pipe_scramble_reset (dev_priv, pipe); +else if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, false);hsw_enable_ips (crtc); }
@@ -4294,7 +4241,8 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)return -EINVAL ; } -static int display_crc_ctl_parse (struct drm_device *dev,char *buf,size_t len) +static int display_crc_ctl_parse (struct drm_i915_private *dev_priv, +char *buf,size_t len) {#define N_WORDS 3int n_words;
@@ -4325,7 +4273,7 @@ static int display_crc_ctl_parse(struct drm_device *dev, char *buf, size_t len)return -EINVAL ; } -return pipe_crc_set_source (dev, pipe, source); +return pipe_crc_set_source (dev_priv, pipe, source); } static ssize_t display_crc_ctl_write(struct file *file, const char __user *ubuf,
@@ -4333,6 +4281,7 @@ static ssize_t display_crc_ctl_write(struct file *file, const char __user *ubuf, {struct seq_file *m = file->private_data;struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv =to_i915 (dev);char *tmpbuf;int ret;
@@ -4355,7 +4304,7 @@ static ssize_t display_crc_ctl_write(struct file *file, const char __user *ubuf, } tmpbuf[len] ='\0' ; - ret =display_crc_ctl_parse (dev, tmpbuf, len); + ret =display_crc_ctl_parse (dev_priv, tmpbuf, len); out:kfree (tmpbuf);
@@ -4505,7 +4454,7 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)return 0 ; }static int i915_displayport_test_data_open (struct inode *inode, -struct file *file) +struct file *file) {struct drm_device *dev = inode->i_private;
@@ -4562,13 +4511,14 @@ static const struct file_operations i915_displayport_test_type_fops = {static void wm_latency_show (struct seq_file *m,const uint16_t wm[8 ]) { -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv = m->private; +struct drm_device *dev = &dev_priv->drm;int level;int num_levels; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else num_levels =ilk_wm_max_level (dev) +1 ;
@@ -4582,8 +4532,8 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])* - WM1+ latency values in 0.5us units * - latencies are in us on gen9/vlv/chv */ -if (INTEL_INFO (dev)->gen >=9 ||IS_VALLEYVIEW (dev) || -IS_CHERRYVIEW (dev)) +if (INTEL_GEN (dev_priv) >=9 ||IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) latency *=10 ;else if (level >0 ) latency *=5 ;
@@ -4597,14 +4547,13 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])static int pri_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;wm_latency_show (m, latencies);
@@ -4613,14 +4562,13 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)static int spr_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;wm_latency_show (m, latencies);
@@ -4629,14 +4577,13 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)static int cur_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;wm_latency_show (m, latencies);
@@ -4645,38 +4592,39 @@ static int cur_wm_latency_show(struct seq_file *m, void *data)static int pri_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return -ENODEV ; -return single_open (file, pri_wm_latency_show, dev); +return single_open (file, pri_wm_latency_show, dev_priv); }static int spr_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, spr_wm_latency_show, dev); +return single_open (file, spr_wm_latency_show, dev_priv); }static int cur_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, cur_wm_latency_show, dev); +return single_open (file, cur_wm_latency_show, dev_priv); }static ssize_t wm_latency_write (struct file *file,const char __user *ubuf,size_t len,loff_t *offp,uint16_t wm[8 ]) {struct seq_file *m = file->private_data; +struct drm_i915_private *dev_priv =to_i915 (m->private);struct drm_device *dev = m->private;uint16_t new[8 ] = {0 };int num_levels;
@@ -4684,9 +4632,9 @@ static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,int ret;char tmp[32 ]; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else num_levels =ilk_wm_max_level (dev) +1 ;
@@ -4720,14 +4668,13 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4736,14 +4683,13 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4752,14 +4698,13 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4794,8 +4739,7 @@ static const struct file_operations i915_cur_wm_latency_fops = {static int i915_wedged_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val =i915_terminally_wedged (&dev_priv->gpu_error);
@@ -4805,8 +4749,7 @@ i915_wedged_get(void *data, u64 *val)static int i915_wedged_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);/* * There is no safeguard against this debugfs entry colliding
@@ -4836,8 +4779,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops,static int i915_ring_missed_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val = dev_priv->gpu_error.missed_irq_rings;return 0 ;
@@ -4846,8 +4788,8 @@ i915_ring_missed_irq_get(void *data, u64 *val)static int i915_ring_missed_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;int ret;/* Lock against concurrent debugfs callers */
@@ -4867,8 +4809,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_ring_missed_irq_fops,static int i915_ring_test_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val = dev_priv->gpu_error.test_irq_rings;
@@ -4878,8 +4819,7 @@ i915_ring_test_irq_get(void *data, u64 *val)static int i915_ring_test_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); val &=INTEL_INFO (dev_priv)->ring_mask;DRM_DEBUG_DRIVER ("Masking interrupts on rings 0x%08llx\n" , val);
@@ -4911,8 +4851,8 @@ i915_drop_caches_get(void *data, u64 *val)static int i915_drop_caches_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;int ret;DRM_DEBUG ("Dropping caches: 0x%08llx\n" , val);
@@ -4951,10 +4891,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_drop_caches_fops,static int i915_max_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);
@@ -4964,12 +4903,11 @@ i915_max_freq_get(void *data, u64 *val)static int i915_max_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 hw_max, hw_min;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val);
@@ -5007,8 +4945,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops,static int i915_min_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;
@@ -5020,8 +4957,7 @@ i915_min_freq_get(void *data, u64 *val)static int i915_min_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 hw_max, hw_min;int ret;
@@ -5063,12 +4999,12 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops,static int i915_cache_sharing_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;u32 snpcr;int ret; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -5079,7 +5015,7 @@ i915_cache_sharing_get(void *data, u64 *val) snpcr =I915_READ (GEN6_MBCUNIT_SNPCR );intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev_priv->drm.struct_mutex); +mutex_unlock (&dev->struct_mutex); *val = (snpcr &GEN6_MBC_SNPCR_MASK ) >>GEN6_MBC_SNPCR_SHIFT ;
@@ -5089,11 +5025,10 @@ i915_cache_sharing_get(void *data, u64 *val)static int i915_cache_sharing_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 snpcr; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ;if (val >3 )
@@ -5124,10 +5059,9 @@ struct sseu_dev_status {unsigned int eu_per_subslice; }; -static void cherryview_sseu_device_status (struct drm_device *dev, +static void cherryview_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int ss_max =2 ;int ss;u32 sig1[ss_max], sig2[ss_max];
@@ -5156,16 +5090,15 @@ static void cherryview_sseu_device_status(struct drm_device *dev, stat->subslice_total = stat->subslice_per_slice; } -static void gen9_sseu_device_status (struct drm_device *dev, +static void gen9_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int s_max =3 , ss_max =4 ;int s, ss;u32 s_reg[s_max], eu_reg[2 *s_max], eu_mask[2 ];/* BXT has a single slice and at most 3 subslices. */ -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { s_max =1 ; ss_max =3 ; }
@@ -5194,18 +5127,18 @@ static void gen9_sseu_device_status(struct drm_device *dev, stat->slice_total++; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) - ss_cnt =INTEL_INFO (dev)->subslice_per_slice; +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) + ss_cnt =INTEL_INFO (dev_priv)->subslice_per_slice;for (ss =0 ; ss < ss_max; ss++) {unsigned int eu_cnt; -if (IS_BROXTON (dev) && +if (IS_BROXTON (dev_priv) && !(s_reg[s] & (GEN9_PGCTL_SS_ACK (ss))))/* skip disabled subslice */ continue ; -if (IS_BROXTON (dev)) +if (IS_BROXTON (dev_priv)) ss_cnt++; eu_cnt = 2 * hweight32(eu_reg[2*s + ss/2] &
@@ -5221,25 +5154,24 @@ static void gen9_sseu_device_status(struct drm_device *dev, } } -static void broadwell_sseu_device_status (struct drm_device *dev, +static void broadwell_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev); -int s;u32 slice_info =I915_READ (GEN8_GT_SLICE_INFO ); +int s; stat->slice_total =hweight32 (slice_info &GEN8_LSLICESTAT_MASK );if (stat->slice_total) { - stat->subslice_per_slice =INTEL_INFO (dev)->subslice_per_slice; + stat->subslice_per_slice =INTEL_INFO (dev_priv)->subslice_per_slice; stat->subslice_total = stat->slice_total * stat->subslice_per_slice; - stat->eu_per_subslice =INTEL_INFO (dev)->eu_per_subslice; + stat->eu_per_subslice =INTEL_INFO (dev_priv)->eu_per_subslice; stat->eu_total = stat->eu_per_subslice * stat->subslice_total;/* subtract fused off EU(s) from enabled slice(s) */ for (s =0 ; s < stat->slice_total; s++) { -u8 subslice_7eu =INTEL_INFO (dev)->subslice_7eu[s]; +u8 subslice_7eu =INTEL_INFO (dev_priv)->subslice_7eu[s]; stat->eu_total -=hweight8 (subslice_7eu); }
@@ -5248,47 +5180,45 @@ static void broadwell_sseu_device_status(struct drm_device *dev,static int i915_sseu_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); -struct drm_device *dev = &dev_priv->drm; +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct sseu_dev_status stat; -if (INTEL_INFO (dev)->gen <8 ) +if (INTEL_GEN (dev_priv) <8 )return -ENODEV ;seq_puts (m,"SSEU Device Info\n" );seq_printf (m," Available Slice Total: %u\n" , -INTEL_INFO (dev)->slice_total); +INTEL_INFO (dev_priv)->slice_total);seq_printf (m," Available Subslice Total: %u\n" , -INTEL_INFO (dev)->subslice_total); +INTEL_INFO (dev_priv)->subslice_total);seq_printf (m," Available Subslice Per Slice: %u\n" , -INTEL_INFO (dev)->subslice_per_slice); +INTEL_INFO (dev_priv)->subslice_per_slice);seq_printf (m," Available EU Total: %u\n" , -INTEL_INFO (dev)->eu_total); +INTEL_INFO (dev_priv)->eu_total);seq_printf (m," Available EU Per Subslice: %u\n" , -INTEL_INFO (dev)->eu_per_subslice); -seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev))); -if (HAS_POOLED_EU (dev)) +INTEL_INFO (dev_priv)->eu_per_subslice); +seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev_priv))); +if (HAS_POOLED_EU (dev_priv))seq_printf (m," Min EU in pool: %u\n" , -INTEL_INFO (dev)->min_eu_in_pool); +INTEL_INFO (dev_priv)->min_eu_in_pool);seq_printf (m," Has Slice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_slice_pg)); +yesno (INTEL_INFO (dev_priv)->has_slice_pg));seq_printf (m," Has Subslice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_subslice_pg)); +yesno (INTEL_INFO (dev_priv)->has_subslice_pg));seq_printf (m," Has EU Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_eu_pg)); +yesno (INTEL_INFO (dev_priv)->has_eu_pg));seq_puts (m,"SSEU Device Status\n" );memset (&stat,0 ,sizeof (stat));intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { -cherryview_sseu_device_status (dev, &stat); - }else if (IS_BROADWELL (dev)) { -broadwell_sseu_device_status (dev, &stat); - }else if (INTEL_INFO (dev)->gen >=9 ) { -gen9_sseu_device_status (dev, &stat); +if (IS_CHERRYVIEW (dev_priv)) { +cherryview_sseu_device_status (dev_priv, &stat); + }else if (IS_BROADWELL (dev_priv)) { +broadwell_sseu_device_status (dev_priv, &stat); + }else if (INTEL_GEN (dev_priv) >=9 ) { +gen9_sseu_device_status (dev_priv, &stat); }intel_runtime_pm_put (dev_priv);
@@ -5309,10 +5239,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)static int i915_forcewake_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_runtime_pm_get (dev_priv);
@@ -5323,10 +5252,9 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)static int i915_forcewake_release (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
@@ -5455,9 +5383,8 @@ static const struct i915_debugfs_files { {"i915_dp_test_active", &i915_displayport_test_active_fops} }; -void intel_display_crc_init (struct drm_device *dev) +void intel_display_crc_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe;for_each_pipe (dev_priv, pipe) {
@@ -5505,7 +5432,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)drm_debugfs_remove_files (i915_debugfs_list,I915_DEBUGFS_ENTRIES , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_forcewake_fops, +drm_debugfs_remove_files ((struct drm_info_list *)&i915_forcewake_fops,1 , minor);for (i =0 ; i <ARRAY_SIZE (i915_pipe_crc_data); i++) {
@@ -5517,7 +5444,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) {struct drm_info_list *info_list = - (struct drm_info_list *) i915_debugfs_files[i].fops; + (struct drm_info_list *)i915_debugfs_files[i].fops;drm_debugfs_remove_files (info_list,1 , minor); }
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -849,7 +849,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_audio_hooks (dev_priv);i915_gem_load_init (&dev_priv->drm); -intel_display_crc_init (&dev_priv->drm); +intel_display_crc_init (dev_priv);intel_device_info_dump (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +7 -1
@@ -2049,6 +2049,12 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) return container_of(dev, struct drm_i915_private, drm); } +static inline struct drm_i915_private *cast_to_i915 (void *data) +{ +struct drm_device *dev = data; +return to_i915 (dev); +} +static inline struct drm_i915_private *kdev_to_i915 (struct device *kdev) {return to_i915 (dev_get_drvdata (kdev));
@@ -3481,7 +3487,7 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objecint i915_debugfs_register (struct drm_i915_private *dev_priv);void i915_debugfs_unregister (struct drm_i915_private *dev_priv);int i915_debugfs_connector_add (struct drm_connector *connector); -void intel_display_crc_init (struct drm_device *dev); +void intel_display_crc_init (struct drm_i915_private *dev_priv);#else static inline int i915_debugfs_register (struct drm_i915_private *dev_priv) {return 0 ;}static inline void i915_debugfs_unregister (struct drm_i915_private *dev_priv) {}
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: debugfs spring cleaning
drivers/gpu/drm/i915/i915_debugfs.c static void · line 150
Quoted 13 lines · David Weinehall
drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -136,13 +140,14 @@ static void describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_vma *vma;unsigned int frontbuffer_bits;int pin_count =0 ;enum intel_engine_id id; -lockdep_assert_held (&obj->base.dev->struct_mutex); +lockdep_assert_held (&dev->struct_mutex);
This is not a good tradeoff however. lockdep_assert_held() is conditional code that should be compiled out,
drivers/gpu/drm/i915/i915_debugfs.c describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) · line 165
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1seq_printf(m, "%pK: %c%c%c%c%c %8zdKiB %02x %02x [ ", &obj->base,@@ -157,13 +162,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)for_each_engine_id (engine, dev_priv, id)seq_printf (m,"%x " ,i915_gem_active_get_seqno (&obj->last_read[id], - &obj->base.dev->struct_mutex)); + &dev->struct_mutex));
Same again here.
Quoted 13 lines
drivers/gpu/drm/i915/i915_debugfs.c +3
-3seq_printf (m,"] %x %x%s%s%s" ,i915_gem_active_get_seqno (&obj->last_write, - &obj->base.dev->struct_mutex), + &dev->struct_mutex),i915_gem_active_get_seqno (&obj->last_fence, - &obj->base.dev->struct_mutex), -i915_cache_level_str (to_i915 (obj->base.dev), obj->cache_level), + &dev->struct_mutex), +i915_cache_level_str (dev_priv, obj->cache_level), obj->dirty ?" dirty" :"" , obj->madv ==I915_MADV_DONTNEED ?" purgeable" :"" );if (obj->base.name)
drivers/gpu/drm/i915/i915_debugfs.c describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) · line 209
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -201,7 +206,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) } engine =i915_gem_active_get_engine (&obj->last_write, - &obj->base.dev->struct_mutex); + &dev->struct_mutex);
and again.
I'm quite happy with dev_priv->drm and need a strong argument to introduce dev = &dev_priv->drm locals. dev_priv->drm should avoid the need for the compiler to emit any locals should they go out of scope. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: debugfs spring cleaning
Quoted 51 lines · Chris Wilson
drivers/gpu/drm/i915/i915_debugfs.c static void · line 150
Quoted 13 lines · David Weinehall
drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -136,13 +140,14 @@ static void describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_vma *vma;unsigned int frontbuffer_bits;int pin_count =0 ;enum intel_engine_id id; -lockdep_assert_held (&obj->base.dev->struct_mutex); +lockdep_assert_held (&dev->struct_mutex);This is not a good tradeoff however.
lockdep_assert_held()is conditional code that should be compiled out,drivers/gpu/drm/i915/i915_debugfs.c describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) · line 165
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1seq_printf(m, "%pK: %c%c%c%c%c %8zdKiB %02x %02x [ ", &obj->base,@@ -157,13 +162,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)for_each_engine_id (engine, dev_priv, id)seq_printf (m,"%x " ,i915_gem_active_get_seqno (&obj->last_read[id], - &obj->base.dev->struct_mutex)); + &dev->struct_mutex));Same again here.
Quoted 13 lines
drivers/gpu/drm/i915/i915_debugfs.c +3
-3seq_printf (m,"] %x %x%s%s%s" ,i915_gem_active_get_seqno (&obj->last_write, - &obj->base.dev->struct_mutex), + &dev->struct_mutex),i915_gem_active_get_seqno (&obj->last_fence, - &obj->base.dev->struct_mutex), -i915_cache_level_str (to_i915 (obj->base.dev), obj->cache_level), + &dev->struct_mutex), +i915_cache_level_str (dev_priv, obj->cache_level), obj->dirty ?" dirty" :"" , obj->madv ==I915_MADV_DONTNEED ?" purgeable" :"" );if (obj->base.name)drivers/gpu/drm/i915/i915_debugfs.c describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) · line 209
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -201,7 +206,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) } engine =i915_gem_active_get_engine (&obj->last_write, - &obj->base.dev->struct_mutex); + &dev->struct_mutex);and again.
Quoted 3 lines
I'm quite happy with
dev_priv->drmand need a strong argument to introduce dev =&dev_priv->drmlocals.dev_priv->drmshould avoid the need for the compiler to emit any locals should they go out of scope.
Thanks for the feedback. Will fix.
Regards: David
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5 v2] drm/i915: debugfs spring cleaning
In reply to David WeinehallJust like with sysfs, we do some major overhaul.
Pass dev_priv instead of dev to all feature macros (IS_, HAS_, INTEL_, etc.). This has the side effect that a bunch of functions now get dev_priv passed instead of dev.
All calls to INTEL_INFO()->gen have been replaced with INTEL_GEN().
We want access to to_i915(node->minor->dev) in a lot of places, so add the node_to_i915() helper to accomodate for this.
Finally, we have quite a few cases where we get a void * pointer, and need to cast it to drm_device *, only to run to_i915() on it. Add cast_to_i915() to do this.
v2: Don't introduce extra dev (Chris)
--- drivers/gpu/drm/i915/i915_debugfs.c | 704 ++++++++++++++++-------------------- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 7 +- 3 files changed, 320 insertions(+), 393 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +313 -391
@@ -46,6 +46,11 @@ enum { PINNED_LIST, }; +static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) +{ +return to_i915 (node->minor->dev); +} +/* As the drm_debugfs_init() routines are called before dev->dev_private is * allocated we need to hook into the minor for release. */ static int
@@ -74,12 +79,11 @@ drm_add_fake_info_node(struct drm_minor *minor,static int i915_capabilities (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -const struct intel_device_info *info =INTEL_INFO (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +const struct intel_device_info *info =INTEL_INFO (dev_priv); -seq_printf (m,"gen: %d\n" , info->gen); -seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev)); +seq_printf (m,"gen: %d\n" ,INTEL_GEN (dev_priv)); +seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));#define PRINT_FLAG (x) seq_printf(m, #x ": %s\n", yesno(info->x))#define SEP_SEMICOLON ;DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG ,SEP_SEMICOLON );
@@ -142,7 +146,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)int pin_count =0 ;enum intel_engine_id id; -lockdep_assert_held (&obj->base.dev->struct_mutex); +lockdep_assert_held (&dev_priv->drm.struct_mutex); seq_printf(m, "%pK: %c%c%c%c%c %8zdKiB %02x %02x [ ", &obj->base,
@@ -157,13 +161,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)for_each_engine_id (engine, dev_priv, id)seq_printf (m,"%x " ,i915_gem_active_get_seqno (&obj->last_read[id], - &obj->base.dev->struct_mutex)); + &dev_priv->drm.struct_mutex));seq_printf (m,"] %x %x%s%s%s" ,i915_gem_active_get_seqno (&obj->last_write, - &obj->base.dev->struct_mutex), + &dev_priv->drm.struct_mutex),i915_gem_active_get_seqno (&obj->last_fence, - &obj->base.dev->struct_mutex), -i915_cache_level_str (to_i915 (obj->base.dev), obj->cache_level), + &dev_priv->drm.struct_mutex), +i915_cache_level_str (dev_priv, obj->cache_level), obj->dirty ?" dirty" :"" , obj->madv ==I915_MADV_DONTNEED ?" purgeable" :"" );if (obj->base.name)
@@ -201,7 +205,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) } engine =i915_gem_active_get_engine (&obj->last_write, - &obj->base.dev->struct_mutex); + &dev_priv->drm.struct_mutex);if (engine)seq_printf (m," (%s)" , engine->name);
@@ -215,8 +219,8 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data)struct drm_info_node *node = m->private;uintptr_t list = (uintptr_t ) node->info_ent->data;struct list_head *head; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct i915_vma *vma;u64 total_obj_size, total_gtt_size;
@@ -274,9 +278,8 @@ static int obj_rank_by_stolen(void *priv,static int i915_gem_stolen_list_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;LIST_HEAD (stolen);
@@ -460,9 +463,8 @@ static void print_context_stats(struct seq_file *m,static int i915_gem_object_info (struct seq_file *m,void * data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;u32 count, mappable_count, purgeable_count;u64 size, mappable_size, purgeable_size;
@@ -583,9 +585,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data)static int i915_gem_gtt_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev;uintptr_t list = (uintptr_t ) node->info_ent->data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;int count, ret;
@@ -617,9 +619,8 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)static int i915_gem_pageflip_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;int ret;
@@ -666,7 +667,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) intel_crtc_get_vblank_counter(crtc));seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane)));else addr =I915_READ (DSPADDR (crtc->plane));
@@ -687,9 +688,8 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)static int i915_gem_batch_pool_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;struct intel_engine_cs *engine;int total =0 ;
@@ -732,9 +732,8 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)static int i915_gem_request_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct drm_i915_gem_request *req;int ret, any;
@@ -802,9 +801,8 @@ static void i915_ring_seqno_info(struct seq_file *m,static int i915_gem_seqno_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret;
@@ -825,9 +823,8 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)static int i915_interrupt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret, i, pipe;
@@ -836,7 +833,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev_priv)) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -875,7 +872,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (INTEL_INFO (dev)->gen >=8 ) { + }else if (INTEL_GEN (dev_priv) >=8 ) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -931,7 +928,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (IS_VALLEYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv)) {seq_printf (m,"Display IER:\t%08x\n" ,I915_READ (VLV_IER )); seq_printf(m, "Display IIR:\t%08x\n",
@@ -969,7 +966,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"DPINVGTT:\t%08x\n" ,I915_READ (DPINVGTT )); - }else if (!HAS_PCH_SPLIT (dev)) { + }else if (!HAS_PCH_SPLIT (dev_priv)) {seq_printf (m,"Interrupt enable: %08x\n" ,I915_READ (IER )); seq_printf(m, "Interrupt identity: %08x\n",
@@ -1001,7 +998,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); }for_each_engine (engine, dev_priv) { -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , engine->name,I915_READ_IMR (engine));
@@ -1016,9 +1013,8 @@ static int i915_interrupt_info(struct seq_file *m, void *data)static int i915_gem_fence_regs_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i, ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1045,8 +1041,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)static int i915_hws_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node);struct intel_engine_cs *engine;const u32 *hws;int i;
@@ -1192,14 +1187,13 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,static int i915_frequency_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret =0 ;intel_runtime_pm_get (dev_priv); -if (IS_GEN5 (dev)) { +if (IS_GEN5 (dev_priv)) {u16 rgvswctl =I915_READ16 (MEMSWCTL );u16 rgvstat =I915_READ16 (MEMSTAT_ILK );
@@ -1209,7 +1203,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) MEMSTAT_VID_SHIFT);seq_printf (m,"Current P-state: %d\n" , (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); - }else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {u32 freq_sts;mutex_lock (&dev_priv->rps.hw_lock);
@@ -1236,7 +1230,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)"efficient (RPe) frequency: %d MHz\n" , intel_gpu_freq(dev_priv, dev_priv->rps.efficient_freq));mutex_unlock (&dev_priv->rps.hw_lock); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {u32 rp_state_limits;u32 gt_perf_status;u32 rp_state_cap;
@@ -1248,7 +1242,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)int max_freq; rp_state_limits =I915_READ (GEN6_RP_STATE_LIMITS ); -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { rp_state_cap =I915_READ (BXT_RP_STATE_CAP ); gt_perf_status =I915_READ (BXT_GT_PERF_STATUS ); }else {
@@ -1264,11 +1258,11 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); reqf =I915_READ (GEN6_RPNSWREQ ); -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) reqf >>=23 ;else { reqf &= ~GEN6_TURBO_DISABLE ; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) reqf >>=24 ;else reqf >>=25 ;
@@ -1286,9 +1280,9 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpdownei =I915_READ (GEN6_RP_CUR_DOWN_EI ) &GEN6_CURIAVG_MASK ; rpcurdown =I915_READ (GEN6_RP_CUR_DOWN ) &GEN6_CURBSYTAVG_MASK ; rpprevdown =I915_READ (GEN6_RP_PREV_DOWN ) &GEN6_CURBSYTAVG_MASK ; -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) cagf = (rpstat &GEN9_CAGF_MASK ) >>GEN9_CAGF_SHIFT ; -else if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cagf = (rpstat &HSW_CAGF_MASK ) >>HSW_CAGF_SHIFT ;else cagf = (rpstat &GEN6_CAGF_MASK ) >>GEN6_CAGF_SHIFT ;
@@ -1297,7 +1291,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev->struct_mutex); -if (IS_GEN6 (dev) ||IS_GEN7 (dev)) { +if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) { pm_ier =I915_READ (GEN6_PMIER ); pm_imr =I915_READ (GEN6_PMIMR ); pm_isr =I915_READ (GEN6_PMISR );
@@ -1315,7 +1309,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"pm_intr_keep: 0x%08x\n" , dev_priv->rps.pm_intr_keep);seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status);seq_printf (m,"Render p-state ratio: %d\n" , - (gt_perf_status & (IS_GEN9 (dev) ?0x1ff00 :0xff00 )) >>8 ); + (gt_perf_status & (IS_GEN9 (dev_priv) ?0x1ff00 :0xff00 )) >>8 );seq_printf (m,"Render p-state VID: %d\n" , gt_perf_status &0xff ); seq_printf(m, "Render p-state limit: %d\n",
@@ -1344,22 +1338,22 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Down threshold: %d%%\n" , dev_priv->rps.down_threshold); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>0 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Lowest (RPN) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (rp_state_cap &0xff00 ) >>8 ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Nominal (RP1) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>16 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>16 : rp_state_cap >>0 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));
@@ -1395,9 +1389,7 @@ out:static int i915_hangcheck_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_engine_cs *engine;u64 acthd[I915_NUM_ENGINES ];u32 seqno[I915_NUM_ENGINES ];
@@ -1466,9 +1458,8 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)static int ironlake_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rgvmodectl, rstdbyctl;u16 crstandvid;int ret;
@@ -1534,9 +1525,7 @@ static int ironlake_drpc_info(struct seq_file *m)static int i915_forcewake_domains (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_uncore_forcewake_domain *fw_domain;spin_lock_irq (&dev_priv->uncore.lock);
@@ -1552,9 +1541,7 @@ static int i915_forcewake_domains(struct seq_file *m, void *data)static int vlv_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 rpmodectl1, rcctl1, pw_status;intel_runtime_pm_get (dev_priv);
@@ -1592,9 +1579,8 @@ static int vlv_drpc_info(struct seq_file *m)static int gen6_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rpmodectl1, gt_core_status, rcctl1, rc6vids =0 ;u32 gen9_powergate_enable =0 , gen9_powergate_status =0 ;unsigned forcewake_count;
@@ -1624,7 +1610,7 @@ static int gen6_drpc_info(struct seq_file *m) rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL ); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { gen9_powergate_enable =I915_READ (GEN9_PG_ENABLE ); gen9_powergate_status =I915_READ (GEN9_PWRGT_DOMAIN_STATUS ); }
@@ -1646,7 +1632,7 @@ static int gen6_drpc_info(struct seq_file *m) yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));seq_printf (m,"RC6 Enabled: %s\n" ,yesno (rcctl1 &GEN6_RC_CTL_RC6_ENABLE )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Well Gating Enabled: %s\n" ,yesno (gen9_powergate_enable &GEN9_RENDER_PG_ENABLE )); seq_printf(m, "Media Well Gating Enabled: %s\n",
@@ -1680,7 +1666,7 @@ static int gen6_drpc_info(struct seq_file *m)seq_printf (m,"Core Power Down: %s\n" ,yesno (gt_core_status &GEN6_CORE_CPD_STATE_MASK )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Power Well: %s\n" , (gen9_powergate_status &GEN9_PWRGT_RENDER_STATUS_MASK ) ?"Up" :"Down" );
@@ -1710,12 +1696,11 @@ static int gen6_drpc_info(struct seq_file *m)static int i915_drpc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))return vlv_drpc_info (m); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )return gen6_drpc_info (m);else return ironlake_drpc_info (m);
@@ -1723,9 +1708,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)static int i915_frontbuffer_tracking (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);seq_printf (m,"FB tracking busy bits: 0x%08x\n" , dev_priv->fb_tracking.busy_bits);
@@ -1738,11 +1721,9 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)static int i915_fbc_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_FBC (dev)) { +if (!HAS_FBC (dev_priv)) {seq_puts (m,"FBC unsupported on this chipset\n" );return 0 ; }
@@ -1756,7 +1737,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)seq_printf (m,"FBC disabled: %s\n" , dev_priv->fbc.no_fbc_reason); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 )seq_printf (m,"Compressing: %s\n" ,yesno (I915_READ (FBC_STATUS2 ) &FBC_COMPRESSION_MASK ));
@@ -1772,7 +1753,7 @@ static int i915_fbc_fc_get(void *data, u64 *val)struct drm_device *dev = data;struct drm_i915_private *dev_priv =to_i915 (dev); -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ; *val = dev_priv->fbc.false_color;
@@ -1786,7 +1767,7 @@ static int i915_fbc_fc_set(void *data, u64 val)struct drm_i915_private *dev_priv =to_i915 (dev);u32 reg; -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ;mutex_lock (&dev_priv->fbc.lock);
@@ -1808,11 +1789,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_fbc_fc_fops,static int i915_ips_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_IPS (dev)) { +if (!HAS_IPS (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -1822,7 +1801,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)seq_printf (m,"Enabled by kernel parameter: %s\n" ,yesno (i915.enable_ips)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else {if (I915_READ (IPS_CTL ) &IPS_ENABLE )
@@ -1838,23 +1817,21 @@ static int i915_ips_status(struct seq_file *m, void *unused)static int i915_sr_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);bool sr_enabled = false;intel_runtime_pm_get (dev_priv); -if (HAS_PCH_SPLIT (dev)) +if (HAS_PCH_SPLIT (dev_priv)) sr_enabled =I915_READ (WM1_LP_ILK ) &WM1_LP_SR_EN ; -else if (IS_CRESTLINE (dev) ||IS_G4X (dev) || -IS_I945G (dev) ||IS_I945GM (dev)) +else if (IS_CRESTLINE (dev_priv) ||IS_G4X (dev_priv) || +IS_I945G (dev_priv) ||IS_I945GM (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF ) &FW_BLC_SELF_EN ; -else if (IS_I915GM (dev)) +else if (IS_I915GM (dev_priv)) sr_enabled =I915_READ (INSTPM ) &INSTPM_SELF_EN ; -else if (IS_PINEVIEW (dev)) +else if (IS_PINEVIEW (dev_priv)) sr_enabled =I915_READ (DSPFW3 ) &PINEVIEW_SELF_REFRESH_EN ; -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF_VLV ) &FW_CSPWRDWNEN ;intel_runtime_pm_put (dev_priv);
@@ -1867,13 +1844,12 @@ static int i915_sr_status(struct seq_file *m, void *unused)static int i915_emon_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;unsigned long temp, chipset, gfx;int ret; -if (!IS_GEN5 (dev)) +if (!IS_GEN5 (dev_priv))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1895,14 +1871,12 @@ static int i915_emon_status(struct seq_file *m, void *unused)static int i915_ring_freq_table (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);int ret =0 ;int gpu_freq, ia_freq;unsigned int max_gpu_freq, min_gpu_freq; -if (!HAS_CORE_RING_FREQ (dev)) { +if (!HAS_CORE_RING_FREQ (dev_priv)) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; }
@@ -1913,7 +1887,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) { +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;
@@ -1933,7 +1907,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) &ia_freq);seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" ,intel_gpu_freq (dev_priv, (gpu_freq * - (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );
@@ -1948,9 +1922,8 @@ out:static int i915_opregion (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_opregion *opregion = &dev_priv->opregion;int ret;
@@ -1969,10 +1942,7 @@ out:static int i915_vbt (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_opregion *opregion = &dev_priv->opregion; +struct intel_opregion *opregion = &node_to_i915 (m->private)->opregion;if (opregion->vbt)seq_write (m, opregion->vbt, opregion->vbt_size);
@@ -1982,8 +1952,8 @@ static int i915_vbt(struct seq_file *m, void *unused)static int i915_gem_framebuffer_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_framebuffer *fbdev_fb =NULL ;struct drm_framebuffer *drm_fb;int ret;
@@ -1993,8 +1963,8 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)return ret;#ifdef CONFIG_DRM_FBDEV_EMULATION -if (to_i915 (dev)->fbdev) { - fbdev_fb =to_intel_framebuffer (to_i915 (dev)->fbdev->helper.fb); +if (dev_priv->fbdev) { + fbdev_fb =to_intel_framebuffer (dev_priv->fbdev->helper.fb); seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ", fbdev_fb->base.width,
@@ -2039,9 +2009,8 @@ static void describe_ctx_ring(struct seq_file *m, struct intel_ring *ring)static int i915_context_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2136,9 +2105,8 @@ static void i915_dump_lrc_obj(struct seq_file *m,static int i915_dump_lrc (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2163,9 +2131,8 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)static int i915_execlists (struct seq_file *m,void *data) { -struct drm_info_node *node = (struct drm_info_node *)m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;u32 status_pointer;u8 read_pointer;
@@ -2266,9 +2233,8 @@ static const char *swizzle_string(unsigned swizzle)static int i915_swizzle_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2281,7 +2247,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)seq_printf (m,"bit6 swizzle for Y-tiling = %s\n" ,swizzle_string (dev_priv->mm.bit_6_swizzle_y)); -if (IS_GEN3 (dev) ||IS_GEN4 (dev)) { +if (IS_GEN3 (dev_priv) ||IS_GEN4 (dev_priv)) {seq_printf (m,"DDC = 0x%08x\n" ,I915_READ (DCC )); seq_printf(m, "DDC2 = 0x%08x\n",
@@ -2290,7 +2256,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ16(C0DRB3));seq_printf (m,"C1DRB3 = 0x%04x\n" ,I915_READ16 (C1DRB3 )); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"MAD_DIMM_C0 = 0x%08x\n" ,I915_READ (MAD_DIMM_C0 )); seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n",
@@ -2299,7 +2265,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ(MAD_DIMM_C2));seq_printf (m,"TILECTL = 0x%08x\n" ,I915_READ (TILECTL )); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )seq_printf (m,"GAMTARBMODE = 0x%08x\n" ,I915_READ (GAMTARBMODE ));else
@@ -2394,9 +2360,8 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)static int i915_ppgtt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;int ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2404,9 +2369,9 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )gen8_ppgtt_info (m, dev); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )gen6_ppgtt_info (m, dev);mutex_lock (&dev->filelist_mutex);
@@ -2446,9 +2411,8 @@ static int count_irq_waiters(struct drm_i915_private *i915)static int i915_rps_boost_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;seq_printf (m,"RPS enabled? %d\n" , dev_priv->rps.enabled);
@@ -2486,12 +2450,10 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)static int i915_llc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);const bool edram =INTEL_GEN (dev_priv) >8 ; -seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev))); +seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev_priv)));seq_printf (m,"%s: %lluMB\n" , edram ?"eDRAM" :"eLLC" ,intel_uncore_edram_size (dev_priv)/1024 /1024 );
@@ -2500,8 +2462,7 @@ static int i915_llc(struct seq_file *m, void *data)static int i915_guc_load_status_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;u32 tmp, i;
@@ -2572,9 +2533,8 @@ static void i915_guc_client_info(struct seq_file *m,static int i915_guc_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_guc guc;struct i915_guc_client client = {};struct intel_engine_cs *engine;
@@ -2622,9 +2582,7 @@ static int i915_guc_info(struct seq_file *m, void *data)static int i915_guc_log_dump (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct drm_i915_gem_object *log_obj = dev_priv->guc.log_obj;u32 *log;int i =0 , pg;
@@ -2650,15 +2608,13 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)static int i915_edp_psr_status (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 psrperf =0 ;u32 stat[3 ];enum pipe pipe;bool enabled = false; -if (!HAS_PSR (dev)) { +if (!HAS_PSR (dev_priv)) {seq_puts (m,"PSR not supported\n" );return 0 ; }
@@ -2675,7 +2631,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev)) +if (HAS_DDI (dev_priv)) enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ;else {for_each_pipe (dev_priv, pipe) {
@@ -2692,7 +2648,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"HW Enabled & Active bit: %s" ,yesno (enabled)); -if (!HAS_DDI (dev)) +if (!HAS_DDI (dev_priv))for_each_pipe (dev_priv, pipe) {if ((stat[pipe] ==VLV_EDP_PSR_ACTIVE_NORFB_UP ) || (stat[pipe] ==VLV_EDP_PSR_ACTIVE_SF_UPDATE ))
@@ -2704,7 +2660,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)* VLV/CHV PSR has no kind of performance counter * SKL+ Perf counter is reset to 0 everytime DC state is entered */ -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { psrperf =I915_READ (EDP_PSR_PERF_CNT ) &EDP_PSR_PERF_CNT_MASK ;
@@ -2718,8 +2674,8 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)static int i915_sink_crc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_connector *connector;struct intel_dp *intel_dp =NULL ;int ret;
@@ -2758,13 +2714,11 @@ out:static int i915_energy_uJ (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u64 power;u32 units; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;intel_runtime_pm_get (dev_priv);
@@ -2784,9 +2738,8 @@ static int i915_energy_uJ(struct seq_file *m, void *data)static int i915_runtime_pm_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct pci_dev *pdev = dev_priv->drm.pdev;if (!HAS_RUNTIME_PM (dev_priv))
@@ -2810,9 +2763,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)static int i915_power_domain_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct i915_power_domains *power_domains = &dev_priv->power_domains;int i;
@@ -2845,12 +2796,10 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)static int i915_dmc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_csr *csr; -if (!HAS_CSR (dev)) { +if (!HAS_CSR (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -2868,12 +2817,12 @@ static int i915_dmc_info(struct seq_file *m, void *unused)seq_printf (m,"version: %d.%d\n" ,CSR_VERSION_MAJOR (csr->version),CSR_VERSION_MINOR (csr->version)); -if (IS_SKYLAKE (dev) && csr->version >=CSR_VERSION (1 ,6 )) { +if (IS_SKYLAKE (dev_priv) && csr->version >=CSR_VERSION (1 ,6 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (SKL_CSR_DC3_DC5_COUNT ));seq_printf (m,"DC5 -> DC6 count: %d\n" ,I915_READ (SKL_CSR_DC5_DC6_COUNT )); - }else if (IS_BROXTON (dev) && csr->version >=CSR_VERSION (1 ,4 )) { + }else if (IS_BROXTON (dev_priv) && csr->version >=CSR_VERSION (1 ,4 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (BXT_CSR_DC3_DC5_COUNT )); }
@@ -2910,8 +2859,8 @@ static void intel_encoder_info(struct seq_file *m,struct intel_crtc *intel_crtc, struct intel_encoder *intel_encoder) { - struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; + struct drm_i915_private *dev_priv = node_to_i915(m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_connector *intel_connector;struct drm_encoder *encoder;
@@ -2937,8 +2886,8 @@ static void intel_encoder_info(struct seq_file *m,static void intel_crtc_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_encoder *intel_encoder;struct drm_plane_state *plane_state = crtc->primary->state;
@@ -3041,7 +2990,7 @@ static bool cursor_active(struct drm_device *dev, int pipe)struct drm_i915_private *dev_priv =to_i915 (dev);u32 state; -if (IS_845G (dev) ||IS_I865G (dev)) +if (IS_845G (dev_priv) ||IS_I865G (dev_priv)) state =I915_READ (CURCNTR (PIPE_A )) &CURSOR_ENABLE ;else state =I915_READ (CURCNTR (pipe)) &CURSOR_MODE ;
@@ -3107,8 +3056,8 @@ static const char *plane_rotation(unsigned int rotation)static void intel_plane_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_plane *intel_plane;for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) {
@@ -3170,9 +3119,8 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *intel_crtc)static int i915_display_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;struct drm_connector *connector;
@@ -3225,11 +3173,10 @@ static int i915_display_info(struct seq_file *m, void *unused)static int i915_semaphore_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine; -int num_rings =hweight32 (INTEL_INFO (dev)->ring_mask); +int num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask);enum intel_engine_id id;int j, ret;
@@ -3243,7 +3190,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)return ret;intel_runtime_pm_get (dev_priv); -if (IS_BROADWELL (dev)) { +if (IS_BROADWELL (dev_priv)) {struct page *page;uint64_t *seqno;
@@ -3298,9 +3245,8 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)static int i915_shared_dplls_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i;drm_modeset_lock_all (dev);
@@ -3328,9 +3274,8 @@ static int i915_wa_registers(struct seq_file *m, void *unused)int i;int ret;struct intel_engine_cs *engine; -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_workarounds *workarounds = &dev_priv->workarounds;enum intel_engine_id id;
@@ -3366,15 +3311,14 @@ static int i915_wa_registers(struct seq_file *m, void *unused)static int i915_ddb_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct skl_ddb_allocation *ddb;struct skl_ddb_entry *entry;enum pipe pipe;int plane; -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev_priv) <9 )return 0 ;drm_modeset_lock_all (dev);
@@ -3404,7 +3348,8 @@ static int i915_ddb_info(struct seq_file *m, void *unused) }static void drrs_status_per_crtc (struct seq_file *m, -struct drm_device *dev,struct intel_crtc *intel_crtc) +struct drm_device *dev, +struct intel_crtc *intel_crtc) {struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_drrs *drrs = &dev_priv->drrs;
@@ -3473,8 +3418,8 @@ static void drrs_status_per_crtc(struct seq_file *m,static int i915_drrs_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *intel_crtc;int active_crtc_cnt =0 ;
@@ -3503,8 +3448,8 @@ struct pipe_crc_info {static int i915_dp_mst_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *intel_encoder;struct intel_digital_port *intel_dig_port;struct drm_connector *connector;
@@ -3715,8 +3660,7 @@ static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)static int display_crc_ctl_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;int i;for (i =0 ; i <I915_MAX_PIPES ; i++)
@@ -3728,9 +3672,9 @@ static int display_crc_ctl_show(struct seq_file *m, void *data)static int display_crc_ctl_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -return single_open (file, display_crc_ctl_show, dev); +return single_open (file, display_crc_ctl_show, dev_priv); } static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
@@ -3753,9 +3697,11 @@ static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static int i9xx_pipe_crc_auto_source (struct drm_device *dev,enum pipe pipe, +static int i9xx_pipe_crc_auto_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source *source) { +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder;struct intel_crtc *crtc;struct intel_digital_port *dig_port;
@@ -3805,16 +3751,15 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,return ret; } -static int vlv_pipe_crc_ctl_reg (struct drm_device *dev, +static int vlv_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3832,7 +3777,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev, need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_CHERRYVIEW (dev)) +if (!IS_CHERRYVIEW (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_VLV ; need_stable_symbols = true;
@@ -3876,16 +3821,15 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int i9xx_pipe_crc_ctl_reg (struct drm_device *dev, +static int i9xx_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3895,24 +3839,24 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PIPE_I9XX ;break ;case INTEL_PIPE_CRC_SOURCE_TV : -if (!SUPPORTS_TV (dev)) +if (!SUPPORTS_TV (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_TV_PRE ;break ;case INTEL_PIPE_CRC_SOURCE_DP_B : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_B_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_C : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_C_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_G4X ; need_stable_symbols = true;
@@ -3936,7 +3880,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,if (need_stable_symbols) {uint32_t tmp =I915_READ (PORT_DFT2_G4X ); -WARN_ON (!IS_G4X (dev)); +WARN_ON (!IS_G4X (dev_priv));I915_WRITE (PORT_DFT_I9XX ,I915_READ (PORT_DFT_I9XX ) |DC_BALANCE_RESET );
@@ -3952,10 +3896,9 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static void vlv_undo_pipe_scramble_reset (struct drm_device *dev, +static void vlv_undo_pipe_scramble_reset (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp =I915_READ (PORT_DFT2_G4X );switch (pipe) {
@@ -4021,9 +3964,10 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static void hsw_trans_edp_pipe_A_crc_wa (struct drm_device *dev,bool enable) +static void hsw_trans_edp_pipe_A_crc_wa (struct drm_i915_private *dev_priv, +bool enable) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[PIPE_A ]);struct intel_crtc_state *pipe_config;
@@ -4057,7 +4001,7 @@ out:drm_atomic_state_free (state); } -static int ivb_pipe_crc_ctl_reg (struct drm_device *dev, +static int ivb_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val)
@@ -4073,8 +4017,8 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_SPRITE_IVB ;break ;case INTEL_PIPE_CRC_SOURCE_PF : -if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, true); +if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, true); *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PF_IVB ;break ;
@@ -4088,13 +4032,14 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int pipe_crc_set_source (struct drm_device *dev,enum pipe pipe, +static int pipe_crc_set_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source source) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; -struct intel_crtc *crtc =to_intel_crtc (intel_get_crtc_for_pipe (dev, - pipe)); +struct intel_crtc *crtc = +to_intel_crtc (intel_get_crtc_for_pipe (dev, pipe));enum intel_display_power_domain power_domain;u32 val =0 ;/* shut up gcc */ int ret;
@@ -4112,16 +4057,16 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,return -EIO ; } -if (IS_GEN2 (dev)) +if (IS_GEN2 (dev_priv)) ret =i8xx_pipe_crc_ctl_reg (&source, &val); -else if (INTEL_INFO (dev)->gen <5 ) - ret =i9xx_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) - ret =vlv_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_GEN5 (dev) ||IS_GEN6 (dev)) +else if (INTEL_GEN (dev_priv) <5 ) + ret =i9xx_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + ret =vlv_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_GEN5 (dev_priv) ||IS_GEN6 (dev_priv)) ret =ilk_pipe_crc_ctl_reg (&source, &val);else - ret =ivb_pipe_crc_ctl_reg (dev, pipe, &source, &val); + ret =ivb_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val);if (ret !=0 ) goto out;
@@ -4185,12 +4130,12 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,kfree (entries); -if (IS_G4X (dev)) +if (IS_G4X (dev_priv))g4x_undo_pipe_scramble_reset (dev, pipe); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) -vlv_undo_pipe_scramble_reset (dev, pipe); -else if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, false); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) +vlv_undo_pipe_scramble_reset (dev_priv, pipe); +else if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, false);hsw_enable_ips (crtc); }
@@ -4294,7 +4239,8 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)return -EINVAL ; } -static int display_crc_ctl_parse (struct drm_device *dev,char *buf,size_t len) +static int display_crc_ctl_parse (struct drm_i915_private *dev_priv, +char *buf,size_t len) {#define N_WORDS 3int n_words;
@@ -4325,14 +4271,14 @@ static int display_crc_ctl_parse(struct drm_device *dev, char *buf, size_t len)return -EINVAL ; } -return pipe_crc_set_source (dev, pipe, source); +return pipe_crc_set_source (dev_priv, pipe, source); }static ssize_t display_crc_ctl_write (struct file *file,const char __user *ubuf,size_t len,loff_t *offp) {struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv =to_i915 (m->private);char *tmpbuf;int ret;
@@ -4355,7 +4301,7 @@ static ssize_t display_crc_ctl_write(struct file *file, const char __user *ubuf, } tmpbuf[len] ='\0' ; - ret =display_crc_ctl_parse (dev, tmpbuf, len); + ret =display_crc_ctl_parse (dev_priv, tmpbuf, len); out:kfree (tmpbuf);
@@ -4505,7 +4451,7 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)return 0 ; }static int i915_displayport_test_data_open (struct inode *inode, -struct file *file) +struct file *file) {struct drm_device *dev = inode->i_private;
@@ -4562,18 +4508,18 @@ static const struct file_operations i915_displayport_test_type_fops = {static void wm_latency_show (struct seq_file *m,const uint16_t wm[8 ]) { -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv = m->private;int level;int num_levels; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else - num_levels =ilk_wm_max_level (dev) +1 ; + num_levels =ilk_wm_max_level (&dev_priv->drm) +1 ; -drm_modeset_lock_all (dev); +drm_modeset_lock_all (&dev_priv->drm);for (level =0 ; level < num_levels; level++) {unsigned int latency = wm[level];
@@ -4582,8 +4528,8 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])* - WM1+ latency values in 0.5us units * - latencies are in us on gen9/vlv/chv */ -if (INTEL_INFO (dev)->gen >=9 ||IS_VALLEYVIEW (dev) || -IS_CHERRYVIEW (dev)) +if (INTEL_GEN (dev_priv) >=9 ||IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) latency *=10 ;else if (level >0 ) latency *=5 ;
@@ -4592,19 +4538,18 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8]) level, wm[level], latency / 10, latency % 10); } -drm_modeset_unlock_all (dev); +drm_modeset_unlock_all (&dev_priv->drm); }static int pri_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;wm_latency_show (m, latencies);
@@ -4613,14 +4558,13 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)static int spr_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;wm_latency_show (m, latencies);
@@ -4629,14 +4573,13 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)static int cur_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;wm_latency_show (m, latencies);
@@ -4645,51 +4588,51 @@ static int cur_wm_latency_show(struct seq_file *m, void *data)static int pri_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return -ENODEV ; -return single_open (file, pri_wm_latency_show, dev); +return single_open (file, pri_wm_latency_show, dev_priv); }static int spr_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, spr_wm_latency_show, dev); +return single_open (file, spr_wm_latency_show, dev_priv); }static int cur_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, cur_wm_latency_show, dev); +return single_open (file, cur_wm_latency_show, dev_priv); }static ssize_t wm_latency_write (struct file *file,const char __user *ubuf,size_t len,loff_t *offp,uint16_t wm[8 ]) {struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t new[8 ] = {0 };int num_levels;int level;int ret;char tmp[32 ]; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else - num_levels =ilk_wm_max_level (dev) +1 ; + num_levels =ilk_wm_max_level (&dev_priv->drm) +1 ;if (len >=sizeof (tmp))return -EINVAL ;
@@ -4705,12 +4648,12 @@ static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,if (ret != num_levels)return -EINVAL ; -drm_modeset_lock_all (dev); +drm_modeset_lock_all (&dev_priv->drm);for (level =0 ; level < num_levels; level++) wm[level] = new[level]; -drm_modeset_unlock_all (dev); +drm_modeset_unlock_all (&dev_priv->drm);return len; }
@@ -4720,14 +4663,13 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4736,14 +4678,13 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4752,14 +4693,13 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4794,8 +4734,7 @@ static const struct file_operations i915_cur_wm_latency_fops = {static int i915_wedged_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val =i915_terminally_wedged (&dev_priv->gpu_error);
@@ -4805,8 +4744,7 @@ i915_wedged_get(void *data, u64 *val)static int i915_wedged_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);/* * There is no safeguard against this debugfs entry colliding
@@ -4836,8 +4774,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops,static int i915_ring_missed_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val = dev_priv->gpu_error.missed_irq_rings;return 0 ;
@@ -4846,8 +4783,8 @@ i915_ring_missed_irq_get(void *data, u64 *val)static int i915_ring_missed_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;int ret;/* Lock against concurrent debugfs callers */
@@ -4867,8 +4804,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_ring_missed_irq_fops,static int i915_ring_test_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val = dev_priv->gpu_error.test_irq_rings;
@@ -4878,8 +4814,7 @@ i915_ring_test_irq_get(void *data, u64 *val)static int i915_ring_test_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); val &=INTEL_INFO (dev_priv)->ring_mask;DRM_DEBUG_DRIVER ("Masking interrupts on rings 0x%08llx\n" , val);
@@ -4911,8 +4846,8 @@ i915_drop_caches_get(void *data, u64 *val)static int i915_drop_caches_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;int ret;DRM_DEBUG ("Dropping caches: 0x%08llx\n" , val);
@@ -4951,10 +4886,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_drop_caches_fops,static int i915_max_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);
@@ -4964,12 +4898,11 @@ i915_max_freq_get(void *data, u64 *val)static int i915_max_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 hw_max, hw_min;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val);
@@ -5007,8 +4940,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops,static int i915_min_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;
@@ -5020,8 +4952,7 @@ i915_min_freq_get(void *data, u64 *val)static int i915_min_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 hw_max, hw_min;int ret;
@@ -5063,12 +4994,12 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops,static int i915_cache_sharing_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;u32 snpcr;int ret; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -5079,7 +5010,7 @@ i915_cache_sharing_get(void *data, u64 *val) snpcr =I915_READ (GEN6_MBCUNIT_SNPCR );intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev_priv->drm.struct_mutex); +mutex_unlock (&dev->struct_mutex); *val = (snpcr &GEN6_MBC_SNPCR_MASK ) >>GEN6_MBC_SNPCR_SHIFT ;
@@ -5089,11 +5020,10 @@ i915_cache_sharing_get(void *data, u64 *val)static int i915_cache_sharing_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 snpcr; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ;if (val >3 )
@@ -5124,10 +5054,9 @@ struct sseu_dev_status {unsigned int eu_per_subslice; }; -static void cherryview_sseu_device_status (struct drm_device *dev, +static void cherryview_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int ss_max =2 ;int ss;u32 sig1[ss_max], sig2[ss_max];
@@ -5156,16 +5085,15 @@ static void cherryview_sseu_device_status(struct drm_device *dev, stat->subslice_total = stat->subslice_per_slice; } -static void gen9_sseu_device_status (struct drm_device *dev, +static void gen9_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int s_max =3 , ss_max =4 ;int s, ss;u32 s_reg[s_max], eu_reg[2 *s_max], eu_mask[2 ];/* BXT has a single slice and at most 3 subslices. */ -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { s_max =1 ; ss_max =3 ; }
@@ -5194,18 +5122,18 @@ static void gen9_sseu_device_status(struct drm_device *dev, stat->slice_total++; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) - ss_cnt =INTEL_INFO (dev)->subslice_per_slice; +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) + ss_cnt =INTEL_INFO (dev_priv)->subslice_per_slice;for (ss =0 ; ss < ss_max; ss++) {unsigned int eu_cnt; -if (IS_BROXTON (dev) && +if (IS_BROXTON (dev_priv) && !(s_reg[s] & (GEN9_PGCTL_SS_ACK (ss))))/* skip disabled subslice */ continue ; -if (IS_BROXTON (dev)) +if (IS_BROXTON (dev_priv)) ss_cnt++; eu_cnt = 2 * hweight32(eu_reg[2*s + ss/2] &
@@ -5221,25 +5149,24 @@ static void gen9_sseu_device_status(struct drm_device *dev, } } -static void broadwell_sseu_device_status (struct drm_device *dev, +static void broadwell_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev); -int s;u32 slice_info =I915_READ (GEN8_GT_SLICE_INFO ); +int s; stat->slice_total =hweight32 (slice_info &GEN8_LSLICESTAT_MASK );if (stat->slice_total) { - stat->subslice_per_slice =INTEL_INFO (dev)->subslice_per_slice; + stat->subslice_per_slice =INTEL_INFO (dev_priv)->subslice_per_slice; stat->subslice_total = stat->slice_total * stat->subslice_per_slice; - stat->eu_per_subslice =INTEL_INFO (dev)->eu_per_subslice; + stat->eu_per_subslice =INTEL_INFO (dev_priv)->eu_per_subslice; stat->eu_total = stat->eu_per_subslice * stat->subslice_total;/* subtract fused off EU(s) from enabled slice(s) */ for (s =0 ; s < stat->slice_total; s++) { -u8 subslice_7eu =INTEL_INFO (dev)->subslice_7eu[s]; +u8 subslice_7eu =INTEL_INFO (dev_priv)->subslice_7eu[s]; stat->eu_total -=hweight8 (subslice_7eu); }
@@ -5248,47 +5175,45 @@ static void broadwell_sseu_device_status(struct drm_device *dev,static int i915_sseu_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); -struct drm_device *dev = &dev_priv->drm; +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct sseu_dev_status stat; -if (INTEL_INFO (dev)->gen <8 ) +if (INTEL_GEN (dev_priv) <8 )return -ENODEV ;seq_puts (m,"SSEU Device Info\n" );seq_printf (m," Available Slice Total: %u\n" , -INTEL_INFO (dev)->slice_total); +INTEL_INFO (dev_priv)->slice_total);seq_printf (m," Available Subslice Total: %u\n" , -INTEL_INFO (dev)->subslice_total); +INTEL_INFO (dev_priv)->subslice_total);seq_printf (m," Available Subslice Per Slice: %u\n" , -INTEL_INFO (dev)->subslice_per_slice); +INTEL_INFO (dev_priv)->subslice_per_slice);seq_printf (m," Available EU Total: %u\n" , -INTEL_INFO (dev)->eu_total); +INTEL_INFO (dev_priv)->eu_total);seq_printf (m," Available EU Per Subslice: %u\n" , -INTEL_INFO (dev)->eu_per_subslice); -seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev))); -if (HAS_POOLED_EU (dev)) +INTEL_INFO (dev_priv)->eu_per_subslice); +seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev_priv))); +if (HAS_POOLED_EU (dev_priv))seq_printf (m," Min EU in pool: %u\n" , -INTEL_INFO (dev)->min_eu_in_pool); +INTEL_INFO (dev_priv)->min_eu_in_pool);seq_printf (m," Has Slice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_slice_pg)); +yesno (INTEL_INFO (dev_priv)->has_slice_pg));seq_printf (m," Has Subslice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_subslice_pg)); +yesno (INTEL_INFO (dev_priv)->has_subslice_pg));seq_printf (m," Has EU Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_eu_pg)); +yesno (INTEL_INFO (dev_priv)->has_eu_pg));seq_puts (m,"SSEU Device Status\n" );memset (&stat,0 ,sizeof (stat));intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { -cherryview_sseu_device_status (dev, &stat); - }else if (IS_BROADWELL (dev)) { -broadwell_sseu_device_status (dev, &stat); - }else if (INTEL_INFO (dev)->gen >=9 ) { -gen9_sseu_device_status (dev, &stat); +if (IS_CHERRYVIEW (dev_priv)) { +cherryview_sseu_device_status (dev_priv, &stat); + }else if (IS_BROADWELL (dev_priv)) { +broadwell_sseu_device_status (dev_priv, &stat); + }else if (INTEL_GEN (dev_priv) >=9 ) { +gen9_sseu_device_status (dev_priv, &stat); }intel_runtime_pm_put (dev_priv);
@@ -5309,10 +5234,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)static int i915_forcewake_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_runtime_pm_get (dev_priv);
@@ -5323,10 +5247,9 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)static int i915_forcewake_release (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
@@ -5455,9 +5378,8 @@ static const struct i915_debugfs_files { {"i915_dp_test_active", &i915_displayport_test_active_fops} }; -void intel_display_crc_init (struct drm_device *dev) +void intel_display_crc_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe;for_each_pipe (dev_priv, pipe) {
@@ -5505,7 +5427,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)drm_debugfs_remove_files (i915_debugfs_list,I915_DEBUGFS_ENTRIES , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_forcewake_fops, +drm_debugfs_remove_files ((struct drm_info_list *)&i915_forcewake_fops,1 , minor);for (i =0 ; i <ARRAY_SIZE (i915_pipe_crc_data); i++) {
@@ -5517,7 +5439,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) {struct drm_info_list *info_list = - (struct drm_info_list *) i915_debugfs_files[i].fops; + (struct drm_info_list *)i915_debugfs_files[i].fops;drm_debugfs_remove_files (info_list,1 , minor); }
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -849,7 +849,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_audio_hooks (dev_priv);i915_gem_load_init (&dev_priv->drm); -intel_display_crc_init (&dev_priv->drm); +intel_display_crc_init (dev_priv);intel_device_info_dump (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +6 -1
@@ -2049,6 +2049,11 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) return container_of(dev, struct drm_i915_private, drm); } +static inline struct drm_i915_private *cast_to_i915 (void *data) +{ +return to_i915 ((struct drm_device *)data); +} +static inline struct drm_i915_private *kdev_to_i915 (struct device *kdev) {return to_i915 (dev_get_drvdata (kdev));
@@ -3481,7 +3486,7 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objecint i915_debugfs_register (struct drm_i915_private *dev_priv);void i915_debugfs_unregister (struct drm_i915_private *dev_priv);int i915_debugfs_connector_add (struct drm_connector *connector); -void intel_display_crc_init (struct drm_device *dev); +void intel_display_crc_init (struct drm_i915_private *dev_priv);#else static inline int i915_debugfs_register (struct drm_i915_private *dev_priv) {return 0 ;}static inline void i915_debugfs_unregister (struct drm_i915_private *dev_priv) {}
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5 v3] drm/i915: debugfs spring cleaning
In reply to David Weinehalldrm/i915: debugfs spring cleaning
Just like with sysfs, we do some major overhaul.
Pass dev_priv instead of dev to all feature macros (IS_, HAS_, INTEL_, etc.). This has the side effect that a bunch of functions now get dev_priv passed instead of dev.
All calls to INTEL_INFO()->gen have been replaced with INTEL_GEN().
We want access to to_i915(node->minor->dev) in a lot of places, so add the node_to_i915() helper to accomodate for this.
Finally, we have quite a few cases where we get a void * pointer, and need to cast it to drm_device *, only to run to_i915() on it. Add cast_to_i915() to do this.
v2: Don't introduce extra dev (Chris)
v3: Make pipe_crc_info have a pointer to drm_i915_private instead of
drm_device. This saves a bit of space, since we never use drm_device anywhere in these functions.
Also some minor fixup that I missed in the previous version.
--- drivers/gpu/drm/i915/i915_debugfs.c | 749 ++++++++++++++++-------------------- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 8 +- 3 files changed, 342 insertions(+), 417 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +334 -415
@@ -46,6 +46,11 @@ enum { PINNED_LIST, }; +static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) +{ +return to_i915 (node->minor->dev); +} +/* As the drm_debugfs_init() routines are called before dev->dev_private is * allocated we need to hook into the minor for release. */ static int
@@ -74,12 +79,11 @@ drm_add_fake_info_node(struct drm_minor *minor,static int i915_capabilities (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -const struct intel_device_info *info =INTEL_INFO (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +const struct intel_device_info *info =INTEL_INFO (dev_priv); -seq_printf (m,"gen: %d\n" , info->gen); -seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev)); +seq_printf (m,"gen: %d\n" ,INTEL_GEN (dev_priv)); +seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));#define PRINT_FLAG (x) seq_printf(m, #x ": %s\n", yesno(info->x))#define SEP_SEMICOLON ;DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG ,SEP_SEMICOLON );
@@ -142,7 +146,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)int pin_count =0 ;enum intel_engine_id id; -lockdep_assert_held (&obj->base.dev->struct_mutex); +lockdep_assert_held (&dev_priv->drm.struct_mutex); seq_printf(m, "%pK: %c%c%c%c%c %8zdKiB %02x %02x [ ", &obj->base,
@@ -157,13 +161,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)for_each_engine_id (engine, dev_priv, id)seq_printf (m,"%x " ,i915_gem_active_get_seqno (&obj->last_read[id], - &obj->base.dev->struct_mutex)); + &dev_priv->drm.struct_mutex));seq_printf (m,"] %x %x%s%s%s" ,i915_gem_active_get_seqno (&obj->last_write, - &obj->base.dev->struct_mutex), + &dev_priv->drm.struct_mutex),i915_gem_active_get_seqno (&obj->last_fence, - &obj->base.dev->struct_mutex), -i915_cache_level_str (to_i915 (obj->base.dev), obj->cache_level), + &dev_priv->drm.struct_mutex), +i915_cache_level_str (dev_priv, obj->cache_level), obj->dirty ?" dirty" :"" , obj->madv ==I915_MADV_DONTNEED ?" purgeable" :"" );if (obj->base.name)
@@ -201,7 +205,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) } engine =i915_gem_active_get_engine (&obj->last_write, - &obj->base.dev->struct_mutex); + &dev_priv->drm.struct_mutex);if (engine)seq_printf (m," (%s)" , engine->name);
@@ -215,8 +219,8 @@ static int i915_gem_object_list_info(struct seq_file *m, void *data)struct drm_info_node *node = m->private;uintptr_t list = (uintptr_t ) node->info_ent->data;struct list_head *head; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct i915_vma *vma;u64 total_obj_size, total_gtt_size;
@@ -274,9 +278,8 @@ static int obj_rank_by_stolen(void *priv,static int i915_gem_stolen_list_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;LIST_HEAD (stolen);
@@ -429,20 +432,21 @@ static int per_file_ctx_stats(int id, void *ptr, void *data)static void print_context_stats (struct seq_file *m,struct drm_i915_private *dev_priv) { +struct drm_device *dev = &dev_priv->drm;struct file_stats stats;struct drm_file *file;memset (&stats,0 ,sizeof (stats)); -mutex_lock (&dev_priv->drm.struct_mutex); +mutex_lock (&dev->struct_mutex);if (dev_priv->kernel_context)per_file_ctx_stats (0 , dev_priv->kernel_context, &stats); -list_for_each_entry (file, &dev_priv->drm.filelist, lhead) { +list_for_each_entry (file, &dev->filelist, lhead) {struct drm_i915_file_private *fpriv = file->driver_priv;idr_for_each (&fpriv->context_idr, per_file_ctx_stats, &stats); } -mutex_unlock (&dev_priv->drm.struct_mutex); +mutex_unlock (&dev->struct_mutex);print_file_stats (m,"[k]contexts" , stats); }
@@ -460,9 +464,8 @@ static void print_context_stats(struct seq_file *m,static int i915_gem_object_info (struct seq_file *m,void * data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;u32 count, mappable_count, purgeable_count;u64 size, mappable_size, purgeable_size;
@@ -583,9 +586,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data)static int i915_gem_gtt_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev;uintptr_t list = (uintptr_t ) node->info_ent->data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;int count, ret;
@@ -617,9 +620,8 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)static int i915_gem_pageflip_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;int ret;
@@ -666,7 +668,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) intel_crtc_get_vblank_counter(crtc));seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane)));else addr =I915_READ (DSPADDR (crtc->plane));
@@ -687,9 +689,8 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)static int i915_gem_batch_pool_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;struct intel_engine_cs *engine;int total =0 ;
@@ -732,9 +733,8 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)static int i915_gem_request_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct drm_i915_gem_request *req;int ret, any;
@@ -800,9 +800,8 @@ static void i915_ring_seqno_info(struct seq_file *m,static int i915_gem_seqno_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret;
@@ -823,9 +822,8 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)static int i915_interrupt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret, i, pipe;
@@ -834,7 +832,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev_priv)) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -873,7 +871,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (INTEL_INFO (dev)->gen >=8 ) { + }else if (INTEL_GEN (dev_priv) >=8 ) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -929,7 +927,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (IS_VALLEYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv)) {seq_printf (m,"Display IER:\t%08x\n" ,I915_READ (VLV_IER )); seq_printf(m, "Display IIR:\t%08x\n",
@@ -967,7 +965,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"DPINVGTT:\t%08x\n" ,I915_READ (DPINVGTT )); - }else if (!HAS_PCH_SPLIT (dev)) { + }else if (!HAS_PCH_SPLIT (dev_priv)) {seq_printf (m,"Interrupt enable: %08x\n" ,I915_READ (IER )); seq_printf(m, "Interrupt identity: %08x\n",
@@ -999,7 +997,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); }for_each_engine (engine, dev_priv) { -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , engine->name,I915_READ_IMR (engine));
@@ -1014,9 +1012,8 @@ static int i915_interrupt_info(struct seq_file *m, void *data)static int i915_gem_fence_regs_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i, ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1043,8 +1040,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)static int i915_hws_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node);struct intel_engine_cs *engine;const u32 *hws;int i;
@@ -1190,14 +1186,13 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,static int i915_frequency_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret =0 ;intel_runtime_pm_get (dev_priv); -if (IS_GEN5 (dev)) { +if (IS_GEN5 (dev_priv)) {u16 rgvswctl =I915_READ16 (MEMSWCTL );u16 rgvstat =I915_READ16 (MEMSTAT_ILK );
@@ -1207,7 +1202,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) MEMSTAT_VID_SHIFT);seq_printf (m,"Current P-state: %d\n" , (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); - }else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {u32 freq_sts;mutex_lock (&dev_priv->rps.hw_lock);
@@ -1234,7 +1229,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)"efficient (RPe) frequency: %d MHz\n" , intel_gpu_freq(dev_priv, dev_priv->rps.efficient_freq));mutex_unlock (&dev_priv->rps.hw_lock); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {u32 rp_state_limits;u32 gt_perf_status;u32 rp_state_cap;
@@ -1246,7 +1241,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)int max_freq; rp_state_limits =I915_READ (GEN6_RP_STATE_LIMITS ); -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { rp_state_cap =I915_READ (BXT_RP_STATE_CAP ); gt_perf_status =I915_READ (BXT_GT_PERF_STATUS ); }else {
@@ -1262,11 +1257,11 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); reqf =I915_READ (GEN6_RPNSWREQ ); -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) reqf >>=23 ;else { reqf &= ~GEN6_TURBO_DISABLE ; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) reqf >>=24 ;else reqf >>=25 ;
@@ -1284,9 +1279,9 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpdownei =I915_READ (GEN6_RP_CUR_DOWN_EI ) &GEN6_CURIAVG_MASK ; rpcurdown =I915_READ (GEN6_RP_CUR_DOWN ) &GEN6_CURBSYTAVG_MASK ; rpprevdown =I915_READ (GEN6_RP_PREV_DOWN ) &GEN6_CURBSYTAVG_MASK ; -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) cagf = (rpstat &GEN9_CAGF_MASK ) >>GEN9_CAGF_SHIFT ; -else if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cagf = (rpstat &HSW_CAGF_MASK ) >>HSW_CAGF_SHIFT ;else cagf = (rpstat &GEN6_CAGF_MASK ) >>GEN6_CAGF_SHIFT ;
@@ -1295,7 +1290,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev->struct_mutex); -if (IS_GEN6 (dev) ||IS_GEN7 (dev)) { +if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) { pm_ier =I915_READ (GEN6_PMIER ); pm_imr =I915_READ (GEN6_PMIMR ); pm_isr =I915_READ (GEN6_PMISR );
@@ -1313,7 +1308,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"pm_intr_keep: 0x%08x\n" , dev_priv->rps.pm_intr_keep);seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status);seq_printf (m,"Render p-state ratio: %d\n" , - (gt_perf_status & (IS_GEN9 (dev) ?0x1ff00 :0xff00 )) >>8 ); + (gt_perf_status & (IS_GEN9 (dev_priv) ?0x1ff00 :0xff00 )) >>8 );seq_printf (m,"Render p-state VID: %d\n" , gt_perf_status &0xff ); seq_printf(m, "Render p-state limit: %d\n",
@@ -1342,22 +1337,22 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Down threshold: %d%%\n" , dev_priv->rps.down_threshold); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>0 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Lowest (RPN) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (rp_state_cap &0xff00 ) >>8 ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Nominal (RP1) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>16 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>16 : rp_state_cap >>0 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));
@@ -1393,9 +1388,7 @@ out:static int i915_hangcheck_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_engine_cs *engine;u64 acthd[I915_NUM_ENGINES ];u32 seqno[I915_NUM_ENGINES ];
@@ -1463,9 +1456,8 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)static int ironlake_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rgvmodectl, rstdbyctl;u16 crstandvid;int ret;
@@ -1531,9 +1523,7 @@ static int ironlake_drpc_info(struct seq_file *m)static int i915_forcewake_domains (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_uncore_forcewake_domain *fw_domain;spin_lock_irq (&dev_priv->uncore.lock);
@@ -1549,9 +1539,7 @@ static int i915_forcewake_domains(struct seq_file *m, void *data)static int vlv_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 rpmodectl1, rcctl1, pw_status;intel_runtime_pm_get (dev_priv);
@@ -1589,9 +1577,8 @@ static int vlv_drpc_info(struct seq_file *m)static int gen6_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rpmodectl1, gt_core_status, rcctl1, rc6vids =0 ;u32 gen9_powergate_enable =0 , gen9_powergate_status =0 ;unsigned forcewake_count;
@@ -1621,7 +1608,7 @@ static int gen6_drpc_info(struct seq_file *m) rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL ); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { gen9_powergate_enable =I915_READ (GEN9_PG_ENABLE ); gen9_powergate_status =I915_READ (GEN9_PWRGT_DOMAIN_STATUS ); }
@@ -1643,7 +1630,7 @@ static int gen6_drpc_info(struct seq_file *m) yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));seq_printf (m,"RC6 Enabled: %s\n" ,yesno (rcctl1 &GEN6_RC_CTL_RC6_ENABLE )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Well Gating Enabled: %s\n" ,yesno (gen9_powergate_enable &GEN9_RENDER_PG_ENABLE )); seq_printf(m, "Media Well Gating Enabled: %s\n",
@@ -1677,7 +1664,7 @@ static int gen6_drpc_info(struct seq_file *m)seq_printf (m,"Core Power Down: %s\n" ,yesno (gt_core_status &GEN6_CORE_CPD_STATE_MASK )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Power Well: %s\n" , (gen9_powergate_status &GEN9_PWRGT_RENDER_STATUS_MASK ) ?"Up" :"Down" );
@@ -1707,12 +1694,11 @@ static int gen6_drpc_info(struct seq_file *m)static int i915_drpc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))return vlv_drpc_info (m); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )return gen6_drpc_info (m);else return ironlake_drpc_info (m);
@@ -1720,9 +1706,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)static int i915_frontbuffer_tracking (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);seq_printf (m,"FB tracking busy bits: 0x%08x\n" , dev_priv->fb_tracking.busy_bits);
@@ -1735,11 +1719,9 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)static int i915_fbc_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_FBC (dev)) { +if (!HAS_FBC (dev_priv)) {seq_puts (m,"FBC unsupported on this chipset\n" );return 0 ; }
@@ -1753,7 +1735,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)seq_printf (m,"FBC disabled: %s\n" , dev_priv->fbc.no_fbc_reason); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 )seq_printf (m,"Compressing: %s\n" ,yesno (I915_READ (FBC_STATUS2 ) &FBC_COMPRESSION_MASK ));
@@ -1766,10 +1748,9 @@ static int i915_fbc_status(struct seq_file *m, void *unused)static int i915_fbc_fc_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ; *val = dev_priv->fbc.false_color;
@@ -1779,11 +1760,10 @@ static int i915_fbc_fc_get(void *data, u64 *val)static int i915_fbc_fc_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 reg; -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ;mutex_lock (&dev_priv->fbc.lock);
@@ -1805,11 +1785,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_fbc_fc_fops,static int i915_ips_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_IPS (dev)) { +if (!HAS_IPS (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -1819,7 +1797,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)seq_printf (m,"Enabled by kernel parameter: %s\n" ,yesno (i915.enable_ips)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else {if (I915_READ (IPS_CTL ) &IPS_ENABLE )
@@ -1835,23 +1813,21 @@ static int i915_ips_status(struct seq_file *m, void *unused)static int i915_sr_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);bool sr_enabled = false;intel_runtime_pm_get (dev_priv); -if (HAS_PCH_SPLIT (dev)) +if (HAS_PCH_SPLIT (dev_priv)) sr_enabled =I915_READ (WM1_LP_ILK ) &WM1_LP_SR_EN ; -else if (IS_CRESTLINE (dev) ||IS_G4X (dev) || -IS_I945G (dev) ||IS_I945GM (dev)) +else if (IS_CRESTLINE (dev_priv) ||IS_G4X (dev_priv) || +IS_I945G (dev_priv) ||IS_I945GM (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF ) &FW_BLC_SELF_EN ; -else if (IS_I915GM (dev)) +else if (IS_I915GM (dev_priv)) sr_enabled =I915_READ (INSTPM ) &INSTPM_SELF_EN ; -else if (IS_PINEVIEW (dev)) +else if (IS_PINEVIEW (dev_priv)) sr_enabled =I915_READ (DSPFW3 ) &PINEVIEW_SELF_REFRESH_EN ; -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF_VLV ) &FW_CSPWRDWNEN ;intel_runtime_pm_put (dev_priv);
@@ -1864,13 +1840,12 @@ static int i915_sr_status(struct seq_file *m, void *unused)static int i915_emon_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;unsigned long temp, chipset, gfx;int ret; -if (!IS_GEN5 (dev)) +if (!IS_GEN5 (dev_priv))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1892,14 +1867,12 @@ static int i915_emon_status(struct seq_file *m, void *unused)static int i915_ring_freq_table (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);int ret =0 ;int gpu_freq, ia_freq;unsigned int max_gpu_freq, min_gpu_freq; -if (!HAS_CORE_RING_FREQ (dev)) { +if (!HAS_CORE_RING_FREQ (dev_priv)) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; }
@@ -1910,7 +1883,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) { +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;
@@ -1930,7 +1903,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) &ia_freq);seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" ,intel_gpu_freq (dev_priv, (gpu_freq * - (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );
@@ -1945,9 +1918,8 @@ out:static int i915_opregion (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_opregion *opregion = &dev_priv->opregion;int ret;
@@ -1966,10 +1938,7 @@ out:static int i915_vbt (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_opregion *opregion = &dev_priv->opregion; +struct intel_opregion *opregion = &node_to_i915 (m->private)->opregion;if (opregion->vbt)seq_write (m, opregion->vbt, opregion->vbt_size);
@@ -1979,8 +1948,8 @@ static int i915_vbt(struct seq_file *m, void *unused)static int i915_gem_framebuffer_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_framebuffer *fbdev_fb =NULL ;struct drm_framebuffer *drm_fb;int ret;
@@ -1990,8 +1959,8 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)return ret;#ifdef CONFIG_DRM_FBDEV_EMULATION -if (to_i915 (dev)->fbdev) { - fbdev_fb =to_intel_framebuffer (to_i915 (dev)->fbdev->helper.fb); +if (dev_priv->fbdev) { + fbdev_fb =to_intel_framebuffer (dev_priv->fbdev->helper.fb); seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ", fbdev_fb->base.width,
@@ -2036,9 +2005,8 @@ static void describe_ctx_ring(struct seq_file *m, struct intel_ring *ring)static int i915_context_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2133,9 +2101,8 @@ static void i915_dump_lrc_obj(struct seq_file *m,static int i915_dump_lrc (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2160,9 +2127,8 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)static int i915_execlists (struct seq_file *m,void *data) { -struct drm_info_node *node = (struct drm_info_node *)m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;u32 status_pointer;u8 read_pointer;
@@ -2263,9 +2229,8 @@ static const char *swizzle_string(unsigned swizzle)static int i915_swizzle_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2278,7 +2243,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)seq_printf (m,"bit6 swizzle for Y-tiling = %s\n" ,swizzle_string (dev_priv->mm.bit_6_swizzle_y)); -if (IS_GEN3 (dev) ||IS_GEN4 (dev)) { +if (IS_GEN3 (dev_priv) ||IS_GEN4 (dev_priv)) {seq_printf (m,"DDC = 0x%08x\n" ,I915_READ (DCC )); seq_printf(m, "DDC2 = 0x%08x\n",
@@ -2287,7 +2252,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ16(C0DRB3));seq_printf (m,"C1DRB3 = 0x%04x\n" ,I915_READ16 (C1DRB3 )); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"MAD_DIMM_C0 = 0x%08x\n" ,I915_READ (MAD_DIMM_C0 )); seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n",
@@ -2296,7 +2261,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ(MAD_DIMM_C2));seq_printf (m,"TILECTL = 0x%08x\n" ,I915_READ (TILECTL )); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )seq_printf (m,"GAMTARBMODE = 0x%08x\n" ,I915_READ (GAMTARBMODE ));else
@@ -2336,9 +2301,9 @@ static int per_file_ctx(int id, void *ptr, void *data)return 0 ; } -static void gen8_ppgtt_info (struct seq_file *m,struct drm_device *dev) +static void gen8_ppgtt_info (struct seq_file *m, +struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine;struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;int i;
@@ -2357,9 +2322,9 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev) } } -static void gen6_ppgtt_info (struct seq_file *m,struct drm_device *dev) +static void gen6_ppgtt_info (struct seq_file *m, +struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine;if (IS_GEN6 (dev_priv))
@@ -2391,9 +2356,8 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)static int i915_ppgtt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;int ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2401,10 +2365,10 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (INTEL_INFO (dev)->gen >=8 ) -gen8_ppgtt_info (m, dev); -else if (INTEL_INFO (dev)->gen >=6 ) -gen6_ppgtt_info (m, dev); +if (INTEL_GEN (dev_priv) >=8 ) +gen8_ppgtt_info (m, dev_priv); +else if (INTEL_GEN (dev_priv) >=6 ) +gen6_ppgtt_info (m, dev_priv);mutex_lock (&dev->filelist_mutex);list_for_each_entry_reverse (file, &dev->filelist, lhead) {
@@ -2443,9 +2407,8 @@ static int count_irq_waiters(struct drm_i915_private *i915)static int i915_rps_boost_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;seq_printf (m,"RPS enabled? %d\n" , dev_priv->rps.enabled);
@@ -2483,12 +2446,10 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)static int i915_llc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);const bool edram =INTEL_GEN (dev_priv) >8 ; -seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev))); +seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev_priv)));seq_printf (m,"%s: %lluMB\n" , edram ?"eDRAM" :"eLLC" ,intel_uncore_edram_size (dev_priv)/1024 /1024 );
@@ -2497,8 +2458,7 @@ static int i915_llc(struct seq_file *m, void *data)static int i915_guc_load_status_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;u32 tmp, i;
@@ -2569,9 +2529,8 @@ static void i915_guc_client_info(struct seq_file *m,static int i915_guc_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_guc guc;struct i915_guc_client client = {};struct intel_engine_cs *engine;
@@ -2620,9 +2579,7 @@ static int i915_guc_info(struct seq_file *m, void *data)static int i915_guc_log_dump (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct drm_i915_gem_object *log_obj = dev_priv->guc.log_obj;u32 *log;int i =0 , pg;
@@ -2648,15 +2605,13 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)static int i915_edp_psr_status (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 psrperf =0 ;u32 stat[3 ];enum pipe pipe;bool enabled = false; -if (!HAS_PSR (dev)) { +if (!HAS_PSR (dev_priv)) {seq_puts (m,"PSR not supported\n" );return 0 ; }
@@ -2673,7 +2628,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev)) +if (HAS_DDI (dev_priv)) enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ;else {for_each_pipe (dev_priv, pipe) {
@@ -2690,7 +2645,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"HW Enabled & Active bit: %s" ,yesno (enabled)); -if (!HAS_DDI (dev)) +if (!HAS_DDI (dev_priv))for_each_pipe (dev_priv, pipe) {if ((stat[pipe] ==VLV_EDP_PSR_ACTIVE_NORFB_UP ) || (stat[pipe] ==VLV_EDP_PSR_ACTIVE_SF_UPDATE ))
@@ -2702,7 +2657,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)* VLV/CHV PSR has no kind of performance counter * SKL+ Perf counter is reset to 0 everytime DC state is entered */ -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { psrperf =I915_READ (EDP_PSR_PERF_CNT ) &EDP_PSR_PERF_CNT_MASK ;
@@ -2716,8 +2671,8 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)static int i915_sink_crc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_connector *connector;struct intel_dp *intel_dp =NULL ;int ret;
@@ -2756,13 +2711,11 @@ out:static int i915_energy_uJ (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u64 power;u32 units; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;intel_runtime_pm_get (dev_priv);
@@ -2782,9 +2735,7 @@ static int i915_energy_uJ(struct seq_file *m, void *data)static int i915_runtime_pm_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct pci_dev *pdev = dev_priv->drm.pdev;if (!HAS_RUNTIME_PM (dev_priv))
@@ -2795,7 +2746,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused) yesno(!intel_irqs_enabled(dev_priv)));#ifdef CONFIG_PM seq_printf (m,"Usage count: %d\n" , -atomic_read (&dev->dev->power.usage_count)); +atomic_read (&dev_priv->drm.dev->power.usage_count));#else seq_printf (m,"Device Power Management (CONFIG_PM) disabled\n" );#endif
@@ -2808,9 +2759,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)static int i915_power_domain_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct i915_power_domains *power_domains = &dev_priv->power_domains;int i;
@@ -2843,12 +2792,10 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)static int i915_dmc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_csr *csr; -if (!HAS_CSR (dev)) { +if (!HAS_CSR (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -2866,12 +2813,12 @@ static int i915_dmc_info(struct seq_file *m, void *unused)seq_printf (m,"version: %d.%d\n" ,CSR_VERSION_MAJOR (csr->version),CSR_VERSION_MINOR (csr->version)); -if (IS_SKYLAKE (dev) && csr->version >=CSR_VERSION (1 ,6 )) { +if (IS_SKYLAKE (dev_priv) && csr->version >=CSR_VERSION (1 ,6 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (SKL_CSR_DC3_DC5_COUNT ));seq_printf (m,"DC5 -> DC6 count: %d\n" ,I915_READ (SKL_CSR_DC5_DC6_COUNT )); - }else if (IS_BROXTON (dev) && csr->version >=CSR_VERSION (1 ,4 )) { + }else if (IS_BROXTON (dev_priv) && csr->version >=CSR_VERSION (1 ,4 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (BXT_CSR_DC3_DC5_COUNT )); }
@@ -2908,8 +2855,8 @@ static void intel_encoder_info(struct seq_file *m,struct intel_crtc *intel_crtc, struct intel_encoder *intel_encoder) { - struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; + struct drm_i915_private *dev_priv = node_to_i915(m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_connector *intel_connector;struct drm_encoder *encoder;
@@ -2935,8 +2882,8 @@ static void intel_encoder_info(struct seq_file *m,static void intel_crtc_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_encoder *intel_encoder;struct drm_plane_state *plane_state = crtc->primary->state;
@@ -3034,12 +2981,11 @@ static void intel_connector_info(struct seq_file *m,intel_seq_print_mode (m,2 , mode); } -static bool cursor_active (struct drm_device *dev,int pipe) +static bool cursor_active (struct drm_i915_private *dev_priv,int pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);u32 state; -if (IS_845G (dev) ||IS_I865G (dev)) +if (IS_845G (dev_priv) ||IS_I865G (dev_priv)) state =I915_READ (CURCNTR (PIPE_A )) &CURSOR_ENABLE ;else state =I915_READ (CURCNTR (pipe)) &CURSOR_MODE ;
@@ -3047,9 +2993,9 @@ static bool cursor_active(struct drm_device *dev, int pipe)return state; } -static bool cursor_position (struct drm_device *dev,int pipe,int *x,int *y) +static bool cursor_position (struct drm_i915_private *dev_priv, +int pipe,int *x,int *y) { -struct drm_i915_private *dev_priv =to_i915 (dev);u32 pos; pos =I915_READ (CURPOS (pipe));
@@ -3062,7 +3008,7 @@ static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y)if (pos & (CURSOR_POS_SIGN <<CURSOR_Y_SHIFT )) *y = -*y; -return cursor_active (dev, pipe); +return cursor_active (dev_priv, pipe); }static const char *plane_type (enum drm_plane_type type)
@@ -3105,8 +3051,8 @@ static const char *plane_rotation(unsigned int rotation)static void intel_plane_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_plane *intel_plane;for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) {
@@ -3168,9 +3114,8 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *intel_crtc)static int i915_display_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;struct drm_connector *connector;
@@ -3194,7 +3139,7 @@ static int i915_display_info(struct seq_file *m, void *unused)if (pipe_config->base.active) {intel_crtc_info (m, crtc); - active =cursor_position (dev, crtc->pipe, &x, &y); + active =cursor_position (dev_priv, crtc->pipe, &x, &y); seq_printf(m, "\tcursor visible? %s, position (%d, %d), size %dx%d, addr 0x%08x, active? %s\n", yesno(crtc->cursor_base), x, y, crtc->base.cursor->state->crtc_w,
@@ -3223,11 +3168,10 @@ static int i915_display_info(struct seq_file *m, void *unused)static int i915_semaphore_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine; -int num_rings =INTEL_INFO (dev)->num_rings; +int num_rings =INTEL_INFO (dev_priv)->num_rings;enum intel_engine_id id;int j, ret;
@@ -3241,7 +3185,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)return ret;intel_runtime_pm_get (dev_priv); -if (IS_BROADWELL (dev)) { +if (IS_BROADWELL (dev_priv)) {struct page *page;uint64_t *seqno;
@@ -3296,9 +3240,8 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)static int i915_shared_dplls_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i;drm_modeset_lock_all (dev);
@@ -3326,9 +3269,8 @@ static int i915_wa_registers(struct seq_file *m, void *unused)int i;int ret;struct intel_engine_cs *engine; -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_workarounds *workarounds = &dev_priv->workarounds;enum intel_engine_id id;
@@ -3364,15 +3306,14 @@ static int i915_wa_registers(struct seq_file *m, void *unused)static int i915_ddb_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct skl_ddb_allocation *ddb;struct skl_ddb_entry *entry;enum pipe pipe;int plane; -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev_priv) <9 )return 0 ;drm_modeset_lock_all (dev);
@@ -3402,7 +3343,8 @@ static int i915_ddb_info(struct seq_file *m, void *unused) }static void drrs_status_per_crtc (struct seq_file *m, -struct drm_device *dev,struct intel_crtc *intel_crtc) +struct drm_device *dev, +struct intel_crtc *intel_crtc) {struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_drrs *drrs = &dev_priv->drrs;
@@ -3471,8 +3413,8 @@ static void drrs_status_per_crtc(struct seq_file *m,static int i915_drrs_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *intel_crtc;int active_crtc_cnt =0 ;
@@ -3495,14 +3437,14 @@ static int i915_drrs_status(struct seq_file *m, void *unused)struct pipe_crc_info {const char *name; -struct drm_device *dev; +struct drm_i915_private *dev_priv;enum pipe pipe; };static int i915_dp_mst_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *intel_encoder;struct intel_digital_port *intel_dig_port;struct drm_connector *connector;
@@ -3531,10 +3473,10 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)static int i915_pipe_crc_open (struct inode *inode,struct file *filep) {struct pipe_crc_info *info = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (info->dev); +struct drm_i915_private *dev_priv = info->dev_priv;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; -if (info->pipe >=INTEL_INFO (info->dev)->num_pipes) +if (info->pipe >=INTEL_INFO (dev_priv)->num_pipes)return -ENODEV ;spin_lock_irq (&pipe_crc->lock);
@@ -3555,7 +3497,7 @@ static int i915_pipe_crc_open(struct inode *inode, struct file *filep)static int i915_pipe_crc_release (struct inode *inode,struct file *filep) {struct pipe_crc_info *info = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (info->dev); +struct drm_i915_private *dev_priv = dev_priv;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];spin_lock_irq (&pipe_crc->lock);
@@ -3582,8 +3524,7 @@ i915_pipe_crc_read(struct file *filep, char __user *user_buf, size_t count, loff_t *pos) {struct pipe_crc_info *info = filep->private_data; -struct drm_device *dev = info->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = dev_priv;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];char buf[PIPE_CRC_BUFFER_LEN ];int n_entries;
@@ -3679,11 +3620,11 @@ static struct pipe_crc_info i915_pipe_crc_data[I915_MAX_PIPES] = {static int i915_pipe_crc_create (struct dentry *root,struct drm_minor *minor,enum pipe pipe) { -struct drm_device *dev = minor->dev; +struct drm_i915_private *dev_priv =to_i915 (minor->dev);struct dentry *ent;struct pipe_crc_info *info = &i915_pipe_crc_data[pipe]; - info->dev = dev; + info->dev_priv = dev_priv; ent =debugfs_create_file (info->name,S_IRUGO , root, info, &i915_pipe_crc_fops);if (!ent)
@@ -3713,8 +3654,7 @@ static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)static int display_crc_ctl_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;int i;for (i =0 ; i <I915_MAX_PIPES ; i++)
@@ -3726,9 +3666,9 @@ static int display_crc_ctl_show(struct seq_file *m, void *data)static int display_crc_ctl_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -return single_open (file, display_crc_ctl_show, dev); +return single_open (file, display_crc_ctl_show, dev_priv); } static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
@@ -3751,9 +3691,11 @@ static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static int i9xx_pipe_crc_auto_source (struct drm_device *dev,enum pipe pipe, +static int i9xx_pipe_crc_auto_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source *source) { +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder;struct intel_crtc *crtc;struct intel_digital_port *dig_port;
@@ -3803,16 +3745,15 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,return ret; } -static int vlv_pipe_crc_ctl_reg (struct drm_device *dev, +static int vlv_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3830,7 +3771,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev, need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_CHERRYVIEW (dev)) +if (!IS_CHERRYVIEW (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_VLV ; need_stable_symbols = true;
@@ -3874,16 +3815,15 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int i9xx_pipe_crc_ctl_reg (struct drm_device *dev, +static int i9xx_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3893,24 +3833,24 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PIPE_I9XX ;break ;case INTEL_PIPE_CRC_SOURCE_TV : -if (!SUPPORTS_TV (dev)) +if (!SUPPORTS_TV (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_TV_PRE ;break ;case INTEL_PIPE_CRC_SOURCE_DP_B : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_B_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_C : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_C_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_G4X ; need_stable_symbols = true;
@@ -3934,7 +3874,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,if (need_stable_symbols) {uint32_t tmp =I915_READ (PORT_DFT2_G4X ); -WARN_ON (!IS_G4X (dev)); +WARN_ON (!IS_G4X (dev_priv));I915_WRITE (PORT_DFT_I9XX ,I915_READ (PORT_DFT_I9XX ) |DC_BALANCE_RESET );
@@ -3950,10 +3890,9 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static void vlv_undo_pipe_scramble_reset (struct drm_device *dev, +static void vlv_undo_pipe_scramble_reset (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp =I915_READ (PORT_DFT2_G4X );switch (pipe) {
@@ -3975,10 +3914,9 @@ static void vlv_undo_pipe_scramble_reset(struct drm_device *dev, } -static void g4x_undo_pipe_scramble_reset (struct drm_device *dev, +static void g4x_undo_pipe_scramble_reset (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp =I915_READ (PORT_DFT2_G4X );if (pipe ==PIPE_A )
@@ -4019,9 +3957,10 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static void hsw_trans_edp_pipe_A_crc_wa (struct drm_device *dev,bool enable) +static void hsw_trans_edp_pipe_A_crc_wa (struct drm_i915_private *dev_priv, +bool enable) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[PIPE_A ]);struct intel_crtc_state *pipe_config;
@@ -4055,7 +3994,7 @@ out:drm_atomic_state_free (state); } -static int ivb_pipe_crc_ctl_reg (struct drm_device *dev, +static int ivb_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val)
@@ -4071,8 +4010,8 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_SPRITE_IVB ;break ;case INTEL_PIPE_CRC_SOURCE_PF : -if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, true); +if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, true); *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PF_IVB ;break ;
@@ -4086,13 +4025,14 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int pipe_crc_set_source (struct drm_device *dev,enum pipe pipe, +static int pipe_crc_set_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source source) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; -struct intel_crtc *crtc =to_intel_crtc (intel_get_crtc_for_pipe (dev, - pipe)); +struct intel_crtc *crtc = +to_intel_crtc (intel_get_crtc_for_pipe (dev, pipe));enum intel_display_power_domain power_domain;u32 val =0 ;/* shut up gcc */ int ret;
@@ -4110,16 +4050,16 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,return -EIO ; } -if (IS_GEN2 (dev)) +if (IS_GEN2 (dev_priv)) ret =i8xx_pipe_crc_ctl_reg (&source, &val); -else if (INTEL_INFO (dev)->gen <5 ) - ret =i9xx_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) - ret =vlv_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_GEN5 (dev) ||IS_GEN6 (dev)) +else if (INTEL_GEN (dev_priv) <5 ) + ret =i9xx_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + ret =vlv_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_GEN5 (dev_priv) ||IS_GEN6 (dev_priv)) ret =ilk_pipe_crc_ctl_reg (&source, &val);else - ret =ivb_pipe_crc_ctl_reg (dev, pipe, &source, &val); + ret =ivb_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val);if (ret !=0 ) goto out;
@@ -4183,12 +4123,12 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,kfree (entries); -if (IS_G4X (dev)) -g4x_undo_pipe_scramble_reset (dev, pipe); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) -vlv_undo_pipe_scramble_reset (dev, pipe); -else if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, false); +if (IS_G4X (dev_priv)) +g4x_undo_pipe_scramble_reset (dev_priv, pipe); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) +vlv_undo_pipe_scramble_reset (dev_priv, pipe); +else if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, false);hsw_enable_ips (crtc); }
@@ -4292,7 +4232,8 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)return -EINVAL ; } -static int display_crc_ctl_parse (struct drm_device *dev,char *buf,size_t len) +static int display_crc_ctl_parse (struct drm_i915_private *dev_priv, +char *buf,size_t len) {#define N_WORDS 3int n_words;
@@ -4323,14 +4264,14 @@ static int display_crc_ctl_parse(struct drm_device *dev, char *buf, size_t len)return -EINVAL ; } -return pipe_crc_set_source (dev, pipe, source); +return pipe_crc_set_source (dev_priv, pipe, source); }static ssize_t display_crc_ctl_write (struct file *file,const char __user *ubuf,size_t len,loff_t *offp) {struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv =cast_to_i915 (m->private);char *tmpbuf;int ret;
@@ -4353,7 +4294,7 @@ static ssize_t display_crc_ctl_write(struct file *file, const char __user *ubuf, } tmpbuf[len] ='\0' ; - ret =display_crc_ctl_parse (dev, tmpbuf, len); + ret =display_crc_ctl_parse (dev_priv, tmpbuf, len); out:kfree (tmpbuf);
@@ -4503,7 +4444,7 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)return 0 ; }static int i915_displayport_test_data_open (struct inode *inode, -struct file *file) +struct file *file) {struct drm_device *dev = inode->i_private;
@@ -4560,13 +4501,14 @@ static const struct file_operations i915_displayport_test_type_fops = {static void wm_latency_show (struct seq_file *m,const uint16_t wm[8 ]) { -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv = m->private; +struct drm_device *dev = &dev_priv->drm;int level;int num_levels; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else num_levels =ilk_wm_max_level (dev) +1 ;
@@ -4580,8 +4522,8 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])* - WM1+ latency values in 0.5us units * - latencies are in us on gen9/vlv/chv */ -if (INTEL_INFO (dev)->gen >=9 ||IS_VALLEYVIEW (dev) || -IS_CHERRYVIEW (dev)) +if (INTEL_GEN (dev_priv) >=9 ||IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) latency *=10 ;else if (level >0 ) latency *=5 ;
@@ -4595,14 +4537,13 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])static int pri_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;wm_latency_show (m, latencies);
@@ -4611,14 +4552,13 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)static int spr_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;wm_latency_show (m, latencies);
@@ -4627,14 +4567,13 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)static int cur_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;wm_latency_show (m, latencies);
@@ -4643,38 +4582,39 @@ static int cur_wm_latency_show(struct seq_file *m, void *data)static int pri_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return -ENODEV ; -return single_open (file, pri_wm_latency_show, dev); +return single_open (file, pri_wm_latency_show, dev_priv); }static int spr_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, spr_wm_latency_show, dev); +return single_open (file, spr_wm_latency_show, dev_priv); }static int cur_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, cur_wm_latency_show, dev); +return single_open (file, cur_wm_latency_show, dev_priv); }static ssize_t wm_latency_write (struct file *file,const char __user *ubuf,size_t len,loff_t *offp,uint16_t wm[8 ]) {struct seq_file *m = file->private_data; +struct drm_i915_private *dev_priv =to_i915 (m->private);struct drm_device *dev = m->private;uint16_t new[8 ] = {0 };int num_levels;
@@ -4682,9 +4622,9 @@ static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,int ret;char tmp[32 ]; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else num_levels =ilk_wm_max_level (dev) +1 ;
@@ -4718,14 +4658,13 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4734,14 +4673,13 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4750,14 +4688,13 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (m->private);uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4792,8 +4729,7 @@ static const struct file_operations i915_cur_wm_latency_fops = {static int i915_wedged_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val =i915_terminally_wedged (&dev_priv->gpu_error);
@@ -4803,8 +4739,7 @@ i915_wedged_get(void *data, u64 *val)static int i915_wedged_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);/* * There is no safeguard against this debugfs entry colliding
@@ -4834,8 +4769,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops,static int i915_ring_missed_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val = dev_priv->gpu_error.missed_irq_rings;return 0 ;
@@ -4844,8 +4778,8 @@ i915_ring_missed_irq_get(void *data, u64 *val)static int i915_ring_missed_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;int ret;/* Lock against concurrent debugfs callers */
@@ -4865,8 +4799,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_ring_missed_irq_fops,static int i915_ring_test_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); *val = dev_priv->gpu_error.test_irq_rings;
@@ -4876,8 +4809,7 @@ i915_ring_test_irq_get(void *data, u64 *val)static int i915_ring_test_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); val &=INTEL_INFO (dev_priv)->ring_mask;DRM_DEBUG_DRIVER ("Masking interrupts on rings 0x%08llx\n" , val);
@@ -4909,8 +4841,8 @@ i915_drop_caches_get(void *data, u64 *val)static int i915_drop_caches_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;int ret;DRM_DEBUG ("Dropping caches: 0x%08llx\n" , val);
@@ -4949,10 +4881,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_drop_caches_fops,static int i915_max_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);
@@ -4962,12 +4893,11 @@ i915_max_freq_get(void *data, u64 *val)static int i915_max_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 hw_max, hw_min;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val);
@@ -5005,8 +4935,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops,static int i915_min_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;
@@ -5018,8 +4947,7 @@ i915_min_freq_get(void *data, u64 *val)static int i915_min_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 hw_max, hw_min;int ret;
@@ -5061,12 +4989,12 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops,static int i915_cache_sharing_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data); +struct drm_device *dev = &dev_priv->drm;u32 snpcr;int ret; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -5077,7 +5005,7 @@ i915_cache_sharing_get(void *data, u64 *val) snpcr =I915_READ (GEN6_MBCUNIT_SNPCR );intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev_priv->drm.struct_mutex); +mutex_unlock (&dev->struct_mutex); *val = (snpcr &GEN6_MBC_SNPCR_MASK ) >>GEN6_MBC_SNPCR_SHIFT ;
@@ -5087,11 +5015,10 @@ i915_cache_sharing_get(void *data, u64 *val)static int i915_cache_sharing_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =cast_to_i915 (data);u32 snpcr; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ;if (val >3 )
@@ -5122,10 +5049,9 @@ struct sseu_dev_status {unsigned int eu_per_subslice; }; -static void cherryview_sseu_device_status (struct drm_device *dev, +static void cherryview_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int ss_max =2 ;int ss;u32 sig1[ss_max], sig2[ss_max];
@@ -5154,16 +5080,15 @@ static void cherryview_sseu_device_status(struct drm_device *dev, stat->subslice_total = stat->subslice_per_slice; } -static void gen9_sseu_device_status (struct drm_device *dev, +static void gen9_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int s_max =3 , ss_max =4 ;int s, ss;u32 s_reg[s_max], eu_reg[2 *s_max], eu_mask[2 ];/* BXT has a single slice and at most 3 subslices. */ -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { s_max =1 ; ss_max =3 ; }
@@ -5192,18 +5117,18 @@ static void gen9_sseu_device_status(struct drm_device *dev, stat->slice_total++; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) - ss_cnt =INTEL_INFO (dev)->subslice_per_slice; +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) + ss_cnt =INTEL_INFO (dev_priv)->subslice_per_slice;for (ss =0 ; ss < ss_max; ss++) {unsigned int eu_cnt; -if (IS_BROXTON (dev) && +if (IS_BROXTON (dev_priv) && !(s_reg[s] & (GEN9_PGCTL_SS_ACK (ss))))/* skip disabled subslice */ continue ; -if (IS_BROXTON (dev)) +if (IS_BROXTON (dev_priv)) ss_cnt++; eu_cnt = 2 * hweight32(eu_reg[2*s + ss/2] &
@@ -5219,25 +5144,24 @@ static void gen9_sseu_device_status(struct drm_device *dev, } } -static void broadwell_sseu_device_status (struct drm_device *dev, +static void broadwell_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev); -int s;u32 slice_info =I915_READ (GEN8_GT_SLICE_INFO ); +int s; stat->slice_total =hweight32 (slice_info &GEN8_LSLICESTAT_MASK );if (stat->slice_total) { - stat->subslice_per_slice =INTEL_INFO (dev)->subslice_per_slice; + stat->subslice_per_slice =INTEL_INFO (dev_priv)->subslice_per_slice; stat->subslice_total = stat->slice_total * stat->subslice_per_slice; - stat->eu_per_subslice =INTEL_INFO (dev)->eu_per_subslice; + stat->eu_per_subslice =INTEL_INFO (dev_priv)->eu_per_subslice; stat->eu_total = stat->eu_per_subslice * stat->subslice_total;/* subtract fused off EU(s) from enabled slice(s) */ for (s =0 ; s < stat->slice_total; s++) { -u8 subslice_7eu =INTEL_INFO (dev)->subslice_7eu[s]; +u8 subslice_7eu =INTEL_INFO (dev_priv)->subslice_7eu[s]; stat->eu_total -=hweight8 (subslice_7eu); }
@@ -5246,47 +5170,45 @@ static void broadwell_sseu_device_status(struct drm_device *dev,static int i915_sseu_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); -struct drm_device *dev = &dev_priv->drm; +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct sseu_dev_status stat; -if (INTEL_INFO (dev)->gen <8 ) +if (INTEL_GEN (dev_priv) <8 )return -ENODEV ;seq_puts (m,"SSEU Device Info\n" );seq_printf (m," Available Slice Total: %u\n" , -INTEL_INFO (dev)->slice_total); +INTEL_INFO (dev_priv)->slice_total);seq_printf (m," Available Subslice Total: %u\n" , -INTEL_INFO (dev)->subslice_total); +INTEL_INFO (dev_priv)->subslice_total);seq_printf (m," Available Subslice Per Slice: %u\n" , -INTEL_INFO (dev)->subslice_per_slice); +INTEL_INFO (dev_priv)->subslice_per_slice);seq_printf (m," Available EU Total: %u\n" , -INTEL_INFO (dev)->eu_total); +INTEL_INFO (dev_priv)->eu_total);seq_printf (m," Available EU Per Subslice: %u\n" , -INTEL_INFO (dev)->eu_per_subslice); -seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev))); -if (HAS_POOLED_EU (dev)) +INTEL_INFO (dev_priv)->eu_per_subslice); +seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev_priv))); +if (HAS_POOLED_EU (dev_priv))seq_printf (m," Min EU in pool: %u\n" , -INTEL_INFO (dev)->min_eu_in_pool); +INTEL_INFO (dev_priv)->min_eu_in_pool);seq_printf (m," Has Slice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_slice_pg)); +yesno (INTEL_INFO (dev_priv)->has_slice_pg));seq_printf (m," Has Subslice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_subslice_pg)); +yesno (INTEL_INFO (dev_priv)->has_subslice_pg));seq_printf (m," Has EU Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_eu_pg)); +yesno (INTEL_INFO (dev_priv)->has_eu_pg));seq_puts (m,"SSEU Device Status\n" );memset (&stat,0 ,sizeof (stat));intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { -cherryview_sseu_device_status (dev, &stat); - }else if (IS_BROADWELL (dev)) { -broadwell_sseu_device_status (dev, &stat); - }else if (INTEL_INFO (dev)->gen >=9 ) { -gen9_sseu_device_status (dev, &stat); +if (IS_CHERRYVIEW (dev_priv)) { +cherryview_sseu_device_status (dev_priv, &stat); + }else if (IS_BROADWELL (dev_priv)) { +broadwell_sseu_device_status (dev_priv, &stat); + }else if (INTEL_GEN (dev_priv) >=9 ) { +gen9_sseu_device_status (dev_priv, &stat); }intel_runtime_pm_put (dev_priv);
@@ -5307,10 +5229,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)static int i915_forcewake_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_runtime_pm_get (dev_priv);
@@ -5321,10 +5242,9 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)static int i915_forcewake_release (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (inode->i_private); -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
@@ -5453,9 +5373,8 @@ static const struct i915_debugfs_files { {"i915_dp_test_active", &i915_displayport_test_active_fops} }; -void intel_display_crc_init (struct drm_device *dev) +void intel_display_crc_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe;for_each_pipe (dev_priv, pipe) {
@@ -5503,7 +5422,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)drm_debugfs_remove_files (i915_debugfs_list,I915_DEBUGFS_ENTRIES , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_forcewake_fops, +drm_debugfs_remove_files ((struct drm_info_list *)&i915_forcewake_fops,1 , minor);for (i =0 ; i <ARRAY_SIZE (i915_pipe_crc_data); i++) {
@@ -5515,7 +5434,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) {struct drm_info_list *info_list = - (struct drm_info_list *) i915_debugfs_files[i].fops; + (struct drm_info_list *)i915_debugfs_files[i].fops;drm_debugfs_remove_files (info_list,1 , minor); }
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -849,7 +849,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_audio_hooks (dev_priv);i915_gem_load_init (&dev_priv->drm); -intel_display_crc_init (&dev_priv->drm); +intel_display_crc_init (dev_priv);intel_device_info_dump (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +7 -1
@@ -2046,6 +2046,12 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) return container_of(dev, struct drm_i915_private, drm); } +static inline struct drm_i915_private *cast_to_i915 (void *data) +{ +struct drm_device *dev = data; +return to_i915 (dev); +} +static inline struct drm_i915_private *kdev_to_i915 (struct device *kdev) {return to_i915 (dev_get_drvdata (kdev));
@@ -3478,7 +3484,7 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objecint i915_debugfs_register (struct drm_i915_private *dev_priv);void i915_debugfs_unregister (struct drm_i915_private *dev_priv);int i915_debugfs_connector_add (struct drm_connector *connector); -void intel_display_crc_init (struct drm_device *dev); +void intel_display_crc_init (struct drm_i915_private *dev_priv);#else static inline int i915_debugfs_register (struct drm_i915_private *dev_priv) {return 0 ;}static inline void i915_debugfs_unregister (struct drm_i915_private *dev_priv) {}
Signature · 6 lines
2.8.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5 v3] drm/i915: debugfs spring cleaning
drivers/gpu/drm/i915/i915_drv.h static inline struct drm_i915_private *to_i915(const struct drm_device *dev) · line 2053
Quoted 13 lines · David Weinehall
drivers/gpu/drm/i915/i915_drv.h +5
-0@@ -2046,6 +2046,12 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) return container_of(dev, struct drm_i915_private, drm); } +static inline struct drm_i915_private *cast_to_i915 (void *data) +{ +struct drm_device *dev = data; +return to_i915 (dev); +}
I wouldn't put this in i915_drv.h as this is very specific to the callsite, as it must know it has a void pointer to struct drm_device. Especially as to_i915() just works, right?
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5 v3] drm/i915: debugfs spring cleaning
Quoted 9 lines · Chris Wilson
Quoted 8 lines · David Weinehall
drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -2046,6 +2046,12 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) return container_of(dev, struct drm_i915_private, drm); }
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.h static inline struct drm_i915_private *to_i915(const struct drm_device *dev) · line 2053
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +5
-0+static inline struct drm_i915_private *cast_to_i915 (void *data) +{ +struct drm_device *dev = data; +return to_i915 (dev); +}I wouldn't put this in
i915_drv.has this is very specific to the callsite, as it must know it has a void pointer to structdrm_device. Especially asto_i915()just works, right?
While it does indeed rely on the callsite, there are places outside of i915_debugfs that could benefit from this (and if I remember correctly my patch series that transitions things to dev_priv makes use of it elsewhere.
Kind regards, David
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5 v3] drm/i915: debugfs spring cleaning
In reply to David WeinehallQuoted 38 lines · David Weinehall
drm/i915: debugfs spring cleaning
Just like with sysfs, we do some major overhaul.
Pass
dev_privinstead of dev to all feature macros (IS_,HAS_,INTEL_, etc.). This has the side effect that a bunch of functions now getdev_privpassed instead of dev.All calls to INTEL_INFO()->gen have been replaced with
INTEL_GEN().We want access to
to_i915(node->minor->dev)in a lot of places, so add thenode_to_i915()helper to accomodate for this.Finally, we have quite a few cases where we get a void * pointer, and need to cast it to
drm_device*, only to runto_i915()on it. Addcast_to_i915()to do this.v2: Don't introduce extra dev (Chris)
v3: Make
pipe_crc_infohave a pointer todrm_i915_privateinstead of
drm_device. This saves a bit of space, since we never usedrm_deviceanywhere in these functions.Also some minor fixup that I missed in the previous version.
Signed-off-by David Weinehall <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 749 ++++++++++++++++-------------------- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 8 +- 3 files changed, 342 insertions(+), 417 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c enum { · line 52
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +4
-0@@ -46,6 +46,11 @@ enum { PINNED_LIST, }; +static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) +{ +return to_i915 (node->minor->dev); +}
Alternatively (noting that almost the only use we make of this drm_info_node is to indirect multiple times to get dev_priv), we could change what is stored in (struct seq_file).private to make it more convenient and/or efficient. For example,
struct i915_debugfs_node {
struct drm_i915_private *dev_priv;
struct drm_info_node drm_info; // if still required
};thus eliminating several memory cycles per use for a cost of one word extra data per debugfs node.
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5 v3] drm/i915: debugfs spring cleaning
Quoted 52 lines · Dave Gordon
Quoted 38 lines · David Weinehall
drm/i915: debugfs spring cleaning
Just like with sysfs, we do some major overhaul.
Pass
dev_privinstead of dev to all feature macros (IS_,HAS_,INTEL_, etc.). This has the side effect that a bunch of functions now getdev_privpassed instead of dev.All calls to INTEL_INFO()->gen have been replaced with
INTEL_GEN().We want access to
to_i915(node->minor->dev)in a lot of places, so add thenode_to_i915()helper to accomodate for this.Finally, we have quite a few cases where we get a void * pointer, and need to cast it to
drm_device*, only to runto_i915()on it. Addcast_to_i915()to do this.v2: Don't introduce extra dev (Chris)
v3: Make
pipe_crc_infohave a pointer todrm_i915_privateinstead of
drm_device. This saves a bit of space, since we never usedrm_deviceanywhere in these functions.Also some minor fixup that I missed in the previous version.
Signed-off-by David Weinehall <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 749 ++++++++++++++++-------------------- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 8 +- 3 files changed, 342 insertions(+), 417 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0drivers/gpu/drm/i915/i915_debugfs.c enum { · line 52
Quoted 7 lines
drivers/gpu/drm/i915/i915_debugfs.c +4
-0@@ -46,6 +46,11 @@ enum { PINNED_LIST, }; +static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) +{ +return to_i915 (node->minor->dev); +}Alternatively (noting that almost the only use we make of this
drm_info_nodeis to indirect multiple times to getdev_priv), we could change what is stored in (struct seq_file).private to make it more convenient and/or efficient. For example,
Quoted 7 lines
struct i915_debugfs_node { struct drm_i915_private *dev_priv; struct drm_info_node drm_info; // if still required };thus eliminating several memory cycles per use for a cost of one word extra data per debugfs node.
Well, the memory cycles / use isn't really that important for debugfs (or sysfs, for that matter). Memory consumption, however, always affects us. Still, I admit that having the nodes provide dev_priv directly would definitely be nice. I'll give your suggestion a whirl and see how big the overhead would be.
Kind regards, David
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5 v3] drm/i915: debugfs spring cleaning
In reply to Dave GordonQuoted 5 lines · Dave Gordon
Alternatively (noting that almost the only use we make of this
drm_info_nodeis to indirect multiple times to getdev_priv), we could change what is stored in (struct seq_file).private to make it more convenient and/or efficient. For example,
Quoted 7 lines
struct i915_debugfs_node { struct drm_i915_private *dev_priv; struct drm_info_node drm_info; // if still required };thus eliminating several memory cycles per use for a cost of one word extra data per debugfs node.
v4 of the patch doesn't eliminate the need for the node_to_i915() macro and its users, but all functions that don't use the drm_debugfs_create_files() helper now receive drm_i915_private *dev_priv instead of drm_device *dev. This at least kills off the cast_to_i915() macro.
Regards, David
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 5/5 drm/i915: debugfs spring cleaning
In reply to David Weinehalldrm/i915: debugfs spring cleaning
Just like with sysfs, we do some major overhaul.
Pass dev_priv instead of dev to all feature macros (IS_, HAS_, INTEL_, etc.). This has the side effect that a bunch of functions now get dev_priv passed instead of dev.
All calls to INTEL_INFO()->gen have been replaced with INTEL_GEN().
We want access to to_i915(node->minor->dev) in a lot of places, so add the node_to_i915() helper to accomodate for this.
Finally, we have quite a few cases where we get a void * pointer, and need to cast it to drm_device *, only to run to_i915() on it. Add cast_to_i915() to do this.
v2: Don't introduce extra dev (Chris)
v3: Make pipe_crc_info have a pointer to drm_i915_private instead of
drm_device. This saves a bit of space, since we never use drm_device anywhere in these functions.
Also some minor fixup that I missed in the previous version.
v4: Fixed a nasty bug in the earlier version (that could trigger
an oops).
Changed the code a bit so that dev_priv is passed directly to various functions, thus removing the need for the cast_to_i915() helper. Also did some additional cleanup.
drivers/gpu/drm/i915/i915_debugfs.c +366 -448
@@ -46,6 +46,11 @@ enum { PINNED_LIST, }; +static inline struct drm_i915_private *node_to_i915 (struct drm_info_node *node) +{ +return to_i915 (node->minor->dev); +} +/* As the drm_debugfs_init() routines are called before dev->dev_private is * allocated we need to hook into the minor for release. */ static int
@@ -63,7 +68,7 @@ drm_add_fake_info_node(struct drm_minor *minor, node->minor = minor; node->dent = ent; - node->info_ent = (void *) key; + node->info_ent = (void *)key;mutex_lock (&minor->debugfs_lock);list_add (&node->list, &minor->debugfs_list);
@@ -74,12 +79,11 @@ drm_add_fake_info_node(struct drm_minor *minor,static int i915_capabilities (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -const struct intel_device_info *info =INTEL_INFO (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +const struct intel_device_info *info =INTEL_INFO (dev_priv); -seq_printf (m,"gen: %d\n" , info->gen); -seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev)); +seq_printf (m,"gen: %d\n" ,INTEL_GEN (dev_priv)); +seq_printf (m,"pch: %d\n" ,INTEL_PCH_TYPE (dev_priv));#define PRINT_FLAG (x) seq_printf(m, #x ": %s\n", yesno(info->x))#define SEP_SEMICOLON ;DEV_INFO_FOR_EACH_FLAG (PRINT_FLAG ,SEP_SEMICOLON );
@@ -136,13 +140,14 @@ static void describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) { struct drm_i915_private *dev_priv = to_i915(obj->base.dev); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_vma *vma;unsigned int frontbuffer_bits;int pin_count =0 ;enum intel_engine_id id; -lockdep_assert_held (&obj->base.dev->struct_mutex); +lockdep_assert_held (&dev->struct_mutex); seq_printf(m, "%pK: %c%c%c%c%c %8zdKiB %02x %02x [ ", &obj->base,
@@ -157,13 +162,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)for_each_engine_id (engine, dev_priv, id)seq_printf (m,"%x " ,i915_gem_active_get_seqno (&obj->last_read[id], - &obj->base.dev->struct_mutex)); + &dev->struct_mutex));seq_printf (m,"] %x %x%s%s%s" ,i915_gem_active_get_seqno (&obj->last_write, - &obj->base.dev->struct_mutex), + &dev->struct_mutex),i915_gem_active_get_seqno (&obj->last_fence, - &obj->base.dev->struct_mutex), -i915_cache_level_str (to_i915 (obj->base.dev), obj->cache_level), + &dev->struct_mutex), +i915_cache_level_str (dev_priv, obj->cache_level), obj->dirty ?" dirty" :"" , obj->madv ==I915_MADV_DONTNEED ?" purgeable" :"" );if (obj->base.name)
@@ -201,7 +206,7 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) } engine =i915_gem_active_get_engine (&obj->last_write, - &obj->base.dev->struct_mutex); + &dev->struct_mutex);if (engine)seq_printf (m," (%s)" , engine->name);
@@ -213,10 +218,10 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)static int i915_gem_object_list_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -uintptr_t list = (uintptr_t ) node->info_ent->data; +uintptr_t list = (uintptr_t )node->info_ent->data;struct list_head *head; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;struct i915_vma *vma;u64 total_obj_size, total_gtt_size;
@@ -274,9 +279,8 @@ static int obj_rank_by_stolen(void *priv,static int i915_gem_stolen_list_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;LIST_HEAD (stolen);
@@ -429,20 +433,21 @@ static int per_file_ctx_stats(int id, void *ptr, void *data)static void print_context_stats (struct seq_file *m,struct drm_i915_private *dev_priv) { +struct drm_device *dev = &dev_priv->drm;struct file_stats stats;struct drm_file *file;memset (&stats,0 ,sizeof (stats)); -mutex_lock (&dev_priv->drm.struct_mutex); +mutex_lock (&dev->struct_mutex);if (dev_priv->kernel_context)per_file_ctx_stats (0 , dev_priv->kernel_context, &stats); -list_for_each_entry (file, &dev_priv->drm.filelist, lhead) { +list_for_each_entry (file, &dev->filelist, lhead) {struct drm_i915_file_private *fpriv = file->driver_priv;idr_for_each (&fpriv->context_idr, per_file_ctx_stats, &stats); } -mutex_unlock (&dev_priv->drm.struct_mutex); +mutex_unlock (&dev->struct_mutex);print_file_stats (m,"[k]contexts" , stats); }
@@ -460,9 +465,8 @@ static void print_context_stats(struct seq_file *m,static int i915_gem_object_info (struct seq_file *m,void * data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_ggtt *ggtt = &dev_priv->ggtt;u32 count, mappable_count, purgeable_count;u64 size, mappable_size, purgeable_size;
@@ -583,9 +587,9 @@ static int i915_gem_object_info(struct seq_file *m, void* data)static int i915_gem_gtt_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -uintptr_t list = (uintptr_t ) node->info_ent->data; -struct drm_i915_private *dev_priv =to_i915 (dev); +uintptr_t list = (uintptr_t )node->info_ent->data; +struct drm_i915_private *dev_priv =node_to_i915 (node); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;u64 total_obj_size, total_gtt_size;int count, ret;
@@ -617,9 +621,8 @@ static int i915_gem_gtt_info(struct seq_file *m, void *data)static int i915_gem_pageflip_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;int ret;
@@ -666,7 +669,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) intel_crtc_get_vblank_counter(crtc));seq_printf (m,"%d prepares\n" ,atomic_read (&work->pending)); -if (INTEL_INFO (dev)->gen >=4 ) +if (INTEL_GEN (dev_priv) >=4 ) addr =I915_HI_DISPBASE (I915_READ (DSPSURF (crtc->plane)));else addr =I915_READ (DSPADDR (crtc->plane));
@@ -687,9 +690,8 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)static int i915_gem_batch_pool_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_i915_gem_object *obj;struct intel_engine_cs *engine;int total =0 ;
@@ -732,9 +734,8 @@ static int i915_gem_batch_pool_info(struct seq_file *m, void *data)static int i915_gem_request_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct drm_i915_gem_request *req;int ret, any;
@@ -800,9 +801,8 @@ static void i915_ring_seqno_info(struct seq_file *m,static int i915_gem_seqno_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret;
@@ -823,9 +823,8 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data)static int i915_interrupt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;int ret, i, pipe;
@@ -834,7 +833,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { +if (IS_CHERRYVIEW (dev_priv)) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -873,7 +872,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (INTEL_INFO (dev)->gen >=8 ) { + }else if (INTEL_GEN (dev_priv) >=8 ) {seq_printf (m,"Master Interrupt Control:\t%08x\n" ,I915_READ (GEN8_MASTER_IRQ ));
@@ -929,7 +928,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GEN8_PCU_IIR));seq_printf (m,"PCU interrupt enable:\t%08x\n" ,I915_READ (GEN8_PCU_IER )); - }else if (IS_VALLEYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv)) {seq_printf (m,"Display IER:\t%08x\n" ,I915_READ (VLV_IER )); seq_printf(m, "Display IIR:\t%08x\n",
@@ -967,7 +966,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"DPINVGTT:\t%08x\n" ,I915_READ (DPINVGTT )); - }else if (!HAS_PCH_SPLIT (dev)) { + }else if (!HAS_PCH_SPLIT (dev_priv)) {seq_printf (m,"Interrupt enable: %08x\n" ,I915_READ (IER )); seq_printf(m, "Interrupt identity: %08x\n",
@@ -999,7 +998,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); }for_each_engine (engine, dev_priv) { -if (INTEL_INFO (dev)->gen >=6 ) { +if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"Graphics Interrupt mask (%s): %08x\n" , engine->name,I915_READ_IMR (engine));
@@ -1014,9 +1013,8 @@ static int i915_interrupt_info(struct seq_file *m, void *data)static int i915_gem_fence_regs_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i, ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1043,8 +1041,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data)static int i915_hws_info (struct seq_file *m,void *data) {struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (node);struct intel_engine_cs *engine;const u32 *hws;int i;
@@ -1086,16 +1083,16 @@ i915_error_state_write(struct file *filp,static int i915_error_state_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv = inode->i_private;struct i915_error_state_file_priv *error_priv; error_priv =kzalloc (sizeof (*error_priv),GFP_KERNEL );if (!error_priv)return -ENOMEM ; - error_priv->dev = dev; + error_priv->dev = &dev_priv->drm; -i915_error_state_get (dev, error_priv); +i915_error_state_get (&dev_priv->drm, error_priv); file->private_data = error_priv;
@@ -1121,7 +1118,8 @@ static ssize_t i915_error_state_read(struct file *file, char __user *userbuf,ssize_t ret_count =0 ;int ret; - ret =i915_error_state_buf_init (&error_str,to_i915 (error_priv->dev), count, *pos); + ret =i915_error_state_buf_init (&error_str, +to_i915 (error_priv->dev), count, *pos);if (ret)return ret;
@@ -1154,8 +1152,8 @@ static const struct file_operations i915_error_state_fops = {static int i915_next_seqno_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; +struct drm_device *dev = &dev_priv->drm;int ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1171,7 +1169,8 @@ i915_next_seqno_get(void *data, u64 *val)static int i915_next_seqno_set (void *data,u64 val) { -struct drm_device *dev = data; +struct drm_i915_private *dev_priv = data; +struct drm_device *dev = &dev_priv->drm;int ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1190,14 +1189,13 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,static int i915_frequency_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret =0 ;intel_runtime_pm_get (dev_priv); -if (IS_GEN5 (dev)) { +if (IS_GEN5 (dev_priv)) {u16 rgvswctl =I915_READ16 (MEMSWCTL );u16 rgvstat =I915_READ16 (MEMSTAT_ILK );
@@ -1207,7 +1205,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) MEMSTAT_VID_SHIFT);seq_printf (m,"Current P-state: %d\n" , (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); - }else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) { + }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {u32 freq_sts;mutex_lock (&dev_priv->rps.hw_lock);
@@ -1234,7 +1232,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)"efficient (RPe) frequency: %d MHz\n" , intel_gpu_freq(dev_priv, dev_priv->rps.efficient_freq));mutex_unlock (&dev_priv->rps.hw_lock); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {u32 rp_state_limits;u32 gt_perf_status;u32 rp_state_cap;
@@ -1246,7 +1244,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)int max_freq; rp_state_limits =I915_READ (GEN6_RP_STATE_LIMITS ); -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { rp_state_cap =I915_READ (BXT_RP_STATE_CAP ); gt_perf_status =I915_READ (BXT_GT_PERF_STATUS ); }else {
@@ -1262,11 +1260,11 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); reqf =I915_READ (GEN6_RPNSWREQ ); -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) reqf >>=23 ;else { reqf &= ~GEN6_TURBO_DISABLE ; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) reqf >>=24 ;else reqf >>=25 ;
@@ -1284,9 +1282,9 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpdownei =I915_READ (GEN6_RP_CUR_DOWN_EI ) &GEN6_CURIAVG_MASK ; rpcurdown =I915_READ (GEN6_RP_CUR_DOWN ) &GEN6_CURBSYTAVG_MASK ; rpprevdown =I915_READ (GEN6_RP_PREV_DOWN ) &GEN6_CURBSYTAVG_MASK ; -if (IS_GEN9 (dev)) +if (IS_GEN9 (dev_priv)) cagf = (rpstat &GEN9_CAGF_MASK ) >>GEN9_CAGF_SHIFT ; -else if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) +else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cagf = (rpstat &HSW_CAGF_MASK ) >>HSW_CAGF_SHIFT ;else cagf = (rpstat &GEN6_CAGF_MASK ) >>GEN6_CAGF_SHIFT ;
@@ -1295,7 +1293,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );mutex_unlock (&dev->struct_mutex); -if (IS_GEN6 (dev) ||IS_GEN7 (dev)) { +if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) { pm_ier =I915_READ (GEN6_PMIER ); pm_imr =I915_READ (GEN6_PMIMR ); pm_isr =I915_READ (GEN6_PMISR );
@@ -1313,7 +1311,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"pm_intr_keep: 0x%08x\n" , dev_priv->rps.pm_intr_keep);seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status);seq_printf (m,"Render p-state ratio: %d\n" , - (gt_perf_status & (IS_GEN9 (dev) ?0x1ff00 :0xff00 )) >>8 ); + (gt_perf_status & (IS_GEN9 (dev_priv) ?0x1ff00 :0xff00 )) >>8 );seq_printf (m,"Render p-state VID: %d\n" , gt_perf_status &0xff ); seq_printf(m, "Render p-state limit: %d\n",
@@ -1342,22 +1340,22 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Down threshold: %d%%\n" , dev_priv->rps.down_threshold); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>0 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Lowest (RPN) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); max_freq = (rp_state_cap &0xff00 ) >>8 ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Nominal (RP1) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq)); - max_freq = (IS_BROXTON (dev) ? rp_state_cap >>16 : + max_freq = (IS_BROXTON (dev_priv) ? rp_state_cap >>16 : rp_state_cap >>0 ) &0xff ; - max_freq *= (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + max_freq *= (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 );seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));
@@ -1393,9 +1391,7 @@ out:static int i915_hangcheck_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_engine_cs *engine;u64 acthd[I915_NUM_ENGINES ];u32 seqno[I915_NUM_ENGINES ];
@@ -1463,9 +1459,8 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)static int ironlake_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rgvmodectl, rstdbyctl;u16 crstandvid;int ret;
@@ -1531,9 +1526,7 @@ static int ironlake_drpc_info(struct seq_file *m)static int i915_forcewake_domains (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_uncore_forcewake_domain *fw_domain;spin_lock_irq (&dev_priv->uncore.lock);
@@ -1549,9 +1542,7 @@ static int i915_forcewake_domains(struct seq_file *m, void *data)static int vlv_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 rpmodectl1, rcctl1, pw_status;intel_runtime_pm_get (dev_priv);
@@ -1589,9 +1580,8 @@ static int vlv_drpc_info(struct seq_file *m)static int gen6_drpc_info (struct seq_file *m) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;u32 rpmodectl1, gt_core_status, rcctl1, rc6vids =0 ;u32 gen9_powergate_enable =0 , gen9_powergate_status =0 ;unsigned forcewake_count;
@@ -1621,7 +1611,7 @@ static int gen6_drpc_info(struct seq_file *m) rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL ); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) { gen9_powergate_enable =I915_READ (GEN9_PG_ENABLE ); gen9_powergate_status =I915_READ (GEN9_PWRGT_DOMAIN_STATUS ); }
@@ -1643,7 +1633,7 @@ static int gen6_drpc_info(struct seq_file *m) yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));seq_printf (m,"RC6 Enabled: %s\n" ,yesno (rcctl1 &GEN6_RC_CTL_RC6_ENABLE )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Well Gating Enabled: %s\n" ,yesno (gen9_powergate_enable &GEN9_RENDER_PG_ENABLE )); seq_printf(m, "Media Well Gating Enabled: %s\n",
@@ -1677,7 +1667,7 @@ static int gen6_drpc_info(struct seq_file *m)seq_printf (m,"Core Power Down: %s\n" ,yesno (gt_core_status &GEN6_CORE_CPD_STATE_MASK )); -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) {seq_printf (m,"Render Power Well: %s\n" , (gen9_powergate_status &GEN9_PWRGT_RENDER_STATUS_MASK ) ?"Up" :"Down" );
@@ -1707,12 +1697,11 @@ static int gen6_drpc_info(struct seq_file *m)static int i915_drpc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))return vlv_drpc_info (m); -else if (INTEL_INFO (dev)->gen >=6 ) +else if (INTEL_GEN (dev_priv) >=6 )return gen6_drpc_info (m);else return ironlake_drpc_info (m);
@@ -1720,9 +1709,7 @@ static int i915_drpc_info(struct seq_file *m, void *unused)static int i915_frontbuffer_tracking (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);seq_printf (m,"FB tracking busy bits: 0x%08x\n" , dev_priv->fb_tracking.busy_bits);
@@ -1735,11 +1722,9 @@ static int i915_frontbuffer_tracking(struct seq_file *m, void *unused)static int i915_fbc_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_FBC (dev)) { +if (!HAS_FBC (dev_priv)) {seq_puts (m,"FBC unsupported on this chipset\n" );return 0 ; }
@@ -1753,7 +1738,7 @@ static int i915_fbc_status(struct seq_file *m, void *unused)seq_printf (m,"FBC disabled: %s\n" , dev_priv->fbc.no_fbc_reason); -if (INTEL_INFO (dev_priv)->gen >=7 ) +if (INTEL_GEN (dev_priv) >=7 )seq_printf (m,"Compressing: %s\n" ,yesno (I915_READ (FBC_STATUS2 ) &FBC_COMPRESSION_MASK ));
@@ -1766,10 +1751,9 @@ static int i915_fbc_status(struct seq_file *m, void *unused)static int i915_fbc_fc_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ; *val = dev_priv->fbc.false_color;
@@ -1779,11 +1763,10 @@ static int i915_fbc_fc_get(void *data, u64 *val)static int i915_fbc_fc_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data;u32 reg; -if (INTEL_INFO (dev)->gen <7 || !HAS_FBC (dev)) +if (INTEL_GEN (dev_priv) <7 || !HAS_FBC (dev_priv))return -ENODEV ;mutex_lock (&dev_priv->fbc.lock);
@@ -1805,11 +1788,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_fbc_fc_fops,static int i915_ips_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); -if (!HAS_IPS (dev)) { +if (!HAS_IPS (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -1819,7 +1800,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)seq_printf (m,"Enabled by kernel parameter: %s\n" ,yesno (i915.enable_ips)); -if (INTEL_INFO (dev)->gen >=8 ) { +if (INTEL_GEN (dev_priv) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else {if (I915_READ (IPS_CTL ) &IPS_ENABLE )
@@ -1835,23 +1816,21 @@ static int i915_ips_status(struct seq_file *m, void *unused)static int i915_sr_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);bool sr_enabled = false;intel_runtime_pm_get (dev_priv); -if (HAS_PCH_SPLIT (dev)) +if (HAS_PCH_SPLIT (dev_priv)) sr_enabled =I915_READ (WM1_LP_ILK ) &WM1_LP_SR_EN ; -else if (IS_CRESTLINE (dev) ||IS_G4X (dev) || -IS_I945G (dev) ||IS_I945GM (dev)) +else if (IS_CRESTLINE (dev_priv) ||IS_G4X (dev_priv) || +IS_I945G (dev_priv) ||IS_I945GM (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF ) &FW_BLC_SELF_EN ; -else if (IS_I915GM (dev)) +else if (IS_I915GM (dev_priv)) sr_enabled =I915_READ (INSTPM ) &INSTPM_SELF_EN ; -else if (IS_PINEVIEW (dev)) +else if (IS_PINEVIEW (dev_priv)) sr_enabled =I915_READ (DSPFW3 ) &PINEVIEW_SELF_REFRESH_EN ; -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) sr_enabled =I915_READ (FW_BLC_SELF_VLV ) &FW_CSPWRDWNEN ;intel_runtime_pm_put (dev_priv);
@@ -1864,13 +1843,12 @@ static int i915_sr_status(struct seq_file *m, void *unused)static int i915_emon_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;unsigned long temp, chipset, gfx;int ret; -if (!IS_GEN5 (dev)) +if (!IS_GEN5 (dev_priv))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -1892,14 +1870,12 @@ static int i915_emon_status(struct seq_file *m, void *unused)static int i915_ring_freq_table (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);int ret =0 ;int gpu_freq, ia_freq;unsigned int max_gpu_freq, min_gpu_freq; -if (!HAS_CORE_RING_FREQ (dev)) { +if (!HAS_CORE_RING_FREQ (dev_priv)) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; }
@@ -1910,7 +1886,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) { +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ;
@@ -1930,7 +1906,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) &ia_freq);seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" ,intel_gpu_freq (dev_priv, (gpu_freq * - (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev) ? + (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 );
@@ -1945,9 +1921,8 @@ out:static int i915_opregion (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_opregion *opregion = &dev_priv->opregion;int ret;
@@ -1966,10 +1941,7 @@ out:static int i915_vbt (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_opregion *opregion = &dev_priv->opregion; +struct intel_opregion *opregion = &node_to_i915 (m->private)->opregion;if (opregion->vbt)seq_write (m, opregion->vbt, opregion->vbt_size);
@@ -1979,8 +1951,8 @@ static int i915_vbt(struct seq_file *m, void *unused)static int i915_gem_framebuffer_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_framebuffer *fbdev_fb =NULL ;struct drm_framebuffer *drm_fb;int ret;
@@ -1990,8 +1962,8 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)return ret;#ifdef CONFIG_DRM_FBDEV_EMULATION -if (to_i915 (dev)->fbdev) { - fbdev_fb =to_intel_framebuffer (to_i915 (dev)->fbdev->helper.fb); +if (dev_priv->fbdev) { + fbdev_fb =to_intel_framebuffer (dev_priv->fbdev->helper.fb); seq_printf(m, "fbcon size: %d x %d, depth %d, %d bpp, modifier 0x%llx, refcount %d, obj ", fbdev_fb->base.width,
@@ -2036,9 +2008,8 @@ static void describe_ctx_ring(struct seq_file *m, struct intel_ring *ring)static int i915_context_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2133,9 +2104,8 @@ static void i915_dump_lrc_obj(struct seq_file *m,static int i915_dump_lrc (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;struct i915_gem_context *ctx;int ret;
@@ -2160,9 +2130,8 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)static int i915_execlists (struct seq_file *m,void *data) { -struct drm_info_node *node = (struct drm_info_node *)m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine;u32 status_pointer;u8 read_pointer;
@@ -2263,9 +2232,8 @@ static const char *swizzle_string(unsigned swizzle)static int i915_swizzle_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int ret; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2278,7 +2246,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)seq_printf (m,"bit6 swizzle for Y-tiling = %s\n" ,swizzle_string (dev_priv->mm.bit_6_swizzle_y)); -if (IS_GEN3 (dev) ||IS_GEN4 (dev)) { +if (IS_GEN3 (dev_priv) ||IS_GEN4 (dev_priv)) {seq_printf (m,"DDC = 0x%08x\n" ,I915_READ (DCC )); seq_printf(m, "DDC2 = 0x%08x\n",
@@ -2287,7 +2255,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ16(C0DRB3));seq_printf (m,"C1DRB3 = 0x%04x\n" ,I915_READ16 (C1DRB3 )); - }else if (INTEL_INFO (dev)->gen >=6 ) { + }else if (INTEL_GEN (dev_priv) >=6 ) {seq_printf (m,"MAD_DIMM_C0 = 0x%08x\n" ,I915_READ (MAD_DIMM_C0 )); seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n",
@@ -2296,7 +2264,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) I915_READ(MAD_DIMM_C2));seq_printf (m,"TILECTL = 0x%08x\n" ,I915_READ (TILECTL )); -if (INTEL_INFO (dev)->gen >=8 ) +if (INTEL_GEN (dev_priv) >=8 )seq_printf (m,"GAMTARBMODE = 0x%08x\n" ,I915_READ (GAMTARBMODE ));else
@@ -2336,9 +2304,9 @@ static int per_file_ctx(int id, void *ptr, void *data)return 0 ; } -static void gen8_ppgtt_info (struct seq_file *m,struct drm_device *dev) +static void gen8_ppgtt_info (struct seq_file *m, +struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine;struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;int i;
@@ -2357,9 +2325,9 @@ static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev) } } -static void gen6_ppgtt_info (struct seq_file *m,struct drm_device *dev) +static void gen6_ppgtt_info (struct seq_file *m, +struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine;if (IS_GEN6 (dev_priv))
@@ -2391,9 +2359,8 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev)static int i915_ppgtt_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;int ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -2401,10 +2368,10 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)return ret;intel_runtime_pm_get (dev_priv); -if (INTEL_INFO (dev)->gen >=8 ) -gen8_ppgtt_info (m, dev); -else if (INTEL_INFO (dev)->gen >=6 ) -gen6_ppgtt_info (m, dev); +if (INTEL_GEN (dev_priv) >=8 ) +gen8_ppgtt_info (m, dev_priv); +else if (INTEL_GEN (dev_priv) >=6 ) +gen6_ppgtt_info (m, dev_priv);mutex_lock (&dev->filelist_mutex);list_for_each_entry_reverse (file, &dev->filelist, lhead) {
@@ -2453,9 +2420,8 @@ static const char *rps_power_to_str(int power)static int i915_rps_boost_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_file *file;seq_printf (m,"RPS enabled? %d\n" , dev_priv->rps.enabled);
@@ -2522,12 +2488,10 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)static int i915_llc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);const bool edram =INTEL_GEN (dev_priv) >8 ; -seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev))); +seq_printf (m,"LLC: %s\n" ,yesno (HAS_LLC (dev_priv)));seq_printf (m,"%s: %lluMB\n" , edram ?"eDRAM" :"eLLC" ,intel_uncore_edram_size (dev_priv)/1024 /1024 );
@@ -2536,8 +2500,7 @@ static int i915_llc(struct seq_file *m, void *data)static int i915_guc_load_status_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw;u32 tmp, i;
@@ -2608,9 +2571,8 @@ static void i915_guc_client_info(struct seq_file *m,static int i915_guc_info (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_guc guc;struct i915_guc_client client = {};struct intel_engine_cs *engine;
@@ -2659,9 +2621,7 @@ static int i915_guc_info(struct seq_file *m, void *data)static int i915_guc_log_dump (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct drm_i915_gem_object *log_obj = dev_priv->guc.log_obj;u32 *log;int i =0 , pg;
@@ -2687,15 +2647,13 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)static int i915_edp_psr_status (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u32 psrperf =0 ;u32 stat[3 ];enum pipe pipe;bool enabled = false; -if (!HAS_PSR (dev)) { +if (!HAS_PSR (dev_priv)) {seq_puts (m,"PSR not supported\n" );return 0 ; }
@@ -2712,7 +2670,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev)) +if (HAS_DDI (dev_priv)) enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ;else {for_each_pipe (dev_priv, pipe) {
@@ -2729,7 +2687,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"HW Enabled & Active bit: %s" ,yesno (enabled)); -if (!HAS_DDI (dev)) +if (!HAS_DDI (dev_priv))for_each_pipe (dev_priv, pipe) {if ((stat[pipe] ==VLV_EDP_PSR_ACTIVE_NORFB_UP ) || (stat[pipe] ==VLV_EDP_PSR_ACTIVE_SF_UPDATE ))
@@ -2741,7 +2699,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)* VLV/CHV PSR has no kind of performance counter * SKL+ Perf counter is reset to 0 everytime DC state is entered */ -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { psrperf =I915_READ (EDP_PSR_PERF_CNT ) &EDP_PSR_PERF_CNT_MASK ;
@@ -2755,8 +2713,8 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)static int i915_sink_crc (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_connector *connector;struct intel_dp *intel_dp =NULL ;int ret;
@@ -2795,13 +2753,11 @@ out:static int i915_energy_uJ (struct seq_file *m,void *data) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);u64 power;u32 units; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;intel_runtime_pm_get (dev_priv);
@@ -2821,9 +2777,7 @@ static int i915_energy_uJ(struct seq_file *m, void *data)static int i915_runtime_pm_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct pci_dev *pdev = dev_priv->drm.pdev;if (!HAS_RUNTIME_PM (dev_priv))
@@ -2834,7 +2788,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused) yesno(!intel_irqs_enabled(dev_priv)));#ifdef CONFIG_PM seq_printf (m,"Usage count: %d\n" , -atomic_read (&dev->dev->power.usage_count)); +atomic_read (&dev_priv->drm.dev->power.usage_count));#else seq_printf (m,"Device Power Management (CONFIG_PM) disabled\n" );#endif
@@ -2847,9 +2801,7 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)static int i915_power_domain_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct i915_power_domains *power_domains = &dev_priv->power_domains;int i;
@@ -2882,12 +2834,10 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)static int i915_dmc_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct intel_csr *csr; -if (!HAS_CSR (dev)) { +if (!HAS_CSR (dev_priv)) {seq_puts (m,"not supported\n" );return 0 ; }
@@ -2905,12 +2855,12 @@ static int i915_dmc_info(struct seq_file *m, void *unused)seq_printf (m,"version: %d.%d\n" ,CSR_VERSION_MAJOR (csr->version),CSR_VERSION_MINOR (csr->version)); -if (IS_SKYLAKE (dev) && csr->version >=CSR_VERSION (1 ,6 )) { +if (IS_SKYLAKE (dev_priv) && csr->version >=CSR_VERSION (1 ,6 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (SKL_CSR_DC3_DC5_COUNT ));seq_printf (m,"DC5 -> DC6 count: %d\n" ,I915_READ (SKL_CSR_DC5_DC6_COUNT )); - }else if (IS_BROXTON (dev) && csr->version >=CSR_VERSION (1 ,4 )) { + }else if (IS_BROXTON (dev_priv) && csr->version >=CSR_VERSION (1 ,4 )) {seq_printf (m,"DC3 -> DC5 count: %d\n" ,I915_READ (BXT_CSR_DC3_DC5_COUNT )); }
@@ -2947,8 +2897,8 @@ static void intel_encoder_info(struct seq_file *m,struct intel_crtc *intel_crtc, struct intel_encoder *intel_encoder) { - struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; + struct drm_i915_private *dev_priv = node_to_i915(m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_connector *intel_connector;struct drm_encoder *encoder;
@@ -2974,8 +2924,8 @@ static void intel_encoder_info(struct seq_file *m,static void intel_crtc_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct drm_crtc *crtc = &intel_crtc->base;struct intel_encoder *intel_encoder;struct drm_plane_state *plane_state = crtc->primary->state;
@@ -3073,12 +3023,11 @@ static void intel_connector_info(struct seq_file *m,intel_seq_print_mode (m,2 , mode); } -static bool cursor_active (struct drm_device *dev,int pipe) +static bool cursor_active (struct drm_i915_private *dev_priv,int pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);u32 state; -if (IS_845G (dev) ||IS_I865G (dev)) +if (IS_845G (dev_priv) ||IS_I865G (dev_priv)) state =I915_READ (CURCNTR (PIPE_A )) &CURSOR_ENABLE ;else state =I915_READ (CURCNTR (pipe)) &CURSOR_MODE ;
@@ -3086,9 +3035,9 @@ static bool cursor_active(struct drm_device *dev, int pipe)return state; } -static bool cursor_position (struct drm_device *dev,int pipe,int *x,int *y) +static bool cursor_position (struct drm_i915_private *dev_priv, +int pipe,int *x,int *y) { -struct drm_i915_private *dev_priv =to_i915 (dev);u32 pos; pos =I915_READ (CURPOS (pipe));
@@ -3101,7 +3050,7 @@ static bool cursor_position(struct drm_device *dev, int pipe, int *x, int *y)if (pos & (CURSOR_POS_SIGN <<CURSOR_Y_SHIFT )) *y = -*y; -return cursor_active (dev, pipe); +return cursor_active (dev_priv, pipe); }static const char *plane_type (enum drm_plane_type type)
@@ -3144,8 +3093,8 @@ static const char *plane_rotation(unsigned int rotation)static void intel_plane_info (struct seq_file *m,struct intel_crtc *intel_crtc) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_plane *intel_plane;for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) {
@@ -3216,9 +3165,8 @@ static void intel_scaler_info(struct seq_file *m, struct intel_crtc *intel_crtc)static int i915_display_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc;struct drm_connector *connector;
@@ -3242,7 +3190,7 @@ static int i915_display_info(struct seq_file *m, void *unused)if (pipe_config->base.active) {intel_crtc_info (m, crtc); - active =cursor_position (dev, crtc->pipe, &x, &y); + active =cursor_position (dev_priv, crtc->pipe, &x, &y); seq_printf(m, "\tcursor visible? %s, position (%d, %d), size %dx%d, addr 0x%08x, active? %s\n", yesno(crtc->cursor_base), x, y, crtc->base.cursor->state->crtc_w,
@@ -3271,11 +3219,10 @@ static int i915_display_info(struct seq_file *m, void *unused)static int i915_semaphore_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_engine_cs *engine; -int num_rings =INTEL_INFO (dev)->num_rings; +int num_rings =INTEL_INFO (dev_priv)->num_rings;enum intel_engine_id id;int j, ret;
@@ -3289,7 +3236,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)return ret;intel_runtime_pm_get (dev_priv); -if (IS_BROADWELL (dev)) { +if (IS_BROADWELL (dev_priv)) {struct page *page;uint64_t *seqno;
@@ -3344,9 +3291,8 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)static int i915_shared_dplls_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;int i;drm_modeset_lock_all (dev);
@@ -3374,9 +3320,8 @@ static int i915_wa_registers(struct seq_file *m, void *unused)int i;int ret;struct intel_engine_cs *engine; -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct i915_workarounds *workarounds = &dev_priv->workarounds;enum intel_engine_id id;
@@ -3412,15 +3357,14 @@ static int i915_wa_registers(struct seq_file *m, void *unused)static int i915_ddb_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct skl_ddb_allocation *ddb;struct skl_ddb_entry *entry;enum pipe pipe;int plane; -if (INTEL_INFO (dev)->gen <9 ) +if (INTEL_GEN (dev_priv) <9 )return 0 ;drm_modeset_lock_all (dev);
@@ -3450,7 +3394,8 @@ static int i915_ddb_info(struct seq_file *m, void *unused) }static void drrs_status_per_crtc (struct seq_file *m, -struct drm_device *dev,struct intel_crtc *intel_crtc) +struct drm_device *dev, +struct intel_crtc *intel_crtc) {struct drm_i915_private *dev_priv =to_i915 (dev);struct i915_drrs *drrs = &dev_priv->drrs;
@@ -3519,8 +3464,8 @@ static void drrs_status_per_crtc(struct seq_file *m,static int i915_drrs_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *intel_crtc;int active_crtc_cnt =0 ;
@@ -3543,14 +3488,14 @@ static int i915_drrs_status(struct seq_file *m, void *unused)struct pipe_crc_info {const char *name; -struct drm_device *dev; +struct drm_i915_private *dev_priv;enum pipe pipe; };static int i915_dp_mst_info (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *intel_encoder;struct intel_digital_port *intel_dig_port;struct drm_connector *connector;
@@ -3579,10 +3524,10 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)static int i915_pipe_crc_open (struct inode *inode,struct file *filep) {struct pipe_crc_info *info = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (info->dev); +struct drm_i915_private *dev_priv = info->dev_priv;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; -if (info->pipe >=INTEL_INFO (info->dev)->num_pipes) +if (info->pipe >=INTEL_INFO (dev_priv)->num_pipes)return -ENODEV ;spin_lock_irq (&pipe_crc->lock);
@@ -3603,7 +3548,7 @@ static int i915_pipe_crc_open(struct inode *inode, struct file *filep)static int i915_pipe_crc_release (struct inode *inode,struct file *filep) {struct pipe_crc_info *info = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (info->dev); +struct drm_i915_private *dev_priv = info->dev_priv;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];spin_lock_irq (&pipe_crc->lock);
@@ -3630,8 +3575,7 @@ i915_pipe_crc_read(struct file *filep, char __user *user_buf, size_t count, loff_t *pos) {struct pipe_crc_info *info = filep->private_data; -struct drm_device *dev = info->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = info->dev_priv;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];char buf[PIPE_CRC_BUFFER_LEN ];int n_entries;
@@ -3727,11 +3671,11 @@ static struct pipe_crc_info i915_pipe_crc_data[I915_MAX_PIPES] = {static int i915_pipe_crc_create (struct dentry *root,struct drm_minor *minor,enum pipe pipe) { -struct drm_device *dev = minor->dev; +struct drm_i915_private *dev_priv =to_i915 (minor->dev);struct dentry *ent;struct pipe_crc_info *info = &i915_pipe_crc_data[pipe]; - info->dev = dev; + info->dev_priv = dev_priv; ent =debugfs_create_file (info->name,S_IRUGO , root, info, &i915_pipe_crc_fops);if (!ent)
@@ -3761,8 +3705,7 @@ static const char *pipe_crc_source_name(enum intel_pipe_crc_source source)static int display_crc_ctl_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;int i;for (i =0 ; i <I915_MAX_PIPES ; i++)
@@ -3774,9 +3717,7 @@ static int display_crc_ctl_show(struct seq_file *m, void *data)static int display_crc_ctl_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; - -return single_open (file, display_crc_ctl_show, dev); +return single_open (file, display_crc_ctl_show, inode->i_private); } static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
@@ -3799,9 +3740,11 @@ static int i8xx_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static int i9xx_pipe_crc_auto_source (struct drm_device *dev,enum pipe pipe, +static int i9xx_pipe_crc_auto_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source *source) { +struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder;struct intel_crtc *crtc;struct intel_digital_port *dig_port;
@@ -3851,16 +3794,15 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,return ret; } -static int vlv_pipe_crc_ctl_reg (struct drm_device *dev, +static int vlv_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3878,7 +3820,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev, need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_CHERRYVIEW (dev)) +if (!IS_CHERRYVIEW (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_VLV ; need_stable_symbols = true;
@@ -3922,16 +3864,15 @@ static int vlv_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int i9xx_pipe_crc_ctl_reg (struct drm_device *dev, +static int i9xx_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val) { -struct drm_i915_private *dev_priv =to_i915 (dev);bool need_stable_symbols = false;if (*source ==INTEL_PIPE_CRC_SOURCE_AUTO ) { -int ret =i9xx_pipe_crc_auto_source (dev, pipe, source); +int ret =i9xx_pipe_crc_auto_source (dev_priv, pipe, source);if (ret)return ret; }
@@ -3941,24 +3882,24 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PIPE_I9XX ;break ;case INTEL_PIPE_CRC_SOURCE_TV : -if (!SUPPORTS_TV (dev)) +if (!SUPPORTS_TV (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_TV_PRE ;break ;case INTEL_PIPE_CRC_SOURCE_DP_B : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_B_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_C : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_C_G4X ; need_stable_symbols = true;break ;case INTEL_PIPE_CRC_SOURCE_DP_D : -if (!IS_G4X (dev)) +if (!IS_G4X (dev_priv))return -EINVAL ; *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_DP_D_G4X ; need_stable_symbols = true;
@@ -3982,7 +3923,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,if (need_stable_symbols) {uint32_t tmp =I915_READ (PORT_DFT2_G4X ); -WARN_ON (!IS_G4X (dev)); +WARN_ON (!IS_G4X (dev_priv));I915_WRITE (PORT_DFT_I9XX ,I915_READ (PORT_DFT_I9XX ) |DC_BALANCE_RESET );
@@ -3998,10 +3939,9 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static void vlv_undo_pipe_scramble_reset (struct drm_device *dev, +static void vlv_undo_pipe_scramble_reset (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp =I915_READ (PORT_DFT2_G4X );switch (pipe) {
@@ -4023,10 +3963,9 @@ static void vlv_undo_pipe_scramble_reset(struct drm_device *dev, } -static void g4x_undo_pipe_scramble_reset (struct drm_device *dev, +static void g4x_undo_pipe_scramble_reset (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t tmp =I915_READ (PORT_DFT2_G4X );if (pipe ==PIPE_A )
@@ -4067,9 +4006,10 @@ static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,return 0 ; } -static void hsw_trans_edp_pipe_A_crc_wa (struct drm_device *dev,bool enable) +static void hsw_trans_edp_pipe_A_crc_wa (struct drm_i915_private *dev_priv, +bool enable) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_crtc *crtc =to_intel_crtc (dev_priv->pipe_to_crtc_mapping[PIPE_A ]);struct intel_crtc_state *pipe_config;
@@ -4103,7 +4043,7 @@ out:drm_atomic_state_free (state); } -static int ivb_pipe_crc_ctl_reg (struct drm_device *dev, +static int ivb_pipe_crc_ctl_reg (struct drm_i915_private *dev_priv,enum pipe pipe,enum intel_pipe_crc_source *source,uint32_t *val)
@@ -4119,8 +4059,8 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev, *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_SPRITE_IVB ;break ;case INTEL_PIPE_CRC_SOURCE_PF : -if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, true); +if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, true); *val =PIPE_CRC_ENABLE |PIPE_CRC_SOURCE_PF_IVB ;break ;
@@ -4134,13 +4074,14 @@ static int ivb_pipe_crc_ctl_reg(struct drm_device *dev,return 0 ; } -static int pipe_crc_set_source (struct drm_device *dev,enum pipe pipe, +static int pipe_crc_set_source (struct drm_i915_private *dev_priv, +enum pipe pipe,enum intel_pipe_crc_source source) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_device *dev = &dev_priv->drm;struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; -struct intel_crtc *crtc =to_intel_crtc (intel_get_crtc_for_pipe (dev, - pipe)); +struct intel_crtc *crtc = +to_intel_crtc (intel_get_crtc_for_pipe (dev, pipe));enum intel_display_power_domain power_domain;u32 val =0 ;/* shut up gcc */ int ret;
@@ -4158,16 +4099,16 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,return -EIO ; } -if (IS_GEN2 (dev)) +if (IS_GEN2 (dev_priv)) ret =i8xx_pipe_crc_ctl_reg (&source, &val); -else if (INTEL_INFO (dev)->gen <5 ) - ret =i9xx_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) - ret =vlv_pipe_crc_ctl_reg (dev, pipe, &source, &val); -else if (IS_GEN5 (dev) ||IS_GEN6 (dev)) +else if (INTEL_GEN (dev_priv) <5 ) + ret =i9xx_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) + ret =vlv_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val); +else if (IS_GEN5 (dev_priv) ||IS_GEN6 (dev_priv)) ret =ilk_pipe_crc_ctl_reg (&source, &val);else - ret =ivb_pipe_crc_ctl_reg (dev, pipe, &source, &val); + ret =ivb_pipe_crc_ctl_reg (dev_priv, pipe, &source, &val);if (ret !=0 ) goto out;
@@ -4231,12 +4172,12 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,kfree (entries); -if (IS_G4X (dev)) -g4x_undo_pipe_scramble_reset (dev, pipe); -else if (IS_VALLEYVIEW (dev) ||IS_CHERRYVIEW (dev)) -vlv_undo_pipe_scramble_reset (dev, pipe); -else if (IS_HASWELL (dev) && pipe ==PIPE_A ) -hsw_trans_edp_pipe_A_crc_wa (dev, false); +if (IS_G4X (dev_priv)) +g4x_undo_pipe_scramble_reset (dev_priv, pipe); +else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) +vlv_undo_pipe_scramble_reset (dev_priv, pipe); +else if (IS_HASWELL (dev_priv) && pipe ==PIPE_A ) +hsw_trans_edp_pipe_A_crc_wa (dev_priv, false);hsw_enable_ips (crtc); }
@@ -4340,7 +4281,8 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)return -EINVAL ; } -static int display_crc_ctl_parse (struct drm_device *dev,char *buf,size_t len) +static int display_crc_ctl_parse (struct drm_i915_private *dev_priv, +char *buf,size_t len) {#define N_WORDS 3int n_words;
@@ -4371,14 +4313,14 @@ static int display_crc_ctl_parse(struct drm_device *dev, char *buf, size_t len)return -EINVAL ; } -return pipe_crc_set_source (dev, pipe, source); +return pipe_crc_set_source (dev_priv, pipe, source); }static ssize_t display_crc_ctl_write (struct file *file,const char __user *ubuf,size_t len,loff_t *offp) {struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv = m->private;char *tmpbuf;int ret;
@@ -4401,7 +4343,7 @@ static ssize_t display_crc_ctl_write(struct file *file, const char __user *ubuf, } tmpbuf[len] ='\0' ; - ret =display_crc_ctl_parse (dev, tmpbuf, len); + ret =display_crc_ctl_parse (dev_priv, tmpbuf, len); out:kfree (tmpbuf);
@@ -4422,8 +4364,8 @@ static const struct file_operations i915_display_crc_ctl_fops = { };static ssize_t i915_displayport_test_active_write (struct file *file, -const char __user *ubuf, -size_t len,loff_t *offp) +const char __user *ubuf, +size_t len,loff_t *offp) {char *input_buffer;int status =0 ;
@@ -4453,7 +4395,6 @@ static ssize_t i915_displayport_test_active_write(struct file *file,DRM_DEBUG_DRIVER ("Copied %d bytes from user\n" , (unsigned int )len);list_for_each_entry (connector, connector_list, head) { -if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)continue ;
@@ -4491,7 +4432,6 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data)struct intel_dp *intel_dp;list_for_each_entry (connector, connector_list, head) { -if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)continue ;
@@ -4511,11 +4451,12 @@ static int i915_displayport_test_active_show(struct seq_file *m, void *data) }static int i915_displayport_test_active_open (struct inode *inode, -struct file *file) +struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv = inode->i_private; -return single_open (file, i915_displayport_test_active_show, dev); +return single_open (file, i915_displayport_test_active_show, + &dev_priv->drm); }static const struct file_operations i915_displayport_test_active_fops = {
@@ -4535,7 +4476,6 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)struct intel_dp *intel_dp;list_for_each_entry (connector, connector_list, head) { -if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)continue ;
@@ -4551,11 +4491,12 @@ static int i915_displayport_test_data_show(struct seq_file *m, void *data)return 0 ; }static int i915_displayport_test_data_open (struct inode *inode, -struct file *file) +struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv = inode->i_private; -return single_open (file, i915_displayport_test_data_show, dev); +return single_open (file, i915_displayport_test_data_show, + &dev_priv->drm); }static const struct file_operations i915_displayport_test_data_fops = {
@@ -4574,7 +4515,6 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)struct intel_dp *intel_dp;list_for_each_entry (connector, connector_list, head) { -if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)continue ;
@@ -4593,9 +4533,10 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)static int i915_displayport_test_type_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv = inode->i_private; -return single_open (file, i915_displayport_test_type_show, dev); +return single_open (file, i915_displayport_test_type_show, + &dev_priv->drm); }static const struct file_operations i915_displayport_test_type_fops = {
@@ -4608,13 +4549,14 @@ static const struct file_operations i915_displayport_test_type_fops = {static void wm_latency_show (struct seq_file *m,const uint16_t wm[8 ]) { -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv = m->private; +struct drm_device *dev = &dev_priv->drm;int level;int num_levels; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else num_levels =ilk_wm_max_level (dev) +1 ;
@@ -4628,8 +4570,8 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])* - WM1+ latency values in 0.5us units * - latencies are in us on gen9/vlv/chv */ -if (INTEL_INFO (dev)->gen >=9 ||IS_VALLEYVIEW (dev) || -IS_CHERRYVIEW (dev)) +if (INTEL_GEN (dev_priv) >=9 ||IS_VALLEYVIEW (dev_priv) || +IS_CHERRYVIEW (dev_priv)) latency *=10 ;else if (level >0 ) latency *=5 ;
@@ -4643,14 +4585,13 @@ static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])static int pri_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;wm_latency_show (m, latencies);
@@ -4659,14 +4600,13 @@ static int pri_wm_latency_show(struct seq_file *m, void *data)static int spr_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;wm_latency_show (m, latencies);
@@ -4675,14 +4615,13 @@ static int spr_wm_latency_show(struct seq_file *m, void *data)static int cur_wm_latency_show (struct seq_file *m,void *data) { -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;const uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;wm_latency_show (m, latencies);
@@ -4691,48 +4630,49 @@ static int cur_wm_latency_show(struct seq_file *m, void *data)static int pri_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv = inode->i_private; -if (INTEL_INFO (dev)->gen <5 ) +if (INTEL_GEN (dev_priv) <5 )return -ENODEV ; -return single_open (file, pri_wm_latency_show, dev); +return single_open (file, pri_wm_latency_show, dev_priv); }static int spr_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv = inode->i_private; -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, spr_wm_latency_show, dev); +return single_open (file, spr_wm_latency_show, dev_priv); }static int cur_wm_latency_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; +struct drm_i915_private *dev_priv = inode->i_private; -if (HAS_GMCH_DISPLAY (dev)) +if (HAS_GMCH_DISPLAY (dev_priv))return -ENODEV ; -return single_open (file, cur_wm_latency_show, dev); +return single_open (file, cur_wm_latency_show, dev_priv); }static ssize_t wm_latency_write (struct file *file,const char __user *ubuf,size_t len,loff_t *offp,uint16_t wm[8 ]) {struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; +struct drm_i915_private *dev_priv = m->private; +struct drm_device *dev = &dev_priv->drm;uint16_t new[8 ] = {0 };int num_levels;int level;int ret;char tmp[32 ]; -if (IS_CHERRYVIEW (dev)) +if (IS_CHERRYVIEW (dev_priv)) num_levels =3 ; -else if (IS_VALLEYVIEW (dev)) +else if (IS_VALLEYVIEW (dev_priv)) num_levels =1 ;else num_levels =ilk_wm_max_level (dev) +1 ;
@@ -4766,14 +4706,13 @@ static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.pri_latency; + latencies = dev_priv->wm.pri_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4782,14 +4721,13 @@ static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.spr_latency; + latencies = dev_priv->wm.spr_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4798,14 +4736,13 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, size_t len, loff_t *offp) { struct seq_file *m = file->private_data; -struct drm_device *dev = m->private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = m->private;uint16_t *latencies; -if (INTEL_INFO (dev)->gen >=9 ) +if (INTEL_GEN (dev_priv) >=9 ) latencies = dev_priv->wm.skl_latency;else - latencies =to_i915 (dev)->wm.cur_latency; + latencies = dev_priv->wm.cur_latency;return wm_latency_write (file, ubuf, len, offp, latencies); }
@@ -4840,8 +4777,7 @@ static const struct file_operations i915_cur_wm_latency_fops = {static int i915_wedged_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; *val =i915_terminally_wedged (&dev_priv->gpu_error);
@@ -4851,8 +4787,7 @@ i915_wedged_get(void *data, u64 *val)static int i915_wedged_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data;/* * There is no safeguard against this debugfs entry colliding
@@ -4882,8 +4817,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_wedged_fops,static int i915_ring_missed_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; *val = dev_priv->gpu_error.missed_irq_rings;return 0 ;
@@ -4892,8 +4826,8 @@ i915_ring_missed_irq_get(void *data, u64 *val)static int i915_ring_missed_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; +struct drm_device *dev = &dev_priv->drm;int ret;/* Lock against concurrent debugfs callers */
@@ -4913,8 +4847,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_ring_missed_irq_fops,static int i915_ring_test_irq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; *val = dev_priv->gpu_error.test_irq_rings;
@@ -4924,8 +4857,7 @@ i915_ring_test_irq_get(void *data, u64 *val)static int i915_ring_test_irq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; val &=INTEL_INFO (dev_priv)->ring_mask;DRM_DEBUG_DRIVER ("Masking interrupts on rings 0x%08llx\n" , val);
@@ -4957,8 +4889,8 @@ i915_drop_caches_get(void *data, u64 *val)static int i915_drop_caches_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; +struct drm_device *dev = &dev_priv->drm;int ret;DRM_DEBUG ("Dropping caches: 0x%08llx\n" , val);
@@ -4997,10 +4929,9 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_drop_caches_fops,static int i915_max_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);
@@ -5010,12 +4941,11 @@ i915_max_freq_get(void *data, u64 *val)static int i915_max_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data;u32 hw_max, hw_min;int ret; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val);
@@ -5053,8 +4983,7 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_max_freq_fops,static int i915_min_freq_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data;if (INTEL_GEN (dev_priv) <6 )return -ENODEV ;
@@ -5066,8 +4995,7 @@ i915_min_freq_get(void *data, u64 *val)static int i915_min_freq_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data;u32 hw_max, hw_min;int ret;
@@ -5088,7 +5016,8 @@ i915_min_freq_set(void *data, u64 val) hw_max = dev_priv->rps.max_freq; hw_min = dev_priv->rps.min_freq; -if (val < hw_min || val > hw_max || val > dev_priv->rps.max_freq_softlimit) { +if (val < hw_min || + val > hw_max || val > dev_priv->rps.max_freq_softlimit) {mutex_unlock (&dev_priv->rps.hw_lock);return -EINVAL ; }
@@ -5109,12 +5038,12 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops,static int i915_cache_sharing_get (void *data,u64 *val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data; +struct drm_device *dev = &dev_priv->drm;u32 snpcr;int ret; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ; ret =mutex_lock_interruptible (&dev->struct_mutex);
@@ -5125,7 +5054,7 @@ i915_cache_sharing_get(void *data, u64 *val) snpcr =I915_READ (GEN6_MBCUNIT_SNPCR );intel_runtime_pm_put (dev_priv); -mutex_unlock (&dev_priv->drm.struct_mutex); +mutex_unlock (&dev->struct_mutex); *val = (snpcr &GEN6_MBC_SNPCR_MASK ) >>GEN6_MBC_SNPCR_SHIFT ;
@@ -5135,11 +5064,10 @@ i915_cache_sharing_get(void *data, u64 *val)static int i915_cache_sharing_set (void *data,u64 val) { -struct drm_device *dev = data; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = data;u32 snpcr; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) +if (!(IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)))return -ENODEV ;if (val >3 )
@@ -5170,10 +5098,9 @@ struct sseu_dev_status {unsigned int eu_per_subslice; }; -static void cherryview_sseu_device_status (struct drm_device *dev, +static void cherryview_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int ss_max =2 ;int ss;u32 sig1[ss_max], sig2[ss_max];
@@ -5202,16 +5129,15 @@ static void cherryview_sseu_device_status(struct drm_device *dev, stat->subslice_total = stat->subslice_per_slice; } -static void gen9_sseu_device_status (struct drm_device *dev, +static void gen9_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev);int s_max =3 , ss_max =4 ;int s, ss;u32 s_reg[s_max], eu_reg[2 *s_max], eu_mask[2 ];/* BXT has a single slice and at most 3 subslices. */ -if (IS_BROXTON (dev)) { +if (IS_BROXTON (dev_priv)) { s_max =1 ; ss_max =3 ; }
@@ -5240,18 +5166,18 @@ static void gen9_sseu_device_status(struct drm_device *dev, stat->slice_total++; -if (IS_SKYLAKE (dev) ||IS_KABYLAKE (dev)) - ss_cnt =INTEL_INFO (dev)->subslice_per_slice; +if (IS_SKYLAKE (dev_priv) ||IS_KABYLAKE (dev_priv)) + ss_cnt =INTEL_INFO (dev_priv)->subslice_per_slice;for (ss =0 ; ss < ss_max; ss++) {unsigned int eu_cnt; -if (IS_BROXTON (dev) && +if (IS_BROXTON (dev_priv) && !(s_reg[s] & (GEN9_PGCTL_SS_ACK (ss))))/* skip disabled subslice */ continue ; -if (IS_BROXTON (dev)) +if (IS_BROXTON (dev_priv)) ss_cnt++; eu_cnt = 2 * hweight32(eu_reg[2*s + ss/2] &
@@ -5267,25 +5193,24 @@ static void gen9_sseu_device_status(struct drm_device *dev, } } -static void broadwell_sseu_device_status (struct drm_device *dev, +static void broadwell_sseu_device_status (struct drm_i915_private *dev_priv,struct sseu_dev_status *stat) { -struct drm_i915_private *dev_priv =to_i915 (dev); -int s;u32 slice_info =I915_READ (GEN8_GT_SLICE_INFO ); +int s; stat->slice_total =hweight32 (slice_info &GEN8_LSLICESTAT_MASK );if (stat->slice_total) { - stat->subslice_per_slice =INTEL_INFO (dev)->subslice_per_slice; + stat->subslice_per_slice =INTEL_INFO (dev_priv)->subslice_per_slice; stat->subslice_total = stat->slice_total * stat->subslice_per_slice; - stat->eu_per_subslice =INTEL_INFO (dev)->eu_per_subslice; + stat->eu_per_subslice =INTEL_INFO (dev_priv)->eu_per_subslice; stat->eu_total = stat->eu_per_subslice * stat->subslice_total;/* subtract fused off EU(s) from enabled slice(s) */ for (s =0 ; s < stat->slice_total; s++) { -u8 subslice_7eu =INTEL_INFO (dev)->subslice_7eu[s]; +u8 subslice_7eu =INTEL_INFO (dev_priv)->subslice_7eu[s]; stat->eu_total -=hweight8 (subslice_7eu); }
@@ -5294,47 +5219,45 @@ static void broadwell_sseu_device_status(struct drm_device *dev,static int i915_sseu_status (struct seq_file *m,void *unused) { -struct drm_info_node *node = (struct drm_info_node *) m->private; -struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); -struct drm_device *dev = &dev_priv->drm; +struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct sseu_dev_status stat; -if (INTEL_INFO (dev)->gen <8 ) +if (INTEL_GEN (dev_priv) <8 )return -ENODEV ;seq_puts (m,"SSEU Device Info\n" );seq_printf (m," Available Slice Total: %u\n" , -INTEL_INFO (dev)->slice_total); +INTEL_INFO (dev_priv)->slice_total);seq_printf (m," Available Subslice Total: %u\n" , -INTEL_INFO (dev)->subslice_total); +INTEL_INFO (dev_priv)->subslice_total);seq_printf (m," Available Subslice Per Slice: %u\n" , -INTEL_INFO (dev)->subslice_per_slice); +INTEL_INFO (dev_priv)->subslice_per_slice);seq_printf (m," Available EU Total: %u\n" , -INTEL_INFO (dev)->eu_total); +INTEL_INFO (dev_priv)->eu_total);seq_printf (m," Available EU Per Subslice: %u\n" , -INTEL_INFO (dev)->eu_per_subslice); -seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev))); -if (HAS_POOLED_EU (dev)) +INTEL_INFO (dev_priv)->eu_per_subslice); +seq_printf (m," Has Pooled EU: %s\n" ,yesno (HAS_POOLED_EU (dev_priv))); +if (HAS_POOLED_EU (dev_priv))seq_printf (m," Min EU in pool: %u\n" , -INTEL_INFO (dev)->min_eu_in_pool); +INTEL_INFO (dev_priv)->min_eu_in_pool);seq_printf (m," Has Slice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_slice_pg)); +yesno (INTEL_INFO (dev_priv)->has_slice_pg));seq_printf (m," Has Subslice Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_subslice_pg)); +yesno (INTEL_INFO (dev_priv)->has_subslice_pg));seq_printf (m," Has EU Power Gating: %s\n" , -yesno (INTEL_INFO (dev)->has_eu_pg)); +yesno (INTEL_INFO (dev_priv)->has_eu_pg));seq_puts (m,"SSEU Device Status\n" );memset (&stat,0 ,sizeof (stat));intel_runtime_pm_get (dev_priv); -if (IS_CHERRYVIEW (dev)) { -cherryview_sseu_device_status (dev, &stat); - }else if (IS_BROADWELL (dev)) { -broadwell_sseu_device_status (dev, &stat); - }else if (INTEL_INFO (dev)->gen >=9 ) { -gen9_sseu_device_status (dev, &stat); +if (IS_CHERRYVIEW (dev_priv)) { +cherryview_sseu_device_status (dev_priv, &stat); + }else if (IS_BROADWELL (dev_priv)) { +broadwell_sseu_device_status (dev_priv, &stat); + }else if (INTEL_GEN (dev_priv) >=9 ) { +gen9_sseu_device_status (dev_priv, &stat); }intel_runtime_pm_put (dev_priv);
@@ -5355,10 +5278,9 @@ static int i915_sseu_status(struct seq_file *m, void *unused)static int i915_forcewake_open (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = inode->i_private; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_runtime_pm_get (dev_priv);
@@ -5369,10 +5291,9 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)static int i915_forcewake_release (struct inode *inode,struct file *file) { -struct drm_device *dev = inode->i_private; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv = inode->i_private; -if (INTEL_INFO (dev)->gen <6 ) +if (INTEL_GEN (dev_priv) <6 )return 0 ;intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
@@ -5389,12 +5310,11 @@ static const struct file_operations i915_forcewake_fops = {static int i915_forcewake_create (struct dentry *root,struct drm_minor *minor) { -struct drm_device *dev = minor->dev;struct dentry *ent; ent =debugfs_create_file ("i915_forcewake_user" ,S_IRUSR , - root, dev, + root,to_i915 (minor->dev), &i915_forcewake_fops);if (!ent)return -ENOMEM ;
@@ -5407,12 +5327,11 @@ static int i915_debugfs_create(struct dentry *root,const char *name, const struct file_operations *fops) { - struct drm_device *dev = minor->dev; struct dentry *ent; ent =debugfs_create_file (name,S_IRUGO |S_IWUSR , - root, dev, + root,to_i915 (minor->dev), fops);if (!ent)return -ENOMEM ;
@@ -5424,9 +5343,9 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_capabilities", i915_capabilities, 0}, {"i915_gem_objects", i915_gem_object_info, 0}, {"i915_gem_gtt", i915_gem_gtt_info, 0}, - {"i915_gem_pinned", i915_gem_gtt_info, 0, (void *) PINNED_LIST}, - {"i915_gem_active", i915_gem_object_list_info, 0, (void *) ACTIVE_LIST}, - {"i915_gem_inactive", i915_gem_object_list_info, 0, (void *) INACTIVE_LIST}, + {"i915_gem_pinned", i915_gem_gtt_info, 0, (void *)PINNED_LIST}, + {"i915_gem_active", i915_gem_object_list_info, 0, (void *)ACTIVE_LIST}, + {"i915_gem_inactive", i915_gem_object_list_info, 0, (void *)INACTIVE_LIST}, {"i915_gem_stolen", i915_gem_stolen_list_info }, {"i915_gem_pageflip", i915_gem_pageflip_info, 0}, {"i915_gem_request", i915_gem_request_info, 0},
@@ -5501,9 +5420,8 @@ static const struct i915_debugfs_files { {"i915_dp_test_active", &i915_displayport_test_active_fops} }; -void intel_display_crc_init (struct drm_device *dev) +void intel_display_crc_init (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe;for_each_pipe (dev_priv, pipe) {
@@ -5551,7 +5469,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)drm_debugfs_remove_files (i915_debugfs_list,I915_DEBUGFS_ENTRIES , minor); -drm_debugfs_remove_files ((struct drm_info_list *) &i915_forcewake_fops, +drm_debugfs_remove_files ((struct drm_info_list *)&i915_forcewake_fops,1 , minor);for (i =0 ; i <ARRAY_SIZE (i915_pipe_crc_data); i++) {
@@ -5563,7 +5481,7 @@ void i915_debugfs_unregister(struct drm_i915_private *dev_priv)for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) {struct drm_info_list *info_list = - (struct drm_info_list *) i915_debugfs_files[i].fops; + (struct drm_info_list *)i915_debugfs_files[i].fops;drm_debugfs_remove_files (info_list,1 , minor); }
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -849,7 +849,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_audio_hooks (dev_priv);i915_gem_load_init (&dev_priv->drm); -intel_display_crc_init (&dev_priv->drm); +intel_display_crc_init (dev_priv);intel_device_info_dump (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -3486,7 +3486,7 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objecint i915_debugfs_register (struct drm_i915_private *dev_priv);void i915_debugfs_unregister (struct drm_i915_private *dev_priv);int i915_debugfs_connector_add (struct drm_connector *connector); -void intel_display_crc_init (struct drm_device *dev); +void intel_display_crc_init (struct drm_i915_private *dev_priv);#else static inline int i915_debugfs_register (struct drm_i915_private *dev_priv) {return 0 ;}static inline void i915_debugfs_unregister (struct drm_i915_private *dev_priv) {}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for Various cleanup (rev2)
In reply to David Weinehall== Series Details ==
== Series Details ==
Series: Various cleanup (rev2)
URL : https://patchwork.freedesktop.org/series/10458/
State : failure
== Summary ==
Series 10458v2 Various cleanup
http://patchwork.freedesktop.org/api/1.0/series/10458/revisions/2/mbox
Test drv_module_reload_basic:
pass -> SKIP (fi-skl-i5-6260u)
Test kms_cursor_legacy:
Subgroup basic-cursor-vs-flip-varying-size:
pass -> FAIL (ro-byt-n2820)fi-hsw-i7-4770k total:107 pass:91 dwarn:0 dfail:0 fail:0 skip:15 fi-kbl-qkkr total:107 pass:84 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-i5-6260u total:107 pass:97 dwarn:0 dfail:0 fail:0 skip:9 fi-skl-i7-6700k total:107 pass:84 dwarn:0 dfail:0 fail:0 skip:22 fi-snb-i7-2600 total:107 pass:77 dwarn:0 dfail:0 fail:0 skip:29 ro-bdw-i5-5250u total:107 pass:97 dwarn:0 dfail:0 fail:0 skip:9 ro-bdw-i7-5557U total:107 pass:97 dwarn:0 dfail:0 fail:0 skip:9 ro-bdw-i7-5600u total:107 pass:79 dwarn:0 dfail:0 fail:0 skip:27 ro-byt-n2820 total:240 pass:196 dwarn:0 dfail:0 fail:4 skip:40 ro-ilk1-i5-650 total:235 pass:173 dwarn:0 dfail:0 fail:2 skip:60 ro-ivb-i7-3770 total:107 pass:80 dwarn:0 dfail:0 fail:0 skip:26 ro-skl3-i5-6260u total:107 pass:98 dwarn:0 dfail:0 fail:0 skip:8
ro-bsw-n3050 failed to connect after reboot
ro-hsw-i3-4010u failed to connect after reboot
ro-hsw-i7-4770r failed to connect after reboot
ro-ivb2-i7-3770 failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1765/
8ca71ca drm-intel-nightly: 2016y-08m-08d-09h-02m-24s UTC integration manifest 7dc3805 drm/i915: debugfs spring cleaning
4a7d66a drm/i915: pdev cleanup
8c3ed85 drm/i915: sysfs spring cleaning
4d0cde8 drm/i915: Consistent struct device * naming
64b0d95 drm/i915: Cosmetic fixes in i915_drv.h
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx