Commit cb9a3509 authored Oct 26, 2022 by Ville Syrjälä Committed by Lipeng Sang May 24, 2023

drm/i915/sdvo: Filter out invalid outputs more sensibly

stable inclusion
from stable-v5.10.154
commit b86830cc95af9bc0ba27041f163ce61a03bcded2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64YCB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b86830cc95af9bc0ba27041f163ce61a03bcded2



--------------------------------

commit 3e206b6a upstream.

We try to filter out the corresponding xxx1 output
if the xxx0 output is not present. But the way that is
being done is pretty awkward. Make it less so.

Cc: stable@vger.kernel.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026101134.20865-2-ville.syrjala@linux.intel.com


Reviewed-by: Jani Nikula <jani.nikula@intel.com>
(cherry picked from commit cc1e6639)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Lipeng Sang <sanglipeng1@jd.com>

parent 8413cba3

drivers/gpu/drm/i915/display/intel_sdvo.c

+22 −5

Original line number	Diff line number	Diff line
		@@ -2937,16 +2937,33 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
		return false;
		}

		static u16 intel_sdvo_filter_output_flags(u16 flags)
		{
		flags &= SDVO_OUTPUT_MASK;

		/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
		if (!(flags & SDVO_OUTPUT_TMDS0))
		flags &= ~SDVO_OUTPUT_TMDS1;

		if (!(flags & SDVO_OUTPUT_RGB0))
		flags &= ~SDVO_OUTPUT_RGB1;

		if (!(flags & SDVO_OUTPUT_LVDS0))
		flags &= ~SDVO_OUTPUT_LVDS1;

		return flags;
		}

		static bool
		intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
		{
		/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
		flags = intel_sdvo_filter_output_flags(flags);

		if (flags & SDVO_OUTPUT_TMDS0)
		if (!intel_sdvo_dvi_init(intel_sdvo, 0))
		return false;

		if ((flags & SDVO_TMDS_MASK) == SDVO_TMDS_MASK)
		if (flags & SDVO_OUTPUT_TMDS1)
		if (!intel_sdvo_dvi_init(intel_sdvo, 1))
		return false;

		@@ -2967,7 +2984,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
		if (!intel_sdvo_analog_init(intel_sdvo, 0))
		return false;

		if ((flags & SDVO_RGB_MASK) == SDVO_RGB_MASK)
		if (flags & SDVO_OUTPUT_RGB1)
		if (!intel_sdvo_analog_init(intel_sdvo, 1))
		return false;

		@@ -2975,11 +2992,11 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
		if (!intel_sdvo_lvds_init(intel_sdvo, 0))
		return false;

		if ((flags & SDVO_LVDS_MASK) == SDVO_LVDS_MASK)
		if (flags & SDVO_OUTPUT_LVDS1)
		if (!intel_sdvo_lvds_init(intel_sdvo, 1))
		return false;

		if ((flags & SDVO_OUTPUT_MASK) == 0) {
		if (flags == 0) {
		unsigned char bytes[2];

		intel_sdvo->controlled_output = 0;