AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Move checksum routines to root panfrost

Browse Source 
These are Gallium-independent and clean code; as is tradition, let's
hoist them up out of the Gallium driver as a bit of yak shaving as we
prepare to untangle the monster that is pan_resource.c

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3858>
This commit is contained in:
Alyssa Rosenzweig
2020-02-18 12:07:47 -05:00
parent 2e3318b151
commit 5ddf7ad9d2
7 changed files with 117 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/pan_resource.c
+1 -24
View File
@@ -235,29 +235,6 @@ panfrost_create_scanout_res(struct pipe_screen *screen,
return res;
}
/* Computes sizes for checksumming, which is 8 bytes per 16x16 tile */
#define CHECKSUM_TILE_WIDTH 16
#define CHECKSUM_TILE_HEIGHT 16
#define CHECKSUM_BYTES_PER_TILE 8
static unsigned
panfrost_compute_checksum_sizes(
struct panfrost_slice *slice,
unsigned width,
unsigned height)
{
unsigned aligned_width = ALIGN_POT(width, CHECKSUM_TILE_WIDTH);
unsigned aligned_height = ALIGN_POT(height, CHECKSUM_TILE_HEIGHT);
unsigned tile_count_x = aligned_width / CHECKSUM_TILE_WIDTH;
unsigned tile_count_y = aligned_height / CHECKSUM_TILE_HEIGHT;
slice->checksum_stride = tile_count_x * CHECKSUM_BYTES_PER_TILE;
return slice->checksum_stride * tile_count_y;
}
/* Setup the mip tree given a particular layout, possibly with checksumming */
static void
@@ -349,7 +326,7 @@ panfrost_setup_slices(struct panfrost_resource *pres, size_t *bo_size)
if (pres->checksummed) {
slice->checksum_offset = offset;
unsigned size = panfrost_compute_checksum_sizes(
unsigned size = panfrost_compute_checksum_size(
slice, width, height);
offset += size;
src/gallium/drivers/panfrost/pan_resource.h
+1 -18
View File
@@ -29,27 +29,10 @@
#include <panfrost-job.h>
#include "pan_screen.h"
#include "pan_allocate.h"
#include "pan_texture.h"
#include "drm-uapi/drm.h"
#include "util/u_range.h"
struct panfrost_slice {
unsigned offset;
unsigned stride;
unsigned size0;
/* If there is a header preceding each slice, how big is
* that header? Used for AFBC */
unsigned header_size;
/* If checksumming is enabled following the slice, what
* is its offset/stride? */
unsigned checksum_offset;
unsigned checksum_stride;
/* Has anything been written to this slice? */
bool initialized;
};
struct panfrost_resource {
struct pipe_resource base;
struct {
src/panfrost/Makefile.sources
+1
View File
@@ -21,6 +21,7 @@ encoder_FILES := \
encoder/pan_props.c \
encoder/pan_sampler.c \
encoder/pan_tiler.c \
encoder/pan_texture.c \
encoder/pan_scratch.c
midgard_FILES := \
src/panfrost/encoder/meson.build
+1
View File
@@ -26,6 +26,7 @@ libpanfrost_encoder_files = files(
'pan_invocation.c',
'pan_sampler.c',
'pan_tiler.c',
'pan_texture.c',
'pan_scratch.c',
'pan_props.c',
)
src/panfrost/encoder/pan_encoder.h
+2
View File
@@ -107,4 +107,6 @@ void panfrost_instance_id(unsigned padded_count, union mali_attr *attr);
enum mali_func
panfrost_flip_compare_func(enum mali_func f);
#endif
src/panfrost/encoder/pan_texture.c
+54
View File
@@ -0,0 +1,54 @@
/*
* Copyright (C) 2008 VMware, Inc.
* Copyright (C) 2014 Broadcom
* Copyright (C) 2018-2019 Alyssa Rosenzweig
* Copyright (C) 2019-2020 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.
*
*/
#include "util/macros.h"
#include "pan_texture.h"
/* Computes sizes for checksumming, which is 8 bytes per 16x16 tile.
* Checksumming is believed to be a CRC variant (CRC64 based on the size?).
* This feature is also known as "transaction elimination". */
#define CHECKSUM_TILE_WIDTH 16
#define CHECKSUM_TILE_HEIGHT 16
#define CHECKSUM_BYTES_PER_TILE 8
unsigned
panfrost_compute_checksum_size(
struct panfrost_slice *slice,
unsigned width,
unsigned height)
{
unsigned aligned_width = ALIGN_POT(width, CHECKSUM_TILE_WIDTH);
unsigned aligned_height = ALIGN_POT(height, CHECKSUM_TILE_HEIGHT);
unsigned tile_count_x = aligned_width / CHECKSUM_TILE_WIDTH;
unsigned tile_count_y = aligned_height / CHECKSUM_TILE_HEIGHT;
slice->checksum_stride = tile_count_x * CHECKSUM_BYTES_PER_TILE;
return slice->checksum_stride * tile_count_y;
}
src/panfrost/encoder/pan_texture.h
+57
View File
@@ -0,0 +1,57 @@
/*
* Copyright (C) 2008 VMware, Inc.
* Copyright (C) 2014 Broadcom
* Copyright (C) 2018-2019 Alyssa Rosenzweig
* Copyright (C) 2019-2020 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.
*
*/
#ifndef __PAN_TEXTURE_H
#define __PAN_TEXTURE_H
#include <stdbool.h>
struct panfrost_slice {
unsigned offset;
unsigned stride;
unsigned size0;
/* If there is a header preceding each slice, how big is
* that header? Used for AFBC */
unsigned header_size;
/* If checksumming is enabled following the slice, what
* is its offset/stride? */
unsigned checksum_offset;
unsigned checksum_stride;
/* Has anything been written to this slice? */
bool initialized;
};
unsigned
panfrost_compute_checksum_size(
struct panfrost_slice *slice,
unsigned width,
unsigned height);
#endif