platform/upstream/libdrm.git
10 years agoBump the version to 2.4.52 libdrm-2.4.52
Kenneth Graunke [Mon, 13 Jan 2014 23:47:15 +0000 (15:47 -0800)]
Bump the version to 2.4.52

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agointel: Create a new drm_intel_bo offset64 field.
Kenneth Graunke [Mon, 13 Jan 2014 22:14:36 +0000 (14:14 -0800)]
intel: Create a new drm_intel_bo offset64 field.

The existing 'offset' field is unfortunately typed as 'unsigned long',
which is unfortunately only 4 bytes with a 32-bit userspace.

Traditionally, the hardware has only supported 32-bit virtual addresses,
so even though the kernel uses a __u64, the value would always fit.

However, Broadwell supports 48-bit addressing.  So with a 64-bit kernel,
the card virtual address may be too large to fit in the 'offset' field.

Ideally, we would change the type of 'offset' to be a uint64_t---but
this would break the libdrm ABI.  Instead, we create a new 'offset64'
field to hold the full 64-bit value from the kernel, and store the
32-bit truncation in the existing 'offset' field, for compatibility.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agointel: Track whether a buffer is idle to avoid trips to the kernel.
Eric Anholt [Wed, 15 Jan 2014 08:38:39 +0000 (00:38 -0800)]
intel: Track whether a buffer is idle to avoid trips to the kernel.

I've seen a number of apps spending unreasonable amounts of time in
drm_intel_bo_busy during the buffer mapping process.

We can't track idleness in general, in the case of buffers shared
across processes.  But this should significantly reduce our overhead
for checking for busy on things like VBOs.

Improves (unoptimized) glamor x11perf -f8text by 0.243334% +/-
0.161498% (n=1549), which has formerly been spending about .5% of its
time hitting the kernel for drm_intel_gem_bo_busy().

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agodrm: Initialize or valgrind-clear modesetting ioctl arguments.
Eric Anholt [Sun, 29 Dec 2013 06:06:51 +0000 (22:06 -0800)]
drm: Initialize or valgrind-clear modesetting ioctl arguments.

Fixes valgrind complaints in the modesetting driver.  I tried to
follow each ioctl's pattern for whether it was initializing just the
in values, or both in and out values.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoMark debug_print with __attribute__ ((format(__printf__, 1, 0)))
Keith Packard [Sun, 12 Jan 2014 18:32:57 +0000 (10:32 -0800)]
Mark debug_print with __attribute__ ((format(__printf__, 1, 0)))

the drmServerInfo member, debug_print, takes a printf format string
and varargs list. Tell the compiler about it.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agofreedreno: add fd_device_new_dup()
Rob Clark [Sun, 12 Jan 2014 13:27:36 +0000 (08:27 -0500)]
freedreno: add fd_device_new_dup()

There seem to be some cases (I've noticed this switching resolution in
some games, for example) where the fd can get closed() before the device
and all it's bo's are destroyed.  Which, if the drm device is opened
again and bo's are allocated with the same handles, results that when
the first pipe_screen/pipe_context is destroyed causes the first dev to
close handles for bo's allocated by the second device.

The easy solution to that is to add a mode where the fd_device creates
it's own private fd (a dup()).

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agomodetest: add the possibility to select the refresh frequency for a mode
Vincent ABRIOU [Fri, 10 Jan 2014 10:02:33 +0000 (11:02 +0100)]
modetest: add the possibility to select the refresh frequency for a mode

When mode is selected we only give the name of the mode as parameter.
But sometime, two different modes have the same name but not
the same vrefresh frequency.
This patch give the possibility to select a mode by its name
and optionally by its refresh frequency.

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agotests/kmstest: support exynos
Hyungwon Hwang [Fri, 10 Jan 2014 07:44:30 +0000 (16:44 +0900)]
tests/kmstest: support exynos

