fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 21:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Just some minor cleanups.

Browse source
This commit is contained in:
Alan Hourihane 2007-05-10 13:16:05 +01:00
parent 45e09ea3cf
commit eba00df120
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linux-core/drm_fb.c
View file

@ -106,8 +106,7 @@ int drmfb_probe(struct drm_device *dev, struct drm_framebuffer *fb)
struct fb_info *info; struct fb_info *info;
struct drmfb_par *par; struct drmfb_par *par;
struct device *device = &dev->pdev->dev; struct device *device = &dev->pdev->dev;
struct fb_var_screeninfo *var_info; unsigned long size = (8*1024*1024); /* FIXME */
unsigned long base, size;
int ret; int ret;
info = framebuffer_alloc(sizeof(struct drmfb_par), device); 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"); strcpy(info->fix.id, "drmfb");
info->fix.smem_start = fb->offset + dev->mode_config.fb_base; 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.type = FB_TYPE_PACKED_PIXELS;
info->fix.visual = FB_VISUAL_DIRECTCOLOR; info->fix.visual = FB_VISUAL_DIRECTCOLOR;
info->fix.accel = FB_ACCEL_NONE; info->fix.accel = FB_ACCEL_NONE;

3
linux-core/intel_sdvo.c
View file

@ -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) static int intel_sdvo_get_clock_rate_mult(struct drm_output *output)
{ {
struct intel_output *intel_output = output->driver_private;
u8 response, status; u8 response, status;
intel_sdvo_write_cmd(output, SDVO_CMD_GET_CLOCK_RATE_MULT, NULL, 0); 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) static int intel_sdvo_get_modes(struct drm_output *output)
{ {
struct drm_display_mode *modes;
/* set the bus switch and get the modes */ /* set the bus switch and get the modes */
intel_sdvo_set_control_bus_switch(output, SDVO_CONTROL_BUS_DDC2); intel_sdvo_set_control_bus_switch(output, SDVO_CONTROL_BUS_DDC2);
intel_ddc_get_modes(output); intel_ddc_get_modes(output);

1
shared-core/i915_drv.h
View file

@ -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 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_emit_mi_flush(drm_device_t *dev, uint32_t flush);
extern int i915_driver_firstopen(struct drm_device *dev); extern int i915_driver_firstopen(struct drm_device *dev);
extern int i915_dma_cleanup(drm_device_t * dev);
/* i915_irq.c */ /* i915_irq.c */
extern int i915_irq_emit(DRM_IOCTL_ARGS); extern int i915_irq_emit(DRM_IOCTL_ARGS);

2
shared-core/i915_init.c
View file

@ -202,7 +202,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
/* FIXME: need wrapper with PCI mem checks */ /* FIXME: need wrapper with PCI mem checks */
ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem, ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
&dev_priv->ring.virtual_start); (void **) &dev_priv->ring.virtual_start);
if (ret) if (ret)
DRM_ERROR("error mapping ring buffer: %d\n", ret); DRM_ERROR("error mapping ring buffer: %d\n", ret);