drm-tip amdgpu not compiling, possible fix attached

[Thomas Zimmermann]

Hi

Am 10.07.22 um 22:01 schrieb Hans de Goede:
> Hi All,
> 
> I've been rebasing my backlight refactor on top of drm-tip to submit
> a new version upstream and I noticed that drm-tip does not compile.
> 
> This is caused by a mismerge of:
> 
> commit 925b6e59138cefa47275c67891c65d48d3266d57 (drm-misc/for-linux-next-fixes, drm-misc/drm-misc-fixes, drm-misc-fixes)Selvam <Arunpravin.PaneerSelvam at amd.com>
> Date:   Fri Jul 8 02:30:47 2022 -0700
>      Revert "drm/amdgpu: add drm buddy support to amdgpu"
>      
>      This reverts commit c9cad937c0c58618fe5b0310fd539a854dc1ae95.
>      
>      This is part of a revert of the following commits:
>      commit 708d19d9f362 ("drm/amdgpu: move internal vram_mgr function into the C file")
>      commit 5e3f1e7729ec ("drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new")
>      commit c9cad937c0c5 ("drm/amdgpu: add drm buddy support to amdgpu")
>      
>      [WHY]
>      Few users reported garbaged graphics as soon as x starts,
>      reverting until this can be resolved.
>      
>      Signed-off-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam at amd.com>
> 
>  From drm-misc/for-linux-next-fixes / drm-misc-fixes
> 
> The attached patch on top of drm-tip fixes the mismerge. Note compile-tested
> only!

Thank you for the workaround. I ran into the same problem yesterday 
after synchronizing with drm-tip. amdgpu doesn't build on drm-tip.

Best regards
Thomas

> 
> If someone with more rerere experience then me can use this to fix things that
> would be great.
> 
> Regards,
> 
> Hans

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20220711/cfae545c/attachment.sig>