In this patch, to support exynos for KMS, Exynos KMS driver is newly added.
Also, Exynos is added to the list of kmstest supported modules.

Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agointel: Merge latest i915_drm.h
Ben Widawsky [Thu, 2 Jan 2014 19:36:59 +0000 (11:36 -0800)]
intel: Merge latest i915_drm.h

This was not done as a straight copy because reset_stats IOCTL landed in
libdrm before upstream kernel.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agointel: Handle malloc fails in context create
Ben Widawsky [Fri, 27 Dec 2013 00:37:00 +0000 (16:37 -0800)]
intel: Handle malloc fails in context create

The previous code would just use the potentially unallocated variable,
which is probably okay most of the time, but not very nice to the user
of the library.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agointel: squash unused variable 'bo_gem'
Ben Widawsky [Fri, 27 Dec 2013 00:30:09 +0000 (16:30 -0800)]
intel: squash unused variable 'bo_gem'

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agoBump the version to 2.4.51 2.4.51 libdrm-2.4.51
Rob Clark [Wed, 8 Jan 2014 20:36:29 +0000 (15:36 -0500)]
Bump the version to 2.4.51

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agofreedreno: allow IB to different ringbuffer
Rob Clark [Sat, 21 Dec 2013 17:11:40 +0000 (12:11 -0500)]
freedreno: allow IB to different ringbuffer

Allow IB to different ringbuffer in addition to just different part of
same ringbuffer.  In particular, we need to add bo's to the parent (ie.
one passed to flush) bo table, since the bo table applies to all the
cmd buffers in submit ioctl.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agofreedreno/kgsl: fix crash introduced w/ bo-cache
Rob Clark [Sun, 5 Jan 2014 17:19:12 +0000 (12:19 -0500)]
freedreno/kgsl: fix crash introduced w/ bo-cache

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agoradeon: fix sumo2 pci id
Alex Deucher [Tue, 24 Dec 2013 20:19:34 +0000 (15:19 -0500)]
radeon: fix sumo2 pci id

0x9649 is sumo2, not sumo.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agoradeon: avoid possible divide by 0 in surface manager
Alex Deucher [Tue, 10 Dec 2013 17:38:26 +0000 (12:38 -0500)]
radeon: avoid possible divide by 0 in surface manager

Some users report hitting a divide by 0 with the tile split in
certain apps.  Tile_split shouldn't ever be 0 unless the surface
structure was not properly initialized.  I think there may be some
cases where mesa uses an improperly initialized surface struct,
but I haven't had time to track it down.

Bug:
https://bugs.freedesktop.org/show_bug.cgi?id=72425

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
10 years agofreedreno: add bo cache
Rob Clark [Fri, 13 Dec 2013 17:48:30 +0000 (12:48 -0500)]
freedreno: add bo cache

Workloads which create many transient buffers cause significant CPU
overhead in buffer allocation, zeroing, cache maint, and mmap setup.
By caching and re-using existing buffers, the CPU overhead drops
significantly.  See:

http://bloggingthemonkey.blogspot.com/2013/09/freedreno-update-moar-fps.html

A simple time based policy is used for purging the cache.  Once the
kernel supports it, we could use madvise style API to handle memory
pressure scenarios a bit better.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agointel/test_decode: Allow gen8 to be infered from the batch filenames
Damien Lespiau [Fri, 13 Dec 2013 12:03:10 +0000 (12:03 +0000)]
intel/test_decode: Allow gen8 to be infered from the batch filenames

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
10 years agogitignore: Ignore various generated files
Damien Lespiau [Fri, 13 Dec 2013 17:15:14 +0000 (17:15 +0000)]
gitignore: Ignore various generated files

