drm/nouveau/kms/nv50-: use NVIDIA's headers for wndw ntfy_reset()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs
Родитель
941522b7fe
Коммит
0ecaefc144
|
|
@ -162,7 +162,8 @@ base507c_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
|
|||
void
|
||||
base507c_ntfy_reset(struct nouveau_bo *bo, u32 offset)
|
||||
{
|
||||
nouveau_bo_wr32(bo, offset / 4, 0x00000000);
|
||||
NVBO_WR32(bo, offset, NV_DISP_BASE_NOTIFIER_1, _0,
|
||||
NVDEF(NV_DISP_BASE_NOTIFIER_1, _0, STATUS, NOT_BEGUN));
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
#include <nvif/push507c.h>
|
||||
#include <nvif/timer.h>
|
||||
|
||||
#include <nvhw/class/cl827e.h>
|
||||
|
||||
static int
|
||||
ovly827e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
|
||||
{
|
||||
|
|
@ -66,10 +68,11 @@ ovly827e_ntfy_wait_begun(struct nouveau_bo *bo, u32 offset,
|
|||
void
|
||||
ovly827e_ntfy_reset(struct nouveau_bo *bo, u32 offset)
|
||||
{
|
||||
nouveau_bo_wr32(bo, offset / 4 + 0, 0x00000000);
|
||||
nouveau_bo_wr32(bo, offset / 4 + 1, 0x00000000);
|
||||
nouveau_bo_wr32(bo, offset / 4 + 2, 0x00000000);
|
||||
nouveau_bo_wr32(bo, offset / 4 + 3, 0x80000000);
|
||||
NVBO_WR32(bo, offset, NV_DISP_NOTIFICATION_1, TIME_STAMP_0, 0);
|
||||
NVBO_WR32(bo, offset, NV_DISP_NOTIFICATION_1, TIME_STAMP_1, 0);
|
||||
NVBO_WR32(bo, offset, NV_DISP_NOTIFICATION_1, _2, 0);
|
||||
NVBO_WR32(bo, offset, NV_DISP_NOTIFICATION_1, _3,
|
||||
NVDEF(NV_DISP_NOTIFICATION_1, _3, STATUS, NOT_BEGUN));
|
||||
}
|
||||
|
||||
static const struct nv50_wndw_func
|
||||
|
|
|
|||
|
|
@ -0,0 +1,88 @@
|
|||
/*
|
||||
* 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 _cl827e_h_
|
||||
#define _cl827e_h_
|
||||
|
||||
#define NV_DISP_NOTIFICATION_1 0x00000000
|
||||
#define NV_DISP_NOTIFICATION_1_SIZEOF 0x00000010
|
||||
#define NV_DISP_NOTIFICATION_1_TIME_STAMP_0 0x00000000
|
||||
#define NV_DISP_NOTIFICATION_1_TIME_STAMP_0_NANOSECONDS0 31:0
|
||||
#define NV_DISP_NOTIFICATION_1_TIME_STAMP_1 0x00000001
|
||||
#define NV_DISP_NOTIFICATION_1_TIME_STAMP_1_NANOSECONDS1 31:0
|
||||
#define NV_DISP_NOTIFICATION_1__2 0x00000002
|
||||
#define NV_DISP_NOTIFICATION_1__2_AUDIT_TIMESTAMP 31:0
|
||||
#define NV_DISP_NOTIFICATION_1__3 0x00000003
|
||||
#define NV_DISP_NOTIFICATION_1__3_PRESENT_COUNT 7:0
|
||||
#define NV_DISP_NOTIFICATION_1__3_R0 15:8
|
||||
#define NV_DISP_NOTIFICATION_1__3_STATUS 31:16
|
||||
#define NV_DISP_NOTIFICATION_1__3_STATUS_NOT_BEGUN 0x00008000
|
||||
#define NV_DISP_NOTIFICATION_1__3_STATUS_BEGUN 0x0000FFFF
|
||||
#define NV_DISP_NOTIFICATION_1__3_STATUS_FINISHED 0x00000000
|
||||
|
||||
|
||||
// class methods
|
||||
#define NV827E_SET_PRESENT_CONTROL (0x00000084)
|
||||
#define NV827E_SET_PRESENT_CONTROL_BEGIN_MODE 1:0
|
||||
#define NV827E_SET_PRESENT_CONTROL_BEGIN_MODE_ASAP (0x00000000)
|
||||
#define NV827E_SET_PRESENT_CONTROL_BEGIN_MODE_TIMESTAMP (0x00000003)
|
||||
#define NV827E_SET_PRESENT_CONTROL_MIN_PRESENT_INTERVAL 7:4
|
||||
#define NV827E_SET_CONTEXT_DMA_ISO (0x000000C0)
|
||||
#define NV827E_SET_CONTEXT_DMA_ISO_HANDLE 31:0
|
||||
#define NV827E_SET_COMPOSITION_CONTROL (0x00000100)
|
||||
#define NV827E_SET_COMPOSITION_CONTROL_MODE 3:0
|
||||
#define NV827E_SET_COMPOSITION_CONTROL_MODE_SOURCE_COLOR_VALUE_KEYING (0x00000000)
|
||||
#define NV827E_SET_COMPOSITION_CONTROL_MODE_DESTINATION_COLOR_VALUE_KEYING (0x00000001)
|
||||
#define NV827E_SET_COMPOSITION_CONTROL_MODE_OPAQUE_SUSPEND_BASE (0x00000002)
|
||||
|
||||
#define NV827E_SURFACE_SET_OFFSET (0x00000800)
|
||||
#define NV827E_SURFACE_SET_OFFSET_ORIGIN 31:0
|
||||
#define NV827E_SURFACE_SET_SIZE (0x00000808)
|
||||
#define NV827E_SURFACE_SET_SIZE_WIDTH 14:0
|
||||
#define NV827E_SURFACE_SET_SIZE_HEIGHT 30:16
|
||||
#define NV827E_SURFACE_SET_STORAGE (0x0000080C)
|
||||
#define NV827E_SURFACE_SET_STORAGE_BLOCK_HEIGHT 3:0
|
||||
#define NV827E_SURFACE_SET_STORAGE_BLOCK_HEIGHT_ONE_GOB (0x00000000)
|
||||
#define NV827E_SURFACE_SET_STORAGE_BLOCK_HEIGHT_TWO_GOBS (0x00000001)
|
||||
#define NV827E_SURFACE_SET_STORAGE_BLOCK_HEIGHT_FOUR_GOBS (0x00000002)
|
||||
#define NV827E_SURFACE_SET_STORAGE_BLOCK_HEIGHT_EIGHT_GOBS (0x00000003)
|
||||
#define NV827E_SURFACE_SET_STORAGE_BLOCK_HEIGHT_SIXTEEN_GOBS (0x00000004)
|
||||
#define NV827E_SURFACE_SET_STORAGE_BLOCK_HEIGHT_THIRTYTWO_GOBS (0x00000005)
|
||||
#define NV827E_SURFACE_SET_STORAGE_PITCH 17:8
|
||||
#define NV827E_SURFACE_SET_STORAGE_MEMORY_LAYOUT 20:20
|
||||
#define NV827E_SURFACE_SET_STORAGE_MEMORY_LAYOUT_BLOCKLINEAR (0x00000000)
|
||||
#define NV827E_SURFACE_SET_STORAGE_MEMORY_LAYOUT_PITCH (0x00000001)
|
||||
#define NV827E_SURFACE_SET_PARAMS (0x00000810)
|
||||
#define NV827E_SURFACE_SET_PARAMS_FORMAT 15:8
|
||||
#define NV827E_SURFACE_SET_PARAMS_FORMAT_VE8YO8UE8YE8 (0x00000028)
|
||||
#define NV827E_SURFACE_SET_PARAMS_FORMAT_YO8VE8YE8UE8 (0x00000029)
|
||||
#define NV827E_SURFACE_SET_PARAMS_FORMAT_A2B10G10R10 (0x000000D1)
|
||||
#define NV827E_SURFACE_SET_PARAMS_FORMAT_A8R8G8B8 (0x000000CF)
|
||||
#define NV827E_SURFACE_SET_PARAMS_FORMAT_A1R5G5B5 (0x000000E9)
|
||||
#define NV827E_SURFACE_SET_PARAMS_COLOR_SPACE 1:0
|
||||
#define NV827E_SURFACE_SET_PARAMS_COLOR_SPACE_RGB (0x00000000)
|
||||
#define NV827E_SURFACE_SET_PARAMS_COLOR_SPACE_YUV_601 (0x00000001)
|
||||
#define NV827E_SURFACE_SET_PARAMS_COLOR_SPACE_YUV_709 (0x00000002)
|
||||
#define NV827E_SURFACE_SET_PARAMS_RESERVED0 22:16
|
||||
#define NV827E_SURFACE_SET_PARAMS_RESERVED1 24:24
|
||||
#endif // _cl827e_h
|
||||
|
|
@ -162,4 +162,16 @@ int nve0_bo_move_init(struct nouveau_channel *, u32);
|
|||
int nve0_bo_move_copy(struct nouveau_channel *, struct ttm_buffer_object *,
|
||||
struct ttm_mem_reg *, struct ttm_mem_reg *);
|
||||
|
||||
#define NVBO_WR32_(b,o,dr,f) nouveau_bo_wr32((b), (o)/4 + (dr), (f))
|
||||
#define NVBO_RD32_(b,o,dr) nouveau_bo_rd32((b), (o)/4 + (dr))
|
||||
#define NVBO_RD32(A...) DRF_RD(NVBO_RD32_, ##A)
|
||||
#define NVBO_RV32(A...) DRF_RV(NVBO_RD32_, ##A)
|
||||
#define NVBO_TV32(A...) DRF_TV(NVBO_RD32_, ##A)
|
||||
#define NVBO_TD32(A...) DRF_TD(NVBO_RD32_, ##A)
|
||||
#define NVBO_WR32(A...) DRF_WR( NVBO_WR32_, ##A)
|
||||
#define NVBO_WV32(A...) DRF_WV( NVBO_WR32_, ##A)
|
||||
#define NVBO_WD32(A...) DRF_WD( NVBO_WR32_, ##A)
|
||||
#define NVBO_MR32(A...) DRF_MR(NVBO_RD32_, NVBO_WR32_, u32, ##A)
|
||||
#define NVBO_MV32(A...) DRF_MV(NVBO_RD32_, NVBO_WR32_, u32, ##A)
|
||||
#define NVBO_MD32(A...) DRF_MD(NVBO_RD32_, NVBO_WR32_, u32, ##A)
|
||||
#endif
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче