xf86-video-ati: Branch 'kms-only' - 2 commits
Dave Airlie
airlied at kemper.freedesktop.org
Fri Jun 15 08:11:52 PDT 2012
src/pcidb/parse_pci_ids.pl | 2 +-
src/radeon.h | 3 ---
src/radeon_accel.c | 3 ---
src/radeon_commonfuncs.c | 2 --
src/radeon_exa.c | 3 ---
src/radeon_exa_funcs.c | 7 -------
src/radeon_exa_render.c | 8 --------
src/radeon_pci_chipset_gen.h | 2 +-
src/radeon_probe.h | 3 ---
src/radeon_textured_video.c | 3 ---
src/radeon_textured_videofuncs.c | 8 --------
11 files changed, 2 insertions(+), 42 deletions(-)
New commits:
commit 678c1f3425c0fa7e98795c8e351da77d04652e02
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Jun 15 16:06:27 2012 +0100
make pci chipsets static
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/pcidb/parse_pci_ids.pl b/src/pcidb/parse_pci_ids.pl
index d1900a4..72fb480 100755
--- a/src/pcidb/parse_pci_ids.pl
+++ b/src/pcidb/parse_pci_ids.pl
@@ -29,7 +29,7 @@ open (RADEONCHIPINFO, ">", $radeonchipinfofile) or die;
print RADEONCHIPSET "/* This file is autogenerated please do not edit */\n";
print RADEONCHIPSET "static SymTabRec RADEONChipsets[] = {\n";
print PCICHIPSET "/* This file is autogenerated please do not edit */\n";
-print PCICHIPSET "PciChipsets RADEONPciChipsets[] = {\n";
+print PCICHIPSET "static PciChipsets RADEONPciChipsets[] = {\n";
print PCIDEVICEMATCH "/* This file is autogenerated please do not edit */\n";
print PCIDEVICEMATCH "static const struct pci_id_match radeon_device_match[] = {\n";
print RADEONCHIPINFO "/* This file is autogenerated please do not edit */\n";
diff --git a/src/radeon.h b/src/radeon.h
index 3566bba..21ecfd9 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -53,7 +53,6 @@
/* Exa and Cursor Support */
-#include "vbe.h"
#include "xf86Cursor.h"
/* DDC support */
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index dbf0728..c9f9656 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -1,5 +1,5 @@
/* This file is autogenerated please do not edit */
-PciChipsets RADEONPciChipsets[] = {
+static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_RV380_3150, PCI_CHIP_RV380_3150, RES_SHARED_VGA },
{ PCI_CHIP_RV380_3151, PCI_CHIP_RV380_3151, RES_SHARED_VGA },
{ PCI_CHIP_RV380_3152, PCI_CHIP_RV380_3152, RES_SHARED_VGA },
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 0af4531..db4535c 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -128,9 +128,6 @@ typedef struct
int dri2_info_cnt;
} RADEONEntRec, *RADEONEntPtr;
-/* radeon_probe.c */
-extern PciChipsets RADEONPciChipsets[];
-
/* radeon_driver.c */
#ifdef X_XF86MiscPassMessage
extern Bool RADEONHandleMessage(int, const char*, const char*,
commit 95cbbe999418c72dc407069d31e759d70f49ab16
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Jun 15 16:01:53 2012 +0100
drop RING_LOCALS/ACCEL_PREAMBLE
these were unused now.
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/radeon.h b/src/radeon.h
index d45c4cc..3566bba 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -600,8 +600,6 @@ uint32_t radeon_get_pixmap_tiling(PixmapPtr pPix);
#define RADEON_VERBOSE 0
-#define RING_LOCALS
-
#define BEGIN_RING(n) do { \
if (RADEON_VERBOSE) { \
xf86DrvMsg(pScrn->scrnIndex, X_INFO, \
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index c51b0e5..6adb518 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -159,8 +159,6 @@ int radeon_cs_space_remaining(ScrnInfoPtr pScrn)
return (info->cs->ndw - info->cs->cdw);
}
-#define ACCEL_PREAMBLE() \
- RING_LOCALS;
#define BEGIN_ACCEL(n) BEGIN_RING(2*(n))
#define OUT_ACCEL_REG(reg, val) OUT_RING_REG(reg, val)
#define FINISH_ACCEL() ADVANCE_RING()
@@ -168,7 +166,6 @@ int radeon_cs_space_remaining(ScrnInfoPtr pScrn)
#include "radeon_commonfuncs.c"
-#undef ACCEL_PREAMBLE
#undef BEGIN_ACCEL
#undef OUT_ACCEL_REG
#undef FINISH_ACCEL
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 6111af4..6fa741f 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -44,7 +44,6 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
uint32_t gb_tile_config, vap_cntl;
- ACCEL_PREAMBLE();
info->accel_state->texW[0] = info->accel_state->texH[0] =
info->accel_state->texW[1] = info->accel_state->texH[1] = 1;
@@ -770,7 +769,6 @@ void FUNC_NAME(RADEONWaitForVLine)(ScrnInfoPtr pScrn, PixmapPtr pPix,
{
RADEONInfoPtr info = RADEONPTR(pScrn);
drmmode_crtc_private_ptr drmmode_crtc;
- ACCEL_PREAMBLE();
if (!crtc)
return;
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index e081f3d..2cfecb3 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -531,8 +531,6 @@ Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix)
#define LEAVE_DRAW(x) TRACE
/***********************************************************************/
-#define ACCEL_PREAMBLE() \
- RING_LOCALS;
#define BEGIN_ACCEL(n) BEGIN_RING(2*(n))
#define OUT_ACCEL_REG(reg, val) OUT_RING_REG(reg, val)
#define FINISH_ACCEL() ADVANCE_RING()
@@ -545,7 +543,6 @@ Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix)
#endif
#include "radeon_exa_funcs.c"
-#undef ACCEL_PREAMBLE
#undef BEGIN_ACCEL
#undef OUT_ACCEL_REG
#undef FINISH_ACCEL
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index b2f3552..39b3428 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -66,7 +66,6 @@ static void FUNC_NAME(Emit2DState)(ScrnInfoPtr pScrn, int op)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
int has_src;
- ACCEL_PREAMBLE();
/* don't emit if no operation in progress */
if (info->state_2d.op == 0 && op == 0)
@@ -106,7 +105,6 @@ static void
FUNC_NAME(RADEONFlush2D)(PixmapPtr pPix)
{
RINFO_FROM_SCREEN(pPix->drawable.pScreen);
- ACCEL_PREAMBLE();
TRACE;
@@ -188,7 +186,6 @@ static void
FUNC_NAME(RADEONSolid)(PixmapPtr pPix, int x1, int y1, int x2, int y2)
{
RINFO_FROM_SCREEN(pPix->drawable.pScreen);
- ACCEL_PREAMBLE();
TRACE;
@@ -293,7 +290,6 @@ FUNC_NAME(RADEONCopy)(PixmapPtr pDst,
int w, int h)
{
RINFO_FROM_SCREEN(pDst->drawable.pScreen);
- ACCEL_PREAMBLE();
TRACE;
@@ -334,7 +330,6 @@ RADEONBlitChunk(ScrnInfoPtr pScrn, struct radeon_bo *src_bo,
uint32_t src_domain, uint32_t dst_domain)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
- ACCEL_PREAMBLE();
if (src_bo && dst_bo) {
BEGIN_ACCEL_RELOC(6, 2);
@@ -463,7 +458,6 @@ copy:
if (copy_dst == scratch) {
RADEONGetDatatypeBpp(pDst->drawable.bitsPerPixel, &datatype);
RADEONGetPixmapOffsetPitch(pDst, &dst_pitch_offset);
- ACCEL_PREAMBLE();
RADEON_SWITCH_TO_2D();
RADEONBlitChunk(pScrn, scratch, driver_priv->bo, datatype, scratch_pitch << 16,
dst_pitch_offset, 0, 0, x, y, w, h,
@@ -547,7 +541,6 @@ RADEONDownloadFromScreenCS(PixmapPtr pSrc, int x, int y, int w,
}
RADEONGetDatatypeBpp(pSrc->drawable.bitsPerPixel, &datatype);
RADEONGetPixmapOffsetPitch(pSrc, &src_pitch_offset);
- ACCEL_PREAMBLE();
RADEON_SWITCH_TO_2D();
RADEONBlitChunk(pScrn, driver_priv->bo, scratch, datatype, src_pitch_offset,
scratch_pitch << 16, x, y, 0, 0, w, h,
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 2866bc8..aae1d8c 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -373,7 +373,6 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
Bool repeat;
int i, w, h;
struct radeon_exa_pixmap_priv *driver_priv;
- ACCEL_PREAMBLE();
if (pPict->pDrawable) {
w = pPict->pDrawable->width;
@@ -608,7 +607,6 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
uint32_t pp_cntl, blendcntl, cblend, ablend;
int pixel_shift;
struct radeon_exa_pixmap_priv *driver_priv;
- ACCEL_PREAMBLE();
TRACE;
@@ -781,7 +779,6 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
Bool repeat;
int i, w, h;
struct radeon_exa_pixmap_priv *driver_priv;
- ACCEL_PREAMBLE();
if (pPict->pDrawable) {
w = pPict->pDrawable->width;
@@ -978,7 +975,6 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch;
int pixel_shift;
struct radeon_exa_pixmap_priv *driver_priv;
- ACCEL_PREAMBLE();
TRACE;
@@ -1171,7 +1167,6 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
int i, pixel_shift, out_size = 6;
unsigned int repeatType;
struct radeon_exa_pixmap_priv *driver_priv;
- ACCEL_PREAMBLE();
TRACE;
@@ -1480,7 +1475,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
uint32_t mask_color, mask_alpha;
int pixel_shift;
struct radeon_exa_pixmap_priv *driver_priv;
- ACCEL_PREAMBLE();
TRACE;
if (!R300GetDestFormat(pDstPicture, &dst_format))
@@ -2141,7 +2135,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst)
{
RINFO_FROM_SCREEN(pDst->drawable.pScreen);
- ACCEL_PREAMBLE();
ENTER_DRAW(0);
@@ -2242,7 +2235,6 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
int vtx_count;
xPointFixed srcTopLeft, srcTopRight, srcBottomLeft, srcBottomRight;
static xPointFixed maskTopLeft, maskTopRight, maskBottomLeft, maskBottomRight;
- ACCEL_PREAMBLE();
ENTER_DRAW(0);
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index d98b68d..a7402aa 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -123,8 +123,6 @@ static REF_TRANSFORM trans[2] =
};
-#define ACCEL_PREAMBLE() \
- RING_LOCALS;
#define BEGIN_ACCEL(n) BEGIN_RING(2*(n))
#define OUT_ACCEL_REG(reg, val) OUT_RING_REG(reg, val)
#define OUT_ACCEL_REG_F(reg, val) OUT_ACCEL_REG(reg, F_TO_DW(val))
@@ -134,7 +132,6 @@ static REF_TRANSFORM trans[2] =
#include "radeon_textured_videofuncs.c"
-#undef ACCEL_PREAMBLE
#undef BEGIN_ACCEL
#undef OUT_ACCEL_REG
#undef OUT_ACCEL_REG_F
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index 061fe96..815448c 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -67,7 +67,6 @@ FUNC_NAME(RADEONPrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
int scissor_w = MIN(pPixmap->drawable.width, 2047);
int scissor_h = MIN(pPixmap->drawable.height, 2047);
int ret;
- ACCEL_PREAMBLE();
radeon_cs_space_reset_bos(info->cs);
radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
@@ -304,7 +303,6 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
int dstxoff, dstyoff;
BoxPtr pBox = REGION_RECTS(&pPriv->clip);
int nBox = REGION_NUM_RECTS(&pPriv->clip);
- ACCEL_PREAMBLE();
#ifdef COMPOSITE
dstxoff = -pPixmap->screen_x + pPixmap->drawable.x;
@@ -441,7 +439,6 @@ FUNC_NAME(R200PrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
float ucscale = 0.25, vcscale = 0.25;
Bool needux8 = FALSE, needvx8 = FALSE;
int ret;
- ACCEL_PREAMBLE();
radeon_cs_space_reset_bos(info->cs);
radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
@@ -852,7 +849,6 @@ FUNC_NAME(R200DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
int dstxoff, dstyoff;
BoxPtr pBox = REGION_RECTS(&pPriv->clip);
int nBox = REGION_NUM_RECTS(&pPriv->clip);
- ACCEL_PREAMBLE();
#ifdef COMPOSITE
dstxoff = -pPixmap->screen_x + pPixmap->drawable.x;
@@ -970,7 +966,6 @@ FUNC_NAME(R300PrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
uint32_t output_fmt;
int pixel_shift;
int ret;
- ACCEL_PREAMBLE();
radeon_cs_space_reset_bos(info->cs);
radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
@@ -2210,7 +2205,6 @@ FUNC_NAME(R300DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
int dstxoff, dstyoff;
BoxPtr pBox = REGION_RECTS(&pPriv->clip);
int nBox = REGION_NUM_RECTS(&pPriv->clip);
- ACCEL_PREAMBLE();
#ifdef COMPOSITE
dstxoff = -pPixmap->screen_x + pPixmap->drawable.x;
@@ -2394,7 +2388,6 @@ FUNC_NAME(R500PrepareTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
uint32_t output_fmt;
int pixel_shift, out_size = 6;
int ret;
- ACCEL_PREAMBLE();
radeon_cs_space_reset_bos(info->cs);
radeon_cs_space_add_persistent_bo(info->cs, src_bo, RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
@@ -3781,7 +3774,6 @@ FUNC_NAME(R500DisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
int dstxoff, dstyoff;
BoxPtr pBox = REGION_RECTS(&pPriv->clip);
int nBox = REGION_NUM_RECTS(&pPriv->clip);
- ACCEL_PREAMBLE();
#ifdef COMPOSITE
dstxoff = -pPixmap->screen_x + pPixmap->drawable.x;
More information about the xorg-commit
mailing list