drm/i915: Don't relay on I915_MAX_PIPES

Let's remove the dependency on I915_MAX_PIPES. Instead, get the number
of pipes from platform information.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1507630626-23806-2-git-send-email-mika.kahola@intel.com

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 27743be5b768e13c4be9749537b1af76dfb3f478..0ddba16fde1bf81346f9e1920d67688add0b6502 100644 (file)
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -754,7 +754,7 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,
 {
        struct intel_encoder *encoder;
 
-       if (WARN_ON(pipe >= I915_MAX_PIPES))
+       if (WARN_ON(pipe >= INTEL_INFO(dev_priv)->num_pipes))
                return NULL;
 
        /* MST */

diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index 96043a51c1bf566ec90398a783bcc080b0d55483..24d781f97761df6dd5a0736d747fc9a502c91f54 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -775,11 +775,12 @@ display_crc_ctl_parse_object(const char *buf, enum intel_pipe_crc_object *o)
        return -EINVAL;
 }
 
-static int display_crc_ctl_parse_pipe(const char *buf, enum pipe *pipe)
+static int display_crc_ctl_parse_pipe(struct drm_i915_private *dev_priv,
+                                     const char *buf, enum pipe *pipe)
 {
        const char name = buf[0];
 
-       if (name < 'A' || name >= pipe_name(I915_MAX_PIPES))
+       if (name < 'A' || name >= pipe_name(INTEL_INFO(dev_priv)->num_pipes))
                return -EINVAL;
 
        *pipe = name - 'A';
@@ -828,7 +829,7 @@ static int display_crc_ctl_parse(struct drm_i915_private *dev_priv,
                return -EINVAL;
        }
 
-       if (display_crc_ctl_parse_pipe(words[1], &pipe) < 0) {
+       if (display_crc_ctl_parse_pipe(dev_priv, words[1], &pipe) < 0) {
                DRM_DEBUG_DRIVER("unknown pipe %s\n", words[1]);
                return -EINVAL;
        }