Re: [PULL] drm-misc-next-fixes

Dave Airlie
2021-06-18T02:26:17Z

when I pulled this in drm-next I got these.

were the mst fixes meant for next or fixes btw? I'm not really sure,
but either way I don't think this is a local reason it doesn't build
or did I miss something?

Dave.

/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/drm_dp_mst_topology.c:
In function ‘drm_dp_update_payload_part1’:
/home/airlied/devel/kernel/dim/src/include/drm/drm_print.h:450:27:
error: request for member ‘dev’ in something not a structure or union
450 | drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__)
| ^~
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/drm_dp_mst_topology.c:3392:5:
note: in expansion of macro ‘drm_dbg_kms’
3392 | drm_dbg_kms("Virtual channel %d is not in current topology\n", i);
| ^~~~~~~~~~~
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/drm_dp_mst_topology.c:3392:68:
warning: passing argument 3 of ‘drm_dev_dbg’ makes pointer from
integer without a cast [-Wint-conversion]
3392 | drm_dbg_kms("Virtual channel %d is not in current topology\n", i);
| ^
| |
| int
/home/airlied/devel/kernel/dim/src/include/drm/drm_print.h:450:53:
note: in definition of macro ‘drm_dbg_kms’
450 | drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__)
| ^~~
/home/airlied/devel/kernel/dim/src/include/drm/drm_print.h:338:16:
note: expected ‘const char *’ but argument is of type ‘int’
338 | const char *format, ...);
| ~~~~~~~~~~~~^~~~~~
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/drm_dp_mst_topology.c:3407:53:
error: macro "drm_dbg_kms" requires 3 arguments, but only 1 given
3407 | drm_dbg_kms("Fail:set payload to invalid sink");
| ^
In file included from
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/drm_dp_mst_topology.c:45:
/home/airlied/devel/kernel/dim/src/include/drm/drm_print.h:449: note:
macro "drm_dbg_kms" defined here
449 | #define drm_dbg_kms(drm, fmt, ...) \
|
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/drm_dp_mst_topology.c:3407:7:
error: ‘drm_dbg_kms’ undeclared (first use in this function)
3407 | drm_dbg_kms("Fail:set payload to invalid sink");
| ^~~~~~~~~~~
/home/airlied/devel/kernel/dim/src/drivers/gpu/drm/drm_dp_mst_topology.c:3407:7:
note: each undeclared identifier is reported only once for each
function it appears in
make[4]: *** [/home/airlied/devel/kernel/dim/src/scripts/Makefile.build:272:
drivers/gpu/drm/drm_dp_mst_topology.o] Error 1
make[4]: *** Waiting for unfinished jobs....

On Thu, 17 Jun 2021 at 04:30, Thomas Zimmermann <tzimmermann@suse.de> wrote:
>
> Hi Dave and Daniel,
>
> here's this week's PR for drm-misc-next-fixes.
>
> Best regards
> Thomas
>
> drm-misc-next-fixes-2021-06-16:
> Short summary of fixes pull:
>
> * hyperv: advertise the correct formatmodifiers for its primary plane
> * dp_mst: VCPI fixes to make it work with StarTech hub
>
> The following changes since commit 1bd8a7dc28c1c410f1ceefae1f2a97c06d1a67c2:
>
> Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next (2021-06-11 14:19:12 +1000)
>
> are available in the Git repository at:
>
> git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2021-06-16
>
> for you to fetch changes up to 3769e4c0af5b82c8ea21d037013cb9564dfaa51f:
>
> drm/dp_mst: Avoid to mess up payload table by ports in stale topology (2021-06-16 12:57:46 -0400)
>
> ----------------------------------------------------------------
> Short summary of fixes pull:
>
> * hyperv: advertise the correct formatmodifiers for its primary plane
> * dp_mst: VCPI fixes to make it work with StarTech hub
>
> ----------------------------------------------------------------
> Pu Lehui (1):
> drm/hyperv: Fix unused const variable 'hyperv_modifiers'
>
> Wayne Lin (2):
> drm/dp_mst: Do not set proposed vcpi directly
> drm/dp_mst: Avoid to mess up payload table by ports in stale topology
>
> drivers/gpu/drm/drm_dp_mst_topology.c | 65 +++++++++++++++++------------
> drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 2 +-
> 2 files changed, 40 insertions(+), 27 deletions(-)
>
> --
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Maxfeldstr. 5, 90409 Nürnberg, Germany
> (HRB 36809, AG Nürnberg)
> Geschäftsführer: Felix Imendörffer