[Intel-gfx] [PATCH] drm/msm/dp: fix build after dp quirk helper change

[Fabio Estevam]

Hi Jani,

On Thu, Jan 21, 2021 at 8:22 AM Jani Nikula <jani.nikula at intel.com> wrote:

> Sean, Rob, or anyone with an arm toolchain for msm available, could I
> trouble you to build test this please?

I tried to build after applying your patch:

  CC      drivers/gpu/drm/msm/dp/dp_ctrl.o
drivers/gpu/drm/msm/dp/dp_ctrl.c: In function ‘dp_ctrl_use_fixed_nvid’:
drivers/gpu/drm/msm/dp/dp_ctrl.c:1429:11: error: too few arguments to
function ‘drm_dp_has_quirk’
 1429 |   return (drm_dp_has_quirk(&ctrl->panel->desc,
      |           ^~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/msm/dp/dp_ctrl.c:15:
./include/drm/drm_dp_helper.h:2101:1: note: declared here
 2101 | drm_dp_has_quirk(const struct drm_dp_desc *desc, u32 edid_quirks,
      | ^~~~~~~~~~~~~~~~
make[4]: *** [scripts/Makefile.build:287:
drivers/gpu/drm/msm/dp/dp_ctrl.o] Error 1
make[3]: *** [scripts/Makefile.build:530: drivers/gpu/drm/msm] Error 2
make[2]: *** [scripts/Makefile.build:530: drivers/gpu/drm] Error 2
make[1]: *** [scripts/Makefile.build:530: drivers/gpu] Error 2
make: *** [Makefile:1819: drivers] Error 2

I had to add the extra parameter like this:

--- 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, 0,
+                                        DP_DPCD_QUIRK_CONSTANT_N));

        return false;
 }

and then it builds.