- *.log/*.trs are generated by make check
- TAGS are generated by make tags
- build-aux, config.h.in~ by autoconf
- *.sw? are temporary files create by vim
- name_from_fd wasn't ignored yet for some reason

v2: Ignore *~ as well (Daniel Vetter)

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
10 years agoBump the version to 2.4.50 2.4.50 libdrm-2.4.50
Marek Olšák [Tue, 3 Dec 2013 18:50:22 +0000 (19:50 +0100)]
Bump the version to 2.4.50

10 years ago intel: Track known prime buffers for re-use
Keith Packard [Fri, 22 Nov 2013 13:31:01 +0000 (05:31 -0800)]
 intel: Track known prime buffers for re-use

If the application sends us a file descriptor pointing at a prime
buffer that we've already got, we have to re-use the same bo_gem
structure or chaos will result.

Track the set of all known prime objects and look to see if the kernel
has returned one of those for a new file descriptor.

Also checks for prime buffers in the flink case.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
10 years agoradeon: Update unaligned offset for 2D->1D tiling transition on SI
Michel Dänzer [Tue, 26 Nov 2013 09:16:03 +0000 (18:16 +0900)]
radeon: Update unaligned offset for 2D->1D tiling transition on SI

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71983

Tested-by: Arek Ruśniak <arek.rusi@gmail.com>
10 years agoBump the version for release 2.4.49 libdrm-2.4.49
Marek Olšák [Sat, 23 Nov 2013 00:27:57 +0000 (01:27 +0100)]
Bump the version for release

10 years agoradeon: handle P16 pipe configs for Hawaii
Marek Olšák [Fri, 22 Nov 2013 23:34:45 +0000 (00:34 +0100)]
radeon: handle P16 pipe configs for Hawaii

10 years agoradeon: don't overallocate stencil by 4 on SI and CIK
Michel Dänzer [Mon, 18 Nov 2013 10:40:08 +0000 (11:40 +0100)]
radeon: don't overallocate stencil by 4 on SI and CIK

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
10 years agoradeon: implement 2D tiling for CIK
Marek Olšák [Fri, 22 Nov 2013 22:31:13 +0000 (23:31 +0100)]
radeon: implement 2D tiling for CIK

Bug fixes and simplification by Marek.
We have to use the tile index of 0 for non-MSAA depth-stencil after all.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
10 years agoradeon: fix mipmap level 0 and 1 alignment for SI and CIK
Michel Dänzer [Thu, 14 Nov 2013 15:40:30 +0000 (16:40 +0100)]
radeon: fix mipmap level 0 and 1 alignment for SI and CIK

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
10 years agointel: Use memset instead of VG_CLEAR
Ian Romanick [Wed, 20 Nov 2013 16:32:14 +0000 (08:32 -0800)]
intel: Use memset instead of VG_CLEAR

The ioctl expects that certain fields will be zeroed, so we should allow
the helper function to actually work in non-Valgrind builds.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reported-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
10 years agolibdrm/mode: Update the encoder and connector defines
Thomas Hellstrom [Tue, 19 Nov 2013 06:50:11 +0000 (07:50 +0100)]
libdrm/mode: Update the encoder and connector defines

Update the defines to match the kernel drm_mode.h

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
10 years agolibdrm: bump to 2.4.48 2.4.48 libdrm-2.4.48
Ian Romanick [Sat, 16 Nov 2013 02:01:08 +0000 (18:01 -0800)]
libdrm: bump to 2.4.48

10 years agointel: Add support for GPU reset status query ioctl
Ian Romanick [Fri, 15 Nov 2013 18:24:43 +0000 (10:24 -0800)]
intel: Add support for GPU reset status query ioctl

I would have just used the drmIoctl interface directly in Mesa, but the
ioctl needs some data from the drm_intel_context that is not exposed
outside libdrm.

This ioctl is in the drm-intel-next tree as b635991.

v2: Update based on Mika's kernel work.

v3: Fix compile failures from last-minute typos.  Sigh.

v4: Import the actual changes from the kernel i915_drm.h.  Only comments
on some fields of drm_i915_reset_stats differed.  There are still some
deltas between the kernel i915_drm.h and the one in libdrm, but those
can be resolved in other patches.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> [v3]
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
10 years agoradeon: add hawaii pci ids
Alex Deucher [Tue, 24 Sep 2013 15:30:19 +0000 (11:30 -0400)]
radeon: add hawaii pci ids

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agoradeon: add hawaii chip family
Alex Deucher [Tue, 24 Sep 2013 15:27:11 +0000 (11:27 -0400)]
radeon: add hawaii chip family

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agoRevert "intel: Add support for GPU reset status query ioctl"
Dave Airlie [Fri, 8 Nov 2013 06:40:18 +0000 (16:40 +1000)]
Revert "intel: Add support for GPU reset status query ioctl"

This reverts commit 6335e1d28c422050024bcf4100c4fb3a5bac2afb.

No taxation without representation, in other words no userspace without kernel
stuff being in a stable location, either drm-next but I'll accept drm-intel-next
for intel specific stuff.

10 years agointel: Add support for GPU reset status query ioctl
Ian Romanick [Mon, 10 Sep 2012 11:15:02 +0000 (14:15 +0300)]
intel: Add support for GPU reset status query ioctl

I would have just used the drmIoctl interface directly in Mesa, but the
ioctl needs some data from the drm_intel_context that is not exposed
outside libdrm.

v2: Update based on Mika's kernel work.

v3: Fix compile failures from last-minute typos.  Sigh.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
10 years agointel/bdw: Update MI_BATCH_BUFFER_START for aub dumps
Damien Lespiau [Fri, 15 Feb 2013 16:44:05 +0000 (16:44 +0000)]
intel/bdw: Update MI_BATCH_BUFFER_START for aub dumps

The command now takes a 48bits address and is thus 1 dword longer.

v2 (Ben): commit message: s/byte/dword (Eric)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agointel/bdw/aub: Update AUB trace block writes for 48-bit addressing.
Kenneth Graunke [Fri, 15 Feb 2013 17:29:46 +0000 (09:29 -0800)]
intel/bdw/aub: Update AUB trace block writes for 48-bit addressing.

Since our aub file dumping's GTT handling is totally fake, we always put
everything in the low 4GB anyway and shouldn't ever need to set
AddressHigh to anything other than 0.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
[ben: slight commit message change]
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agointel/bdw: Add gen8 to the decode init
Damien Lespiau [Wed, 13 Feb 2013 16:09:34 +0000 (16:09 +0000)]
intel/bdw: Add gen8 to the decode init

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agointel/bdw: Handle gen8 bufmgr_init
Ben Widawsky [Wed, 13 Feb 2013 16:09:33 +0000 (16:09 +0000)]
intel/bdw: Handle gen8 bufmgr_init

[bwidawsk: Added Damien's SOB]
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agointel/bdw: Add broadwell chipset IDs
Ben Widawsky [Tue, 4 Dec 2012 21:56:14 +0000 (13:56 -0800)]
intel/bdw: Add broadwell chipset IDs

v2: Rename s/<SECRET>/IRIS/

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
10 years agonouveau: prevent undefined behavior in nouveau_pushbuf_reloc with gcc-4.8
Maarten Lankhorst [Thu, 7 Nov 2013 12:30:19 +0000 (13:30 +0100)]
nouveau: prevent undefined behavior in nouveau_pushbuf_reloc with gcc-4.8

Reported-by: ronald645@gmail.com
Bisected-by (gcc): Andreas Radke <a.radke@arcor.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71116
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
10 years agoAdd DRM_MODE_PAGE_FLIP_ASYNC define
Keith Packard [Sun, 21 Jul 2013 21:24:35 +0000 (14:24 -0700)]
Add DRM_MODE_PAGE_FLIP_ASYNC define

This exposes the kernel API for performing asynchronous flips

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agointel: Add MI_LOAD_REGISTER_MEM to intel_decode.c.
Kenneth Graunke [Wed, 30 Oct 2013 03:41:16 +0000 (20:41 -0700)]
intel: Add MI_LOAD_REGISTER_MEM to intel_decode.c.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>
10 years agointel: Add the Gen6+ version of MI_REPORT_PERF_COUNT to intel_decode.c.
Kenneth Graunke [Wed, 30 Oct 2013 02:30:45 +0000 (19:30 -0700)]
intel: Add the Gen6+ version of MI_REPORT_PERF_COUNT to intel_decode.c.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ben Widawsky <benjamin.widawsky@intel.com>
10 years agolibdrm: bump to 2.4.47 2.4.47 libdrm-2.4.47
Ben Widawsky [Fri, 11 Oct 2013 16:47:45 +0000 (09:47 -0700)]
libdrm: bump to 2.4.47

10 years agointel: Set bo size from lseek if kernel supports it
Kristian Høgsberg [Thu, 10 Oct 2013 21:40:58 +0000 (14:40 -0700)]
intel: Set bo size from lseek if kernel supports it

The various create and open functions set the buffer size, but
drm_intel_bo_gem_create_from_prime() is an exception.  In the 3.12 kernel
we can now use lseek on the prime fd to determine the size of the bo.
Use that and override the userprovided size.  If the kernel doesn't
support this, we get an error and fall back to the user provided size.

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
10 years agodrm: Introduce a drmSetClientCap() wrapper
Damien Lespiau [Tue, 3 Sep 2013 14:34:41 +0000 (15:34 +0100)]
drm: Introduce a drmSetClientCap() wrapper

That wraps around the new DRM_SET_CLIENT_CAP ioctl.

v2: SET_CAP -> SET_CLIENT_CAP renaming

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
10 years agodrm: Sync the DRM_SET_CLIENT_CAP ioctl definition
Damien Lespiau [Tue, 3 Sep 2013 14:31:49 +0000 (15:31 +0100)]
drm: Sync the DRM_SET_CLIENT_CAP ioctl definition

v2: SET_CAP -> SET_CLIENT_CAP renaming

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
10 years agodrm: Synchronize the stereo 3D mode flags from the kernel headers
Damien Lespiau [Fri, 23 Aug 2013 14:57:40 +0000 (15:57 +0100)]
drm: Synchronize the stereo 3D mode flags from the kernel headers

v2: stereo layouts are now an enum (Daniel Vetter)

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
10 years agoradeon: fix pitch alignment for non-power-of-two mipmaps on SI
Marek Olšák [Thu, 19 Sep 2013 12:19:02 +0000 (14:19 +0200)]
radeon: fix pitch alignment for non-power-of-two mipmaps on SI

This fixes VM protection faults.

I have a new piglit test which can iterate over all possible widths, heights,
and depths (including NPOT) and tests mipmapping with various texture targets.

After this is committed, I'll make a new release of libdrm and bump
the libdrm version requirement in Mesa.

10 years agoconfigure: add AC_LANG_SOURCE call within AC_COMPILE_IFELSE
Emil Velikov [Thu, 19 Sep 2013 16:21:01 +0000 (17:21 +0100)]
configure: add AC_LANG_SOURCE call within AC_COMPILE_IFELSE

Documentation states that AC_*_IFELSE has to use AC_LANG_SOURCE or
friends in order to generate the source code to compile.
AC_LINK_IFELSE already handles this, thus convert AC_COMPILE_IFELSE
to silence the final autoconf warnings.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
10 years agolibdrm: Make some drm headers compatible with gcc -std=c89 -pedantic
Daniel Kurtz [Mon, 26 Aug 2013 15:39:16 +0000 (23:39 +0800)]
libdrm: Make some drm headers compatible with gcc -std=c89 -pedantic

The following minor changes were needed to these headers:
 * Convert // comments to /* */
 * No , after final member of enum

