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_sdvo.c | |
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_sdvo.c')
-rw-r--r-- | linux-core/intel_sdvo.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c index 196298ff..11f3a0a6 100644 --- a/linux-core/intel_sdvo.c +++ b/linux-core/intel_sdvo.c @@ -62,8 +62,8 @@ struct intel_sdvo_priv { */ static void intel_sdvo_write_sdvox(struct drm_output *output, u32 val) { - drm_device_t *dev = output->dev; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_device *dev = output->dev; + struct drm_i915_private *dev_priv = dev->dev_private; struct intel_output *intel_output = output->driver_private; struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv; u32 bval = val, cval = val; @@ -567,8 +567,8 @@ static void intel_sdvo_mode_set(struct drm_output *output, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - drm_device_t *dev = output->dev; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_device *dev = output->dev; + struct drm_i915_private *dev_priv = dev->dev_private; struct drm_crtc *crtc = output->crtc; struct intel_crtc *intel_crtc = crtc->driver_private; struct intel_output *intel_output = output->driver_private; @@ -698,8 +698,8 @@ static void intel_sdvo_mode_set(struct drm_output *output, static void intel_sdvo_dpms(struct drm_output *output, int mode) { - drm_device_t *dev = output->dev; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_device *dev = output->dev; + struct drm_i915_private *dev_priv = dev->dev_private; struct intel_output *intel_output = output->driver_private; struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv; u32 temp; @@ -745,8 +745,8 @@ static void intel_sdvo_dpms(struct drm_output *output, int mode) static void intel_sdvo_save(struct drm_output *output) { - drm_device_t *dev = output->dev; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_device *dev = output->dev; + struct drm_i915_private *dev_priv = dev->dev_private; struct intel_output *intel_output = output->driver_private; struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv; int o; @@ -782,8 +782,8 @@ static void intel_sdvo_save(struct drm_output *output) static void intel_sdvo_restore(struct drm_output *output) { - drm_device_t *dev = output->dev; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_device *dev = output->dev; + struct drm_i915_private *dev_priv = dev->dev_private; struct intel_output *intel_output = output->driver_private; struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv; int o; @@ -941,7 +941,7 @@ static const struct drm_output_funcs intel_sdvo_output_funcs = { .cleanup = intel_sdvo_destroy }; -void intel_sdvo_init(drm_device_t *dev, int output_device) +void intel_sdvo_init(struct drm_device *dev, int output_device) { struct drm_output *output; struct intel_output *intel_output; |