Commit 86a4d69c authored by Ilija Hadzic's avatar Ilija Hadzic Committed by Dave Airlie
Browse files

drm/radeon/kms: common definitions for blit copy code 



R600/700 and Evergreen/NI blit code have a few redundant
definitions in respective .c file. Move common definitions
into a separate (new) .h file.

Signed-off-by: default avatarIlija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a14b1b42

drivers/gpu/drm/radeon/evergreen_blit_kms.c

+1 −11
Original line number Diff line number Diff line
@@ -32,17 +32,7 @@ 
#include "evergreend.h"

#include "evergreen_blit_shaders.h"

#include "cayman_blit_shaders.h"



#define DI_PT_RECTLIST        0x11

#define DI_INDEX_SIZE_16_BIT  0x0

#define DI_SRC_SEL_AUTO_INDEX 0x2



#define FMT_8                 0x1

#define FMT_5_6_5             0x8

#define FMT_8_8_8_8           0x1a

#define COLOR_8               0x1

#define COLOR_5_6_5           0x8

#define COLOR_8_8_8_8         0x1a

#include "radeon_blit_common.h"



/* emits 17 */

static void

drivers/gpu/drm/radeon/r600_blit_kms.c

+1 −14
Original line number Diff line number Diff line
@@ -30,20 +30,7 @@ 


#include "r600d.h"

#include "r600_blit_shaders.h"



#define DI_PT_RECTLIST        0x11

#define DI_INDEX_SIZE_16_BIT  0x0

#define DI_SRC_SEL_AUTO_INDEX 0x2



#define FMT_8                 0x1

#define FMT_5_6_5             0x8

#define FMT_8_8_8_8           0x1a

#define COLOR_8               0x1

#define COLOR_5_6_5           0x8

#define COLOR_8_8_8_8         0x1a



#define RECT_UNIT_H           32

#define RECT_UNIT_W           (RADEON_GPU_PAGE_SIZE / 4 / RECT_UNIT_H)

#include "radeon_blit_common.h"



/* emits 21 on rv770+, 23 on r600 */

static void

drivers/gpu/drm/radeon/radeon_blit_common.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2009 Advanced Micro Devices, Inc.

 * Copyright 2009 Red Hat Inc.

 * Copyright 2012 Alcatel-Lucent, Inc.

 *

 * 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 COPYRIGHT HOLDER(S) 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.

 *

 */



#ifndef __RADEON_BLIT_COMMON_H__



#define DI_PT_RECTLIST        0x11

#define DI_INDEX_SIZE_16_BIT  0x0

#define DI_SRC_SEL_AUTO_INDEX 0x2



#define FMT_8                 0x1

#define FMT_5_6_5             0x8

#define FMT_8_8_8_8           0x1a

#define COLOR_8               0x1

#define COLOR_5_6_5           0x8

#define COLOR_8_8_8_8         0x1a



#define RECT_UNIT_H           32

#define RECT_UNIT_W           (RADEON_GPU_PAGE_SIZE / 4 / RECT_UNIT_H)



#define __RADEON_BLIT_COMMON_H__

#endif