Re: [PATCH libdrm] configure.ac: pthread-stubs is not a thing on GNU/kFreeBSD

[Andreas Boll]

2017-04-05 18:43 GMT+02:00 Eric Engestrom <eric.engest...@imgtec.com>:
> On Wednesday, 2017-04-05 17:24:31 +0100, Emil Velikov wrote:
>> From: Emil Velikov <emil.veli...@collabora.com>
>>
>> As mentioned on the xcb mailing list, the platform uses the GLIBC
>> forwarding mechanism.
>>
>> https://lists.freedesktop.org/archives/xcb/2016-November/010896.html
>>
>> Cc: Andreas Boll <andreas.boll@gmail.com>
>> Reported-by: Andreas Boll <andreas.boll@gmail.com>
>> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
>> ---
>> I'm slightly inclined to go a single *gnu* but I'm not 100% sure if that
>> won't catch some corner case platforms. Opinions ?
>
> Go with `*gnu*` and replace it with something more complex if/when
> someone reports this breaks their platform?
> Without knowing any more, it's almost as likely that this hypothetical
> platform would match `*-gnu*` as well anyway.
>
> Either way:
> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>

Yeah, sounds good.

Either way too for this and the mesa patch:
Reviewed-by: Andreas Boll <andreas.boll@gmail.com>

>
>> ---
>>  configure.ac | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index f1a13090..0f6fe46d 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -64,7 +64,7 @@ LT_INIT([disable-static])
>>  dnl pthread-stubs is mandatory on BSD platforms, due to the nature of the
>>  dnl project. Even then there's a notable issue as described in the project 
>> README
>>  case "$host_os" in
>> -linux* | cygwin* | darwin* | solaris* | gnu*)
>> +linux* | cygwin* | darwin* | solaris* | *-gnu* | gnu*)
>>  pthread_stubs_possible="no"
>>  ;;
>>  * )
>> --
>> 2.11.1
>>
> ___
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2 0/2] drm amdgpu/radeon: clean up d3_delay usage

[Andreas Boll]

For the series:
Reviewed-by: Andreas Boll <andreas.boll@gmail.com>

2017-02-01 17:22 GMT+01:00 Bjorn Helgaas <bhelg...@google.com>:
> amdgpu doesn't need to touch pdev->d3_delay at all.
>
> radeon has a d3_delay quirk for MacBook Pro, but it only affects
> radeon_switcheroo_set_state().  I think it should affect wakeups done by
> the PCI core as well.
>
> Changes from v1 to v2:
>   - Fix accidental removal of "{ 0, 0, 0, 0, 0 }" quirk list termination
> (thanks, Andreas Boll!)
>   - Add ack from Alex Deucher
> ---
>
> Bjorn Helgaas (2):
>   drm/amdgpu: remove unnecessary save/restore of pdev->d3_delay
>   drm/radeon: make MacBook Pro d3_delay quirk more generic
>
>
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |4 
>  drivers/gpu/drm/radeon/radeon_device.c |   11 ---
>  drivers/pci/quirks.c   |   13 +
>  3 files changed, 13 insertions(+), 15 deletions(-)
> ___
> amd-gfx mailing list
> amd-...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v1 2/2] drm/radeon: make MacBook Pro d3_delay quirk more generic

[Andreas Boll]

