Commit 34cf8cae authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: convert wndw sema_set() to new push macros 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 9659be21

drivers/gpu/drm/nouveau/dispnv50/base.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ int base507c_acquire(struct nv50_wndw *, struct nv50_wndw_atom *, 
		     struct nv50_head_atom *);

void base507c_release(struct nv50_wndw *, struct nv50_wndw_atom *,

		      struct nv50_head_atom *);

void base507c_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);

int base507c_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void base507c_sema_clr(struct nv50_wndw *);

void base507c_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void base507c_ntfy_clr(struct nv50_wndw *);

drivers/gpu/drm/nouveau/dispnv50/base507c.c

+13 −10
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <nvif/cl507c.h>

#include <nvif/event.h>

#include <nvif/push507c.h>

#include <nvif/timer.h>



#include <drm/drm_atomic_helper.h>
@@ -163,18 +164,20 @@ base507c_sema_clr(struct nv50_wndw *wndw) 
	}

}



void

int

base507c_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	u32 *push;

	if ((push = evo_wait(&wndw->wndw, 5))) {

		evo_mthd(push, 0x0088, 4);

		evo_data(push, asyw->sema.offset);

		evo_data(push, asyw->sema.acquire);

		evo_data(push, asyw->sema.release);

		evo_data(push, asyw->sema.handle);

		evo_kick(push, &wndw->wndw);

	}

	struct nvif_push *push = wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 5)))

		return ret;



	PUSH_NVSQ(push, NV507C, 0x0088, asyw->sema.offset,

				0x008c, asyw->sema.acquire,

				0x0090, asyw->sema.release,

				0x0094, asyw->sema.handle);

	return 0;

}



void

drivers/gpu/drm/nouveau/dispnv50/wndw.h

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct nv50_wndw_func { 
	void (*prepare)(struct nv50_wndw *, struct nv50_head_atom *asyh,

			struct nv50_wndw_atom *asyw);



	void (*sema_set)(struct nv50_wndw *, struct nv50_wndw_atom *);

	int (*sema_set)(struct nv50_wndw *, struct nv50_wndw_atom *);

	void (*sema_clr)(struct nv50_wndw *);

	void (*ntfy_reset)(struct nouveau_bo *, u32 offset);

	void (*ntfy_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
@@ -115,7 +115,7 @@ int wndwc37e_acquire(struct nv50_wndw *, struct nv50_wndw_atom *, 
		     struct nv50_head_atom *);

void wndwc37e_release(struct nv50_wndw *, struct nv50_wndw_atom *,

		      struct nv50_head_atom *);

void wndwc37e_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);

int wndwc37e_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void wndwc37e_sema_clr(struct nv50_wndw *);

void wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);

void wndwc37e_ntfy_clr(struct nv50_wndw *);

drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c

+13 −10
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <nouveau_bo.h>



#include <nvif/clc37e.h>

#include <nvif/pushc37b.h>



static void

wndwc37e_csc_clr(struct nv50_wndw *wndw)
@@ -185,18 +186,20 @@ wndwc37e_sema_clr(struct nv50_wndw *wndw) 
	}

}



void

int

wndwc37e_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)

{

	u32 *push;

	if ((push = evo_wait(&wndw->wndw, 5))) {

		evo_mthd(push, 0x020c, 4);

		evo_data(push, asyw->sema.offset);

		evo_data(push, asyw->sema.acquire);

		evo_data(push, asyw->sema.release);

		evo_data(push, asyw->sema.handle);

		evo_kick(push, &wndw->wndw);

	}

	struct nvif_push *push = wndw->wndw.push;

	int ret;



	if ((ret = PUSH_WAIT(push, 5)))

		return ret;



	PUSH_NVSQ(push, NVC37E, 0x020c, asyw->sema.offset,

				0x0210, asyw->sema.acquire,

				0x0214, asyw->sema.release,

				0x0218, asyw->sema.handle);

	return 0;

}



void

drivers/gpu/drm/nouveau/include/nvhw/class/cl507c.h

