Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6558429b authored by Michel Dänzer's avatar Michel Dänzer Committed by Dave Airlie
Browse files

vmwgfx: Fix 'bbp' typo 



Signed-off-by: default avatarMichel Dänzer <daenzer@vmware.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e666d66b

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, 
			  SVGA3dCmdHeader *header);

void vmw_kms_write_svga(struct vmw_private *vmw_priv,

			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,

				struct drm_file *file_priv);

void vmw_kms_idle_workqueues(struct vmw_master *vmaster);

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+4 −4
Original line number Diff line number Diff line
@@ -405,14 +405,14 @@ int vmw_fb_init(struct vmw_private *vmw_priv) 
	struct fb_info *info;

	unsigned initial_width, initial_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;



	/* XXX These shouldn't be hardcoded. */

	initial_width = 800;

	initial_height = 600;



	fb_bbp = 32;

	fb_bpp = 32;

	fb_depth = 24;



	/* 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_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_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->vmw_priv = vmw_priv;

	par->depth = fb_depth;

	par->bpp = fb_bbp;

	par->bpp = fb_bpp;

	par->vmalloc = NULL;

	par->max_width = fb_width;

	par->max_height = fb_height;

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ int vmw_kms_cursor_bypass_ioctl(struct drm_device *dev, void *data, 


void vmw_kms_write_svga(struct vmw_private *vmw_priv,

			unsigned width, unsigned height, unsigned pitch,

			unsigned bbp, unsigned depth)

			unsigned bpp, unsigned depth)

{

	if (vmw_priv->capabilities & SVGA_CAP_PITCHLOCK)

		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);

	vmw_write(vmw_priv, SVGA_REG_WIDTH, width);

	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)