diff options
Diffstat (limited to 'sys/dev/pci/drm/radeon')
| -rw-r--r-- | sys/dev/pci/drm/radeon/atombios_i2c.c | 9 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r100.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r600.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r600_audio.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_benchmark.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_device.c | 44 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_display.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_fb.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_fence.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_i2c.c | 33 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_irq_kms.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_kms.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_object.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_pm.c | 47 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_sa.c | 16 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_ttm.c | 109 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/si.c | 13 |
18 files changed, 99 insertions, 272 deletions
diff --git a/sys/dev/pci/drm/radeon/atombios_i2c.c b/sys/dev/pci/drm/radeon/atombios_i2c.c index a5fffa95990..dde3dfa2be6 100644 --- a/sys/dev/pci/drm/radeon/atombios_i2c.c +++ b/sys/dev/pci/drm/radeon/atombios_i2c.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atombios_i2c.c,v 1.4 2014/02/10 01:32:13 jsg Exp $ */ +/* $OpenBSD: atombios_i2c.c,v 1.5 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2011 Advanced Micro Devices, Inc. * @@ -36,10 +36,8 @@ extern void radeon_atom_copy_swap(u8 *dst, u8 *src, u8 num_bytes, bool to_le); #define ATOM_MAX_HW_I2C_WRITE 2 #define ATOM_MAX_HW_I2C_READ 255 -int radeon_process_i2c_ch(struct radeon_i2c_chan *, u8, u8, u8 *, u8); - -int -radeon_process_i2c_ch(struct radeon_i2c_chan *chan, +#ifdef notyet +static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan, u8 slave_addr, u8 flags, u8 *buf, u8 num) { @@ -97,7 +95,6 @@ radeon_process_i2c_ch(struct radeon_i2c_chan *chan, return 0; } -#ifdef notyet int radeon_atom_hw_i2c_xfer(struct i2c_controller *i2c_adap, struct i2c_msg *msgs, int num) { diff --git a/sys/dev/pci/drm/radeon/r100.c b/sys/dev/pci/drm/radeon/r100.c index bfc1cf31d71..98277e43a39 100644 --- a/sys/dev/pci/drm/radeon/r100.c +++ b/sys/dev/pci/drm/radeon/r100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r100.c,v 1.13 2015/04/06 05:35:29 jsg Exp $ */ +/* $OpenBSD: r100.c,v 1.14 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -64,8 +64,6 @@ MODULE_FIRMWARE(FIRMWARE_R520); * and others in some cases. */ -u32 r100_get_accessible_vram(struct radeon_device *); - static bool r100_is_in_vblank(struct radeon_device *rdev, int crtc) { if (crtc == 0) { @@ -2824,8 +2822,7 @@ static void r100_vram_get_type(struct radeon_device *rdev) } } -u32 -r100_get_accessible_vram(struct radeon_device *rdev) +static u32 r100_get_accessible_vram(struct radeon_device *rdev) { u32 aper_size; pcireg_t reg; diff --git a/sys/dev/pci/drm/radeon/r600.c b/sys/dev/pci/drm/radeon/r600.c index 3f7a869ed78..12e3f28be4a 100644 --- a/sys/dev/pci/drm/radeon/r600.c +++ b/sys/dev/pci/drm/radeon/r600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r600.c,v 1.16 2015/04/06 05:35:29 jsg Exp $ */ +/* $OpenBSD: r600.c,v 1.17 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -98,10 +98,6 @@ static void r600_gpu_init(struct radeon_device *rdev); void r600_fini(struct radeon_device *rdev); void r600_irq_disable(struct radeon_device *rdev); static void r600_pcie_gen2_enable(struct radeon_device *rdev); -int r600_ih_ring_alloc(struct radeon_device *rdev); -void r600_ih_ring_fini(struct radeon_device *rdev); -void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc); -void r600_rlc_start(struct radeon_device *rdev); /* get temperature in millidegrees */ int rv6xx_get_temp(struct radeon_device *rdev) @@ -1114,8 +1110,7 @@ static void r600_mc_program(struct radeon_device *rdev) * Note: GTT start, end, size should be initialized before calling this * function on AGP platform. */ -void -r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) +static void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) { u64 size_bf, size_af; @@ -3296,8 +3291,7 @@ void r600_rlc_stop(struct radeon_device *rdev) WREG32(RLC_CNTL, 0); } -void -r600_rlc_start(struct radeon_device *rdev) +static void r600_rlc_start(struct radeon_device *rdev) { WREG32(RLC_CNTL, RLC_ENABLE); } diff --git a/sys/dev/pci/drm/radeon/r600_audio.c b/sys/dev/pci/drm/radeon/r600_audio.c index fdd05e36e0d..d7b6bbb2ebd 100644 --- a/sys/dev/pci/drm/radeon/r600_audio.c +++ b/sys/dev/pci/drm/radeon/r600_audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: r600_audio.c,v 1.2 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: r600_audio.c,v 1.3 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -30,13 +30,10 @@ #include "radeon_asic.h" #include "atom.h" -bool radeon_dig_encoder(struct drm_encoder *); - /* * check if enc_priv stores radeon_encoder_atom_dig */ -bool -radeon_dig_encoder(struct drm_encoder *encoder) +static bool radeon_dig_encoder(struct drm_encoder *encoder) { struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); switch (radeon_encoder->encoder_id) { @@ -122,8 +119,7 @@ struct r600_audio r600_audio_status(struct radeon_device *rdev) /* * update all hdmi interfaces with current audio parameters */ -void -r600_audio_update_hdmi(void *arg1) +void r600_audio_update_hdmi(void *arg1) { struct radeon_device *rdev = arg1; struct drm_device *dev = rdev->ddev; diff --git a/sys/dev/pci/drm/radeon/radeon.h b/sys/dev/pci/drm/radeon/radeon.h index d9a8a780f51..b74d7ff1cb1 100644 --- a/sys/dev/pci/drm/radeon/radeon.h +++ b/sys/dev/pci/drm/radeon/radeon.h @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon.h,v 1.11 2015/02/10 06:19:36 jsg Exp $ */ +/* $OpenBSD: radeon.h,v 1.12 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -1957,8 +1957,6 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, int radeon_vm_bo_rmv(struct radeon_device *rdev, struct radeon_bo_va *bo_va); -void radeon_hotplug_work_func(void *arg1); - /* audio */ void r600_audio_update_hdmi(void *arg1); diff --git a/sys/dev/pci/drm/radeon/radeon_benchmark.c b/sys/dev/pci/drm/radeon/radeon_benchmark.c index c76619ce747..02be19ae255 100644 --- a/sys/dev/pci/drm/radeon/radeon_benchmark.c +++ b/sys/dev/pci/drm/radeon/radeon_benchmark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_benchmark.c,v 1.2 2015/02/11 07:01:37 jsg Exp $ */ +/* $OpenBSD: radeon_benchmark.c,v 1.3 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2009 Jerome Glisse. * @@ -35,13 +35,7 @@ extern int ticks; -int radeon_benchmark_do_move(struct radeon_device *, unsigned, uint64_t, - uint64_t, int, int); -void radeon_benchmark_log_results(int, unsigned, unsigned int, unsigned, - unsigned, char *); - -int -radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size, +static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size, uint64_t saddr, uint64_t daddr, int flag, int n) { @@ -84,8 +78,7 @@ exit_do_move: } -void -radeon_benchmark_log_results(int n, unsigned size, +static void radeon_benchmark_log_results(int n, unsigned size, unsigned int time, unsigned sdomain, unsigned ddomain, char *kind) diff --git a/sys/dev/pci/drm/radeon/radeon_device.c b/sys/dev/pci/drm/radeon/radeon_device.c index d38a13a6de2..4359453bc6c 100644 --- a/sys/dev/pci/drm/radeon/radeon_device.c +++ b/sys/dev/pci/drm/radeon/radeon_device.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_device.c,v 1.10 2015/04/06 06:12:25 jsg Exp $ */ +/* $OpenBSD: radeon_device.c,v 1.11 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -92,18 +92,6 @@ static const char radeon_family_name[][16] = { "LAST", }; -unsigned int radeon_vga_set_decode(void *, bool); -void radeon_check_arguments(struct radeon_device *); - -uint32_t cail_pll_read(struct card_info *, uint32_t); -void cail_pll_write(struct card_info *, uint32_t, uint32_t); -uint32_t cail_mc_read(struct card_info *, uint32_t); -void cail_mc_write(struct card_info *, uint32_t, uint32_t); -void cail_reg_write(struct card_info *, uint32_t, uint32_t); -uint32_t cail_reg_read(struct card_info *, uint32_t); -void cail_ioreg_write(struct card_info *, uint32_t, uint32_t); -uint32_t cail_ioreg_read(struct card_info *, uint32_t); - /** * radeon_surface_init - Clear GPU surface registers. * @@ -599,8 +587,7 @@ void radeon_dummy_page_fini(struct radeon_device *rdev) * Provides a PLL register accessor for the atom interpreter (r4xx+). * Returns the value of the PLL register. */ -uint32_t -cail_pll_read(struct card_info *info, uint32_t reg) +static uint32_t cail_pll_read(struct card_info *info, uint32_t reg) { struct radeon_device *rdev = info->dev->dev_private; uint32_t r; @@ -618,8 +605,7 @@ cail_pll_read(struct card_info *info, uint32_t reg) * * Provides a PLL register accessor for the atom interpreter (r4xx+). */ -void -cail_pll_write(struct card_info *info, uint32_t reg, uint32_t val) +static void cail_pll_write(struct card_info *info, uint32_t reg, uint32_t val) { struct radeon_device *rdev = info->dev->dev_private; @@ -635,8 +621,7 @@ cail_pll_write(struct card_info *info, uint32_t reg, uint32_t val) * Provides an MC register accessor for the atom interpreter (r4xx+). * Returns the value of the MC register. */ -uint32_t -cail_mc_read(struct card_info *info, uint32_t reg) +static uint32_t cail_mc_read(struct card_info *info, uint32_t reg) { struct radeon_device *rdev = info->dev->dev_private; uint32_t r; @@ -654,8 +639,7 @@ cail_mc_read(struct card_info *info, uint32_t reg) * * Provides a MC register accessor for the atom interpreter (r4xx+). */ -void -cail_mc_write(struct card_info *info, uint32_t reg, uint32_t val) +static void cail_mc_write(struct card_info *info, uint32_t reg, uint32_t val) { struct radeon_device *rdev = info->dev->dev_private; @@ -671,8 +655,7 @@ cail_mc_write(struct card_info *info, uint32_t reg, uint32_t val) * * Provides a MMIO register accessor for the atom interpreter (r4xx+). */ -void -cail_reg_write(struct card_info *info, uint32_t reg, uint32_t val) +static void cail_reg_write(struct card_info *info, uint32_t reg, uint32_t val) { struct radeon_device *rdev = info->dev->dev_private; @@ -688,8 +671,7 @@ cail_reg_write(struct card_info *info, uint32_t reg, uint32_t val) * Provides an MMIO register accessor for the atom interpreter (r4xx+). * Returns the value of the MMIO register. */ -uint32_t -cail_reg_read(struct card_info *info, uint32_t reg) +static uint32_t cail_reg_read(struct card_info *info, uint32_t reg) { struct radeon_device *rdev = info->dev->dev_private; uint32_t r; @@ -707,8 +689,7 @@ cail_reg_read(struct card_info *info, uint32_t reg) * * Provides a IO register accessor for the atom interpreter (r4xx+). */ -void -cail_ioreg_write(struct card_info *info, uint32_t reg, uint32_t val) +static void cail_ioreg_write(struct card_info *info, uint32_t reg, uint32_t val) { struct radeon_device *rdev = info->dev->dev_private; @@ -724,8 +705,7 @@ cail_ioreg_write(struct card_info *info, uint32_t reg, uint32_t val) * Provides an IO register accessor for the atom interpreter (r4xx+). * Returns the value of the IO register. */ -uint32_t -cail_ioreg_read(struct card_info *info, uint32_t reg) +static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg) { struct radeon_device *rdev = info->dev->dev_private; uint32_t r; @@ -840,8 +820,7 @@ void radeon_combios_fini(struct radeon_device *rdev) * Returns VGA resource flags. */ #ifdef notyet -unsigned int -radeon_vga_set_decode(void *cookie, bool state) +static unsigned int radeon_vga_set_decode(void *cookie, bool state) { struct radeon_device *rdev = cookie; radeon_vga_set_state(rdev, state); @@ -874,8 +853,7 @@ static bool radeon_check_pot_argument(int arg) * Validates certain module parameters and updates * the associated values used by the driver (all asics). */ -void -radeon_check_arguments(struct radeon_device *rdev) +static void radeon_check_arguments(struct radeon_device *rdev) { /* vramlimit must be a power of two */ if (!radeon_check_pot_argument(radeon_vram_limit)) { diff --git a/sys/dev/pci/drm/radeon/radeon_display.c b/sys/dev/pci/drm/radeon/radeon_display.c index b634e82630b..fa47a6f1eed 100644 --- a/sys/dev/pci/drm/radeon/radeon_display.c +++ b/sys/dev/pci/drm/radeon/radeon_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_display.c,v 1.9 2015/02/10 10:50:49 jsg Exp $ */ +/* $OpenBSD: radeon_display.c,v 1.10 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2007-8 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -33,8 +33,6 @@ #include <dev/pci/drm/drm_crtc_helper.h> #include <dev/pci/drm/drm_edid.h> -void radeon_unpin_work_func(void *); - static void avivo_crtc_load_lut(struct drm_crtc *crtc) { struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); @@ -248,8 +246,7 @@ static void radeon_crtc_destroy(struct drm_crtc *crtc) /* * Handle unpin events outside the interrupt handler proper. */ -void -radeon_unpin_work_func(void *arg1) +static void radeon_unpin_work_func(void *arg1) { struct radeon_unpin_work *work = arg1; int r; diff --git a/sys/dev/pci/drm/radeon/radeon_fb.c b/sys/dev/pci/drm/radeon/radeon_fb.c index 6962b728679..d87e0658fdf 100644 --- a/sys/dev/pci/drm/radeon/radeon_fb.c +++ b/sys/dev/pci/drm/radeon/radeon_fb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_fb.c,v 1.7 2015/02/11 07:01:37 jsg Exp $ */ +/* $OpenBSD: radeon_fb.c,v 1.8 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright © 2007 David Airlie * @@ -60,9 +60,6 @@ static struct fb_ops radeonfb_ops = { }; #endif -int radeonfb_create_pinned_object(struct radeon_fbdev *, - struct drm_mode_fb_cmd2 *, struct drm_gem_object **); - void radeondrm_burner_cb(void *); int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled) @@ -103,8 +100,7 @@ static void radeonfb_destroy_pinned_object(struct drm_gem_object *gobj) drm_gem_object_unreference_unlocked(gobj); } -int -radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev, +static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **gobj_p) { diff --git a/sys/dev/pci/drm/radeon/radeon_fence.c b/sys/dev/pci/drm/radeon/radeon_fence.c index fb6b7103eb1..76d76b15294 100644 --- a/sys/dev/pci/drm/radeon/radeon_fence.c +++ b/sys/dev/pci/drm/radeon/radeon_fence.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_fence.c,v 1.4 2015/04/06 05:35:29 jsg Exp $ */ +/* $OpenBSD: radeon_fence.c,v 1.5 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2009 Jerome Glisse. * All Rights Reserved. @@ -38,8 +38,6 @@ #include <dev/pci/drm/refcount.h> -bool radeon_fence_any_seq_signaled(struct radeon_device *, u64 *); - extern int ticks; /* @@ -409,8 +407,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool intr) return 0; } -bool -radeon_fence_any_seq_signaled(struct radeon_device *rdev, u64 *seq) +static bool radeon_fence_any_seq_signaled(struct radeon_device *rdev, u64 *seq) { unsigned i; diff --git a/sys/dev/pci/drm/radeon/radeon_i2c.c b/sys/dev/pci/drm/radeon/radeon_i2c.c index e291b7d9b99..12119b03677 100644 --- a/sys/dev/pci/drm/radeon/radeon_i2c.c +++ b/sys/dev/pci/drm/radeon/radeon_i2c.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_i2c.c,v 1.4 2015/02/10 06:19:36 jsg Exp $ */ +/* $OpenBSD: radeon_i2c.c,v 1.5 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2007-8 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -40,14 +40,6 @@ extern int radeon_atom_hw_i2c_xfer(struct i2c_controller *i2c_adap, #endif extern u32 radeon_atom_hw_i2c_func(struct i2c_controller *adap); -int pre_xfer(void *); -void post_xfer(void *); -int get_clock(void *); -int get_data(void *); -void set_clock(void *, int); -void set_data(void *, int); -u32 radeon_get_i2c_prescale(struct radeon_device *); - /** * radeon_ddc_probe * @@ -91,8 +83,7 @@ bool radeon_ddc_probe(struct radeon_connector *radeon_connector, bool use_aux) /* bit banging i2c */ -int -pre_xfer(void *cookie) +static int pre_xfer(void *cookie) { struct radeon_i2c_chan *i2c = cookie; struct radeon_device *rdev = i2c->dev->dev_private; @@ -160,8 +151,7 @@ pre_xfer(void *cookie) return 0; } -void -post_xfer(void *cookie) +static void post_xfer(void *cookie) { struct radeon_i2c_chan *i2c = cookie; struct radeon_device *rdev = i2c->dev->dev_private; @@ -178,8 +168,7 @@ post_xfer(void *cookie) temp = RREG32(rec->mask_data_reg); } -int -get_clock(void *i2c_priv) +static int get_clock(void *i2c_priv) { struct radeon_i2c_chan *i2c = i2c_priv; struct radeon_device *rdev = i2c->dev->dev_private; @@ -194,8 +183,7 @@ get_clock(void *i2c_priv) } -int -get_data(void *i2c_priv) +static int get_data(void *i2c_priv) { struct radeon_i2c_chan *i2c = i2c_priv; struct radeon_device *rdev = i2c->dev->dev_private; @@ -209,8 +197,7 @@ get_data(void *i2c_priv) return (val != 0); } -void -set_clock(void *i2c_priv, int clock) +static void set_clock(void *i2c_priv, int clock) { struct radeon_i2c_chan *i2c = i2c_priv; struct radeon_device *rdev = i2c->dev->dev_private; @@ -223,8 +210,7 @@ set_clock(void *i2c_priv, int clock) WREG32(rec->en_clk_reg, val); } -void -set_data(void *i2c_priv, int data) +static void set_data(void *i2c_priv, int data) { struct radeon_i2c_chan *i2c = i2c_priv; struct radeon_device *rdev = i2c->dev->dev_private; @@ -329,8 +315,8 @@ radeon_write_byte(void *cookie, u_int8_t byte, int flags) /* hw i2c */ -u32 -radeon_get_i2c_prescale(struct radeon_device *rdev) +#ifdef notyet +static u32 radeon_get_i2c_prescale(struct radeon_device *rdev) { u32 sclk = rdev->pm.current_sclk; u32 prescale = 0; @@ -420,7 +406,6 @@ radeon_get_i2c_prescale(struct radeon_device *rdev) /* hw i2c engine for r1xx-4xx hardware * hw can buffer up to 15 bytes */ -#ifdef notyet static int r100_hw_i2c_xfer(struct i2c_controller *i2c_adap, struct i2c_msg *msgs, int num) { diff --git a/sys/dev/pci/drm/radeon/radeon_irq_kms.c b/sys/dev/pci/drm/radeon/radeon_irq_kms.c index 27d2d8e2c13..1427d3729ad 100644 --- a/sys/dev/pci/drm/radeon/radeon_irq_kms.c +++ b/sys/dev/pci/drm/radeon/radeon_irq_kms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_irq_kms.c,v 1.7 2015/02/11 07:01:37 jsg Exp $ */ +/* $OpenBSD: radeon_irq_kms.c,v 1.8 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -35,11 +35,6 @@ #define RADEON_WAIT_IDLE_TIMEOUT 200 -int radeon_driver_irq_handler_kms(void *); -void radeon_driver_irq_preinstall_kms(struct drm_device *); -int radeon_driver_irq_postinstall_kms(struct drm_device *); -void radeon_driver_irq_uninstall_kms(struct drm_device *); - /** * radeon_driver_irq_handler_kms - irq handler for KMS * @@ -75,8 +70,7 @@ radeon_driver_irq_handler_kms(void *arg) * and calls the hotplug handler for each one, then sends * a drm hotplug event to alert userspace. */ -void -radeon_hotplug_work_func(void *arg1) +static void radeon_hotplug_work_func(void *arg1) { struct radeon_device *rdev = arg1; struct drm_device *dev = rdev->ddev; @@ -177,8 +171,7 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev) * Returns true if MSIs should be enabled, false if MSIs * should not be enabled. */ -bool -radeon_msi_ok(struct radeon_device *rdev) +bool radeon_msi_ok(struct radeon_device *rdev) { /* RV370/RV380 was first asic with MSI support */ if (rdev->family < CHIP_RV380) diff --git a/sys/dev/pci/drm/radeon/radeon_kms.c b/sys/dev/pci/drm/radeon/radeon_kms.c index 8ab5e83c799..0dd1814eb15 100644 --- a/sys/dev/pci/drm/radeon/radeon_kms.c +++ b/sys/dev/pci/drm/radeon/radeon_kms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_kms.c,v 1.35 2015/02/11 07:01:37 jsg Exp $ */ +/* $OpenBSD: radeon_kms.c,v 1.36 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2008 Advanced Micro Devices, Inc. * Copyright 2008 Red Hat Inc. @@ -80,8 +80,6 @@ int radeon_enable_vblank_kms(struct drm_device *, int); void radeon_disable_vblank_kms(struct drm_device *, int); int radeon_get_vblank_timestamp_kms(struct drm_device *, int, int *, struct timeval *, unsigned); -void radeon_set_filp_rights(struct drm_device *, struct drm_file **, - struct drm_file *, uint32_t *); int radeondrm_ioctl_kms(struct drm_device *, u_long, caddr_t, struct drm_file *); int radeon_ioctl_kms(struct drm_device *, u_long, caddr_t, struct drm_file *); @@ -789,8 +787,7 @@ radeondrm_activate_kms(struct device *self, int act) * * Sets the filp rights for the device (all asics). */ -void -radeon_set_filp_rights(struct drm_device *dev, +static void radeon_set_filp_rights(struct drm_device *dev, struct drm_file **owner, struct drm_file *applier, uint32_t *value) diff --git a/sys/dev/pci/drm/radeon/radeon_object.c b/sys/dev/pci/drm/radeon/radeon_object.c index 6e621086da1..1836ecd8453 100644 --- a/sys/dev/pci/drm/radeon/radeon_object.c +++ b/sys/dev/pci/drm/radeon/radeon_object.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_object.c,v 1.8 2015/02/11 07:01:37 jsg Exp $ */ +/* $OpenBSD: radeon_object.c,v 1.9 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2009 Jerome Glisse. * All Rights Reserved. @@ -38,10 +38,9 @@ #endif -int radeon_ttm_init(struct radeon_device *); -void radeon_ttm_fini(struct radeon_device *); -void radeon_bo_clear_surface_reg(struct radeon_bo *); -void radeon_bo_clear_va(struct radeon_bo *); +int radeon_ttm_init(struct radeon_device *rdev); +void radeon_ttm_fini(struct radeon_device *rdev); +static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); /* * To exclude mutual BO access we rely on bo_reserve exclusion, as all @@ -460,8 +459,7 @@ out: return 0; } -void -radeon_bo_clear_surface_reg(struct radeon_bo *bo) +static void radeon_bo_clear_surface_reg(struct radeon_bo *bo) { struct radeon_device *rdev = bo->rdev; struct radeon_surface_reg *reg; diff --git a/sys/dev/pci/drm/radeon/radeon_pm.c b/sys/dev/pci/drm/radeon/radeon_pm.c index b8fe36cf30b..ca597b764b0 100644 --- a/sys/dev/pci/drm/radeon/radeon_pm.c +++ b/sys/dev/pci/drm/radeon/radeon_pm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_pm.c,v 1.10 2015/02/10 06:19:36 jsg Exp $ */ +/* $OpenBSD: radeon_pm.c,v 1.11 2015/04/06 07:38:49 jsg Exp $ */ /* * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -40,25 +40,14 @@ static const char *radeon_pm_state_type_name[5] = { }; #endif -#ifdef notyet -static void radeon_dynpm_idle_work_handler(struct work_struct *work); -#endif -int radeon_debugfs_pm_init(struct radeon_device *rdev); +static void radeon_dynpm_idle_work_handler(void *); +static void radeon_dynpm_idle_tick(void *); +static int radeon_debugfs_pm_init(struct radeon_device *rdev); static bool radeon_pm_in_vbl(struct radeon_device *rdev); static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish); static void radeon_pm_update_profile(struct radeon_device *rdev); static void radeon_pm_set_clocks(struct radeon_device *rdev); -void radeon_pm_acpi_event_handler(struct radeon_device *); -ssize_t radeon_get_pm_profile(struct device *, struct device_attribute *, char *); -ssize_t radeon_get_pm_method(struct device *, struct device_attribute *, char *); -ssize_t radeon_set_pm_profile(struct device *, struct device_attribute *, - const char *, size_t); -ssize_t radeon_set_pm_method(struct device *, struct device_attribute *, - const char *, size_t); -void radeon_dynpm_idle_tick(void *); -void radeon_dynpm_idle_work_handler(void *); - extern int ticks; int radeon_pm_get_type_index(struct radeon_device *rdev, @@ -91,9 +80,7 @@ void radeon_pm_acpi_event_handler(struct radeon_device *rdev) } } -int power_supply_is_system_supplied(void); - -int +static int power_supply_is_system_supplied(void) { /* XXX return 0 if on battery */ @@ -352,8 +339,7 @@ static void radeon_pm_print_states(struct radeon_device *rdev) } #ifdef notyet -ssize_t -radeon_get_pm_profile(struct device *dev, +static ssize_t radeon_get_pm_profile(struct device *dev, struct device_attribute *attr, char *buf) { @@ -368,8 +354,7 @@ radeon_get_pm_profile(struct device *dev, (cp == PM_PROFILE_HIGH) ? "high" : "default"); } -ssize_t -radeon_set_pm_profile(struct device *dev, +static ssize_t radeon_set_pm_profile(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -404,8 +389,7 @@ fail: return count; } -ssize_t -radeon_get_pm_method(struct device *dev, +static ssize_t radeon_get_pm_method(struct device *dev, struct device_attribute *attr, char *buf) { @@ -417,8 +401,7 @@ radeon_get_pm_method(struct device *dev, (pm == PM_METHOD_DYNPM) ? "dynpm" : "profile"); } -ssize_t -radeon_set_pm_method(struct device *dev, +static ssize_t radeon_set_pm_method(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -670,11 +653,10 @@ int radeon_pm_init(struct radeon_device *rdev) ret = device_create_file(rdev->dev, &dev_attr_power_method); if (ret) DRM_ERROR("failed to create device file for power method\n"); - +#endif if (radeon_debugfs_pm_init(rdev)) { DRM_ERROR("Failed to register debugfs file for PM!\n"); } -#endif #ifdef DRMDEBUG DRM_INFO("radeon: power management initialized\n"); @@ -819,16 +801,14 @@ static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish return in_vbl; } -void -radeon_dynpm_idle_tick(void *arg) +static void radeon_dynpm_idle_tick(void *arg) { struct radeon_device *rdev = arg; task_add(systq, &rdev->pm.dynpm_idle_task); } -void -radeon_dynpm_idle_work_handler(void *arg1) +static void radeon_dynpm_idle_work_handler(void *arg1) { struct radeon_device *rdev = arg1; int resched; @@ -919,8 +899,7 @@ static struct drm_info_list radeon_pm_info_list[] = { }; #endif -int -radeon_debugfs_pm_init(struct radeon_device *rdev) +static int radeon_debugfs_pm_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) return radeon_debugfs_add_files(rdev, radeon_pm_info_list, ARRAY_SIZE(radeon_pm_info_list)); diff --git a/sys/dev/pci/drm/radeon/radeon_sa.c b/sys/dev/pci/drm/radeon/radeon_sa.c index d42d0d8cb7d..e51ea9904b4 100644 --- a/sys/dev/pci/drm/radeon/radeon_sa.c +++ b/sys/dev/pci/drm/radeon/radeon_sa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_sa.c,v 1.6 2015/04/06 05:35:29 jsg Exp $ */ +/* $OpenBSD: radeon_sa.c,v 1.7 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2011 Red Hat Inc. * All Rights Reserved. @@ -47,11 +47,6 @@ static void radeon_sa_bo_remove_locked(struct radeon_sa_bo *sa_bo); static void radeon_sa_bo_try_free(struct radeon_sa_manager *sa_manager); -bool radeon_sa_bo_try_alloc(struct radeon_sa_manager *, struct radeon_sa_bo *, - unsigned, unsigned); -bool radeon_sa_event(struct radeon_sa_manager *, unsigned, unsigned); -bool radeon_sa_bo_next_hole(struct radeon_sa_manager *, struct radeon_fence **, - unsigned *); int radeon_sa_bo_manager_init(struct radeon_device *rdev, struct radeon_sa_manager *sa_manager, @@ -196,8 +191,7 @@ static inline unsigned radeon_sa_bo_hole_eoffset(struct radeon_sa_manager *sa_ma return sa_manager->size; } -bool -radeon_sa_bo_try_alloc(struct radeon_sa_manager *sa_manager, +static bool radeon_sa_bo_try_alloc(struct radeon_sa_manager *sa_manager, struct radeon_sa_bo *sa_bo, unsigned size, unsigned align) { @@ -231,8 +225,7 @@ radeon_sa_bo_try_alloc(struct radeon_sa_manager *sa_manager, * Check if either there is a fence we can wait for or * enough free memory to satisfy the allocation directly */ -bool -radeon_sa_event(struct radeon_sa_manager *sa_manager, +static bool radeon_sa_event(struct radeon_sa_manager *sa_manager, unsigned size, unsigned align) { unsigned soffset, eoffset, wasted; @@ -255,8 +248,7 @@ radeon_sa_event(struct radeon_sa_manager *sa_manager, return false; } -bool -radeon_sa_bo_next_hole(struct radeon_sa_manager *sa_manager, +static bool radeon_sa_bo_next_hole(struct radeon_sa_manager *sa_manager, struct radeon_fence **fences, unsigned *tries) { diff --git a/sys/dev/pci/drm/radeon/radeon_ttm.c b/sys/dev/pci/drm/radeon/radeon_ttm.c index 77dfa064d35..86f4126d15e 100644 --- a/sys/dev/pci/drm/radeon/radeon_ttm.c +++ b/sys/dev/pci/drm/radeon/radeon_ttm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radeon_ttm.c,v 1.10 2015/02/11 07:01:37 jsg Exp $ */ +/* $OpenBSD: radeon_ttm.c,v 1.11 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2009 Jerome Glisse. * All Rights Reserved. @@ -42,35 +42,7 @@ #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT) -int radeon_ttm_debugfs_init(struct radeon_device *rdev); -int radeon_ttm_init(struct radeon_device *rdev); -void radeon_ttm_fini(struct radeon_device *rdev); -int radeon_ttm_backend_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem); -int radeon_ttm_backend_unbind(struct ttm_tt *ttm); -void radeon_ttm_backend_destroy(struct ttm_tt *ttm); -int radeon_ttm_global_init(struct radeon_device *rdev); -void radeon_ttm_global_fini(struct radeon_device *rdev); -int radeon_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags); -int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, - struct ttm_mem_type_manager *man); -void radeon_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *placement); -int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp); -int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, bool interruptible, - bool no_wait_gpu, struct ttm_mem_reg *new_mem); -int radeon_ttm_io_mem_reserve(struct ttm_bo_device *, struct ttm_mem_reg *); -void radeon_ttm_io_mem_free(struct ttm_bo_device *, struct ttm_mem_reg *); -int radeon_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible); -int radeon_sync_obj_flush(void *sync_obj); -void radeon_sync_obj_unref(void **sync_obj); -void *radeon_sync_obj_ref(void *sync_obj); -bool radeon_sync_obj_signaled(void *sync_obj); -struct ttm_tt *radeon_ttm_tt_create(struct ttm_bo_device *bdev, - unsigned long size, uint32_t page_flags, - struct vm_page *dummy_read_page); -int radeon_ttm_tt_populate(struct ttm_tt *ttm); -void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm); -int radeon_ttm_mem_global_init(struct drm_global_reference *ref); -void radeon_ttm_mem_global_release(struct drm_global_reference *ref); +static int radeon_ttm_debugfs_init(struct radeon_device *rdev); static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev) { @@ -86,20 +58,17 @@ static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev) /* * Global memory. */ -int -radeon_ttm_mem_global_init(struct drm_global_reference *ref) +static int radeon_ttm_mem_global_init(struct drm_global_reference *ref) { return ttm_mem_global_init(ref->object); } -void -radeon_ttm_mem_global_release(struct drm_global_reference *ref) +static void radeon_ttm_mem_global_release(struct drm_global_reference *ref) { ttm_mem_global_release(ref->object); } -int -radeon_ttm_global_init(struct radeon_device *rdev) +static int radeon_ttm_global_init(struct radeon_device *rdev) { struct drm_global_reference *global_ref; int r; @@ -135,8 +104,7 @@ radeon_ttm_global_init(struct radeon_device *rdev) return 0; } -void -radeon_ttm_global_fini(struct radeon_device *rdev) +static void radeon_ttm_global_fini(struct radeon_device *rdev) { if (rdev->mman.mem_global_referenced) { drm_global_item_unref(&rdev->mman.bo_global_ref.ref); @@ -145,14 +113,12 @@ radeon_ttm_global_fini(struct radeon_device *rdev) } } -int -radeon_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags) +static int radeon_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags) { return 0; } -int -radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, +static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, struct ttm_mem_type_manager *man) { struct radeon_device *rdev; @@ -205,8 +171,7 @@ radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, return 0; } -void -radeon_evict_flags(struct ttm_buffer_object *bo, +static void radeon_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *placement) { struct radeon_bo *rbo; @@ -236,8 +201,7 @@ radeon_evict_flags(struct ttm_buffer_object *bo, *placement = rbo->placement; } -int -radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp) +static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp) { return 0; } @@ -395,8 +359,7 @@ out_cleanup: return r; } -int -radeon_bo_move(struct ttm_buffer_object *bo, +static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, bool interruptible, bool no_wait_gpu, struct ttm_mem_reg *new_mem) @@ -443,8 +406,7 @@ memcpy: return r; } -int -radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) +static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) { struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; struct radeon_device *rdev = radeon_get_rdev(bdev); @@ -507,37 +469,31 @@ radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) return 0; } -void -radeon_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) +static void radeon_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) { } -int -radeon_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible) +static int radeon_sync_obj_wait(void *sync_obj, bool lazy, bool interruptible) { return radeon_fence_wait((struct radeon_fence *)sync_obj, interruptible); } -int -radeon_sync_obj_flush(void *sync_obj) +static int radeon_sync_obj_flush(void *sync_obj) { return 0; } -void -radeon_sync_obj_unref(void **sync_obj) +static void radeon_sync_obj_unref(void **sync_obj) { radeon_fence_unref((struct radeon_fence **)sync_obj); } -void -*radeon_sync_obj_ref(void *sync_obj) +static void *radeon_sync_obj_ref(void *sync_obj) { return radeon_fence_ref((struct radeon_fence *)sync_obj); } -bool -radeon_sync_obj_signaled(void *sync_obj) +static bool radeon_sync_obj_signaled(void *sync_obj) { return radeon_fence_signaled((struct radeon_fence *)sync_obj); } @@ -553,8 +509,7 @@ struct radeon_ttm_tt { u64 offset; }; -int -radeon_ttm_backend_bind(struct ttm_tt *ttm, +static int radeon_ttm_backend_bind(struct ttm_tt *ttm, struct ttm_mem_reg *bo_mem) { struct radeon_ttm_tt *gtt = (void*)ttm; @@ -575,8 +530,7 @@ radeon_ttm_backend_bind(struct ttm_tt *ttm, return 0; } -int -radeon_ttm_backend_unbind(struct ttm_tt *ttm) +static int radeon_ttm_backend_unbind(struct ttm_tt *ttm) { struct radeon_ttm_tt *gtt = (void *)ttm; @@ -584,8 +538,7 @@ radeon_ttm_backend_unbind(struct ttm_tt *ttm) return 0; } -void -radeon_ttm_backend_destroy(struct ttm_tt *ttm) +static void radeon_ttm_backend_destroy(struct ttm_tt *ttm) { struct radeon_ttm_tt *gtt = (void *)ttm; @@ -601,7 +554,7 @@ static struct ttm_backend_func radeon_backend_func = { .destroy = &radeon_ttm_backend_destroy, }; -struct ttm_tt *radeon_ttm_tt_create(struct ttm_bo_device *bdev, +static struct ttm_tt *radeon_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size, uint32_t page_flags, struct vm_page *dummy_read_page) { @@ -646,8 +599,7 @@ struct ttm_tt *radeon_ttm_tt_create(struct ttm_bo_device *bdev, return >t->ttm.ttm; } -int -radeon_ttm_tt_populate(struct ttm_tt *ttm) +static int radeon_ttm_tt_populate(struct ttm_tt *ttm) { struct radeon_device *rdev; struct radeon_ttm_tt *gtt = (void *)ttm; @@ -711,8 +663,7 @@ radeon_ttm_tt_populate(struct ttm_tt *ttm) return 0; } -void -radeon_ttm_tt_unpopulate(struct ttm_tt *ttm) +static void radeon_ttm_tt_unpopulate(struct ttm_tt *ttm) { struct radeon_device *rdev; struct radeon_ttm_tt *gtt = (void *)ttm; @@ -874,13 +825,10 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size) man->size = size >> PAGE_SHIFT; } -struct uvm_pagerops radeon_ttm_vm_ops; -const struct uvm_pagerops *ttm_vm_ops = NULL; - -int radeon_ttm_fault(struct uvm_faultinfo *, vaddr_t, vm_page_t *, - int, int, vm_fault_t, vm_prot_t, int); +static struct uvm_pagerops radeon_ttm_vm_ops; +static const struct uvm_pagerops *ttm_vm_ops = NULL; -int +static int radeon_ttm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps, int npages, int centeridx, vm_fault_t fault_type, vm_prot_t access_type, int flags) @@ -947,8 +895,7 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data) } #endif -int -radeon_ttm_debugfs_init(struct radeon_device *rdev) +static int radeon_ttm_debugfs_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2]; diff --git a/sys/dev/pci/drm/radeon/si.c b/sys/dev/pci/drm/radeon/si.c index 18230816052..45d65ea2982 100644 --- a/sys/dev/pci/drm/radeon/si.c +++ b/sys/dev/pci/drm/radeon/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.20 2015/04/06 05:35:29 jsg Exp $ */ +/* $OpenBSD: si.c,v 1.21 2015/04/06 07:38:49 jsg Exp $ */ /* * Copyright 2011 Advanced Micro Devices, Inc. * @@ -59,11 +59,6 @@ extern void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_sa extern void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *save); extern u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev); -void si_rlc_fini(struct radeon_device *); -int si_rlc_init(struct radeon_device *); -void si_vram_gtt_location(struct radeon_device *, struct radeon_mc *); -void si_rlc_start(struct radeon_device *); - /* get temperature in millidegrees */ int si_get_temp(struct radeon_device *rdev) { @@ -2367,8 +2362,7 @@ static void si_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) mc->gtt_size >> 20, mc->gtt_start, mc->gtt_end); } -void -si_vram_gtt_location(struct radeon_device *rdev, +static void si_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) { if (mc->mc_vram_size > 0xFFC0000000ULL) { @@ -3227,8 +3221,7 @@ static void si_rlc_stop(struct radeon_device *rdev) WREG32(RLC_CNTL, 0); } -void -si_rlc_start(struct radeon_device *rdev) +static void si_rlc_start(struct radeon_device *rdev) { WREG32(RLC_CNTL, RLC_ENABLE); } |