With these changes, these header files can be included by a program that
is built with gcc options:
  -std=c89 -Werror -pedantic

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoradeon: Fix tiling mode index for 1D tiled depth/stencil surfaces on CIK
Michel Dänzer [Wed, 18 Sep 2013 13:43:05 +0000 (15:43 +0200)]
radeon: Fix tiling mode index for 1D tiled depth/stencil surfaces on CIK

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
10 years agofreedreno: add missing NOSYNC flag
Rob Clark [Wed, 11 Sep 2013 19:55:35 +0000 (15:55 -0400)]
freedreno: add missing NOSYNC flag

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agomodetest: allow setting a scaling factor when showing plane
Ilia Mirkin [Sun, 8 Sep 2013 01:36:02 +0000 (21:36 -0400)]
modetest: allow setting a scaling factor when showing plane

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Rob Clark <robdclark@gmail.com>
10 years agomodetest: add a -D option to specify a device to be used
Ilia Mirkin [Sun, 8 Sep 2013 01:36:01 +0000 (21:36 -0400)]
modetest: add a -D option to specify a device to be used

This is helpful for differentiating between multiple devices that use
the same module.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Rob Clark <robdclark@gmail.com>
10 years agoradeon: pad CS to 8 DW
Alex Deucher [Fri, 6 Sep 2013 19:58:56 +0000 (15:58 -0400)]
radeon: pad CS to 8 DW

