From: Lyude Paul <lyude@redhat.com>
To: Jani Nikula <jani.nikula@intel.com>, intel-gfx@lists.freedesktop.org
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Sean Paul <sean@poorly.run>,
dri-devel@lists.freedesktop.org,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH] drm/msm/dp: fix build after dp quirk helper change
Date: Wed, 20 Jan 2021 12:26:52 -0500 [thread overview]
Message-ID: <92f48ffdfa30c3941e0fd22337217f0b10d75ec8.camel@redhat.com> (raw)
In-Reply-To: <20210120110708.32131-1-jani.nikula@intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
On Wed, 2021-01-20 at 13:07 +0200, Jani Nikula wrote:
> 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;
> }
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-20 17:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 11:07 [PATCH] drm/msm/dp: fix build after dp quirk helper change Jani Nikula
2021-01-20 17:26 ` Lyude Paul [this message]
2021-01-21 11:22 ` Jani Nikula
2021-01-21 11:30 ` Fabio Estevam
2021-01-21 11:41 ` Jani Nikula
2021-01-21 11:49 ` Fabio Estevam
2021-01-21 12:10 ` Jani Nikula
2021-01-21 12:53 ` Fabio Estevam
2021-01-21 13:14 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=92f48ffdfa30c3941e0fd22337217f0b10d75ec8.camel@redhat.com \
--to=lyude@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=sean@poorly.run \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).