Commit a089301d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/msm/dp: fix build after dp quirk helper change 



Commit 7c553f8b ("drm/dp: Revert "drm/dp: Introduce EDID-based
quirks"") removed drm_dp_get_edid_quirks() and changed the signature of
drm_dp_has_quirk() while they were still being used in msm. Fix the
breakage. Functionally, removing the EDID-based quirks has no impact on
msm.

[The above commit was merged to drm-intel-next; make two wrongs a right
by merging this fix through drm-intel-next as well.]

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
References: http://lore.kernel.org/r/20210120105715.4391dd95@canb.auug.org.au


Fixes: 7c553f8b ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"")
Cc: Lyude Paul <lyude@redhat.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Tested-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210120110708.32131-1-jani.nikula@intel.com
parent aa850fb1

drivers/gpu/drm/msm/dp/dp_ctrl.c

+2 −4
Original line number Diff line number Diff line
@@ -1420,15 +1420,13 @@ void dp_ctrl_host_deinit(struct dp_ctrl *dp_ctrl) 
static bool dp_ctrl_use_fixed_nvid(struct dp_ctrl_private *ctrl)

{

	u8 *dpcd = ctrl->panel->dpcd;

	u32 edid_quirks = 0;



	edid_quirks = drm_dp_get_edid_quirks(ctrl->panel->edid);

	/*

	 * For better interop experience, used a fixed NVID=0x8000

	 * whenever connected to a VGA dongle downstream.

	 */

	if (drm_dp_is_branch(dpcd))

		return (drm_dp_has_quirk(&ctrl->panel->desc, edid_quirks,

		return (drm_dp_has_quirk(&ctrl->panel->desc,

					 DP_DPCD_QUIRK_CONSTANT_N));



	return false;