0 → 100644
+165 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 1993-2014, NVIDIA CORPORATION. All rights reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */





#ifndef _cl507c_h_

#define _cl507c_h_



#define NV_DISP_BASE_NOTIFIER_1                                                      0x00000000

#define NV_DISP_BASE_NOTIFIER_1_SIZEOF                                               0x00000004

#define NV_DISP_BASE_NOTIFIER_1__0                                                   0x00000000

#define NV_DISP_BASE_NOTIFIER_1__0_PRESENTATION_COUNT                                15:0

#define NV_DISP_BASE_NOTIFIER_1__0_TIMESTAMP                                         29:16

#define NV_DISP_BASE_NOTIFIER_1__0_STATUS                                            31:30

#define NV_DISP_BASE_NOTIFIER_1__0_STATUS_NOT_BEGUN                                  0x00000000

#define NV_DISP_BASE_NOTIFIER_1__0_STATUS_BEGUN                                      0x00000001

#define NV_DISP_BASE_NOTIFIER_1__0_STATUS_FINISHED                                   0x00000002





// dma opcode instructions

#define NV507C_DMA                                     0x00000000

#define NV507C_DMA_OPCODE                                   31:29

#define NV507C_DMA_OPCODE_METHOD                       0x00000000

#define NV507C_DMA_OPCODE_JUMP                         0x00000001

#define NV507C_DMA_OPCODE_NONINC_METHOD                0x00000002

#define NV507C_DMA_OPCODE_SET_SUBDEVICE_MASK           0x00000003

#define NV507C_DMA_OPCODE                                   31:29

#define NV507C_DMA_OPCODE_METHOD                       0x00000000

#define NV507C_DMA_OPCODE_NONINC_METHOD                0x00000002

#define NV507C_DMA_METHOD_COUNT                             27:18

#define NV507C_DMA_METHOD_OFFSET                             11:2

#define NV507C_DMA_DATA                                      31:0

#define NV507C_DMA_NOP                                 0x00000000

#define NV507C_DMA_OPCODE                                   31:29

#define NV507C_DMA_OPCODE_JUMP                         0x00000001

#define NV507C_DMA_JUMP_OFFSET                               11:2

#define NV507C_DMA_OPCODE                                   31:29

#define NV507C_DMA_OPCODE_SET_SUBDEVICE_MASK           0x00000003

#define NV507C_DMA_SET_SUBDEVICE_MASK_VALUE                  11:0



// class methods

#define NV507C_PUT                                                              (0x00000000)

#define NV507C_PUT_PTR                                                          11:2

#define NV507C_GET                                                              (0x00000004)

#define NV507C_GET_PTR                                                          11:2

#define NV507C_UPDATE                                                           (0x00000080)

#define NV507C_UPDATE_INTERLOCK_WITH_CORE                                       0:0

#define NV507C_UPDATE_INTERLOCK_WITH_CORE_DISABLE                               (0x00000000)

#define NV507C_UPDATE_INTERLOCK_WITH_CORE_ENABLE                                (0x00000001)

#define NV507C_SET_PRESENT_CONTROL                                              (0x00000084)

#define NV507C_SET_PRESENT_CONTROL_BEGIN_MODE                                   9:8

#define NV507C_SET_PRESENT_CONTROL_BEGIN_MODE_NON_TEARING                       (0x00000000)

#define NV507C_SET_PRESENT_CONTROL_BEGIN_MODE_IMMEDIATE                         (0x00000001)

#define NV507C_SET_PRESENT_CONTROL_BEGIN_MODE_ON_LINE                           (0x00000002)

#define NV507C_SET_PRESENT_CONTROL_MIN_PRESENT_INTERVAL                         7:4

#define NV507C_SET_PRESENT_CONTROL_BEGIN_LINE                                   30:16

#define NV507C_SET_PRESENT_CONTROL_ON_LINE_MARGIN                               15:10

#define NV507C_SET_SEMAPHORE_CONTROL                                            (0x00000088)

#define NV507C_SET_SEMAPHORE_CONTROL_OFFSET                                     11:2

