Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe625f13 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next' of ../drm-2.6 into drm-next

parents 6782cc7b 7433874e

drivers/gpu/drm/radeon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ radeon-y += radeon_device.o radeon_kms.o \ 
	radeon_cs.o radeon_bios.o radeon_benchmark.o r100.o r300.o r420.o \

	rs400.o rs600.o rs690.o rv515.o r520.o r600.o rv770.o radeon_test.o \

	r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \

	r600_blit_kms.o

	r600_blit_kms.o radeon_pm.o



radeon-$(CONFIG_COMPAT) += radeon_ioc32.o

drivers/gpu/drm/radeon/r420.c

+2 −0
Original line number Diff line number Diff line
@@ -311,6 +311,8 @@ int r420_init(struct radeon_device *rdev) 
	}

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	/* Initialize power management */

	radeon_pm_init(rdev);

	/* Get vram informations */

	r300_vram_info(rdev);

	/* Initialize memory controller (also test AGP) */

drivers/gpu/drm/radeon/r520.c

+2 −0
Original line number Diff line number Diff line
@@ -260,6 +260,8 @@ int r520_init(struct radeon_device *rdev) 
	}

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	/* Initialize power management */

	radeon_pm_init(rdev);

	/* Get vram informations */

	r520_vram_info(rdev);

	/* Initialize memory controller (also test AGP) */

drivers/gpu/drm/radeon/r600.c

+3 −0
Original line number Diff line number Diff line
@@ -1621,10 +1621,13 @@ int r600_init(struct radeon_device *rdev) 
	r600_scratch_init(rdev);

	/* Initialize surface registers */

	radeon_surface_init(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	r = radeon_clocks_init(rdev);

	if (r)

		return r;

	/* Initialize power management */

	radeon_pm_init(rdev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	if (r)

drivers/gpu/drm/radeon/radeon.h

+8 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ struct radeon_clock { 
	uint32_t default_sclk;

};



/*

 * Power management

 */

int radeon_pm_init(struct radeon_device *rdev);



/*

 * Fences.
@@ -622,7 +626,9 @@ struct radeon_asic { 
		    uint64_t dst_offset,

		    unsigned num_pages,

		    struct radeon_fence *fence);

	uint32_t (*get_engine_clock)(struct radeon_device *rdev);

	void (*set_engine_clock)(struct radeon_device *rdev, uint32_t eng_clock);

	uint32_t (*get_memory_clock)(struct radeon_device *rdev);

	void (*set_memory_clock)(struct radeon_device *rdev, uint32_t mem_clock);

	void (*set_pcie_lanes)(struct radeon_device *rdev, int lanes);

	void (*set_clock_gating)(struct radeon_device *rdev, int enable);
@@ -953,7 +959,9 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v) 
#define radeon_copy_blit(rdev, s, d, np, f) (rdev)->asic->copy_blit((rdev), (s), (d), (np), (f))

#define radeon_copy_dma(rdev, s, d, np, f) (rdev)->asic->copy_dma((rdev), (s), (d), (np), (f))

#define radeon_copy(rdev, s, d, np, f) (rdev)->asic->copy((rdev), (s), (d), (np), (f))

#define radeon_get_engine_clock(rdev) (rdev)->asic->get_engine_clock((rdev))

#define radeon_set_engine_clock(rdev, e) (rdev)->asic->set_engine_clock((rdev), (e))

#define radeon_get_memory_clock(rdev) (rdev)->asic->get_memory_clock((rdev))

#define radeon_set_memory_clock(rdev, e) (rdev)->asic->set_engine_clock((rdev), (e))

#define radeon_set_pcie_lanes(rdev, l) (rdev)->asic->set_pcie_lanes((rdev), (l))

#define radeon_set_clock_gating(rdev, e) (rdev)->asic->set_clock_gating((rdev), (e))