Commit ec2b1485 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Lucas De Marchi

drm/i915/dmc: s/HAS_CSR/HAS_DMC

No functional change.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210518213444.11420-3-anusha.srivatsa@intel.com
parent c24760cf
...@@ -315,9 +315,9 @@ void intel_csr_load_program(struct drm_i915_private *dev_priv) ...@@ -315,9 +315,9 @@ void intel_csr_load_program(struct drm_i915_private *dev_priv)
u32 *payload = dev_priv->dmc.dmc_payload; u32 *payload = dev_priv->dmc.dmc_payload;
u32 i, fw_size; u32 i, fw_size;
if (!HAS_CSR(dev_priv)) { if (!HAS_DMC(dev_priv)) {
drm_err(&dev_priv->drm, drm_err(&dev_priv->drm,
"No CSR support available for this platform\n"); "No DMC support available for this platform\n");
return; return;
} }
...@@ -686,7 +686,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv) ...@@ -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); INIT_WORK(&dev_priv->dmc.work, csr_load_work_fn);
if (!HAS_CSR(dev_priv)) if (!HAS_DMC(dev_priv))
return; return;
/* /*
...@@ -776,7 +776,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv) ...@@ -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) void intel_csr_ucode_suspend(struct drm_i915_private *dev_priv)
{ {
if (!HAS_CSR(dev_priv)) if (!HAS_DMC(dev_priv))
return; return;
flush_work(&dev_priv->dmc.work); flush_work(&dev_priv->dmc.work);
...@@ -795,7 +795,7 @@ void intel_csr_ucode_suspend(struct drm_i915_private *dev_priv) ...@@ -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) void intel_csr_ucode_resume(struct drm_i915_private *dev_priv)
{ {
if (!HAS_CSR(dev_priv)) if (!HAS_DMC(dev_priv))
return; return;
/* /*
...@@ -815,7 +815,7 @@ void intel_csr_ucode_resume(struct drm_i915_private *dev_priv) ...@@ -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) void intel_csr_ucode_fini(struct drm_i915_private *dev_priv)
{ {
if (!HAS_CSR(dev_priv)) if (!HAS_DMC(dev_priv))
return; return;
intel_csr_ucode_suspend(dev_priv); intel_csr_ucode_suspend(dev_priv);
......
...@@ -535,7 +535,7 @@ static int i915_dmc_info(struct seq_file *m, void *unused) ...@@ -535,7 +535,7 @@ static int i915_dmc_info(struct seq_file *m, void *unused)
struct intel_dmc *dmc; struct intel_dmc *dmc;
i915_reg_t dc5_reg, dc6_reg = {}; i915_reg_t dc5_reg, dc6_reg = {};
if (!HAS_CSR(dev_priv)) if (!HAS_DMC(dev_priv))
return -ENODEV; return -ENODEV;
dmc = &dev_priv->dmc; dmc = &dev_priv->dmc;
......
...@@ -1655,7 +1655,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, ...@@ -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_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) #define HAS_MSO(i915) (INTEL_GEN(i915) >= 12)
......
...@@ -788,7 +788,7 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m, ...@@ -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); 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; struct intel_dmc *dmc = &m->i915->dmc;
err_printf(m, "DMC loaded: %s\n", err_printf(m, "DMC loaded: %s\n",
......
...@@ -643,7 +643,7 @@ static const struct intel_device_info chv_info = { ...@@ -643,7 +643,7 @@ static const struct intel_device_info chv_info = {
GEN8_FEATURES, \ GEN8_FEATURES, \
GEN(9), \ GEN(9), \
GEN9_DEFAULT_PAGE_SIZES, \ GEN9_DEFAULT_PAGE_SIZES, \
.display.has_csr = 1, \ .display.has_dmc = 1, \
.has_gt_uc = 1, \ .has_gt_uc = 1, \
.display.has_hdcp = 1, \ .display.has_hdcp = 1, \
.display.has_ipc = 1, \ .display.has_ipc = 1, \
...@@ -698,7 +698,7 @@ static const struct intel_device_info skl_gt4_info = { ...@@ -698,7 +698,7 @@ static const struct intel_device_info skl_gt4_info = {
.display.has_psr = 1, \ .display.has_psr = 1, \
.display.has_psr_hw_tracking = 1, \ .display.has_psr_hw_tracking = 1, \
.has_runtime_pm = 1, \ .has_runtime_pm = 1, \
.display.has_csr = 1, \ .display.has_dmc = 1, \
.has_rc6 = 1, \ .has_rc6 = 1, \
.has_rps = true, \ .has_rps = true, \
.display.has_dp_mst = 1, \ .display.has_dp_mst = 1, \
......
...@@ -353,7 +353,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) ...@@ -353,7 +353,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
info->display.has_fbc = 0; info->display.has_fbc = 0;
if (INTEL_GEN(dev_priv) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE)) 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 && if (INTEL_GEN(dev_priv) >= 10 &&
(dfsm & CNL_DFSM_DISPLAY_DSC_DISABLE)) (dfsm & CNL_DFSM_DISPLAY_DSC_DISABLE))
......
...@@ -141,7 +141,7 @@ enum intel_ppgtt_type { ...@@ -141,7 +141,7 @@ enum intel_ppgtt_type {
#define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \ #define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \
/* Keep in alphabetical order */ \ /* Keep in alphabetical order */ \
func(cursor_needs_physical); \ func(cursor_needs_physical); \
func(has_csr); \ func(has_dmc); \
func(has_ddi); \ func(has_ddi); \
func(has_dp_mst); \ func(has_dp_mst); \
func(has_dsb); \ func(has_dsb); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment