panfrost: Move property queries to _encoder

We'll want these in non-Gallium devices.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>

diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index aecfe6960445cdfa6bc8f416ede398723aeb84eb..29db75ce561f4bcfdf15279a65321a974feb270a 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -670,54 +670,6 @@ panfrost_screen_get_compiler_options(struct pipe_screen *pscreen,
         return &midgard_nir_options;
 }
 
-static __u64
-panfrost_query_raw(
-                struct panfrost_screen *screen,
-                enum drm_panfrost_param param,
-                bool required,
-                unsigned default_value)
-{
-        struct drm_panfrost_get_param get_param = {0,};
-        ASSERTED int ret;
-
-        get_param.param = DRM_PANFROST_PARAM_GPU_PROD_ID;
-        ret = drmIoctl(screen->fd, DRM_IOCTL_PANFROST_GET_PARAM, &get_param);
-
-        if (ret) {
-                assert(!required);
-                return default_value;
-        }
-
-        return get_param.value;
-}
-
-static unsigned
-panfrost_query_gpu_version(struct panfrost_screen *screen)
-{
-        return panfrost_query_raw(screen, DRM_PANFROST_PARAM_GPU_PROD_ID, true, 0);
-}
-
-static unsigned
-panfrost_query_core_count(struct panfrost_screen *screen)
-{
-        /* On older kernels, worst-case to 16 cores */
-
-        unsigned mask = panfrost_query_raw(screen,
-                        DRM_PANFROST_PARAM_SHADER_PRESENT, false, 0xffff);
-
-        return util_bitcount(mask);
-}
-
-static unsigned
-panfrost_query_thread_tls_alloc(struct panfrost_screen *screen)
-{
-        /* On older kernels, we worst-case to 1024 threads, the architectural
-         * maximum for Midgard */
-
-        return panfrost_query_raw(screen,
-                        DRM_PANFROST_PARAM_THREAD_TLS_ALLOC, false, 1024);
-}
-
 static uint32_t
 panfrost_active_bos_hash(const void *key)
 {
@@ -768,9 +720,9 @@ panfrost_create_screen(int fd, struct renderonly *ro)
 
         screen->fd = fd;
 
-        screen->gpu_id = panfrost_query_gpu_version(screen);
-        screen->core_count = panfrost_query_core_count(screen);
-        screen->thread_tls_alloc = panfrost_query_thread_tls_alloc(screen);
+        screen->gpu_id = panfrost_query_gpu_version(screen->fd);
+        screen->core_count = panfrost_query_core_count(screen->fd);
+        screen->thread_tls_alloc = panfrost_query_thread_tls_alloc(screen->fd);
         screen->quirks = panfrost_get_quirks(screen->gpu_id);
         screen->kernel_version = drmGetVersion(fd);
 

diff --git a/src/panfrost/encoder/meson.build b/src/panfrost/encoder/meson.build
index 310772d59c5769c9e5f3c18a0fd144641312a724..ed022f584e569578581a4183936bb1b92882925c 100644 (file)
--- a/src/panfrost/encoder/meson.build
+++ b/src/panfrost/encoder/meson.build
@@ -25,6 +25,7 @@ libpanfrost_encoder_files = files(
   'pan_invocation.c',
   'pan_tiler.c',
   'pan_scratch.c',
+  'pan_props.c',
 )
 
 libpanfrost_encoder = static_library(
@@ -33,5 +34,6 @@ libpanfrost_encoder = static_library(
   include_directories : [inc_common, inc_panfrost_hw],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
+  dependencies: [dep_libdrm],
   build_by_default : false,
 )

diff --git a/src/panfrost/encoder/pan_encoder.h b/src/panfrost/encoder/pan_encoder.h
index d90dba8b2e8d87690fdd32208b2b53c3ae144e7b..01cec263bed9afcb3aaa27f401416dd2670b062b 100644 (file)
--- a/src/panfrost/encoder/pan_encoder.h
+++ b/src/panfrost/encoder/pan_encoder.h
@@ -77,4 +77,11 @@ panfrost_get_total_stack_size(
                 unsigned threads_per_core,
                 unsigned core_count);
 
+/* Property queries */
+
+
+unsigned panfrost_query_gpu_version(int fd);
+unsigned panfrost_query_core_count(int fd);
+unsigned panfrost_query_thread_tls_alloc(int fd);
+
 #endif

diff --git a/src/panfrost/encoder/pan_props.c b/src/panfrost/encoder/pan_props.c
new file mode 100644 (file)
index 0000000..e8e8986
--- /dev/null
+++ b/src/panfrost/encoder/pan_props.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2019 Collabora, Ltd.
+ *
+ * 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
+ * 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.
+ *
+ * Authors:
+ *   Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+ */
+
+#include <xf86drm.h>
+
+#include "util/u_math.h"
+#include "util/macros.h"
+#include "drm-uapi/panfrost_drm.h"
+#include "pan_encoder.h"
+
+/* Abstraction over the raw drm_panfrost_get_param ioctl for fetching
+ * information about devices */
+
+static __u64
+panfrost_query_raw(
+                int fd,
+                enum drm_panfrost_param param,
+                bool required,
+                unsigned default_value)
+{
+        struct drm_panfrost_get_param get_param = {0,};
+        ASSERTED int ret;
+
+        get_param.param = DRM_PANFROST_PARAM_GPU_PROD_ID;
+        ret = drmIoctl(fd, DRM_IOCTL_PANFROST_GET_PARAM, &get_param);
+
+        if (ret) {
+                assert(!required);
+                return default_value;
+        }
+
+        return get_param.value;
+}
+
+unsigned
+panfrost_query_gpu_version(int fd)
+{
+        return panfrost_query_raw(fd, DRM_PANFROST_PARAM_GPU_PROD_ID, true, 0);
+}
+
+unsigned
+panfrost_query_core_count(int fd)
+{
+        /* On older kernels, worst-case to 16 cores */
+
+        unsigned mask = panfrost_query_raw(fd,
+                        DRM_PANFROST_PARAM_SHADER_PRESENT, false, 0xffff);
+
+        return util_bitcount(mask);
+}
+
+unsigned
+panfrost_query_thread_tls_alloc(int fd)
+{
+        /* On older kernels, we worst-case to 1024 threads, the architectural
+         * maximum for Midgard */
+
+        return panfrost_query_raw(fd,
+                        DRM_PANFROST_PARAM_THREAD_TLS_ALLOC, false, 1024);
+}
+
+