On Wed, 20 Jan 2021, Lyude Paul <lyude@xxxxxxxxxx> wrote:
> Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx>
Thanks for the review.
Sean, Rob, or anyone with an arm toolchain for msm available, could I
trouble you to build test this please?
BR,
Jani.
>
> 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@xxxxxxxxxxxxxxxx>
>> References:
>> http://lore.kernel.org/r/20210120105715.4391dd95@xxxxxxxxxxxxxxxx
>> Fixes: 7c553f8b5a7d ("drm/dp: Revert "drm/dp: Introduce EDID-based quirks"")
>> Cc: Lyude Paul <lyude@xxxxxxxxxx>
>> Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
>> Cc: Rob Clark <robdclark@xxxxxxxxx>
>> Cc: Sean Paul <sean@xxxxxxxxxx>
>> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>>
>> ---
>>
>> 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;
>> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