2017-01-30 21:41 GMT+01:00 Bjorn Helgaas :
> The PCI Power Management Spec, r1.2, sec 5.6.1, requires a 10 millisecond
> delay when powering on a device, i.e., transitioning from state D3hot to
> D0.
>
> Apparently some devices require more time, and d1f9809ed131 ("drm/radeon:
> add quirk for d3 delay during switcheroo poweron for apple macbooks") added
> an additional delay for the Radeon device in a MacBook Pro.  4807c5a8a0c8
> ("drm/radeon: add a PX quirk list") made the affected device more explicit.
>
> Add a generic PCI quirk to increase the d3_delay.  This means we will use
> the additional delay for *all* wakeups from D3, not just those initiated by
> radeon_switcheroo_set_state().
>
> Signed-off-by: Bjorn Helgaas 
> CC: Maarten Lankhorst 
> ---
>  drivers/gpu/drm/radeon/radeon_device.c |   12 
>  drivers/pci/quirks.c   |   13 +
>  2 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c 
> b/drivers/gpu/drm/radeon/radeon_device.c
> index 8a1df2a1afbd..8b8fd981cae5 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -113,7 +113,6 @@ static inline bool radeon_is_atpx_hybrid(void) { return 
> false; }
>  #endif
>
>  #define RADEON_PX_QUIRK_DISABLE_PX  (1 << 0)
> -#define RADEON_PX_QUIRK_LONG_WAKEUP (1 << 1)
>
>  struct radeon_px_quirk {
> u32 chip_vendor;
> @@ -136,9 +135,6 @@ static struct radeon_px_quirk radeon_px_quirk_list[] = {
>  * https://bugzilla.kernel.org/show_bug.cgi?id=51381
>  */
> { PCI_VENDOR_ID_ATI, 0x6840, 0x1043, 0x2122, 
> RADEON_PX_QUIRK_DISABLE_PX },
> -   /* macbook pro 8.2 */
> -   { PCI_VENDOR_ID_ATI, 0x6741, PCI_VENDOR_ID_APPLE, 0x00e2, 
> RADEON_PX_QUIRK_LONG_WAKEUP },

Do you intentionally removed the following line?
> -   { 0, 0, 0, 0, 0 },

>  };
>
>  bool radeon_is_px(struct drm_device *dev)
> @@ -1241,25 +1237,17 @@ static void radeon_check_arguments(struct 
> radeon_device *rdev)
>  static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum 
> vga_switcheroo_state state)
>  {
> struct drm_device *dev = pci_get_drvdata(pdev);
> -   struct radeon_device *rdev = dev->dev_private;
>
> if (radeon_is_px(dev) && state == VGA_SWITCHEROO_OFF)
> return;
>
> if (state == VGA_SWITCHEROO_ON) {
> -   unsigned d3_delay = dev->pdev->d3_delay;
> -
> printk(KERN_INFO "radeon: switched on\n");
> /* don't suspend or resume card normally */
> dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
>
> -   if (d3_delay < 20 && (rdev->px_quirk_flags & 
> RADEON_PX_QUIRK_LONG_WAKEUP))
> -   dev->pdev->d3_delay = 20;
> -
> radeon_resume_kms(dev, true, true);
>
> -   dev->pdev->d3_delay = d3_delay;
> -
> dev->switch_power_state = DRM_SWITCH_POWER_ON;
> drm_kms_helper_poll_enable(dev);
> } else {
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 1800befa8b8b..512d7a875d62 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -1683,6 +1683,19 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 
> 0x2609, quirk_intel_pcie_pm);
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   0x260a, quirk_intel_pcie_pm);
>  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   0x260b, quirk_intel_pcie_pm);
>
> +static void quirk_radeon_pm(struct pci_dev *dev)
> +{
> +   if (dev->subsystem_vendor == PCI_VENDOR_ID_APPLE &&
> +   dev->subsystem_device == 0x00e2) {
> +   if (dev->d3_delay < 20) {
> +   dev->d3_delay = 20;
> +   dev_info(>dev, "extending delay after power-on 
> from D3 to %d msec\n",
> +dev->d3_delay);
> +   }
> +   }
> +}
> +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6741, quirk_radeon_pm);
> +
>  #ifdef CONFIG_X86_IO_APIC
>  /*
>   * Boot interrupts on some chipsets cannot be turned off. For these chipsets,
>
> ___
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH libdrm] Remove unused tests/drmstat.c

[Andreas Boll]

Reviewed-by: Andreas Boll <andreas.boll@gmail.com>

2017-02-01 16:32 GMT+01:00 Emil Velikov <emil.l.veli...@gmail.com>:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> Earlier commit removed all the legacy 'tests' but a file was left
> danglig.
>
> Cc: Andreas Boll <andreas.boll@gmail.com>
> Reported-by: Andreas Boll <andreas.boll@gmail.com>
> Fixes: 0c80fddd1d0 "tests: remove useless legacy tests"
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
>  tests/drmstat.c | 419 
> 
>  1 file changed, 419 deletions(-)
>  delete mode 100644 tests/drmstat.c
>
> diff --git a/tests/drmstat.c b/tests/drmstat.c
> deleted file mode 100644
> index 023aa069..
> --- a/tests/drmstat.c
> +++ /dev/null
> @@ -1,419 +0,0 @@
> -/* drmstat.c -- DRM device status and testing program
> - * Created: Tue Jan  5 08:19:24 1999 by fa...@precisioninsight.com
> - *
> - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
> - * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
> - * 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 (including the next
> - * paragraph) 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
> - * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
> - *
> - * Authors: Rickard E. (Rik) Faith <fa...@valinux.com>
> - *
> - */
> -
> -#ifdef HAVE_CONFIG_H
> -#include "config.h"
> -#endif
> -
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#ifdef HAVE_ALLOCA_H
> -# include 
> -#endif
> -#include "xf86drm.h"
> -
> -int sigio_fd;
> -
> -static double usec(struct timeval *end, struct timeval *start)
> -{
> -double e = end->tv_sec   * 100 + end->tv_usec;
> -double s = start->tv_sec * 100 + start->tv_usec;
> -
> -return e - s;
> -}
> -
> -static void getversion(int fd)
> -{
> -drmVersionPtr version;
> -
> -version = drmGetVersion(fd);
> -if (version) {
> -   printf( "Name: %s\n", version->name ? version->name : "?" );
> -   printf( "Version: %d.%d.%d\n",
> -   version->version_major,
> -   version->version_minor,
> -   version->version_patchlevel );
> -   printf( "Date: %s\n", version->date ? version->date : "?" );
> -   printf( "Desc: %s\n", version->desc ? version->desc : "?" );
> -   drmFreeVersion(version);
> -} else {
> -   printf( "No driver available\n" );
> -}
> -}
> -
> -static void process_sigio(char *device)
> -{
> -int  fd;
> -
> -if ((fd = open(device, 0)) < 0) {
> -   drmError(-errno, __func__);
> -   exit(1);
> -}
> -
> -sigio_fd = fd;
> -for (;;) sleep(60);
> -}
> -
> -int main(int argc, char **argv)
> -{
> -intc;
> -intr  = 0;
> -intfd = -1;
> -drm_handle_t  handle;
> -void   *address;
> -char   *pt;
> -unsigned long  count;
> -unsigned long  offset;
> -unsigned long  size;
> -drm_context_t  context;
> -intloops;
> -char   buf[1024];
> -inti;
> -drmBufInfoPtr  info;
> -drmBufMapPtr   bufs;
> -drmLockPtr lock;
> -intsecs;
> -
> -while ((c = getopt(argc, argv,
> -   

[PATCH libdrm 3/6] libdrm: Fix drm.h include path in virtgpu drm header file

[Andreas Boll]

2016-07-21 18:10 GMT+02:00 Emil Velikov :
> On 21 July 2016 at 14:12, Andreas Boll  wrote:
>> A similar change was made to mesa's copy of virtgpu_drm.h by the
>> following commit:
>>
> Please sync this using the approach shown in commit
> c745e541a9d8dfd3fb5e1ac57297e58d34d9328f.
>
> Namely:
>  - Use make header_install and copy the resulting file over.
>  - Mention the tree/branch and sha where it is based on.
>
> Adding details about the kernel changes are a bonus, but not necessary
> unless they remove/change existing code.
>
> Thanks
> Emil

I've replaced this patch with a new one that syncs from the kernel header.

Thanks,
Andreas

[PATCH libdrm 2/6] automake: Pick up all Android files for distribution

[Andreas Boll]

2016-07-21 18:14 GMT+02:00 Emil Velikov :
> On 21 July 2016 at 14:12, Andreas Boll  wrote:
>> Currently only some Android Makefiles are included in the release tarball.
>> Add all remaining files to be more consistent.
>>
> Since Android folk never fully bought the idea of using actual
> releases/release tarballs, one could just drop all the existing
> Android.mk instances from the Makefiles.

Ok I've just sent a new patch to drop all Android files from the
release tarball.

>
> If the Debian build system warnings about files not included in the
> tarball go ahead with this patch.
>

No problem, I'll just extend the ignore rule like I did for mesa.

Thanks,
Andreas

[PATCH libdrm] virtgpu: Update kernel header

[Andreas Boll]

Generated using make headers_install.

This brings the C++ guard, proper include path for drm.h and the
switching to kernel types for fixed-with integers.

Generated from drm-next commit c11dea5b0290984fa48111957ba3fdc5b3bdae5a

Suggested-by: Emil Velikov 
Signed-off-by: Andreas Boll 
---
 include/drm/virtgpu_drm.h | 109 --
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/include/drm/virtgpu_drm.h b/include/drm/virtgpu_drm.h
index abf11c5..91a31ff 100644
--- a/include/drm/virtgpu_drm.h
+++ b/include/drm/virtgpu_drm.h
@@ -24,13 +24,16 @@
 #ifndef VIRTGPU_DRM_H
 #define VIRTGPU_DRM_H

-#include 
-#include "drm/drm.h"
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif

 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.
  *
- * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel
+ * Do not use pointers, use __u64 instead for 32 bit / 64 bit user/kernel
  * compatibility Keep fields aligned to their size
  */

@@ -45,88 +48,88 @@
 #define DRM_VIRTGPU_GET_CAPS  0x09

 struct drm_virtgpu_map {
-   uint64_t offset; /* use for mmap system call */
-   uint32_t handle;
-   uint32_t pad;
+   __u64 offset; /* use for mmap system call */
+   __u32 handle;
+   __u32 pad;
 };

 struct drm_virtgpu_execbuffer {
-   uint32_t flags; /* for future use */
-   uint32_t size;
-   uint64_t command; /* void* */
-   uint64_t bo_handles;
-   uint32_t num_bo_handles;
-   uint32_t pad;
+   __u32   flags;  /* for future use */
+   __u32 size;
+   __u64 command; /* void* */
+   __u64 bo_handles;
+   __u32 num_bo_handles;
+   __u32 pad;
 };

 #define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */

 struct drm_virtgpu_getparam {
-   uint64_t param;
-   uint64_t value;
+   __u64 param;
+   __u64 value;
 };

 /* NO_BO flags? NO resource flag? */
 /* resource flag for y_0_top */
 struct drm_virtgpu_resource_create {
-   uint32_t target;
-   uint32_t format;
-   uint32_t bind;
-   uint32_t width;
-   uint32_t height;
-   uint32_t depth;
-   uint32_t array_size;
-   uint32_t last_level;
-   uint32_t nr_samples;
-   uint32_t flags;
-   uint32_t bo_handle; /* if this is set - recreate a new resource 
attached to this bo ? */
-   uint32_t res_handle;  /* returned by kernel */
-   uint32_t size;/* validate transfer in the host */
-   uint32_t stride;  /* validate transfer in the host */
+   __u32 target;
+   __u32 format;
+   __u32 bind;
+   __u32 width;
+   __u32 height;
+   __u32 depth;
+   __u32 array_size;
+   __u32 last_level;
+   __u32 nr_samples;
+   __u32 flags;
+   __u32 bo_handle; /* if this is set - recreate a new resource attached 
to this bo ? */
+   __u32 res_handle;  /* returned by kernel */
+   __u32 size;/* validate transfer in the host */
+   __u32 stride;  /* validate transfer in the host */
 };

 struct drm_virtgpu_resource_info {
-   uint32_t bo_handle;
-   uint32_t res_handle;
-   uint32_t size;
-   uint32_t stride;
+   __u32 bo_handle;
+   __u32 res_handle;
+   __u32 size;
+   __u32 stride;
 };

 struct drm_virtgpu_3d_box {
-   uint32_t x;
-   uint32_t y;
-   uint32_t z;
-   uint32_t w;
-   uint32_t h;
-   uint32_t d;
+   __u32 x;
+   __u32 y;
+   __u32 z;
+   __u32 w;
+   __u32 h;
+   __u32 d;
 };

 struct drm_virtgpu_3d_transfer_to_host {
-   uint32_t bo_handle;
+   __u32 bo_handle;
struct drm_virtgpu_3d_box box;
-   uint32_t level;
-   uint32_t offset;
+   __u32 level;
+   __u32 offset;
 };

 struct drm_virtgpu_3d_transfer_from_host {
-   uint32_t bo_handle;
+   __u32 bo_handle;
struct drm_virtgpu_3d_box box;
-   uint32_t level;
-   uint32_t offset;
+   __u32 level;
+   __u32 offset;
 };

 #define VIRTGPU_WAIT_NOWAIT 1 /* like it */
 struct drm_virtgpu_3d_wait {
-   uint32_t handle; /* 0 is an invalid handle */
-   uint32_t flags;
+   __u32 handle; /* 0 is an invalid handle */
+   __u32 flags;
 };

 struct drm_virtgpu_get_caps {
-   uint32_t cap_set_id;
-   uint32_t cap_set_ver;
-   uint64_t addr;
-   uint32_t size;
-   uint32_t pad;
+   __u32 cap_set_id;
+   __u32 cap_set_ver;
+   __u64 addr;
+   __u32 size;
+   __u32 pad;
 };

 #define DRM_IOCTL_VIRTGPU_MAP \
@@ -164,4 +167,8 @@ struct drm_virtgpu_get_caps {
DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_GET_CAPS, \
struct drm_virtgpu_get_caps)

+#if defined(__cplusplus)
+}
+#endif
+
 #endif
-- 
2.8.1

[PATCH libdrm] automake: Don't include Android Makefiles in the release tarball

[Andreas Boll]

Currently only some Android Makefiles are included in the release tarball.
To be more consistent one could either add the remaining files or don't
ship Android Makefiles altogether.

According to Emil the Android folk doesn't use our release tarballs.
Thus it makes sense to remove those files from distribution which also
means less work for maintenance in the future.

Suggested-by: Emil Velikov 
Signed-off-by: Andreas Boll 
---
 Makefile.am| 2 --
 freedreno/Makefile.am  | 2 +-
 intel/Makefile.am  | 1 -
 libkms/Makefile.am | 2 +-
 nouveau/Makefile.am| 2 +-
 radeon/Makefile.am | 2 +-
 tests/modetest/Makefile.am | 2 --
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index feecba7..2ceb352 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,8 +120,6 @@ libdrm_la_SOURCES = $(LIBDRM_FILES)
 libdrmincludedir = ${includedir}
 libdrminclude_HEADERS = $(LIBDRM_H_FILES)

-EXTRA_DIST = Android.mk
-
 klibdrmincludedir = ${includedir}/libdrm
 klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)

diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
index 9b7ec7d..0771d14 100644
--- a/freedreno/Makefile.am
+++ b/freedreno/Makefile.am
@@ -27,4 +27,4 @@ pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_freedreno.pc

 TESTS = freedreno-symbol-check
-EXTRA_DIST = Android.mk $(TESTS)
+EXTRA_DIST = $(TESTS)
diff --git a/intel/Makefile.am b/intel/Makefile.am
index d004568..c52e8c0 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -66,7 +66,6 @@ EXTRA_DIST = \
$(BATCHES:.batch=.batch-ref.txt) \
$(BATCHES:.batch=.batch-ref.txt) \
tests/test-batch.sh \
-   Android.mk \
$(TESTS)

 test_decode_LDADD = libdrm_intel.la ../libdrm.la
diff --git a/libkms/Makefile.am b/libkms/Makefile.am
index 6c0ab7a..7c1debe 100644
--- a/libkms/Makefile.am
+++ b/libkms/Makefile.am
@@ -44,4 +44,4 @@ pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libkms.pc

 TESTS = kms-symbol-check
-EXTRA_DIST = Android.mk $(TESTS)
+EXTRA_DIST = $(TESTS)
diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am
index 76cdeca..344a844 100644
--- a/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -30,4 +30,4 @@ pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_nouveau.pc

 TESTS = nouveau-symbol-check
-EXTRA_DIST = Android.mk $(TESTS)
+EXTRA_DIST = $(TESTS)
diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index 31f19e5..e241531 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -44,4 +44,4 @@ pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_radeon.pc

 TESTS = radeon-symbol-check
-EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES) $(TESTS)
+EXTRA_DIST = $(LIBDRM_RADEON_BOF_FILES) $(TESTS)
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 25ce372..9686ccb 100644
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -22,5 +22,3 @@ modetest_LDADD = \
$(top_builddir)/tests/util/libutil.la \
$(CAIRO_LIBS) \
-lpthread
-
-EXTRA_DIST = Android.mk
-- 
2.8.1

[PATCH libdrm 6/6] radeon: Fix typo in stderr message

[Andreas Boll]

Signed-off-by: Andreas Boll 
---
 radeon/radeon_cs_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index cdec64e..23f33af 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -323,7 +323,7 @@ static int cs_gem_end(struct radeon_cs_int *cs,
 return -EPIPE;
 }
 if (cs->section_ndw != cs->section_cdw) {
-fprintf(stderr, "CS section size missmatch start at (%s,%s,%d) %d vs 
%d\n",
+fprintf(stderr, "CS section size mismatch start at (%s,%s,%d) %d vs 
%d\n",
 cs->section_file, cs->section_func, cs->section_line, 
cs->section_ndw, cs->section_cdw);
 fprintf(stderr, "CS section end at (%s,%s,%d)\n",
 file, func, line);
-- 
2.8.1

[PATCH libdrm 5/6] man: Fix typo

[Andreas Boll]

Signed-off-by: Andreas Boll 
---
 man/drm-kms.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/drm-kms.xml b/man/drm-kms.xml
index 5f04157..ae38dc8 100644
--- a/man/drm-kms.xml
+++ b/man/drm-kms.xml
@@ -126,7 +126,7 @@
   
 Framebuffers are abstract memory objects
   that provide a source of pixel data to scanout to a CRTC.
-  Applications explicitely request the creation of framebuffers
+  Applications explicitly request the creation of framebuffers
   and can control their behavior. Framebuffers rely on the
   underneath memory manager for low-level memory operations.
   When creating a framebuffer, applications pass a memory 
handle
-- 
2.8.1

[PATCH libdrm 4/6] automake: Include virtgpu_drm.h in the release tarball.

[Andreas Boll]

The plan is to use this version of virtgpu_drm.h in mesa and drop mesa's
local copy.
To actually use this header it needs to be shipped in the tarball.

This was missed in c745e541a9d8dfd3fb5e1ac57297e58d34d9328f

Signed-off-by: Andreas Boll 
---
 Makefile.sources | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.sources b/Makefile.sources
index 1a1f0fe..a57036a 100644
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -33,7 +33,8 @@ LIBDRM_INCLUDE_H_FILES := \
include/drm/sis_drm.h \
include/drm/tegra_drm.h \
include/drm/vc4_drm.h \
-   include/drm/via_drm.h
+   include/drm/via_drm.h \
+   include/drm/virtgpu_drm.h

 LIBDRM_INCLUDE_VMWGFX_H_FILES := \
include/drm/vmwgfx_drm.h
-- 
2.8.1

[PATCH libdrm 3/6] libdrm: Fix drm.h include path in virtgpu drm header file

[Andreas Boll]

A similar change was made to mesa's copy of virtgpu_drm.h by the
following commit:

commit c1bf71f77c9d4bc83fa7dc987b56f98350430d7c
Author: Emil Velikov 
Date:   Wed Oct 28 11:47:18 2015 +

virgl: fix drm.h include path

The drm/ prefix is required, if using the kernel provided headers. As
most distros don't ship them it and we already depend on libdrm (which
adds the relevant -I flag) just drop the drm/ from the include.

Once a libdrm release with the virtgpu_drm.h header is released, we can
drop our local copy of the file.

Signed-off-by: Emil Velikov 
Reviewed-by: Dave Airlie 

This matches the include path used by all other drm header files.

Signed-off-by: Andreas Boll 
---
 include/drm/virtgpu_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/virtgpu_drm.h b/include/drm/virtgpu_drm.h
index abf11c5..6a43f8d 100644
--- a/include/drm/virtgpu_drm.h
+++ b/include/drm/virtgpu_drm.h
@@ -25,7 +25,7 @@
 #define VIRTGPU_DRM_H

 #include 
-#include "drm/drm.h"
+#include "drm.h"

 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.
-- 
2.8.1

[PATCH libdrm 2/6] automake: Pick up all Android files for distribution

[Andreas Boll]

Currently only some Android Makefiles are included in the release tarball.
Add all remaining files to be more consistent.

Signed-off-by: Andreas Boll 
---
 Makefile.am| 2 +-
 amdgpu/Makefile.am | 2 +-
 tests/Makefile.am  | 2 ++
 tests/proptest/Makefile.am | 2 ++
 tests/util/Makefile.am | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index feecba7..dce2cf6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,7 +120,7 @@ libdrm_la_SOURCES = $(LIBDRM_FILES)
 libdrmincludedir = ${includedir}
 libdrminclude_HEADERS = $(LIBDRM_H_FILES)

-EXTRA_DIST = Android.mk
+EXTRA_DIST = CleanSpec.mk Android.mk

 klibdrmincludedir = ${includedir}/libdrm
 klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES)
diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am
index cf7bc1b..169788f 100644
--- a/amdgpu/Makefile.am
+++ b/amdgpu/Makefile.am
@@ -44,4 +44,4 @@ pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_amdgpu.pc

 TESTS = amdgpu-symbol-check
-EXTRA_DIST = $(TESTS)
+EXTRA_DIST = Android.mk $(TESTS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58feb12..33a1d42 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,3 +73,5 @@ TESTS +=  \
 endif

 check_PROGRAMS += $(TESTS)
+
+EXTRA_DIST = Android.mk
diff --git a/tests/proptest/Makefile.am b/tests/proptest/Makefile.am
index 3fde46b..6b7ae7c 100644
--- a/tests/proptest/Makefile.am
+++ b/tests/proptest/Makefile.am
@@ -19,3 +19,5 @@ proptest_SOURCES = $(PROPTEST_FILES)
 proptest_LDADD = \
$(top_builddir)/libdrm.la \
$(top_builddir)/tests/util/libutil.la
+
+EXTRA_DIST = Android.mk
diff --git a/tests/util/Makefile.am b/tests/util/Makefile.am
index f8e0b17..92acfb3 100644
--- a/tests/util/Makefile.am
+++ b/tests/util/Makefile.am
@@ -11,3 +11,5 @@ libutil_la_CFLAGS = \
$(CAIRO_CFLAGS)

 libutil_la_SOURCES = $(UTIL_FILES)
+
+EXTRA_DIST = Android.mk
-- 
2.8.1

[PATCH libdrm 1/6] radeon: Wire up radeon-symbol-check to make check

[Andreas Boll]

This was missed in 552de225bf2740ba0cb52312c21353d71d934b8c

Signed-off-by: Andreas Boll 
---
 radeon/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index 25c03d3..31f19e5 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -43,4 +43,5 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_radeon.pc

+TESTS = radeon-symbol-check
 EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES) $(TESTS)
-- 
2.8.1

Misc libdrm fixes

[Andreas Boll]

While packaging the latest libdrm release I've fixed some issues noticed by
Debian's Lintian.

Please review.

Thanks,
Andreas

[PATCH 4/4] drm/radeon: tweak ACCEL_WORKING2 query for the new firmware for hawaii

[Andreas Boll]

Adjust the previous tweak for hawaii to return 3 if the new firmware is used.

Signed-off-by: Andreas Boll 
---
 drivers/gpu/drm/radeon/radeon_kms.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c 
b/drivers/gpu/drm/radeon/radeon_kms.c
index c1a206d..eb7164d 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -255,10 +255,14 @@ static int radeon_info_ioctl(struct drm_device *dev, void 
*data, struct drm_file
break;
case RADEON_INFO_ACCEL_WORKING2:
if (rdev->family == CHIP_HAWAII) {
-   if (rdev->accel_working)
-   *value = 2;
-   else
+   if (rdev->accel_working) {
+   if (rdev->new_fw)
+   *value = 3;
+   else
+   *value = 2;
+   } else {
*value = 0;
+   }
} else {
*value = rdev->accel_working;
}
-- 
2.0.1

[PATCH 3/4] drm/radeon: use packet3 for nop on hawaii with new firmware

[Andreas Boll]

From: Alex Deucher <alexander.deuc...@amd.com>

Older firmware didn't support the new nop packet.

Signed-off-by: Alex Deucher 
Signed-off-by: Andreas Boll 
---
 drivers/gpu/drm/radeon/cik.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index e5985d5..8b580dc 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -8035,7 +8035,10 @@ static int cik_startup(struct radeon_device *rdev)
cik_irq_set(rdev);

if (rdev->family == CHIP_HAWAII) {
-   nop = RADEON_CP_PACKET2;
+   if (rdev->new_fw)
+   nop = PACKET3(PACKET3_NOP, 0x3FFF);
+   else
+   nop = RADEON_CP_PACKET2;
} else {
nop = PACKET3(PACKET3_NOP, 0x3FFF);
}
-- 
2.0.1

[PATCH 2/4] drm/radeon: tweak ACCEL_WORKING2 query for hawaii

[Andreas Boll]

From: Alex Deucher <alexander.deuc...@amd.com>

Return 2 so we can be sure the kernel has the necessary
changes for acceleration to work.

Note: This patch depends on these two commits:
 - drm/radeon: fix cut and paste issue for hawaii.
 - drm/radeon: use packet2 for nop on hawaii with old firmware

Signed-off-by: Alex Deucher 
Signed-off-by: Andreas Boll 
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/radeon/radeon_kms.c | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c 
b/drivers/gpu/drm/radeon/radeon_kms.c
index d25ae6a..c1a206d 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -254,7 +254,14 @@ static int radeon_info_ioctl(struct drm_device *dev, void 
*data, struct drm_file
}
break;
case RADEON_INFO_ACCEL_WORKING2:
-   *value = rdev->accel_working;
+   if (rdev->family == CHIP_HAWAII) {
+   if (rdev->accel_working)
+   *value = 2;
+   else
+   *value = 0;
+   } else {
+   *value = rdev->accel_working;
+   }
break;
case RADEON_INFO_TILING_CONFIG:
if (rdev->family >= CHIP_BONAIRE)
-- 
2.0.1

[PATCH 1/4] drm/radeon: use packet2 for nop on hawaii with old firmware

[Andreas Boll]

From: Alex Deucher <alexander.deuc...@amd.com>

Older firmware didn't support the new nop packet.

v2 (Andreas Boll):
 - Drop usage of packet3 for new firmware

Signed-off-by: Alex Deucher 
Reviewed-by: Christian K?nig  (v1)
Signed-off-by: Andreas Boll 
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/radeon/cik.c | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index c0ea661..e5985d5 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -7900,6 +7900,7 @@ restart_ih:
 static int cik_startup(struct radeon_device *rdev)
 {
struct radeon_ring *ring;
+   u32 nop;
int r;

/* enable pcie gen2/3 link */
@@ -8033,9 +8034,15 @@ static int cik_startup(struct radeon_device *rdev)
}
cik_irq_set(rdev);

+   if (rdev->family == CHIP_HAWAII) {
+   nop = RADEON_CP_PACKET2;
+   } else {
+   nop = PACKET3(PACKET3_NOP, 0x3FFF);
+   }
+
ring = >ring[RADEON_RING_TYPE_GFX_INDEX];
r = radeon_ring_init(rdev, ring, ring->ring_size, 
RADEON_WB_CP_RPTR_OFFSET,
-PACKET3(PACKET3_NOP, 0x3FFF));
+nop);
if (r)
return r;

@@ -8043,7 +8050,7 @@ static int cik_startup(struct radeon_device *rdev)
/* type-2 packets are deprecated on MEC, use type-3 instead */
ring = >ring[CAYMAN_RING_TYPE_CP1_INDEX];
r = radeon_ring_init(rdev, ring, ring->ring_size, 
RADEON_WB_CP1_RPTR_OFFSET,
-PACKET3(PACKET3_NOP, 0x3FFF));
+nop);
if (r)
return r;
ring->me = 1; /* first MEC */
@@ -8054,7 +8061,7 @@ static int cik_startup(struct radeon_device *rdev)
/* type-2 packets are deprecated on MEC, use type-3 instead */
ring = >ring[CAYMAN_RING_TYPE_CP2_INDEX];
r = radeon_ring_init(rdev, ring, ring->ring_size, 
RADEON_WB_CP2_RPTR_OFFSET,
-PACKET3(PACKET3_NOP, 0x3FFF));
+nop);
if (r)
return r;
/* dGPU only have 1 MEC */
-- 
2.0.1

