lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vmwgfx: Fix 'bbp' typo

Browse Source 
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Michel Dänzer
2011-08-31 07:42:49 +00:00
committed by Dave Airlie
parent e666d66b42
commit 6558429bc4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
View File

@@ -505,7 +505,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf,
SVGA3dCmdHeader *header); SVGA3dCmdHeader *header);
void vmw_kms_write_svga(struct vmw_private *vmw_priv, void vmw_kms_write_svga(struct vmw_private *vmw_priv,
unsigned width, unsigned height, unsigned pitch, unsigned width, unsigned height, unsigned pitch,
unsigned bbp, unsigned depth); unsigned bpp, unsigned depth);
int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data, int vmw_kms_update_layout_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
void vmw_kms_idle_workqueues(struct vmw_master *vmaster); void vmw_kms_idle_workqueues(struct vmw_master *vmaster);

8
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
View File

@@ -405,14 +405,14 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
struct fb_info *info; struct fb_info *info;
unsigned initial_width, initial_height; unsigned initial_width, initial_height;
unsigned fb_width, fb_height; unsigned fb_width, fb_height;
unsigned fb_bbp, fb_depth, fb_offset, fb_pitch, fb_size; unsigned fb_bpp, fb_depth, fb_offset, fb_pitch, fb_size;
int ret; int ret;
/* XXX These shouldn't be hardcoded. */ /* XXX These shouldn't be hardcoded. */
initial_width = 800; initial_width = 800;
initial_height = 600; initial_height = 600;
fb_bbp = 32; fb_bpp = 32;
fb_depth = 24; fb_depth = 24;
/* XXX As shouldn't these be as well. */ /* XXX As shouldn't these be as well. */
@@ -422,7 +422,7 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
initial_width = min(fb_width, initial_width); initial_width = min(fb_width, initial_width);
initial_height = min(fb_height, initial_height); initial_height = min(fb_height, initial_height);
fb_pitch = fb_width * fb_bbp / 8; fb_pitch = fb_width * fb_bpp / 8;
fb_size = fb_pitch * fb_height; fb_size = fb_pitch * fb_height;
fb_offset = vmw_read(vmw_priv, SVGA_REG_FB_OFFSET); fb_offset = vmw_read(vmw_priv, SVGA_REG_FB_OFFSET);
@@ -437,7 +437,7 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
par = info->par; par = info->par;
par->vmw_priv = vmw_priv; par->vmw_priv = vmw_priv;
par->depth = fb_depth; par->depth = fb_depth;
par->bpp = fb_bbp; par->bpp = fb_bpp;
par->vmalloc = NULL; par->vmalloc = NULL;
par->max_width = fb_width; par->max_width = fb_width;
par->max_height = fb_height; par->max_height = fb_height;

4
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
View File

@@ -992,7 +992,7 @@ out:
void vmw_kms_write_svga(struct vmw_private *vmw_priv, void vmw_kms_write_svga(struct vmw_private *vmw_priv,
unsigned width, unsigned height, unsigned pitch, unsigned width, unsigned height, unsigned pitch,
unsigned bbp, unsigned depth) unsigned bpp, unsigned depth)
{ {
if (vmw_priv->capabilities & SVGA_CAP_PITCHLOCK) if (vmw_priv->capabilities & SVGA_CAP_PITCHLOCK)
vmw_write(vmw_priv, SVGA_REG_PITCHLOCK, pitch); vmw_write(vmw_priv, SVGA_REG_PITCHLOCK, pitch);
@@ -1000,7 +1000,7 @@ void vmw_kms_write_svga(struct vmw_private *vmw_priv,
iowrite32(pitch, vmw_priv->mmio_virt + SVGA_FIFO_PITCHLOCK); iowrite32(pitch, vmw_priv->mmio_virt + SVGA_FIFO_PITCHLOCK);
vmw_write(vmw_priv, SVGA_REG_WIDTH, width); vmw_write(vmw_priv, SVGA_REG_WIDTH, width);
vmw_write(vmw_priv, SVGA_REG_HEIGHT, height); vmw_write(vmw_priv, SVGA_REG_HEIGHT, height);
vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, bbp); vmw_write(vmw_priv, SVGA_REG_BITS_PER_PIXEL, bpp);
} }
int vmw_kms_save_vga(struct vmw_private *vmw_priv) int vmw_kms_save_vga(struct vmw_private *vmw_priv)