Deleted Added
sdiff udiff text old ( 196142 ) new ( 196470 )
full compact
1/*-
2 * Copyright 2008-2009 Advanced Micro Devices, Inc.
3 * Copyright 2008 Red Hat Inc.
4 *
5 * Permission is hereby granted, free of charge, to any person obtaining a
6 * copy of this software and associated documentation files (the "Software"),
7 * to deal in the Software without restriction, including without limitation
8 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

--- 13 unchanged lines hidden (view full) ---

22 * DEALINGS IN THE SOFTWARE.
23 *
24 * Authors:
25 * Dave Airlie <airlied@redhat.com>
26 * Alex Deucher <alexander.deucher@amd.com>
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/drm/r600_cp.c 196142 2009-08-12 12:57:02Z rnoland $");
31
32#include "dev/drm/drmP.h"
33#include "dev/drm/drm.h"
34#include "dev/drm/radeon_drm.h"
35#include "dev/drm/radeon_drv.h"
36
37#include "dev/drm/r600_microcode.h"
38

--- 1799 unchanged lines hidden (view full) ---

1838 r600_do_cleanup_cp(dev);
1839 return -EINVAL;
1840 }
1841
1842 /* Enable vblank on CRTC1 for older X servers
1843 */
1844 dev_priv->vblank_crtc = DRM_RADEON_VBLANK_CRTC1;
1845
1846 dev_priv->cp_mode = init->cp_mode;
1847
1848 /* We don't support anything other than bus-mastering ring mode,
1849 * but the ring can be in either AGP or PCI space for the ring
1850 * read pointer.
1851 */
1852 if ((init->cp_mode != RADEON_CSQ_PRIBM_INDDIS) &&
1853 (init->cp_mode != RADEON_CSQ_PRIBM_INDBM)) {

--- 241 unchanged lines hidden (view full) ---

2095
2096 r600_cp_init_ring_buffer(dev, dev_priv, file_priv);
2097
2098 dev_priv->last_buf = 0;
2099
2100 r600_do_engine_reset(dev);
2101 r600_test_writeback(dev_priv);
2102
2103 return 0;
2104}
2105
2106int r600_do_resume_cp(struct drm_device *dev, struct drm_file *file_priv)
2107{
2108 drm_radeon_private_t *dev_priv = dev->dev_private;
2109
2110 DRM_DEBUG("\n");

--- 116 unchanged lines hidden (view full) ---

2227 OUT_RING((offset & 0xfffffffc));
2228 OUT_RING((upper_32_bits(offset) & 0xff));
2229 OUT_RING(dwords);
2230 ADVANCE_RING();
2231 }
2232
2233 return 0;
2234}