[PATCH libdrm] libdrm: Fix drm.h include in qxl drm header file

[Andreas Boll]

2014-07-28 17:06 GMT+02:00 Emil Velikov :
> On 28/07/14 15:35, Andreas Boll wrote:
>> ping
>>
>> 2014-05-05 23:54 GMT+02:00 Andreas Boll :
>>> Use "drm.h" instead of "drm/drm.h" as used in the other header files.
>>> Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
>>> file is installed in /usr/include/libdrm.
>>>
> I believe that's the default location for most linux distributions. Seems like
> not many of us build the qxl ddx :\
>
> FWIW
> Reviewed-by: Emil Velikov 
>

Thanks!
Pushed.

>>> Fixes Debian bug #746807
>>>
>>> Reported-by: Bastian Blank 
>>> Signed-off-by: Andreas Boll 
>>> ---
>>>  include/drm/qxl_drm.h | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
>>> index 5d7de70..1e331a8 100644
>>> --- a/include/drm/qxl_drm.h
>>> +++ b/include/drm/qxl_drm.h
>>> @@ -25,7 +25,7 @@
>>>  #define QXL_DRM_H
>>>
>>>  #include 
>>> -#include "drm/drm.h"
>>> +#include "drm.h"
>>>
>>>  /* Please note that modifications to all structs defined here are
>>>   * subject to backwards-compatibility constraints.
>>> --
>>> 1.9.2
>>>
>> ___
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
>

[PATCH libdrm] libdrm: Fix drm.h include in qxl drm header file

[Andreas Boll]

ping

2014-05-05 23:54 GMT+02:00 Andreas Boll :
> Use "drm.h" instead of "drm/drm.h" as used in the other header files.
> Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
> file is installed in /usr/include/libdrm.
>
> Fixes Debian bug #746807
>
> Reported-by: Bastian Blank 
> Signed-off-by: Andreas Boll 
> ---
>  include/drm/qxl_drm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
> index 5d7de70..1e331a8 100644
> --- a/include/drm/qxl_drm.h
> +++ b/include/drm/qxl_drm.h
> @@ -25,7 +25,7 @@
>  #define QXL_DRM_H
>
>  #include 
> -#include "drm/drm.h"
> +#include "drm.h"
>
>  /* Please note that modifications to all structs defined here are
>   * subject to backwards-compatibility constraints.
> --
> 1.9.2
>

[PATCH libdrm] libdrm: Fix drm.h include in qxl drm header file

[Andreas Boll]

Use "drm.h" instead of "drm/drm.h" as used in the other header files.
Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
file is installed in /usr/include/libdrm.

Fixes Debian bug #746807

Reported-by: Bastian Blank 
Signed-off-by: Andreas Boll 
---
 include/drm/qxl_drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
index 5d7de70..1e331a8 100644
--- a/include/drm/qxl_drm.h
+++ b/include/drm/qxl_drm.h
@@ -25,7 +25,7 @@
 #define QXL_DRM_H

 #include 
-#include "drm/drm.h"
+#include "drm.h"

 /* Please note that modifications to all structs defined here are
  * subject to backwards-compatibility constraints.
-- 
1.9.2

UVD fails to init on rv790

[Andreas Boll]

FYI I get the same errors on rv770 (HD4870)

Andreas.


2013/4/3 Christian K?nig 

> Hi Andy,
>
> crap! I feared that something like this would happen. IIRC we never tested
> UVD on an rv790, and this hardware isn't easy to get any more.
>
> RV770/RV790 have a separate UVD hardware generation (that's why they have
> their own firmware) and there possible is some bug or something like this
> that we haven't implemented. You couldn't give me SSH access to that system?
>
> Christian.
>
> Am 03.04.2013 11:51, schrieb Andy Furniss:
>
>  Thanks AMD for getting this out :-)
>>
>> I have an issue, though.
>>
>> On HD4890 drm-fixes kernel (before yesterdays updates) got the new
>>
>> R700_rlc.bin
>> RV770_uvd.bin
>>
>> but on boot I get -
>>
>> [drm] radeon kernel modesetting enabled.
>> [drm] initializing kernel modesetting (RV770 0x1002:0x9460 0x1682:0x2700).
>> [drm] register mmio base: 0xFE6F
>> [drm] register mmio size: 65536
>> ATOM BIOS: Wekiva
>> radeon :01:00.0: VRAM: 1024M 0x - 0x3FFF
>> (1024M used)
>> radeon :01:00.0: GTT: 512M 0x4000 - 0x5FFF
>> [drm] Detected VRAM RAM=1024M, BAR=256M
>> [drm] RAM width 256bits DDR
>> [TTM] Zone  kernel: Available graphics memory: 436936 kiB
>> [TTM] Zone highmem: Available graphics memory: 1685484 kiB
>> [TTM] Initializing pool allocator
>> [drm] radeon: 1024M of VRAM memory ready
>> [drm] radeon: 512M of GTT memory ready.
>> [drm] Supports vblank timestamp caching Rev 1 (10.10.2010).
>> [drm] Driver supports precise vblank timestamp query.
>> radeon :01:00.0: irq 51 for MSI/MSI-X
>> radeon :01:00.0: radeon: using MSI.
>> [drm] radeon: irq initialized.
>> [drm] GART: num cpu pages 131072, num gpu pages 131072
>> [drm] probing gen 2 caps for device 1022:9603 = 300d02/0
>> [drm] enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0
>> [drm] Loading RV770 Microcode
>> [drm] PCIE GART of 512M enabled (table at 0x00257000).
>> radeon :01:00.0: WB enabled
>> radeon :01:00.0: fence driver on ring 0 use gpu addr
>> 0x4c00 and cpu addr 0xff893c00
>> radeon :01:00.0: fence driver on ring 3 use gpu addr
>> 0x4c0c and cpu addr 0xff893c0c
>> radeon :01:00.0: fence driver on ring 5 use gpu addr
>> 0x0005632c and cpu addr 0xfbb9632c
>> [drm] ring test on 0 succeeded in 1 usecs
>> [drm] ring test on 3 succeeded in 1 usecs
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
>> VCPU!!!
>> [drm:r600_uvd_init] *ERROR* UVD not responding, giving up!!!
>> [drm:rv770_startup] *ERROR* radeon: failed initializing UVD (-1).
>> [drm] Enabling audio support
>> [drm] ib test on ring 0 succeeded in 0 usecs
>> [drm] ib test on ring 3 succeeded in 0 usecs
>> ALSA sound/pci/hda/hda_eld.c:334 HDMI: ELD buf size is 0, force 128
>> ALSA sound/pci/hda/hda_eld.c:351 HDMI: invalid ELD data byte 0
>> [drm] Radeon Display Connectors
>> [drm] Connector 0:
>> [drm]   DVI-I-1
>> [drm]   HPD2
>> [drm]   DDC: 0x7e60 0x7e60 0x7e64 0x7e64 0x7e68 0x7e68 0x7e6c 0x7e6c
>> [drm]   Encoders:
>> [drm] DFP1: INTERNAL_UNIPHY
>> [drm] CRT2: INTERNAL_KLDSCP_DAC2
>> [drm] Connector 1:
>> [drm]   DIN-1
>> [drm]   Encoders:
>> [drm] TV1: INTERNAL_KLDSCP_DAC2
>> [drm] Connector 2:
>> [drm]   DVI-I-2
>> [drm]   HPD1
>> [drm]   DDC: 0x7e20 0x7e20 0x7e24 0x7e24 0x7e28 0x7e28 0x7e2c 0x7e2c
>> [drm]   Encoders:
>> [drm] CRT1: INTERNAL_KLDSCP_DAC1
>> [drm] DFP2: INTERNAL_KLDSCP_LVTMA
>> [drm] Internal thermal controller with fan control
>> [drm] radeon: power management initialized
>> [drm] fb mappable at 0xD0359000
>> [drm] vram apper at 0xD000
>> [drm] size 8294400
>> [drm] fb depth is 24
>> [drm]pitch is 7680
>> fbcon: radeondrmfb (fb0) is primary device
>> Console: switching to colour frame buffer device 240x67
>> radeon :01:00.0: fb0: radeondrmfb frame buffer device
>> radeon :01:00.0: registered panic notifier
>> [drm] Initialized radeon 2.30.0 20080528 for :01:00.0 on minor 0
>> __**_
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.**org 
>> http://lists.freedesktop.org/**mailman/listinfo/dri-devel

[PATCH] drm/radeon: UVD support for RV710-SI

[Andreas Boll]

Could you bump drm minor version?

Then we could check for UVD in userspace [1]

Thanks for the great work!

Andreas.

[1] http://lists.freedesktop.org/archives/mesa-dev/2013-April/037089.html


2013/4/3 Christian K?nig 

> Hi everyone,
>
> the following patchset implements the kernel side of UVD support for the
> radeon hardware generations RV710-SI.
>
> The R6xx and RS780/RS880 chipset generations are currently not supported,
> but might be added in the future.
>
> The newest firmware can be found here: from
> http://people.freedesktop.org/~agd5f/radeon_ucode/
>
> A matching patch implementing the necessary userspace side will follow in
> just a minute on the mesa devel list.
>
> Cheers,
> Christian.
>
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
-- next part --
An HTML attachment was scrubbed...
URL: 

Re: [PATCH] drm/radeon: UVD support for RV710-SI

[Andreas Boll]

Could you bump drm minor version?

Then we could check for UVD in userspace [1]

Thanks for the great work!

Andreas.

[1] http://lists.freedesktop.org/archives/mesa-dev/2013-April/037089.html


2013/4/3 Christian König deathsim...@vodafone.de

 Hi everyone,

 the following patchset implements the kernel side of UVD support for the
 radeon hardware generations RV710-SI.

 The R6xx and RS780/RS880 chipset generations are currently not supported,
 but might be added in the future.

 The newest firmware can be found here: from
 http://people.freedesktop.org/~agd5f/radeon_ucode/

 A matching patch implementing the necessary userspace side will follow in
 just a minute on the mesa devel list.

 Cheers,
 Christian.

 ___
 dri-devel mailing list
 dri-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/dri-devel

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: UVD fails to init on rv790

[Andreas Boll]

FYI I get the same errors on rv770 (HD4870)

Andreas.


2013/4/3 Christian König deathsim...@vodafone.de

 Hi Andy,

 crap! I feared that something like this would happen. IIRC we never tested
 UVD on an rv790, and this hardware isn't easy to get any more.

 RV770/RV790 have a separate UVD hardware generation (that's why they have
 their own firmware) and there possible is some bug or something like this
 that we haven't implemented. You couldn't give me SSH access to that system?

 Christian.

 Am 03.04.2013 11:51, schrieb Andy Furniss:

  Thanks AMD for getting this out :-)

 I have an issue, though.

 On HD4890 drm-fixes kernel (before yesterdays updates) got the new

 R700_rlc.bin
 RV770_uvd.bin

 but on boot I get -

 [drm] radeon kernel modesetting enabled.
 [drm] initializing kernel modesetting (RV770 0x1002:0x9460 0x1682:0x2700).
 [drm] register mmio base: 0xFE6F
 [drm] register mmio size: 65536
 ATOM BIOS: Wekiva
 radeon :01:00.0: VRAM: 1024M 0x - 0x3FFF
 (1024M used)
 radeon :01:00.0: GTT: 512M 0x4000 - 0x5FFF
 [drm] Detected VRAM RAM=1024M, BAR=256M
 [drm] RAM width 256bits DDR
 [TTM] Zone  kernel: Available graphics memory: 436936 kiB
 [TTM] Zone highmem: Available graphics memory: 1685484 kiB
 [TTM] Initializing pool allocator
 [drm] radeon: 1024M of VRAM memory ready
 [drm] radeon: 512M of GTT memory ready.
 [drm] Supports vblank timestamp caching Rev 1 (10.10.2010).
 [drm] Driver supports precise vblank timestamp query.
 radeon :01:00.0: irq 51 for MSI/MSI-X
 radeon :01:00.0: radeon: using MSI.
 [drm] radeon: irq initialized.
 [drm] GART: num cpu pages 131072, num gpu pages 131072
 [drm] probing gen 2 caps for device 1022:9603 = 300d02/0
 [drm] enabling PCIE gen 2 link speeds, disable with radeon.pcie_gen2=0
 [drm] Loading RV770 Microcode
 [drm] PCIE GART of 512M enabled (table at 0x00257000).
 radeon :01:00.0: WB enabled
 radeon :01:00.0: fence driver on ring 0 use gpu addr
 0x4c00 and cpu addr 0xff893c00
 radeon :01:00.0: fence driver on ring 3 use gpu addr
 0x4c0c and cpu addr 0xff893c0c
 radeon :01:00.0: fence driver on ring 5 use gpu addr
 0x0005632c and cpu addr 0xfbb9632c
 [drm] ring test on 0 succeeded in 1 usecs
 [drm] ring test on 3 succeeded in 1 usecs
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, trying to reset the
 VCPU!!!
 [drm:r600_uvd_init] *ERROR* UVD not responding, giving up!!!
 [drm:rv770_startup] *ERROR* radeon: failed initializing UVD (-1).
 [drm] Enabling audio support
 [drm] ib test on ring 0 succeeded in 0 usecs
 [drm] ib test on ring 3 succeeded in 0 usecs
 ALSA sound/pci/hda/hda_eld.c:334 HDMI: ELD buf size is 0, force 128
 ALSA sound/pci/hda/hda_eld.c:351 HDMI: invalid ELD data byte 0
 [drm] Radeon Display Connectors
 [drm] Connector 0:
 [drm]   DVI-I-1
 [drm]   HPD2
 [drm]   DDC: 0x7e60 0x7e60 0x7e64 0x7e64 0x7e68 0x7e68 0x7e6c 0x7e6c
 [drm]   Encoders:
 [drm] DFP1: INTERNAL_UNIPHY
 [drm] CRT2: INTERNAL_KLDSCP_DAC2
 [drm] Connector 1:
 [drm]   DIN-1
 [drm]   Encoders:
 [drm] TV1: INTERNAL_KLDSCP_DAC2
 [drm] Connector 2:
 [drm]   DVI-I-2
 [drm]   HPD1
 [drm]   DDC: 0x7e20 0x7e20 0x7e24 0x7e24 0x7e28 0x7e28 0x7e2c 0x7e2c
 [drm]   Encoders:
 [drm] CRT1: INTERNAL_KLDSCP_DAC1
 [drm] DFP2: INTERNAL_KLDSCP_LVTMA
 [drm] Internal thermal controller with fan control
 [drm] radeon: power management initialized
 [drm] fb mappable at 0xD0359000
 [drm] vram apper at 0xD000
 [drm] size 8294400
 [drm] fb depth is 24
 [drm]pitch is 7680
 fbcon: radeondrmfb (fb0) is primary device
 Console: switching to colour frame buffer device 240x67
 radeon :01:00.0: fb0: radeondrmfb frame buffer device
 radeon :01:00.0: registered panic notifier
 [drm] Initialized radeon 2.30.0 20080528 for :01:00.0 on minor 0
 __**_
 dri-devel mailing list
 dri-devel@lists.freedesktop.**org dri-devel@lists.freedesktop.org
 http://lists.freedesktop.org/**mailman/listinfo/dri-develhttp://lists.freedesktop.org/mailman/listinfo/dri-devel


 __**_
 dri-devel mailing list
 dri-devel@lists.freedesktop.**org dri-devel@lists.freedesktop.org
 

[PATCH libdrm][RESEND] radeon: fix unused-function warning

[Andreas Boll]

radeon_cs_gem.c:333:13: warning: 'cs_gem_dump_bof' defined but
not used [-Wunused-function]
---
 radeon/radeon_cs_gem.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 9834bcf..b963140 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -330,6 +330,7 @@ static int cs_gem_end(struct radeon_cs_int *cs,
 return 0;
 }

+#if CS_BOF_DUMP
 static void cs_gem_dump_bof(struct radeon_cs_int *cs)
 {
 struct cs_gem *csg = (struct cs_gem*)cs;
@@ -415,6 +416,7 @@ out_err:
 bof_decref(device_id);
 bof_decref(root);
 }
+#endif

 static int cs_gem_emit(struct radeon_cs_int *cs)
 {
-- 
1.7.4.1

[PATCH libdrm][RESEND] radeon: fix unused-function warning

[Andreas Boll]

radeon_cs_gem.c:333:13: warning: 'cs_gem_dump_bof' defined but
not used [-Wunused-function]
---
 radeon/radeon_cs_gem.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 9834bcf..b963140 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -330,6 +330,7 @@ static int cs_gem_end(struct radeon_cs_int *cs,
 return 0;
 }
 
+#if CS_BOF_DUMP
 static void cs_gem_dump_bof(struct radeon_cs_int *cs)
 {
 struct cs_gem *csg = (struct cs_gem*)cs;
@@ -415,6 +416,7 @@ out_err:
 bof_decref(device_id);
 bof_decref(root);
 }
+#endif
 
 static int cs_gem_emit(struct radeon_cs_int *cs)
 {
-- 
1.7.4.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 1/3] libdrm: add omap and exynos pkgconfig files to .gitignore

[Andreas Boll]

---
 .gitignore |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 243457e..5e4c837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,10 @@ i915.kld
 install-sh
 libdrm/config.h.in
 libdrm.pc
+libdrm_exynos.pc
 libdrm_intel.pc
 libdrm_nouveau.pc
+libdrm_omap.pc
 libdrm_radeon.pc
 libkms.pc
 libtool
-- 
1.7.4.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/3] libdrm: add tests/radeon/radeon_ttm to .gitignore

[Andreas Boll]

---
 .gitignore |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e4c837..219a37e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ tests/modeprint/modeprint
 tests/modetest/modetest
 tests/kmstest/kmstest
 tests/vbltest/vbltest
+tests/radeon/radeon_ttm
-- 
1.7.4.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 3/3] radeon: fix unused-function warning

[Andreas Boll]

radeon_cs_gem.c:333:13: warning: 'cs_gem_dump_bof' defined but
not used [-Wunused-function]
---
 radeon/radeon_cs_gem.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 9834bcf..b963140 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -330,6 +330,7 @@ static int cs_gem_end(struct radeon_cs_int *cs,
 return 0;
 }
 
+#if CS_BOF_DUMP
 static void cs_gem_dump_bof(struct radeon_cs_int *cs)
 {
 struct cs_gem *csg = (struct cs_gem*)cs;
@@ -415,6 +416,7 @@ out_err:
 bof_decref(device_id);
 bof_decref(root);
 }
+#endif
 
 static int cs_gem_emit(struct radeon_cs_int *cs)
 {
-- 
1.7.4.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 3/3] radeon: fix unused-function warning

[Andreas Boll]

radeon_cs_gem.c:333:13: warning: 'cs_gem_dump_bof' defined but
not used [-Wunused-function]
---
 radeon/radeon_cs_gem.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 9834bcf..b963140 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -330,6 +330,7 @@ static int cs_gem_end(struct radeon_cs_int *cs,
 return 0;
 }

+#if CS_BOF_DUMP
 static void cs_gem_dump_bof(struct radeon_cs_int *cs)
 {
 struct cs_gem *csg = (struct cs_gem*)cs;
@@ -415,6 +416,7 @@ out_err:
 bof_decref(device_id);
 bof_decref(root);
 }
+#endif

 static int cs_gem_emit(struct radeon_cs_int *cs)
 {
-- 
1.7.4.1

[PATCH 2/3] libdrm: add tests/radeon/radeon_ttm to .gitignore

[Andreas Boll]

---
 .gitignore |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e4c837..219a37e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ tests/modeprint/modeprint
 tests/modetest/modetest
 tests/kmstest/kmstest
 tests/vbltest/vbltest
+tests/radeon/radeon_ttm
-- 
1.7.4.1

[PATCH 1/3] libdrm: add omap and exynos pkgconfig files to .gitignore

[Andreas Boll]

---
 .gitignore |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 243457e..5e4c837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,10 @@ i915.kld
 install-sh
 libdrm/config.h.in
 libdrm.pc
+libdrm_exynos.pc
 libdrm_intel.pc
 libdrm_nouveau.pc
+libdrm_omap.pc
 libdrm_radeon.pc
 libkms.pc
 libtool
-- 
1.7.4.1