Commit 2a0d40bb authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: use NVIDIA's headers for wimm space() 



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

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

+4 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <nvif/cl507a.h>

#include <nvif/timer.h>



#include <nvhw/class/cl507a.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>
@@ -33,9 +35,10 @@ bool 
curs507a_space(struct nv50_wndw *wndw)

{

	nvif_msec(&nouveau_drm(wndw->plane.dev)->client.device, 100,

		if (nvif_rd32(&wndw->wimm.base.user, 0x0008) >= 4)

		if (NVIF_TV32(&wndw->wimm.base.user, NV507A, FREE, COUNT, >=, 4))

			return true;

	);



	WARN_ON(1);

	return false;

}

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

0 → 100644
+36 −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 _cl507a_h_

#define _cl507a_h_



#define NV507A_FREE                                                             (0x00000008)

#define NV507A_FREE_COUNT                                                       5:0

#define NV507A_UPDATE                                                           (0x00000080)

#define NV507A_UPDATE_INTERLOCK_WITH_CORE                                       0:0

#define NV507A_UPDATE_INTERLOCK_WITH_CORE_DISABLE                               (0x00000000)

#define NV507A_UPDATE_INTERLOCK_WITH_CORE_ENABLE                                (0x00000001)

#define NV507A_SET_CURSOR_HOT_SPOT_POINT_OUT                                    (0x00000084)

#define NV507A_SET_CURSOR_HOT_SPOT_POINT_OUT_X                                  15:0

#define NV507A_SET_CURSOR_HOT_SPOT_POINT_OUT_Y                                  31:16

#endif // _cl507a_h