Commit 6772ffe0 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make HAS_RUNTIME_PM only take dev_priv 



Saves 960 bytes of .rodata strings.

v2: Add parantheses around dev_priv. (Ville Syrjala)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 49cff963

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ static int intel_runtime_suspend(struct device *kdev) 
	if (WARN_ON_ONCE(!(dev_priv->rps.enabled && intel_enable_rc6())))

		return -ENODEV;



	if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev)))

	if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev_priv)))

		return -ENODEV;



	DRM_DEBUG_KMS("Suspending device\n");
@@ -2389,7 +2389,7 @@ static int intel_runtime_resume(struct device *kdev) 
	struct drm_i915_private *dev_priv = to_i915(dev);

	int ret = 0;



	if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev)))

	if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev_priv)))

		return -ENODEV;



	DRM_DEBUG_KMS("Resuming device\n");

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2814,12 +2814,12 @@ struct drm_i915_cmd_table { 
#define HAS_DDI(dev_priv)	((dev_priv)->info.has_ddi)

#define HAS_FPGA_DBG_UNCLAIMED(dev)	(INTEL_INFO(dev)->has_fpga_dbg)

#define HAS_PSR(dev)		(INTEL_INFO(dev)->has_psr)

#define HAS_RUNTIME_PM(dev)	(INTEL_INFO(dev)->has_runtime_pm)

#define HAS_RC6(dev)		(INTEL_INFO(dev)->has_rc6)

#define HAS_RC6p(dev)		(INTEL_INFO(dev)->has_rc6p)



#define HAS_CSR(dev)	(INTEL_INFO(dev)->has_csr)



#define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)

/*

 * For now, anything with a GuC requires uCode loading, and then supports

 * command submission once loaded. But these are logically independent

drivers/gpu/drm/i915/intel_runtime_pm.c

+1 −2
Original line number Diff line number Diff line
@@ -2758,7 +2758,6 @@ 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 = &pdev->dev;



	pm_runtime_set_autosuspend_delay(kdev, 10000); /* 10s */
@@ -2770,7 +2769,7 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv) 
	 * so the driver's own RPM reference tracking asserts also work on

	 * platforms without RPM support.

	 */

	if (!HAS_RUNTIME_PM(dev)) {

	if (!HAS_RUNTIME_PM(dev_priv)) {

		pm_runtime_dont_use_autosuspend(kdev);

		pm_runtime_get_sync(kdev);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE