summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-10 13:16:05 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-10 13:16:05 +0100
commiteba00df1203040905d38bf0ef449d25d6dbdb72c (patch)
tree15c4febadc3ad69250963876b16af25123f8c9fa
parent45e09ea3cf85b76c18fb92a593ca7c40681052a7 (diff)
Just some minor cleanups.
-rw-r--r--linux-core/drm_fb.c5
-rw-r--r--linux-core/intel_sdvo.c3
-rw-r--r--shared-core/i915_drv.h1
-rw-r--r--shared-core/i915_init.c2
4 files changed, 4 insertions, 7 deletions
diff --git a/linux-core/drm_fb.c b/linux-core/drm_fb.c
index ef05341a..c0453258 100644
--- a/linux-core/drm_fb.c
+++ b/linux-core/drm_fb.c
@@ -106,8 +106,7 @@ int drmfb_probe(struct drm_device *dev, struct drm_framebuffer *fb)
struct fb_info *info;
struct drmfb_par *par;
struct device *device = &dev->pdev->dev;
- struct fb_var_screeninfo *var_info;
- unsigned long base, size;
+ unsigned long size = (8*1024*1024); /* FIXME */
int ret;
info = framebuffer_alloc(sizeof(struct drmfb_par), device);
@@ -126,7 +125,7 @@ int drmfb_probe(struct drm_device *dev, struct drm_framebuffer *fb)
strcpy(info->fix.id, "drmfb");
info->fix.smem_start = fb->offset + dev->mode_config.fb_base;
- info->fix.smem_len = (8*1024*1024);
+ info->fix.smem_len = size;
info->fix.type = FB_TYPE_PACKED_PIXELS;
info->fix.visual = FB_VISUAL_DIRECTCOLOR;
info->fix.accel = FB_ACCEL_NONE;
diff --git a/linux-core/intel_sdvo.c b/linux-core/intel_sdvo.c
index 98c4034d..58aa432c 100644
--- a/linux-core/intel_sdvo.c
+++ b/linux-core/intel_sdvo.c
@@ -525,7 +525,6 @@ static bool intel_sdvo_get_preferred_input_timing(struct drm_output *output,
static int intel_sdvo_get_clock_rate_mult(struct drm_output *output)
{
- struct intel_output *intel_output = output->driver_private;
u8 response, status;
intel_sdvo_write_cmd(output, SDVO_CMD_GET_CLOCK_RATE_MULT, NULL, 0);
@@ -895,8 +894,6 @@ static enum drm_output_status intel_sdvo_detect(struct drm_output *output)
static int intel_sdvo_get_modes(struct drm_output *output)
{
- struct drm_display_mode *modes;
-
/* set the bus switch and get the modes */
intel_sdvo_set_control_bus_switch(output, SDVO_CONTROL_BUS_DDC2);
intel_ddc_get_modes(output);
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 946e464f..0513eed8 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -221,6 +221,7 @@ extern void i915_emit_breadcrumb(drm_device_t *dev);
extern void i915_dispatch_flip(drm_device_t * dev, int pipes, int sync);
extern int i915_emit_mi_flush(drm_device_t *dev, uint32_t flush);
extern int i915_driver_firstopen(struct drm_device *dev);
+extern int i915_dma_cleanup(drm_device_t * dev);
/* i915_irq.c */
extern int i915_irq_emit(DRM_IOCTL_ARGS);
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index 0c9ef4d4..43040e6e 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -202,7 +202,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
/* FIXME: need wrapper with PCI mem checks */
ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
- &dev_priv->ring.virtual_start);
+ (void **) &dev_priv->ring.virtual_start);
if (ret)
DRM_ERROR("error mapping ring buffer: %d\n", ret);