drm/i915/dmc: s/HAS_CSR/HAS_DMC

No functional change.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210518213444.11420-3-anusha.srivatsa@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_csr.c b/drivers/gpu/drm/i915/display/intel_csr.c
index a22339ebdffd5e04ee957ec7f2b913a2f1f6be67..5ed286dc672016c50ab4e9909afbbd0a37e0d334 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_csr.c
+++ b/drivers/gpu/drm/i915/display/intel_csr.c
@@ -315,9 +315,9 @@ void intel_csr_load_program(struct drm_i915_private *dev_priv)
        u32 *payload = dev_priv->dmc.dmc_payload;
        u32 i, fw_size;
 
-       if (!HAS_CSR(dev_priv)) {
+       if (!HAS_DMC(dev_priv)) {
                drm_err(&dev_priv->drm,
-                       "No CSR support available for this platform\n");
+                       "No DMC support available for this platform\n");
                return;
        }
 
@@ -686,7 +686,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 
        INIT_WORK(&dev_priv->dmc.work, csr_load_work_fn);
 
-       if (!HAS_CSR(dev_priv))
+       if (!HAS_DMC(dev_priv))
                return;
 
        /*
@@ -776,7 +776,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
  */
 void intel_csr_ucode_suspend(struct drm_i915_private *dev_priv)
 {
-       if (!HAS_CSR(dev_priv))
+       if (!HAS_DMC(dev_priv))
                return;
 
        flush_work(&dev_priv->dmc.work);
@@ -795,7 +795,7 @@ void intel_csr_ucode_suspend(struct drm_i915_private *dev_priv)
  */
 void intel_csr_ucode_resume(struct drm_i915_private *dev_priv)
 {
-       if (!HAS_CSR(dev_priv))
+       if (!HAS_DMC(dev_priv))
                return;
 
        /*
@@ -815,7 +815,7 @@ void intel_csr_ucode_resume(struct drm_i915_private *dev_priv)
  */
 void intel_csr_ucode_fini(struct drm_i915_private *dev_priv)
 {
-       if (!HAS_CSR(dev_priv))
+       if (!HAS_DMC(dev_priv))
                return;
 
        intel_csr_ucode_suspend(dev_priv);

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index a875f3c9b3587bfb5777dddfba5e893a2bfcea1e..6cd7f8c1724f71013901e2f26f8b8f3199eb6585 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -535,7 +535,7 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
        struct intel_dmc *dmc;
        i915_reg_t dc5_reg, dc6_reg = {};
 
-       if (!HAS_CSR(dev_priv))
+       if (!HAS_DMC(dev_priv))
                return -ENODEV;
 
        dmc = &dev_priv->dmc;

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2643273705e9dbe0a62c2621f10b22f4695c915e..836581ab4e31b62f344580f4975bfc2b137ef781 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1655,7 +1655,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 
 #define HAS_RPS(dev_priv)      (INTEL_INFO(dev_priv)->has_rps)
 
-#define HAS_CSR(dev_priv)      (INTEL_INFO(dev_priv)->display.has_csr)
+#define HAS_DMC(dev_priv)      (INTEL_INFO(dev_priv)->display.has_dmc)
 
 #define HAS_MSO(i915)          (INTEL_GEN(i915) >= 12)
 

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 03d1221de13bfc523e3abe6ef5b13227a5b74e0e..06828ff90ccfb9a32edd6e209022471c8073cddc 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -788,7 +788,7 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m,
 
        err_printf(m, "IOMMU enabled?: %d\n", error->iommu);
 
-       if (HAS_CSR(m->i915)) {
+       if (HAS_DMC(m->i915)) {
                struct intel_dmc *dmc = &m->i915->dmc;
 
                err_printf(m, "DMC loaded: %s\n",

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 1680062a2149ebfe4a0c0abdd234c9ffeefd5059..600cadd3a1c9a6d11d4495e46e8a446f2ef58ff9 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -643,7 +643,7 @@ static const struct intel_device_info chv_info = {
        GEN8_FEATURES, \
        GEN(9), \
        GEN9_DEFAULT_PAGE_SIZES, \
-       .display.has_csr = 1, \
+       .display.has_dmc = 1, \
        .has_gt_uc = 1, \
        .display.has_hdcp = 1, \
        .display.has_ipc = 1, \
@@ -698,7 +698,7 @@ static const struct intel_device_info skl_gt4_info = {
        .display.has_psr = 1, \
        .display.has_psr_hw_tracking = 1, \
        .has_runtime_pm = 1, \
-       .display.has_csr = 1, \
+       .display.has_dmc = 1, \
        .has_rc6 = 1, \
        .has_rps = true, \
        .display.has_dp_mst = 1, \

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 8cb58a238c68ce73ef7530f7e1b3781503607cd9..e16599b67b83a855f6a40ece0222d21c189c1c8e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -353,7 +353,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
                        info->display.has_fbc = 0;
 
                if (INTEL_GEN(dev_priv) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE))
-                       info->display.has_csr = 0;
+                       info->display.has_dmc = 0;
 
                if (INTEL_GEN(dev_priv) >= 10 &&
                    (dfsm & CNL_DFSM_DISPLAY_DSC_DISABLE))

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index e98b369597367bc2fcab2c8ffe8e2e0b6294d098..1390fad5ec066c724b58ce9b2e1d7eacc0a7e363 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -141,7 +141,7 @@ enum intel_ppgtt_type {
 #define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \
        /* Keep in alphabetical order */ \
        func(cursor_needs_physical); \
-       func(has_csr); \
+       func(has_dmc); \
        func(has_ddi); \
        func(has_dp_mst); \
        func(has_dsb); \