[PATCH] drm/amdgpu: align driver version with upstream

[PATCH] drm/amdgpu: align driver version with upstream

[Alex Deucher]

We may not upstream the MEM_SYNC interface, so move that
after the SDMA L2 fix.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 76a6198f5b6e..89c4e9dde6b6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -85,12 +85,11 @@
  * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches
  * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask
  * - 3.36.0 - Allow reading more status registers on si/cik
- * - 3.37.0 - Add AMDGPU_IB_FLAG_EMIT_MEM_SYNC
- * - 3.38.0 - L2 is invalidated before SDMA IBs, needed for correctness
- * - 3.39.0 - AMDGPU_IB_FLAG_EMIT_MEM_SYNC also affects compute IBs
+ * - 3.37.0 - L2 is invalidated before SDMA IBs, needed for correctness
+ * - 3.38.0 - Add AMDGPU_IB_FLAG_EMIT_MEM_SYNC
  */
 #define KMS_DRIVER_MAJOR	3
-#define KMS_DRIVER_MINOR	39
+#define KMS_DRIVER_MINOR	38
 #define KMS_DRIVER_PATCHLEVEL	0
 
 int amdgpu_vram_limit = 0;
-- 
2.25.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: align driver version with upstream

[Christian König]

Am 28.04.20 um 17:59 schrieb Alex Deucher:
> We may not upstream the MEM_SYNC interface, so move that
> after the SDMA L2 fix.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 76a6198f5b6e..89c4e9dde6b6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -85,12 +85,11 @@
>    * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches
>    * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask
>    * - 3.36.0 - Allow reading more status registers on si/cik
> - * - 3.37.0 - Add AMDGPU_IB_FLAG_EMIT_MEM_SYNC
> - * - 3.38.0 - L2 is invalidated before SDMA IBs, needed for correctness
> - * - 3.39.0 - AMDGPU_IB_FLAG_EMIT_MEM_SYNC also affects compute IBs
> + * - 3.37.0 - L2 is invalidated before SDMA IBs, needed for correctness
> + * - 3.38.0 - Add AMDGPU_IB_FLAG_EMIT_MEM_SYNC
>    */
>   #define KMS_DRIVER_MAJOR	3
> -#define KMS_DRIVER_MINOR	39
> +#define KMS_DRIVER_MINOR	38
>   #define KMS_DRIVER_PATCHLEVEL	0
>   
>   int amdgpu_vram_limit = 0;

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx