drm/radeon/kms: add R4XX mc register access helper. (905b6822) · Commits · 戴 / test

drivers/gpu/drm/radeon/r420.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include "drmP.h"
		#include "radeon_reg.h"
		#include "radeon.h"
		#include "r420d.h"

		/* r420,r423,rv410 depends on : */
		void r100_pci_gart_disable(struct radeon_device *rdev);
		@@ -232,3 +233,19 @@ int r420_debugfs_pipes_info_init(struct radeon_device *rdev)
		return 0;
		#endif
		}

		u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg)
		{
		u32 r;

		WREG32(R_0001F8_MC_IND_INDEX, S_0001F8_MC_IND_ADDR(reg));
		r = RREG32(R_0001FC_MC_IND_DATA);
		return r;
		}

		void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v)
		{
		WREG32(R_0001F8_MC_IND_INDEX, S_0001F8_MC_IND_ADDR(reg) \|
		S_0001F8_MC_IND_WR_EN(1));
		WREG32(R_0001FC_MC_IND_DATA, v);
		}

drivers/gpu/drm/radeon/r420d.h

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2008 Advanced Micro Devices, Inc.
		* Copyright 2008 Red Hat Inc.
		* Copyright 2009 Jerome Glisse.
		*
		* 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 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) OR AUTHOR(S) 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: Dave Airlie
		* Alex Deucher
		* Jerome Glisse
		*/
		#ifndef R420D_H
		#define R420D_H

		#define R_0001F8_MC_IND_INDEX 0x0001F8
		#define S_0001F8_MC_IND_ADDR(x) (((x) & 0x7F) << 0)
		#define G_0001F8_MC_IND_ADDR(x) (((x) >> 0) & 0x7F)
		#define C_0001F8_MC_IND_ADDR 0xFFFFFF80
		#define S_0001F8_MC_IND_WR_EN(x) (((x) & 0x1) << 8)
		#define G_0001F8_MC_IND_WR_EN(x) (((x) >> 8) & 0x1)
		#define C_0001F8_MC_IND_WR_EN 0xFFFFFEFF
		#define R_0001FC_MC_IND_DATA 0x0001FC
		#define S_0001FC_MC_IND_DATA(x) (((x) & 0xFFFFFFFF) << 0)
		#define G_0001FC_MC_IND_DATA(x) (((x) >> 0) & 0xFFFFFFFF)
		#define C_0001FC_MC_IND_DATA 0x00000000

		#endif

drivers/gpu/drm/radeon/radeon.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -936,4 +936,8 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)
		/* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */
		void r100_cp_disable(struct radeon_device *rdev);

		/* r420,r423,rv410 */
		u32 r420_mc_rreg(struct radeon_device *rdev, u32 reg);
		void r420_mc_wreg(struct radeon_device *rdev, u32 reg, u32 v);

		#endif

drivers/gpu/drm/radeon/radeon_device.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,10 @@ void radeon_register_accessor_init(struct radeon_device *rdev)
		rdev->pll_rreg = &r100_pll_rreg;
		rdev->pll_wreg = &r100_pll_wreg;
		}
		if (rdev->family >= CHIP_R420) {
		rdev->mc_rreg = &r420_mc_rreg;
		rdev->mc_wreg = &r420_mc_wreg;
		}
		if (rdev->family >= CHIP_RV515) {
		rdev->mc_rreg = &rv515_mc_rreg;
		rdev->mc_wreg = &rv515_mc_wreg;

Admin message