drm/bochs: drop mode_config_initialized

[linux.git] / drivers / gpu / drm / bochs / bochs_kms.c

diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 67c3674609e5cb8fddd21ba1777cd6756a68f3ba..485f9cf05e8b8fd2c4fdf70ecb3effe72e9f07a0 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -9,6 +9,8 @@
 #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>
+#include <drm/drm_probe_helper.h>
 
 static int defx = 1024;
 static int defy = 768;
@@ -20,74 +22,6 @@ MODULE_PARM_DESC(defy, "default y resolution");
 
 /* ---------------------------------------------------------------------- */
 
-static void bochs_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-       switch (mode) {
-       case DRM_MODE_DPMS_ON:
-       case DRM_MODE_DPMS_STANDBY:
-       case DRM_MODE_DPMS_SUSPEND:
-       case DRM_MODE_DPMS_OFF:
-       default:
-               return;
-       }
-}
-
-static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
-                                   struct drm_framebuffer *old_fb)
-{
-       struct bochs_device *bochs =
-               container_of(crtc, struct bochs_device, crtc);
-       struct bochs_bo *bo;
-       u64 gpu_addr = 0;
-       int ret;
-
-       if (old_fb) {
-               bo = gem_to_bochs_bo(old_fb->obj[0]);
-               ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
-               if (ret) {
-                       DRM_ERROR("failed to reserve old_fb bo\n");
-               } else {
-                       bochs_bo_unpin(bo);
-                       ttm_bo_unreserve(&bo->bo);
-               }
-       }
-
-       if (WARN_ON(crtc->primary->fb == NULL))
-               return -EINVAL;
-
-       bo = gem_to_bochs_bo(crtc->primary->fb->obj[0]);
-       ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
-       if (ret)
-               return ret;
-
-       ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr);
-       if (ret) {
-               ttm_bo_unreserve(&bo->bo);
-               return ret;
-       }
-
-       ttm_bo_unreserve(&bo->bo);
-       bochs_hw_setbase(bochs, x, y, gpu_addr);
-       return 0;
-}
-
-static int bochs_crtc_mode_set(struct drm_crtc *crtc,
-                              struct drm_display_mode *mode,
-                              struct drm_display_mode *adjusted_mode,
-                              int x, int y, struct drm_framebuffer *old_fb)
-{
-       struct bochs_device *bochs =
-               container_of(crtc, struct bochs_device, crtc);
-
-       if (WARN_ON(crtc->primary->fb == NULL))
-               return -EINVAL;
-
-       bochs_hw_setmode(bochs, mode);
-       bochs_hw_setformat(bochs, crtc->primary->fb->format);
-       bochs_crtc_mode_set_base(crtc, x, y, old_fb);
-       return 0;
-}
-
 static void bochs_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
        struct bochs_device *bochs =
@@ -96,14 +30,6 @@ static void bochs_crtc_mode_set_nofb(struct drm_crtc *crtc)
        bochs_hw_setmode(bochs, &crtc->mode);
 }
 
-static void bochs_crtc_prepare(struct drm_crtc *crtc)
-{
-}
-
-static void bochs_crtc_commit(struct drm_crtc *crtc)
-{
-}
-
 static void bochs_crtc_atomic_enable(struct drm_crtc *crtc,
                                     struct drm_crtc_state *old_crtc_state)
 {
@@ -138,12 +64,7 @@ static const struct drm_crtc_funcs bochs_crtc_funcs = {
 };
 
 static const struct drm_crtc_helper_funcs bochs_helper_funcs = {
-       .dpms = bochs_crtc_dpms,
-       .mode_set = bochs_crtc_mode_set,
-       .mode_set_base = bochs_crtc_mode_set_base,
        .mode_set_nofb = bochs_crtc_mode_set_nofb,
-       .prepare = bochs_crtc_prepare,
-       .commit = bochs_crtc_commit,
        .atomic_enable = bochs_crtc_atomic_enable,
        .atomic_flush = bochs_crtc_atomic_flush,
 };
@@ -173,34 +94,22 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane,
                                struct drm_plane_state *new_state)
 {
        struct bochs_bo *bo;
-       int ret;
 
        if (!new_state->fb)
                return 0;
        bo = gem_to_bochs_bo(new_state->fb->obj[0]);
-
-       ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
-       if (ret)
-               return ret;
-       ret = bochs_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);
-       ttm_bo_unreserve(&bo->bo);
-       return ret;
+       return bochs_bo_pin(bo, TTM_PL_FLAG_VRAM);
 }
 
 static void bochs_plane_cleanup_fb(struct drm_plane *plane,
                                   struct drm_plane_state *old_state)
 {
        struct bochs_bo *bo;
-       int ret;
 
        if (!old_state->fb)
                return;
        bo = gem_to_bochs_bo(old_state->fb->obj[0]);
-       ret = ttm_bo_reserve(&bo->bo, true, false, NULL);
-       if (ret)
-               return;
        bochs_bo_unpin(bo);
-       ttm_bo_unreserve(&bo->bo);
 }
 
 static const struct drm_plane_helper_funcs bochs_plane_helper_funcs = {
@@ -305,20 +214,9 @@ static enum drm_mode_status bochs_connector_mode_valid(struct drm_connector *con
        return MODE_OK;
 }
 
-static struct drm_encoder *
-bochs_connector_best_encoder(struct drm_connector *connector)
-{
-       int enc_id = connector->encoder_ids[0];
-       /* pick the encoder ids */
-       if (enc_id)
-               return drm_encoder_find(connector->dev, NULL, enc_id);
-       return NULL;
-}
-
 static const struct drm_connector_helper_funcs bochs_connector_connector_helper_funcs = {
        .get_modes = bochs_connector_get_modes,
        .mode_valid = bochs_connector_mode_valid,
-       .best_encoder = bochs_connector_best_encoder,
 };
 
 static const struct drm_connector_funcs bochs_connector_connector_funcs = {
@@ -349,11 +247,26 @@ 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)
 {
        drm_mode_config_init(bochs->dev);
-       bochs->mode_config_initialized = true;
 
        bochs->dev->mode_config.max_width = 8192;
        bochs->dev->mode_config.max_height = 8192;
@@ -378,8 +291,6 @@ int bochs_kms_init(struct bochs_device *bochs)
 
 void bochs_kms_fini(struct bochs_device *bochs)
 {
-       if (bochs->mode_config_initialized) {
-               drm_mode_config_cleanup(bochs->dev);
-               bochs->mode_config_initialized = false;
-       }
+       drm_atomic_helper_shutdown(bochs->dev);
+       drm_mode_config_cleanup(bochs->dev);
 }