Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 294947a5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next 

A couple of fixes from the previous pull request as well as gl3 support.
There is one drm core change, an export of a previously private function.

Take 2 implementing screen targets, this time with the fbdev code adjusted
accordingly.

Also there is an implementation of register-driven command buffers, that
overrides the FIFO ring for command processing. It's needed for our upcoming
hardware revision.
* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux: (35 commits)
  drm/vmwgfx: Fix copyright headers
  drm/vmwgfx: Add DX query support. Various fixes.
  drm/vmwgfx: Add command parser support for a couple of DX commands
  drm/vmwgfx: Command parser fixes for DX
  drm/vmwgfx: Initial DX support
  drm/vmwgfx: Update device includes for DX device functionality
  drm: export the DRM permission check code
  drm/vmwgfx: Fix crash when unloading vmwgfx v2
  drm/vmwgfx: Fix framebuffer creation on older hardware
  drm/vmwgfx: Fixed topology boundary checking for Screen Targets
  drm/vmwgfx: Fix an uninitialized value
  drm/vmwgfx: Fix compiler warning with 32-bit dma_addr_t
  drm/vmwgfx: Kill a bunch of sparse warnings
  drm/vmwgfx: Fix kms preferred mode sorting
  drm/vmwgfx: Reinstate the legacy display system dirty callback
  drm/vmwgfx: Implement fbdev on kms v2
  drm/vmwgfx: Add a kernel interface to create a framebuffer v2
  drm/vmwgfx: Avoid cmdbuf alloc sleeping if !TASK_RUNNING
  drm/vmwgfx: Convert screen targets to new helpers v3
  drm/vmwgfx: Convert screen objects to the new helpers
  ...
parents 6406e45c 54fbde8a

drivers/gpu/drm/drm_ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static int drm_version(struct drm_device *dev, void *data, 
 * indicated permissions. If so, returns zero. Otherwise returns an

 * error code suitable for ioctl return.

 */

static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)

int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)

{

	/* ROOT_ONLY is only for CAP_SYS_ADMIN */

	if (unlikely((flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)))
@@ -508,6 +508,7 @@ static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) 


	return 0;

}

EXPORT_SYMBOL(drm_ioctl_permit);



#define DRM_IOCTL_DEF(ioctl, _func, _flags)	\

	[DRM_IOCTL_NR(ioctl)] = {		\

drivers/gpu/drm/vmwgfx/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \ 
	    vmwgfx_overlay.o vmwgfx_marker.o vmwgfx_gmrid_manager.o \

	    vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \

	    vmwgfx_surface.o vmwgfx_prime.o vmwgfx_mob.o vmwgfx_shader.o \

	    vmwgfx_cmdbuf_res.o \

	    vmwgfx_cmdbuf_res.o vmwgfx_cmdbuf.o vmwgfx_stdu.o \

	    vmwgfx_cotable.o vmwgfx_so.o vmwgfx_binding.o



obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/vmwgfx/device_include/includeCheck.h

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

 * Intentionally empty file.

 */

drivers/gpu/drm/vmwgfx/device_include/svga3d_caps.h

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

 * Copyright 2007-2015 VMware, Inc.  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.

 *

 **********************************************************/



/*

 * svga3d_caps.h --

 *

 *       Definitions for SVGA3D hardware capabilities.  Capabilities

 *       are used to query for optional rendering features during

 *       driver initialization. The capability data is stored as very

 *       basic key/value dictionary within the "FIFO register" memory

 *       area at the beginning of BAR2.

 *

 *       Note that these definitions are only for 3D capabilities.

 *       The SVGA device also has "device capabilities" and "FIFO

 *       capabilities", which are non-3D-specific and are stored as

 *       bitfields rather than key/value pairs.

 */



#ifndef _SVGA3D_CAPS_H_

#define _SVGA3D_CAPS_H_



#define INCLUDE_ALLOW_MODULE

#define INCLUDE_ALLOW_USERLEVEL



#include "includeCheck.h"



#include "svga_reg.h"



#define SVGA_FIFO_3D_CAPS_SIZE   (SVGA_FIFO_3D_CAPS_LAST - \

                                  SVGA_FIFO_3D_CAPS + 1)





/*

 * SVGA3dCapsRecordType

 *

 *    Record types that can be found in the caps block.

 *    Related record types are grouped together numerically so that

 *    SVGA3dCaps_FindRecord() can be applied on a range of record

 *    types.

 */



typedef enum {

   SVGA3DCAPS_RECORD_UNKNOWN        = 0,

   SVGA3DCAPS_RECORD_DEVCAPS_MIN    = 0x100,

   SVGA3DCAPS_RECORD_DEVCAPS        = 0x100,

   SVGA3DCAPS_RECORD_DEVCAPS_MAX    = 0x1ff,

} SVGA3dCapsRecordType;





/*

 * SVGA3dCapsRecordHeader

 *

 *    Header field leading each caps block record. Contains the offset (in

 *    register words, NOT bytes) to the next caps block record (or the end

 *    of caps block records which will be a zero word) and the record type

 *    as defined above.

 */



typedef

#include "vmware_pack_begin.h"

struct SVGA3dCapsRecordHeader {

   uint32 length;

   SVGA3dCapsRecordType type;

}

#include "vmware_pack_end.h"

SVGA3dCapsRecordHeader;





/*

 * SVGA3dCapsRecord

 *

 *    Caps block record; "data" is a placeholder for the actual data structure

 *    contained within the record;

 */



typedef

#include "vmware_pack_begin.h"

struct SVGA3dCapsRecord {

   SVGA3dCapsRecordHeader header;

   uint32 data[1];

}

#include "vmware_pack_end.h"

SVGA3dCapsRecord;





typedef uint32 SVGA3dCapPair[2];



#endif

drivers/gpu/drm/vmwgfx/device_include/svga3d_cmd.h

0 → 100644
+2071 −0

File added.

Preview size limit exceeded, changes collapsed.