summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2013-07-03 13:06:41 +1000
committerJonathan Gray <jsg@jsg.id.au>2013-08-12 10:44:29 +1000
commit7167194c79c196c3e395903e6d7bf4c1044b7c7e (patch)
treee061c1be24546f595bf9d55dae4c1e22cfa26094
parent2b0a7035cb0861b750fe2129d41a5d65b180f215 (diff)
fix non debug build
-rw-r--r--sys/dev/pci/drm/radeon/atombios_dp.c2
-rw-r--r--sys/dev/pci/drm/radeon/atombios_encoders.c4
-rw-r--r--sys/dev/pci/drm/radeon/radeon_benchmark.c2
-rw-r--r--sys/dev/pci/drm/radeon/radeon_pm.c4
4 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/radeon/atombios_dp.c b/sys/dev/pci/drm/radeon/atombios_dp.c
index 3236a1eb2d4..2ddd129cac2 100644
--- a/sys/dev/pci/drm/radeon/atombios_dp.c
+++ b/sys/dev/pci/drm/radeon/atombios_dp.c
@@ -36,12 +36,14 @@
#define DP_LINK_CONFIGURATION_SIZE 9
#define DP_DPCD_SIZE DP_RECEIVER_CAP_SIZE
+#ifdef DRMDEBUG
static char *voltage_names[] = {
"0.4V", "0.6V", "0.8V", "1.2V"
};
static char *pre_emph_names[] = {
"0dB", "3.5dB", "6dB", "9.5dB"
};
+#endif
/***** radeon AUX functions *****/
union aux_channel_transaction {
diff --git a/sys/dev/pci/drm/radeon/atombios_encoders.c b/sys/dev/pci/drm/radeon/atombios_encoders.c
index b999713c7b3..186bc9f3ce9 100644
--- a/sys/dev/pci/drm/radeon/atombios_encoders.c
+++ b/sys/dev/pci/drm/radeon/atombios_encoders.c
@@ -2219,7 +2219,9 @@ radeon_atom_dac_detect(struct drm_encoder *encoder, struct drm_connector *connec
{
struct drm_device *dev = encoder->dev;
struct radeon_device *rdev = dev->dev_private;
+#ifdef DRMDEBUG
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+#endif
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
uint32_t bios_0_scratch;
@@ -2260,7 +2262,9 @@ radeon_atom_dig_detect(struct drm_encoder *encoder, struct drm_connector *connec
{
struct drm_device *dev = encoder->dev;
struct radeon_device *rdev = dev->dev_private;
+#ifdef DRMDEBUG
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+#endif
struct radeon_connector *radeon_connector = to_radeon_connector(connector);
struct drm_encoder *ext_encoder = radeon_get_external_encoder(encoder);
u32 bios_0_scratch;
diff --git a/sys/dev/pci/drm/radeon/radeon_benchmark.c b/sys/dev/pci/drm/radeon/radeon_benchmark.c
index 8c96fc6aac3..8c283b3719f 100644
--- a/sys/dev/pci/drm/radeon/radeon_benchmark.c
+++ b/sys/dev/pci/drm/radeon/radeon_benchmark.c
@@ -89,7 +89,9 @@ radeon_benchmark_log_results(int n, unsigned size,
unsigned sdomain, unsigned ddomain,
char *kind)
{
+#ifdef DRMDEBUG
unsigned int throughput = (n * (size >> 10)) / time;
+#endif
DRM_DEBUG("radeon: %s %u bo moves of %u kB from"
" %d to %d in %u ms, throughput: %u Mb/s or %u MB/s\n",
kind, n, size >> 10, sdomain, ddomain, time,
diff --git a/sys/dev/pci/drm/radeon/radeon_pm.c b/sys/dev/pci/drm/radeon/radeon_pm.c
index 9277bf3e8d5..4f3c6606974 100644
--- a/sys/dev/pci/drm/radeon/radeon_pm.c
+++ b/sys/dev/pci/drm/radeon/radeon_pm.c
@@ -29,6 +29,7 @@
#define RADEON_RECLOCK_DELAY_MS 200
#define RADEON_WAIT_VBLANK_TIMEOUT 200
+#ifdef DRMDEBUG
static const char *radeon_pm_state_type_name[5] = {
"",
"Powersave",
@@ -36,6 +37,7 @@ static const char *radeon_pm_state_type_name[5] = {
"Balanced",
"Performance",
};
+#endif
#ifdef notyet
static void radeon_dynpm_idle_work_handler(struct work_struct *work);
@@ -797,7 +799,9 @@ static bool radeon_pm_in_vbl(struct radeon_device *rdev)
static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish)
{
+#ifdef DRMDEBUG
u32 stat_crtc = 0;
+#endif
bool in_vbl = radeon_pm_in_vbl(rdev);
if (in_vbl == false)