Skip to content

Commit

Permalink
staging: gma500: Another file we don't need
Browse files Browse the repository at this point in the history
Zap... bang

And take out a few more variables that are now dead

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent c34433b commit b0e2326
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 264 deletions.
10 changes: 1 addition & 9 deletions drivers/staging/gma500/psb_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,16 @@
int drm_psb_debug;
static int drm_psb_trap_pagefaults;

int drm_psb_disable_vsync = 1;
int drm_psb_no_fb;
int gfxrtdelay = 2 * 1000;

static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);

MODULE_PARM_DESC(debug, "Enable debug output");
MODULE_PARM_DESC(no_fb, "Disable FBdev");
MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults");
MODULE_PARM_DESC(disable_vsync, "Disable vsync interrupts");
MODULE_PARM_DESC(force_pipeb, "Forces PIPEB to become primary fb");
MODULE_PARM_DESC(ta_mem_size, "TA memory size in kiB");
MODULE_PARM_DESC(ospm, "switch for ospm support");
MODULE_PARM_DESC(rtpm, "Specifies Runtime PM delay for GFX");
MODULE_PARM_DESC(hdmi_edid, "EDID info for HDMI monitor");
module_param_named(debug, drm_psb_debug, int, 0600);
module_param_named(no_fb, drm_psb_no_fb, int, 0600);
module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);
module_param_named(rtpm, gfxrtdelay, int, 0600);


static struct pci_device_id pciidlist[] = {
Expand Down Expand Up @@ -498,6 +489,7 @@ static int psb_do_init(struct drm_device *dev)
pg->gatt_pages : PSB_TT_PRIV0_PLIMIT;
tt_start = dev_priv->gatt_free_offset - pg->mmu_gatt_start;
tt_pages -= tt_start >> PAGE_SHIFT;
/* FIXME: can we kill ta_mem_size ? */
dev_priv->sizes.ta_mem_size = 0;

PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0);
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/gma500/psb_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,6 @@ extern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;

extern int drm_psb_debug;
extern int drm_psb_no_fb;
extern int drm_psb_disable_vsync;
extern int drm_idle_check_interval;

#define PSB_DEBUG_GENERAL(_fmt, _arg...) \
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/gma500/psb_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,6 @@ int psb_enable_vblank(struct drm_device *dev, int pipe)

spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);

drm_psb_disable_vsync = 0;
mid_enable_pipe_event(dev_priv, pipe);
psb_enable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);

Expand All @@ -567,7 +566,6 @@ void psb_disable_vblank(struct drm_device *dev, int pipe)

spin_lock_irqsave(&dev_priv->irqmask_lock, irqflags);

drm_psb_disable_vsync = 1;
mid_disable_pipe_event(dev_priv, pipe);
psb_disable_pipestat(dev_priv, pipe, PIPE_VBLANK_INTERRUPT_ENABLE);

Expand Down
252 changes: 0 additions & 252 deletions drivers/staging/gma500/psb_ttm_placement_user.h

This file was deleted.

0 comments on commit b0e2326

Please sign in to comment.