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

Commit 19b85cfa authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/bochs: move remaining fb bits to kms 



bochs_fbdev.c is almost empty now.  Move the remaining framebuffer bits
over to bochs_kms.c.  Pure code motion. No functional change.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190111053752.4004-17-kraxel@redhat.com
parent 60119b0b

drivers/gpu/drm/bochs/Makefile

+1 −1
Original line number Diff line number Diff line 
bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_fbdev.o bochs_hw.o

bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_hw.o



obj-$(CONFIG_DRM_BOCHS)	+= bochs-drm.o

drivers/gpu/drm/bochs/bochs_fbdev.c

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include "bochs.h"

#include <drm/drm_atomic_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>



/* ---------------------------------------------------------------------- */



static struct drm_framebuffer *

bochs_gem_fb_create(struct drm_device *dev, struct drm_file *file,

		    const struct drm_mode_fb_cmd2 *mode_cmd)

{

	if (mode_cmd->pixel_format != DRM_FORMAT_XRGB8888 &&

	    mode_cmd->pixel_format != DRM_FORMAT_BGRX8888)

		return ERR_PTR(-EINVAL);



	return drm_gem_fb_create(dev, file, mode_cmd);

}



const struct drm_mode_config_funcs bochs_mode_funcs = {

	.fb_create = bochs_gem_fb_create,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = drm_atomic_helper_commit,

};

drivers/gpu/drm/bochs/bochs_kms.c

+17 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_atomic_uapi.h>

#include <drm/drm_gem_framebuffer_helper.h>



static int defx = 1024;

static int defy = 768;
@@ -256,6 +257,22 @@ static void bochs_connector_init(struct drm_device *dev) 
	}

}



static struct drm_framebuffer *

bochs_gem_fb_create(struct drm_device *dev, struct drm_file *file,

		    const struct drm_mode_fb_cmd2 *mode_cmd)

{

	if (mode_cmd->pixel_format != DRM_FORMAT_XRGB8888 &&

	    mode_cmd->pixel_format != DRM_FORMAT_BGRX8888)

		return ERR_PTR(-EINVAL);



	return drm_gem_fb_create(dev, file, mode_cmd);

}



const struct drm_mode_config_funcs bochs_mode_funcs = {

	.fb_create = bochs_gem_fb_create,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = drm_atomic_helper_commit,

};



int bochs_kms_init(struct bochs_device *bochs)

{