From 0204426284e6e0652da859c7d027f9f2f25f3855 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 8 Apr 2013 12:41:30 +0200 Subject: [PATCH] --- yaml --- r: 371399 b: refs/heads/master c: 73afc70d1153399b01789ff01e04d2cae49acf52 h: refs/heads/master i: 371397: 671033e33bed9eeaec7a841829735d2272fd5e88 371395: 17404503b335a1a84ade7877700fc431c227e60f 371391: 2248b2d06ad4761f439c61e12a5a082e75956fbe v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5998ede6b8a2..7dd43858a6f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2ba57b5eab8817d86d0f108fdf1878e51dc0a37 +refs/heads/master: 73afc70d1153399b01789ff01e04d2cae49acf52 diff --git a/trunk/drivers/gpu/drm/radeon/radeon.h b/trunk/drivers/gpu/drm/radeon/radeon.h index 66e68c1a578f..ac614a45b27f 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon.h +++ b/trunk/drivers/gpu/drm/radeon/radeon.h @@ -1315,6 +1315,7 @@ struct radeon_asic { int (*get_pcie_lanes)(struct radeon_device *rdev); void (*set_pcie_lanes)(struct radeon_device *rdev, int lanes); void (*set_clock_gating)(struct radeon_device *rdev, int enable); + int (*set_uvd_clocks)(struct radeon_device *rdev, u32 vclk, u32 dclk); } pm; /* pageflipping */ struct { @@ -1882,6 +1883,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); #define radeon_get_pcie_lanes(rdev) (rdev)->asic->pm.get_pcie_lanes((rdev)) #define radeon_set_pcie_lanes(rdev, l) (rdev)->asic->pm.set_pcie_lanes((rdev), (l)) #define radeon_set_clock_gating(rdev, e) (rdev)->asic->pm.set_clock_gating((rdev), (e)) +#define radeon_set_uvd_clocks(rdev, v, d) (rdev)->asic->pm.set_uvd_clocks((rdev), (v), (d)) #define radeon_set_surface_reg(rdev, r, f, p, o, s) ((rdev)->asic->surface.set_reg((rdev), (r), (f), (p), (o), (s))) #define radeon_clear_surface_reg(rdev, r) ((rdev)->asic->surface.clear_reg((rdev), (r))) #define radeon_bandwidth_update(rdev) (rdev)->asic->display.bandwidth_update((rdev))