diff options
| author | Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com> | 2007-09-24 14:41:46 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com> | 2007-09-24 14:41:46 -0700 |
| commit | 5cc3083179b19678456905a9122a3d0f04e6f623 (patch) | |
| tree | 9b776bdd317aa5af68b7cbf8fabde12e20eccf8a /linux-core/intel_drv.h | |
| parent | 2a2d02bbc500140a861380df52ce66abcac39312 (diff) | |
| parent | 54df1b9ff3b79097fedd8ed7bf54aca30a660cbd (diff) | |
Merge branch 'master' into modesetting-101 - TTM & typedef removal
Conflicts:
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_drv.c
linux-core/drm_objects.h
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Mostly removing typedefs that snuck into the modesetting code and
updating to the latest TTM APIs. As of today, the i915 driver builds,
but there are likely to be problems, so debugging and bugfixes will
come next.
Diffstat (limited to 'linux-core/intel_drv.h')
| -rw-r--r-- | linux-core/intel_drv.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linux-core/intel_drv.h b/linux-core/intel_drv.h index 0a03e37b..7de4b924 100644 --- a/linux-core/intel_drv.h +++ b/linux-core/intel_drv.h @@ -38,7 +38,7 @@ #define INTEL_DVO_CHIP_TVOUT 4 struct intel_i2c_chan { - drm_device_t *drm_dev; /* for getting at dev. private (mmio etc.) */ + struct drm_device *drm_dev; /* for getting at dev. private (mmio etc.) */ u32 reg; /* GPIO reg */ struct i2c_adapter adapter; struct i2c_algo_bit_data algo; @@ -58,23 +58,23 @@ struct intel_crtc { u8 lut_r[256], lut_g[256], lut_b[256]; }; -struct intel_i2c_chan *intel_i2c_create(drm_device_t *dev, const u32 reg, +struct intel_i2c_chan *intel_i2c_create(struct drm_device *dev, const u32 reg, const char *name); void intel_i2c_destroy(struct intel_i2c_chan *chan); int intel_ddc_get_modes(struct drm_output *output); extern bool intel_ddc_probe(struct drm_output *output); -extern void intel_crt_init(drm_device_t *dev); -extern void intel_sdvo_init(drm_device_t *dev, int output_device); -extern void intel_lvds_init(drm_device_t *dev); +extern void intel_crt_init(struct drm_device *dev); +extern void intel_sdvo_init(struct drm_device *dev, int output_device); +extern void intel_lvds_init(struct drm_device *dev); extern void intel_crtc_load_lut(struct drm_crtc *crtc); extern void intel_output_prepare (struct drm_output *output); extern void intel_output_commit (struct drm_output *output); -extern struct drm_display_mode *intel_crtc_mode_get(drm_device_t *dev, +extern struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, struct drm_crtc *crtc); -extern void intel_wait_for_vblank(drm_device_t *dev); -extern struct drm_crtc *intel_get_crtc_from_pipe(drm_device_t *dev, int pipe); +extern void intel_wait_for_vblank(struct drm_device *dev); +extern struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe); extern int intelfb_probe(struct drm_device *dev, struct drm_crtc *crtc); extern int intelfb_remove(struct drm_device *dev, struct drm_crtc *crtc); |