lkml.org 
[lkml]   [2015]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 3/6] drm/i915: Add static '3D' Haswell OA unit config
    Date
    Adds a static OA unit, MUX + B Counter configuration for basic '3D'
    metrics on Haswell. This is autogenerated from an internal XML
    description of metric sets.

    Signed-off-by: Robert Bragg <robert@sixbynine.org>
    ---
    drivers/gpu/drm/i915/Makefile | 3 +-
    drivers/gpu/drm/i915/i915_drv.h | 5 ++
    drivers/gpu/drm/i915/i915_oa_hsw.c | 98 ++++++++++++++++++++++++++++++++++++++
    drivers/gpu/drm/i915/i915_oa_hsw.h | 36 ++++++++++++++
    4 files changed, 141 insertions(+), 1 deletion(-)
    create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.c
    create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h

    diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
    index 5485495..5b1c688 100644
    --- a/drivers/gpu/drm/i915/Makefile
    +++ b/drivers/gpu/drm/i915/Makefile
    @@ -94,7 +94,8 @@ i915-y += dvo_ch7017.o \
    i915-y += i915_vgpu.o

    # perf code
    -i915-y += i915_perf.o
    +i915-y += i915_perf.o \
    + i915_oa_hsw.o

    # legacy horrors
    i915-y += i915_dma.o
    diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
    index c16c9e5..0cb36d9 100644
    --- a/drivers/gpu/drm/i915/i915_drv.h
    +++ b/drivers/gpu/drm/i915/i915_drv.h
    @@ -1694,6 +1694,11 @@ struct i915_execbuffer_params {
    struct drm_i915_gem_request *request;
    };

    +struct i915_oa_reg {
    + u32 addr;
    + u32 value;
    +};
    +
    struct i915_perf_read_state {
    int count;
    ssize_t read;
    diff --git a/drivers/gpu/drm/i915/i915_oa_hsw.c b/drivers/gpu/drm/i915/i915_oa_hsw.c
    new file mode 100644
    index 0000000..187bade
    --- /dev/null
    +++ b/drivers/gpu/drm/i915/i915_oa_hsw.c
    @@ -0,0 +1,98 @@
    +/*
    + * Autogenerated file, DO NOT EDIT manually!
    + *
    + * Copyright (c) 2015 Intel Corporation
    + *
    + * 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.
    + *
    + */
    +
    +#include "i915_drv.h"
    +
    +const struct i915_oa_reg i915_oa_3d_b_counter_config_hsw[] = {
    + { 0x2724, 0x00800000 },
    + { 0x2720, 0x00000000 },
    + { 0x2714, 0x00800000 },
    + { 0x2710, 0x00000000 },
    +};
    +const int i915_oa_3d_b_counter_config_hsw_len = 4;
    +
    +const struct i915_oa_reg i915_oa_3d_mux_config_hsw[] = {
    + { 0x253A4, 0x01600000 },
    + { 0x25440, 0x00100000 },
    + { 0x25128, 0x00000000 },
    + { 0x2691C, 0x00000800 },
    + { 0x26AA0, 0x01500000 },
    + { 0x26B9C, 0x00006000 },
    + { 0x2791C, 0x00000800 },
    + { 0x27AA0, 0x01500000 },
    + { 0x27B9C, 0x00006000 },
    + { 0x2641C, 0x00000400 },
    + { 0x25380, 0x00000010 },
    + { 0x2538C, 0x00000000 },
    + { 0x25384, 0x0800AAAA },
    + { 0x25400, 0x00000004 },
    + { 0x2540C, 0x06029000 },
    + { 0x25410, 0x00000002 },
    + { 0x25404, 0x5C30FFFF },
    + { 0x25100, 0x00000016 },
    + { 0x25110, 0x00000400 },
    + { 0x25104, 0x00000000 },
    + { 0x26804, 0x00001211 },
    + { 0x26884, 0x00000100 },
    + { 0x26900, 0x00000002 },
    + { 0x26908, 0x00700000 },
    + { 0x26904, 0x00000000 },
    + { 0x26984, 0x00001022 },
    + { 0x26A04, 0x00000011 },
    + { 0x26A80, 0x00000006 },
    + { 0x26A88, 0x00000C02 },
    + { 0x26A84, 0x00000000 },
    + { 0x26B04, 0x00001000 },
    + { 0x26B80, 0x00000002 },
    + { 0x26B8C, 0x00000007 },
    + { 0x26B84, 0x00000000 },
    + { 0x27804, 0x00004844 },
    + { 0x27884, 0x00000400 },
    + { 0x27900, 0x00000002 },
    + { 0x27908, 0x0E000000 },
    + { 0x27904, 0x00000000 },
    + { 0x27984, 0x00004088 },
    + { 0x27A04, 0x00000044 },
    + { 0x27A80, 0x00000006 },
    + { 0x27A88, 0x00018040 },
    + { 0x27A84, 0x00000000 },
    + { 0x27B04, 0x00004000 },
    + { 0x27B80, 0x00000002 },
    + { 0x27B8C, 0x000000E0 },
    + { 0x27B84, 0x00000000 },
    + { 0x26104, 0x00002222 },
    + { 0x26184, 0x0C006666 },
    + { 0x26284, 0x04000000 },
    + { 0x26304, 0x04000000 },
    + { 0x26400, 0x00000002 },
    + { 0x26410, 0x000000A0 },
    + { 0x26404, 0x00000000 },
    + { 0x25420, 0x04108020 },
    + { 0x25424, 0x1284A420 },
    + { 0x2541C, 0x00000000 },
    + { 0x25428, 0x00042049 },
    +};
    +const int i915_oa_3d_mux_config_hsw_len = 59;
    diff --git a/drivers/gpu/drm/i915/i915_oa_hsw.h b/drivers/gpu/drm/i915/i915_oa_hsw.h
    new file mode 100644
    index 0000000..e170e4d
    --- /dev/null
    +++ b/drivers/gpu/drm/i915/i915_oa_hsw.h
    @@ -0,0 +1,36 @@
    +/*
    + * Autogenerated file, DO NOT EDIT manually!
    + *
    + * Copyright (c) 2015 Intel Corporation
    + *
    + * 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.
    + *
    + */
    +
    +#ifndef __I915_OA_HSW_H__
    +#define __I915_OA_HSW_H__
    +
    +/* HSW Render Metrics Basic Gen7.5 */
    +extern const struct i915_oa_reg i915_oa_3d_b_counter_config_hsw[];
    +extern const int i915_oa_3d_b_counter_config_hsw_len;
    +extern const struct i915_oa_reg i915_oa_3d_mux_config_hsw[];
    +extern const int i915_oa_3d_mux_config_hsw_len;
    +
    +#endif
    --
    2.5.2


    \
     
     \ /
      Last update: 2015-09-29 17:01    [W:3.049 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site