drm/i915: Check for fused or unused pipes

Web:        https://git.kernel.org/torvalds/c/9965db26ac0548648309f506dc155a92daa2158f
Commit:     9965db26ac0548648309f506dc155a92daa2158f
Parent:     124804c4c4b2e84e956cedd17878562e230a907f
Refname:    refs/heads/master
Author:     Mika Kahola <[email protected]>
AuthorDate: Mon Dec 18 10:04:03 2017 +0200
Committer:  Rodrigo Vivi <[email protected]>
CommitDate: Thu Feb 1 07:32:49 2018 -0800

    drm/i915: Check for fused or unused pipes
    
    We may have fused or unused pipes in our system. Let's check that the pipe
    in question is within limits of accessible pipes. In case, that we are not
    able to access the pipe, we return early with a warning.
    
    v2: Rephrasing of the commit message (Jani)
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103206
    Reported-by: Thomas Gleixner <[email protected]>
    Tested-by: Jaswinder Singh Rajput <[email protected]>
    Suggested-by: Jani Nikula <[email protected]>
    Reviewed-by: Jani Nikula <[email protected]>
    Signed-off-by: Mika Kahola <[email protected]>
    Signed-off-by: Jani Nikula <[email protected]>
    Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
    (cherry picked from commit 0b7029b7e43fda1304c181a3ade0b429b9edcd9d)
    Signed-off-by: Rodrigo Vivi <[email protected]>
    Cc: <[email protected]> # v4.10+
---
 drivers/gpu/drm/i915/intel_audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index f1502a0188eb..522d54fecb53 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -779,7 +779,7 @@ static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,
 {
 	struct intel_encoder *encoder;
 
-	if (WARN_ON(pipe >= INTEL_INFO(dev_priv)->num_pipes))
+	if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
 		return NULL;
 
 	/* MST */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html