Aligns the IB to 8 DWs.  The aligns the IB to the
CP fetch size.  r6xx also require at least 4 DW
alignment to avoid a hw bug.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agoradeon: add berlin pci ids
Alex Deucher [Thu, 24 Jan 2013 23:12:21 +0000 (18:12 -0500)]
radeon: add berlin pci ids

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agointel: Update package name and description in libdrm_intel.pc
Emil Velikov [Thu, 29 Aug 2013 20:31:54 +0000 (21:31 +0100)]
intel: Update package name and description in libdrm_intel.pc

Currently the package name and description duplicate that of the
core libdrm. Update those to reflect reality.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
10 years agofreedreno: set automake options to include subdir-objects
Emil Velikov [Thu, 29 Aug 2013 20:31:53 +0000 (21:31 +0100)]
freedreno: set automake options to include subdir-objects

Handles automake complains about lack of forward-compatibility, due to the
source files in the kgsl and msm backends/folders.

Cc: Rob Clark <robclark@freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agofreedreno: use local drm.h over the system one
Emil Velikov [Thu, 29 Aug 2013 20:31:52 +0000 (21:31 +0100)]
freedreno: use local drm.h over the system one

Otherwise build will fail, as drm/drm.h is not available.

Cc: Rob Clark <robclark@freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agotests/modetest: silence compiler warning about uninitialised variables
Emil Velikov [Thu, 29 Aug 2013 20:31:51 +0000 (21:31 +0100)]
tests/modetest: silence compiler warning about uninitialised variables

