Commit 0bc8ffe0 authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/nouveau/kms/nv50-: Move hard-coded object handles into header 



While most of the functionality on Nvidia GPUs doesn't require using an
explicit handle instead of the main VRAM handle + offset, there are a
couple of places that do require explicit handles, such as CRC
functionality. Since this means we're about to add another
nouveau-chosen handle, let's just go ahead and move any hard-coded
handles into a single header. This is just to keep things slightly
organized, and to make it a little bit easier if we need to add more
handles in the future.

This patch should contain no functional changes.

Changes since v3:
* Correct SPDX license identifier (checkpatch)

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200627194657.156514-9-lyude@redhat.com
parent ebec8847

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

+5 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "core.h"

#include "head.h"

#include "wndw.h"

#include "handles.h"



#include <linux/dma-mapping.h>

#include <linux/hdmi.h>
@@ -154,7 +155,8 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
	if (!syncbuf)

		return 0;



	ret = nvif_object_init(&dmac->base.user, 0xf0000000, NV_DMA_IN_MEMORY,

	ret = nvif_object_init(&dmac->base.user, NV50_DISP_HANDLE_SYNCBUF,

			       NV_DMA_IN_MEMORY,

			       &(struct nv_dma_v0) {

					.target = NV_DMA_V0_TARGET_VRAM,

					.access = NV_DMA_V0_ACCESS_RDWR,
@@ -165,7 +167,8 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
	if (ret)

		return ret;



	ret = nvif_object_init(&dmac->base.user, 0xf0000001, NV_DMA_IN_MEMORY,

	ret = nvif_object_init(&dmac->base.user, NV50_DISP_HANDLE_VRAM,

			       NV_DMA_IN_MEMORY,

			       &(struct nv_dma_v0) {

					.target = NV_DMA_V0_TARGET_VRAM,

					.access = NV_DMA_V0_ACCESS_RDWR,

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

#ifndef __NV50_KMS_HANDLES_H__

#define __NV50_KMS_HANDLES_H__



/*

 * Various hard-coded object handles that nouveau uses. These are made-up by

 * nouveau developers, not Nvidia. The only significance of the handles chosen

 * is that they must all be unique.

 */

#define NV50_DISP_HANDLE_SYNCBUF                                        0xf0000000

#define NV50_DISP_HANDLE_VRAM                                           0xf0000001



#define NV50_DISP_HANDLE_WNDW_CTX(kind)                        (0xfb000000 | kind)



#endif /* !__NV50_KMS_HANDLES_H__ */

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

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 */

#include "wndw.h"

#include "wimm.h"

#include "handles.h"



#include <nvif/class.h>

#include <nvif/cl0002.h>
@@ -59,7 +60,7 @@ nv50_wndw_ctxdma_new(struct nv50_wndw *wndw, struct drm_framebuffer *fb) 
	int ret;



	nouveau_framebuffer_get_layout(fb, &unused, &kind);

	handle = 0xfb000000 | kind;

	handle = NV50_DISP_HANDLE_WNDW_CTX(kind);



	list_for_each_entry(ctxdma, &wndw->ctxdma.list, head) {

		if (ctxdma->object.handle == handle)

CRA Git | Maintained and supported by SUSTech CRA and CCSE