#define NV507C_SET_SEMAPHORE_ACQUIRE                                            (0x0000008C)

#define NV507C_SET_SEMAPHORE_ACQUIRE_VALUE                                      31:0

#define NV507C_SET_SEMAPHORE_RELEASE                                            (0x00000090)

#define NV507C_SET_SEMAPHORE_RELEASE_VALUE                                      31:0

#define NV507C_SET_CONTEXT_DMA_SEMAPHORE                                        (0x00000094)

#define NV507C_SET_CONTEXT_DMA_SEMAPHORE_HANDLE                                 31:0

#define NV507C_SET_NOTIFIER_CONTROL                                             (0x000000A0)

#define NV507C_SET_NOTIFIER_CONTROL_MODE                                        30:30

#define NV507C_SET_NOTIFIER_CONTROL_MODE_WRITE                                  (0x00000000)

#define NV507C_SET_NOTIFIER_CONTROL_MODE_WRITE_AWAKEN                           (0x00000001)

#define NV507C_SET_NOTIFIER_CONTROL_OFFSET                                      11:2

#define NV507C_SET_CONTEXT_DMA_NOTIFIER                                         (0x000000A4)

#define NV507C_SET_CONTEXT_DMA_NOTIFIER_HANDLE                                  31:0

#define NV507C_SET_CONTEXT_DMA_ISO                                              (0x000000C0)

#define NV507C_SET_CONTEXT_DMA_ISO_HANDLE                                       31:0

#define NV507C_SET_BASE_LUT_LO                                                  (0x000000E0)

#define NV507C_SET_BASE_LUT_LO_ENABLE                                           31:30

#define NV507C_SET_BASE_LUT_LO_ENABLE_DISABLE                                   (0x00000000)

#define NV507C_SET_BASE_LUT_LO_ENABLE_USE_CORE_LUT                              (0x00000001)

#define NV507C_SET_BASE_LUT_LO_ENABLE_ENABLE                                    (0x00000003)

#define NV507C_SET_BASE_LUT_LO_MODE                                             29:29

#define NV507C_SET_BASE_LUT_LO_MODE_LORES                                       (0x00000000)

#define NV507C_SET_BASE_LUT_LO_MODE_HIRES                                       (0x00000001)

#define NV507C_SET_BASE_LUT_LO_ORIGIN                                           7:2

#define NV507C_SET_PROCESSING                                                   (0x00000110)

#define NV507C_SET_PROCESSING_USE_GAIN_OFS                                      0:0

#define NV507C_SET_PROCESSING_USE_GAIN_OFS_DISABLE                              (0x00000000)

#define NV507C_SET_PROCESSING_USE_GAIN_OFS_ENABLE                               (0x00000001)

#define NV507C_SET_CONVERSION                                                   (0x00000114)

#define NV507C_SET_CONVERSION_GAIN                                              15:0

#define NV507C_SET_CONVERSION_OFS                                               31:16



#define NV507C_SURFACE_SET_OFFSET(a,b)                                          (0x00000800 + (a)*0x00000020 + (b)*0x00000004)

#define NV507C_SURFACE_SET_OFFSET_ORIGIN                                        31:0

#define NV507C_SURFACE_SET_SIZE(a)                                              (0x00000808 + (a)*0x00000020)

#define NV507C_SURFACE_SET_SIZE_WIDTH                                           14:0

#define NV507C_SURFACE_SET_SIZE_HEIGHT                                          30:16

#define NV507C_SURFACE_SET_STORAGE(a)                                           (0x0000080C + (a)*0x00000020)

#define NV507C_SURFACE_SET_STORAGE_BLOCK_HEIGHT                                 3:0

#define NV507C_SURFACE_SET_STORAGE_BLOCK_HEIGHT_ONE_GOB                         (0x00000000)

#define NV507C_SURFACE_SET_STORAGE_BLOCK_HEIGHT_TWO_GOBS                        (0x00000001)

#define NV507C_SURFACE_SET_STORAGE_BLOCK_HEIGHT_FOUR_GOBS                       (0x00000002)

