Commit d1648930 authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Daniel Vetter

drm/vkms: Add connectors helpers

This patch adds the struct drm_connector_helper_funcs with some
necessary hooks. Additionally, it also adds some missing hooks at
drm_connector_funcs.

Changes since V1:
- None
Change since V2:
 Daniel Vetter:
 - Remove vkms_conn_mode_valid
Signed-off-by: default avatarRodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/c8ee28b889234e866ef18bce4216385661c48041.1531359228.git.rodrigosiqueiramelo@gmail.com
parent 657cd71e
...@@ -17,12 +17,6 @@ ...@@ -17,12 +17,6 @@
#define DRIVER_MAJOR 1 #define DRIVER_MAJOR 1
#define DRIVER_MINOR 0 #define DRIVER_MINOR 0
#define XRES_MIN 32
#define YRES_MIN 32
#define XRES_MAX 8192
#define YRES_MAX 8192
static struct vkms_device *vkms_device; static struct vkms_device *vkms_device;
static const struct file_operations vkms_driver_fops = { static const struct file_operations vkms_driver_fops = {
......
...@@ -6,6 +6,15 @@ ...@@ -6,6 +6,15 @@
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_encoder.h> #include <drm/drm_encoder.h>
#define XRES_MIN 32
#define YRES_MIN 32
#define XRES_DEF 1024
#define YRES_DEF 768
#define XRES_MAX 8192
#define YRES_MAX 8192
static const u32 vkms_formats[] = { static const u32 vkms_formats[] = {
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
}; };
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "vkms_drv.h" #include "vkms_drv.h"
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_atomic_helper.h>
static void vkms_connector_destroy(struct drm_connector *connector) static void vkms_connector_destroy(struct drm_connector *connector)
{ {
...@@ -18,12 +19,29 @@ static void vkms_connector_destroy(struct drm_connector *connector) ...@@ -18,12 +19,29 @@ static void vkms_connector_destroy(struct drm_connector *connector)
static const struct drm_connector_funcs vkms_connector_funcs = { static const struct drm_connector_funcs vkms_connector_funcs = {
.fill_modes = drm_helper_probe_single_connector_modes, .fill_modes = drm_helper_probe_single_connector_modes,
.destroy = vkms_connector_destroy, .destroy = vkms_connector_destroy,
.reset = drm_atomic_helper_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
}; };
static const struct drm_encoder_funcs vkms_encoder_funcs = { static const struct drm_encoder_funcs vkms_encoder_funcs = {
.destroy = drm_encoder_cleanup, .destroy = drm_encoder_cleanup,
}; };
static int vkms_conn_get_modes(struct drm_connector *connector)
{
int count;
count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
return count;
}
static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
.get_modes = vkms_conn_get_modes,
};
int vkms_output_init(struct vkms_device *vkmsdev) int vkms_output_init(struct vkms_device *vkmsdev)
{ {
struct vkms_output *output = &vkmsdev->output; struct vkms_output *output = &vkmsdev->output;
...@@ -49,6 +67,8 @@ int vkms_output_init(struct vkms_device *vkmsdev) ...@@ -49,6 +67,8 @@ int vkms_output_init(struct vkms_device *vkmsdev)
goto err_connector; goto err_connector;
} }
drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
ret = drm_connector_register(connector); ret = drm_connector_register(connector);
if (ret) { if (ret) {
DRM_ERROR("Failed to register connector\n"); DRM_ERROR("Failed to register connector\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment