All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH] drm/msm/dp: fix build after dp quirk helper change
@ 2021-01-20 11:07 ` Jani Nikula
  0 siblings, 0 replies; 22+ messages in thread
From: Jani Nikula @ 2021-01-20 11:07 UTC (permalink / raw)
  To: intel-gfx; +Cc: Stephen Rothwell, jani.nikula, Daniel Vetter, dri-devel

Commit 7c553f8b5a7d ("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: Stephen Rothwell <sfr@canb.auug.org.au>
References: http://lore.kernel.org/r/20210120105715.4391dd95@canb.auug.org.au
Fixes: 7c553f8b5a7d ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"")
Cc: Lyude Paul <lyude@redhat.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

Note: I admit to not even build testing this one. I'd need a config,
possibly also a toolchain setup for that.
---
 drivers/gpu/drm/msm/dp/dp_ctrl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c
index e3462f5d96d7..36b39c381b3f 100644
--- a/drivers/gpu/drm/msm/dp/dp_ctrl.c
+++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c
@@ -1420,16 +1420,14 @@ 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,
-				DP_DPCD_QUIRK_CONSTANT_N));
+		return (drm_dp_has_quirk(&ctrl->panel->desc,
+					 DP_DPCD_QUIRK_CONSTANT_N));
 
 	return false;
 }
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 22+ messages in thread
end of thread, other threads:[~2021-01-21 17:40 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-20 11:07 [Intel-gfx] [PATCH] drm/msm/dp: fix build after dp quirk helper change Jani Nikula
2021-01-20 11:07 ` Jani Nikula
2021-01-20 17:04 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-01-20 17:26 ` [Intel-gfx] [PATCH] " Lyude Paul
2021-01-20 17:26   ` Lyude Paul
2021-01-21 11:22   ` [Intel-gfx] " Jani Nikula
2021-01-21 11:22     ` Jani Nikula
2021-01-21 11:30     ` [Intel-gfx] " Fabio Estevam
2021-01-21 11:30       ` Fabio Estevam
2021-01-21 11:41       ` [Intel-gfx] " Jani Nikula
2021-01-21 11:41         ` Jani Nikula
2021-01-21 11:49         ` [Intel-gfx] " Fabio Estevam
2021-01-21 11:49           ` Fabio Estevam
2021-01-21 12:10           ` [Intel-gfx] " Jani Nikula
2021-01-21 12:10             ` Jani Nikula
2021-01-21 12:53             ` [Intel-gfx] " Fabio Estevam
2021-01-21 12:53               ` Fabio Estevam
2021-01-21 13:14               ` [Intel-gfx] " Jani Nikula
2021-01-21 13:14                 ` Jani Nikula
2021-01-20 17:34 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-01-20 20:33 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-01-21 17:40 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/msm/dp: fix build after dp quirk helper change (rev2) Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.