[PATCH v2 1/2] drm/amdgpu: Improve documentation of bo_ptr in amdgpu_bo_create_kernel

[Andrey Grodzovsky]

NP, makes sense what you did.


Andrey


On 03/16/2018 01:44 AM, Zhu, Rex wrote:
>
> Hi Andrey,
>
> Sorry for the confusion.
>
> I just need to push a bunch of patches that conflict with  your patch.
>
> So apply your patch first.
>
> Best Regards
>
> Rex
>
> *From:*amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] *On 
> Behalf Of *Andrey Grodzovsky
> *Sent:* Friday, March 16, 2018 12:20 AM
> *To:* Deucher, Alexander; amd-gfx at lists.freedesktop.org; 
> ckoenig.leichtzumerken at gmail.com; Zhu, Rex
> *Subject:* Re: [PATCH v2 1/2] drm/amdgpu: Improve documentation of 
> bo_ptr in amdgpu_bo_create_kernel
>
> That explains the merge conflict that surprised me :)
>
> Thanks,
>
> Andrey
>
> On 03/15/2018 12:18 PM, Deucher, Alexander wrote:
>
>     For the series:
>
>     Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
>     <mailto:alexander.deucher at amd.com>
>
>     I think Rex already applied the second one.
>
>     ------------------------------------------------------------------------
>
>     *From:*amd-gfx <amd-gfx-bounces at lists.freedesktop.org>
>     <mailto:amd-gfx-bounces at lists.freedesktop.org> on behalf of Andrey
>     Grodzovsky <andrey.grodzovsky at amd.com>
>     <mailto:andrey.grodzovsky at amd.com>
>     *Sent:* Thursday, March 15, 2018 12:15 PM
>     *To:* amd-gfx at lists.freedesktop.org
>     <mailto:amd-gfx at lists.freedesktop.org>;
>     ckoenig.leichtzumerken at gmail.com
>     <mailto:ckoenig.leichtzumerken at gmail.com>; Zhu, Rex
>     *Cc:* Grodzovsky, Andrey
>     *Subject:* [PATCH v2 1/2] drm/amdgpu: Improve documentation of
>     bo_ptr in amdgpu_bo_create_kernel
>
>     and amdgpu_bo_create_reserved.
>
>     Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
>     <mailto:andrey.grodzovsky at amd.com>
>     ---
>      drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 ++++++--
>      1 file changed, 6 insertions(+), 2 deletions(-)
>
>     diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>     b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>     index 48e0115..ac1fa33 100644
>     --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>     +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>     @@ -171,13 +171,15 @@ void amdgpu_ttm_placement_from_domain(struct
>     amdgpu_bo *abo, u32 domain)
>       * @size: size for the new BO
>       * @align: alignment for the new BO
>       * @domain: where to place it
>     - * @bo_ptr: resulting BO
>     + * @bo_ptr: used to initialize BOs in structures
>       * @gpu_addr: GPU addr of the pinned BO
>       * @cpu_addr: optional CPU address mapping
>       *
>       * Allocates and pins a BO for kernel internal use, and returns
>     it still
>       * reserved.
>       *
>     + * Note: For bo_ptr new BO is only created if bo_ptr points to NULL.
>     + *
>       * Returns 0 on success, negative error code otherwise.
>       */
>      int amdgpu_bo_create_reserved(struct amdgpu_device *adev,
>     @@ -240,12 +242,14 @@ int amdgpu_bo_create_reserved(struct
>     amdgpu_device *adev,
>       * @size: size for the new BO
>       * @align: alignment for the new BO
>       * @domain: where to place it
>     - * @bo_ptr: resulting BO
>     + * @bo_ptr:  used to initialize BOs in structures
>       * @gpu_addr: GPU addr of the pinned BO
>       * @cpu_addr: optional CPU address mapping
>       *
>       * Allocates and pins a BO for kernel internal use.
>       *
>     + * Note: For bo_ptr new BO is only created if bo_ptr points to NULL.
>     + *
>       * Returns 0 on success, negative error code otherwise.
>       */
>      int amdgpu_bo_create_kernel(struct amdgpu_device *adev,
>     -- 
>     2.7.4
>
>     _______________________________________________
>     amd-gfx mailing list
>     amd-gfx at lists.freedesktop.org <mailto:amd-gfx at lists.freedesktop.org>
>     https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180316/14602ab4/attachment-0001.html>