The compiler is unaware of that we have at least one crts/connector/plane
thus it complains that some of our variables will be used uninitialised.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
10 years agotests/*version: add missing string.h header
Emil Velikov [Thu, 29 Aug 2013 20:31:50 +0000 (21:31 +0100)]
tests/*version: add missing string.h header

Prodives memset() and strlen(), used in tests/setversion
tests/getversion respectively.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
10 years agotests: add msm
Rob Clark [Fri, 30 Aug 2013 15:15:30 +0000 (11:15 -0400)]
tests: add msm

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agofreedreno: add support for msm drm
Rob Clark [Sun, 21 Jul 2013 00:35:31 +0000 (20:35 -0400)]
freedreno: add support for msm drm

This adds support for the "msm" backend, using the upstream msm drm/kms
driver.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agofreedreno: support either kgsl or msm
Rob Clark [Wed, 10 Jul 2013 19:20:04 +0000 (15:20 -0400)]
freedreno: support either kgsl or msm

Split out common code and backend.  Current backend is for 'kgsl'
android driver, but a new backend will provide support for the
upstream msm drm/kms driver.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agomodetest: Allocate NV buffers large enough for the two planes
Laurent Pinchart [Fri, 14 Jun 2013 20:57:49 +0000 (22:57 +0200)]
modetest: Allocate NV buffers large enough for the two planes

Multiple the image height by 1.5 for NV12/NV21 and by 2 for NV16/NV61 to
make room for the chroma plane.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Fix line stride in SMPTE YUV packet pattern generator
Laurent Pinchart [Fri, 14 Jun 2013 20:57:30 +0000 (22:57 +0200)]
modetest: Fix line stride in SMPTE YUV packet pattern generator

The line stride passed to the function is expressed in bytes, there's no
need to multiply it by 2.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Try all possible encoders for a connector
Laurent Pinchart [Tue, 19 Mar 2013 14:36:09 +0000 (15:36 +0100)]
modetest: Try all possible encoders for a connector

When building the pipeline, instead of using only the encoders attached
to a connector, take all possible encoders into account to locate a
CRTC.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Support pipes with multiple connectors
Laurent Pinchart [Tue, 19 Mar 2013 12:48:36 +0000 (13:48 +0100)]
modetest: Support pipes with multiple connectors

The -s argument can now take a list of connectors. Configure all of them
in cloned mode using a single CRTC.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Rename struct connector_arg to struct pipe_arg
Laurent Pinchart [Tue, 19 Mar 2013 12:47:39 +0000 (13:47 +0100)]
modetest: Rename struct connector_arg to struct pipe_arg

This prepares the code for handling multiple connectors in a single
pipeline in a cloned configuration.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Split mode setting and plane setup
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Split mode setting and plane setup

There's not reason to require setting a mode to test planes. Split the
two operations.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Give the CRTC ID to the -P option
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Give the CRTC ID to the -P option

Planes are associated with CRTCs, not connectors. Don't try to be too
clever, use the CRTC ID in the -P option. This prepares for splitting
CRTC and planes setup.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Store the mode in the crtc structure
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Store the mode in the crtc structure

This prepares the code for the split in separate functions of CRTC and
planes setup.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Store the crtc in the connector_arg structure
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Store the crtc in the connector_arg structure

This prepares the code for the split in separate functions of CRTC and
planes setup.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Remove the struct connector_arg encoder field
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Remove the struct connector_arg encoder field

The field is no needed, make it a local variable where used.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Compute CRTC pipe number as needed
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Compute CRTC pipe number as needed

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Create a device structure
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Create a device structure

Instead of passing the device fd and resources as global variables group
them in a device structure and pass it explictly to all functions that
need it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Remove the -m argument
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Remove the -m argument

The argument isn't used, remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Print the plane ID when setting up a plane
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Print the plane ID when setting up a plane

As modetest automatically selects an unused plan, providing the plane ID
allows modifying plane properties for the selected planes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Allow specifying plane position
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Allow specifying plane position

Extend the -P option to allow specifying the plane x and y offsets. The
position is optional, if not specified the plane will be positioned at
the center of the screen as before.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Add a command line parameter to set properties
Laurent Pinchart [Wed, 27 Feb 2013 04:35:13 +0000 (05:35 +0100)]
modetest: Add a command line parameter to set properties

The -w parameter can be used to set a property value from the command
line, using the target object ID and the property name.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Don't limit mode set and planes to two instances
Laurent Pinchart [Fri, 1 Mar 2013 01:28:42 +0000 (02:28 +0100)]
modetest: Don't limit mode set and planes to two instances

Configuring mode on more than two connectors or two planes is perfectly
valid. Support it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Retrieve all resources in one go
Laurent Pinchart [Wed, 27 Feb 2013 05:39:36 +0000 (06:39 +0100)]
modetest: Retrieve all resources in one go

Instead of retrieving resources as they are needed, retrieve them all
(except property blobs) in one go at startup.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Add a command line parameter to drop master after mode set
Laurent Pinchart [Wed, 27 Feb 2013 04:19:44 +0000 (05:19 +0100)]
modetest: Add a command line parameter to drop master after mode set

If the -d parameter is specified, modetest will drop master permissions
after setting the mode.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agomodetest: Add a command line parameter to select the driver
Laurent Pinchart [Fri, 8 Feb 2013 12:42:45 +0000 (13:42 +0100)]
modetest: Add a command line parameter to select the driver

If the -M parameter is specified, modetest will use the requested device
name instead of trying its builtin list of device names.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
10 years agomodetest: Sort command line arguments
Laurent Pinchart [Fri, 8 Feb 2013 10:12:03 +0000 (11:12 +0100)]
modetest: Sort command line arguments

The current mostly random sort order hinders code readability. Sort the
options alphabetically in the code, and by group in the help message.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
10 years agomodetest: Remove extern declarations of opt(arg|ind|err|opt)
Laurent Pinchart [Fri, 8 Feb 2013 10:08:38 +0000 (11:08 +0100)]
modetest: Remove extern declarations of opt(arg|ind|err|opt)

Those variables are declared in unistd.h, there's no need to redeclare
them here.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
10 years agomodetest: Fix warnings
Laurent Pinchart [Mon, 11 Feb 2013 20:36:30 +0000 (21:36 +0100)]
modetest: Fix warnings

Enable all standard automake warnings except for -Wpointer-arith (as the
test pattern generation code uses void pointer arithmetics) and fix
them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
10 years agotests: add tilcdc to modetest/vbltest
Rob Clark [Thu, 1 Aug 2013 21:52:13 +0000 (17:52 -0400)]
tests: add tilcdc to modetest/vbltest

Signed-off-by: Rob Clark <robclark@freedesktop.org>
10 years agointel: silence valgrind warnings for unsynchronized maps
Chia-I Wu [Wed, 10 Jul 2013 02:49:59 +0000 (10:49 +0800)]
intel: silence valgrind warnings for unsynchronized maps

Mark the address ranges as accessible with VALGRIND_MAKE_MEM_DEFINED.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
10 years agolibdrm: add missing DRM_CAP_TIMESTAMP_MONOTONIC
Imre Deak [Thu, 22 Nov 2012 14:00:39 +0000 (16:00 +0200)]
libdrm: add missing DRM_CAP_TIMESTAMP_MONOTONIC

Just add the definition according the kernel's copy of drm.h

Signed-off-by: Imre Deak <imre.deak@intel.com>
10 years agolibdrm: bump to 2.4.46 2.4.46 libdrm-2.4.46
Dave Airlie [Tue, 2 Jul 2013 08:24:53 +0000 (09:24 +0100)]
libdrm: bump to 2.4.46

10 years agodrm: add hotspot cursor interface support.
Dave Airlie [Tue, 2 Jul 2013 08:21:06 +0000 (09:21 +0100)]
drm: add hotspot cursor interface support.

Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agoradeon: add kabini pci ids
Alex Deucher [Thu, 24 Jan 2013 23:01:59 +0000 (18:01 -0500)]
radeon: add kabini pci ids

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agoradeon: add Bonaire pci ids
Alex Deucher [Fri, 7 Jun 2013 17:46:37 +0000 (13:46 -0400)]
radeon: add Bonaire pci ids

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agoradeon: add CIK chip families
Alex Deucher [Fri, 7 Jun 2013 17:45:30 +0000 (13:45 -0400)]
radeon: add CIK chip families

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
10 years agointel/aub: Implement a way to specify the output .aub filename
Damien Lespiau [Wed, 20 Feb 2013 12:11:49 +0000 (12:11 +0000)]
intel/aub: Implement a way to specify the output .aub filename

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agointel/aub: Return early if we disable aub dumps
Damien Lespiau [Wed, 20 Feb 2013 12:11:50 +0000 (12:11 +0000)]
intel/aub: Return early if we disable aub dumps

No need to prepare the .aub header and dump in that case, it'll be
done with the next call with true.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agointel/aub: Sync the AUB defines with mesa's
Damien Lespiau [Wed, 20 Feb 2013 12:11:48 +0000 (12:11 +0000)]
intel/aub: Sync the AUB defines with mesa's

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>