#define NV507C_SURFACE_SET_STORAGE_BLOCK_HEIGHT_EIGHT_GOBS                      (0x00000003)

#define NV507C_SURFACE_SET_STORAGE_BLOCK_HEIGHT_SIXTEEN_GOBS                    (0x00000004)

#define NV507C_SURFACE_SET_STORAGE_BLOCK_HEIGHT_THIRTYTWO_GOBS                  (0x00000005)

#define NV507C_SURFACE_SET_STORAGE_PITCH                                        17:8

#define NV507C_SURFACE_SET_STORAGE_MEMORY_LAYOUT                                20:20

#define NV507C_SURFACE_SET_STORAGE_MEMORY_LAYOUT_BLOCKLINEAR                    (0x00000000)

#define NV507C_SURFACE_SET_STORAGE_MEMORY_LAYOUT_PITCH                          (0x00000001)

#define NV507C_SURFACE_SET_PARAMS(a)                                            (0x00000810 + (a)*0x00000020)

#define NV507C_SURFACE_SET_PARAMS_FORMAT                                        15:8

#define NV507C_SURFACE_SET_PARAMS_FORMAT_I8                                     (0x0000001E)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_VOID16                                 (0x0000001F)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_VOID32                                 (0x0000002E)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_RF16_GF16_BF16_AF16                    (0x000000CA)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_A8R8G8B8                               (0x000000CF)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_A2B10G10R10                            (0x000000D1)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_A8B8G8R8                               (0x000000D5)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_R5G6B5                                 (0x000000E8)

#define NV507C_SURFACE_SET_PARAMS_FORMAT_A1R5G5B5                               (0x000000E9)

#define NV507C_SURFACE_SET_PARAMS_SUPER_SAMPLE                                  1:0

#define NV507C_SURFACE_SET_PARAMS_SUPER_SAMPLE_X1_AA                            (0x00000000)

#define NV507C_SURFACE_SET_PARAMS_SUPER_SAMPLE_X4_AA                            (0x00000002)

#define NV507C_SURFACE_SET_PARAMS_GAMMA                                         2:2

#define NV507C_SURFACE_SET_PARAMS_GAMMA_LINEAR                                  (0x00000000)

#define NV507C_SURFACE_SET_PARAMS_GAMMA_SRGB                                    (0x00000001)

#define NV507C_SURFACE_SET_PARAMS_LAYOUT                                        5:4

#define NV507C_SURFACE_SET_PARAMS_LAYOUT_FRM                                    (0x00000000)

#define NV507C_SURFACE_SET_PARAMS_LAYOUT_FLD1                                   (0x00000001)

#define NV507C_SURFACE_SET_PARAMS_LAYOUT_FLD2                                   (0x00000002)

#define NV507C_SURFACE_SET_PARAMS_KIND                                          22:16

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_PITCH                               (0x00000000)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_GENERIC_8BX2                        (0x00000070)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_GENERIC_8BX2_BANKSWIZ               (0x00000072)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_GENERIC_16BX1                       (0x00000074)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_GENERIC_16BX1_BANKSWIZ              (0x00000076)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_C32_MS4                             (0x00000078)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_C32_MS8                             (0x00000079)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_C32_MS4_BANKSWIZ                    (0x0000007A)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_C32_MS8_BANKSWIZ                    (0x0000007B)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_C64_MS4                             (0x0000007C)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_C64_MS8                             (0x0000007D)

#define NV507C_SURFACE_SET_PARAMS_KIND_KIND_C128_MS4                            (0x0000007E)

#define NV507C_SURFACE_SET_PARAMS_KIND_FROM_PTE                                 (0x0000007F)

#define NV507C_SURFACE_SET_PARAMS_PART_STRIDE                                   24:24

#define NV507C_SURFACE_SET_PARAMS_PART_STRIDE_PARTSTRIDE_256                    (0x00000000)

#define NV507C_SURFACE_SET_PARAMS_PART_STRIDE_PARTSTRIDE_1024                   (0x00000001)

#endif // _cl507c_h

CRA Git | Maintained and supported by SUSTech CRA and CCSE