Re: [Intel-gfx] [PATCH 07/19] drm/i915: Make INTEL_DEVID only take dev_priv

[David Weinehall]

On Tue, Oct 11, 2016 at 02:21:40PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin 
> 
> Saves 4472 bytes of .rodata strings.
> 
> v2: Add parantheses around dev_priv. (Ville Syrjala)

Reviewed-by: David Weinehall 

> 
> Signed-off-by: Tvrtko Ursulin 
> ---
>  drivers/gpu/drm/i915/i915_drv.c|  14 +++--
>  drivers/gpu/drm/i915/i915_drv.h| 111 
> +
>  drivers/gpu/drm/i915/i915_gem.c|  36 +--
>  drivers/gpu/drm/i915/i915_gem_stolen.c |   6 +-
>  drivers/gpu/drm/i915/i915_gem_tiling.c |   3 +-
>  drivers/gpu/drm/i915/i915_irq.c|   2 +-
>  drivers/gpu/drm/i915/intel_crt.c   |   4 +-
>  drivers/gpu/drm/i915/intel_display.c   |  58 +
>  drivers/gpu/drm/i915/intel_dp.c|   2 +-
>  drivers/gpu/drm/i915/intel_hdmi.c  |   2 +-
>  drivers/gpu/drm/i915/intel_i2c.c   |   5 +-
>  drivers/gpu/drm/i915/intel_lvds.c  |   9 ++-
>  drivers/gpu/drm/i915/intel_pm.c|  26 
>  drivers/gpu/drm/i915/intel_sdvo.c  |  11 ++--
>  drivers/gpu/drm/i915/intel_tv.c|   4 +-
>  15 files changed, 151 insertions(+), 142 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index fbb4e2e0d124..bfdbbb745939 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -188,12 +188,14 @@ static void intel_detect_pch(struct drm_device *dev)
>   dev_priv->pch_type = PCH_LPT;
>   DRM_DEBUG_KMS("Found LynxPoint PCH\n");
>   WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
> - WARN_ON(IS_HSW_ULT(dev) || IS_BDW_ULT(dev));
> + WARN_ON(IS_HSW_ULT(dev_priv) ||
> + IS_BDW_ULT(dev_priv));
>   } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
>   dev_priv->pch_type = PCH_LPT;
>   DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
>   WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
> - WARN_ON(!IS_HSW_ULT(dev) && !IS_BDW_ULT(dev));
> + WARN_ON(!IS_HSW_ULT(dev_priv) &&
> + !IS_BDW_ULT(dev_priv));
>   } else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
>   dev_priv->pch_type = PCH_SPT;
>   DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
> @@ -422,7 +424,7 @@ intel_setup_mchbar(struct drm_device *dev)
>  
>   dev_priv->mchbar_need_disable = false;
>  
> - if (IS_I915G(dev) || IS_I915GM(dev)) {
> + if (IS_I915G(dev_priv) || IS_I915GM(dev_priv)) {
>   pci_read_config_dword(dev_priv->bridge_dev, DEVEN, );
>   enabled = !!(temp & DEVEN_MCHBAR_EN);
>   } else {
> @@ -440,7 +442,7 @@ intel_setup_mchbar(struct drm_device *dev)
>   dev_priv->mchbar_need_disable = true;
>  
>   /* Space is allocated or reserved, so enable it. */
> - if (IS_I915G(dev) || IS_I915GM(dev)) {
> + if (IS_I915G(dev_priv) || IS_I915GM(dev_priv)) {
>   pci_write_config_dword(dev_priv->bridge_dev, DEVEN,
>  temp | DEVEN_MCHBAR_EN);
>   } else {
> @@ -456,7 +458,7 @@ intel_teardown_mchbar(struct drm_device *dev)
>   int mchbar_reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915;
>  
>   if (dev_priv->mchbar_need_disable) {
> - if (IS_I915G(dev) || IS_I915GM(dev)) {
> + if (IS_I915G(dev_priv) || IS_I915GM(dev_priv)) {
>   u32 deven_val;
>  
>   pci_read_config_dword(dev_priv->bridge_dev, DEVEN,
> @@ -1077,7 +1079,7 @@ static int i915_driver_init_hw(struct drm_i915_private 
> *dev_priv)
>* be lost or delayed, but we use them anyways to avoid
>* stuck interrupts on some machines.
>*/
> - if (!IS_I945G(dev) && !IS_I945GM(dev)) {
> + if (!IS_I945G(dev_priv) && !IS_I945GM(dev_priv)) {
>   if (pci_enable_msi(pdev) < 0)
>   DRM_DEBUG_DRIVER("can't enable MSI");
>   }
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 58045cd7a087..7a40dfa830e7 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2605,7 +2605,8 @@ struct drm_i915_cmd_table {
>  })
>  #define INTEL_INFO(p)(&__I915__(p)->info)
>  #define INTEL_GEN(p) (INTEL_INFO(p)->gen)
> -#define INTEL_DEVID(p)   (INTEL_INFO(p)->device_id)
> +
> +#define INTEL_DEVID(dev_priv)((dev_priv)->info.device_id)
>  
>  #define REVID_FOREVER0xff
>  #define INTEL_REVID(p)   (__I915__(p)->drm.pdev->revision)
> @@ -2637,27 +2638,27 @@ struct drm_i915_cmd_table {
>  #define 

[Intel-gfx] [PATCH 07/19] drm/i915: Make INTEL_DEVID only take dev_priv

[Tvrtko Ursulin]

From: Tvrtko Ursulin 

Saves 4472 bytes of .rodata strings.

v2: Add parantheses around dev_priv. (Ville Syrjala)

Signed-off-by: Tvrtko Ursulin 
---
 drivers/gpu/drm/i915/i915_drv.c|  14 +++--
 drivers/gpu/drm/i915/i915_drv.h| 111 +
 drivers/gpu/drm/i915/i915_gem.c|  36 +--
 drivers/gpu/drm/i915/i915_gem_stolen.c |   6 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c |   3 +-
 drivers/gpu/drm/i915/i915_irq.c|   2 +-
 drivers/gpu/drm/i915/intel_crt.c   |   4 +-
 drivers/gpu/drm/i915/intel_display.c   |  58 +
 drivers/gpu/drm/i915/intel_dp.c|   2 +-
 drivers/gpu/drm/i915/intel_hdmi.c  |   2 +-
 drivers/gpu/drm/i915/intel_i2c.c   |   5 +-
 drivers/gpu/drm/i915/intel_lvds.c  |   9 ++-
 drivers/gpu/drm/i915/intel_pm.c|  26 
 drivers/gpu/drm/i915/intel_sdvo.c  |  11 ++--
 drivers/gpu/drm/i915/intel_tv.c|   4 +-
 15 files changed, 151 insertions(+), 142 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index fbb4e2e0d124..bfdbbb745939 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -188,12 +188,14 @@ static void intel_detect_pch(struct drm_device *dev)
dev_priv->pch_type = PCH_LPT;
DRM_DEBUG_KMS("Found LynxPoint PCH\n");
WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
-   WARN_ON(IS_HSW_ULT(dev) || IS_BDW_ULT(dev));
+   WARN_ON(IS_HSW_ULT(dev_priv) ||
+   IS_BDW_ULT(dev_priv));
} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
dev_priv->pch_type = PCH_LPT;
DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev));
-   WARN_ON(!IS_HSW_ULT(dev) && !IS_BDW_ULT(dev));
+   WARN_ON(!IS_HSW_ULT(dev_priv) &&
+   !IS_BDW_ULT(dev_priv));
} else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
dev_priv->pch_type = PCH_SPT;
DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
@@ -422,7 +424,7 @@ intel_setup_mchbar(struct drm_device *dev)
 
dev_priv->mchbar_need_disable = false;
 
-   if (IS_I915G(dev) || IS_I915GM(dev)) {
+   if (IS_I915G(dev_priv) || IS_I915GM(dev_priv)) {
pci_read_config_dword(dev_priv->bridge_dev, DEVEN, );
enabled = !!(temp & DEVEN_MCHBAR_EN);
} else {
@@ -440,7 +442,7 @@ intel_setup_mchbar(struct drm_device *dev)
dev_priv->mchbar_need_disable = true;
 
/* Space is allocated or reserved, so enable it. */
-   if (IS_I915G(dev) || IS_I915GM(dev)) {
+   if (IS_I915G(dev_priv) || IS_I915GM(dev_priv)) {
pci_write_config_dword(dev_priv->bridge_dev, DEVEN,
   temp | DEVEN_MCHBAR_EN);
} else {
@@ -456,7 +458,7 @@ intel_teardown_mchbar(struct drm_device *dev)
int mchbar_reg = INTEL_INFO(dev)->gen >= 4 ? MCHBAR_I965 : MCHBAR_I915;
 
if (dev_priv->mchbar_need_disable) {
-   if (IS_I915G(dev) || IS_I915GM(dev)) {
+   if (IS_I915G(dev_priv) || IS_I915GM(dev_priv)) {
u32 deven_val;
 
pci_read_config_dword(dev_priv->bridge_dev, DEVEN,
@@ -1077,7 +1079,7 @@ static int i915_driver_init_hw(struct drm_i915_private 
*dev_priv)
 * be lost or delayed, but we use them anyways to avoid
 * stuck interrupts on some machines.
 */
-   if (!IS_I945G(dev) && !IS_I945GM(dev)) {
+   if (!IS_I945G(dev_priv) && !IS_I945GM(dev_priv)) {
if (pci_enable_msi(pdev) < 0)
DRM_DEBUG_DRIVER("can't enable MSI");
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 58045cd7a087..7a40dfa830e7 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2605,7 +2605,8 @@ struct drm_i915_cmd_table {
 })
 #define INTEL_INFO(p)  (&__I915__(p)->info)
 #define INTEL_GEN(p)   (INTEL_INFO(p)->gen)
-#define INTEL_DEVID(p) (INTEL_INFO(p)->device_id)
+
+#define INTEL_DEVID(dev_priv)  ((dev_priv)->info.device_id)
 
 #define REVID_FOREVER  0xff
 #define INTEL_REVID(p) (__I915__(p)->drm.pdev->revision)
@@ -2637,27 +2638,27 @@ struct drm_i915_cmd_table {
 #define IS_REVID(p, since, until) \
(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))
 
-#define IS_I830(dev)   (INTEL_DEVID(dev) == 0x3577)
-#define IS_845G(dev)   (INTEL_DEVID(dev) == 0x2562)
+#define IS_I830(dev_priv)  (INTEL_DEVID(dev_priv) ==