WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_fb_helper.c

  */
 #include
 #include
 #include
 #include
+#include
-#include "drmP.h"
+#include
-#include "drm_crtc.h"
+#include
-#include "drm_fb_helper.h"
+#include
-#include "drm_crtc_helper.h"
+#include
 MODULE_AUTHOR("David Airlie, Jesse Barnes");
 MODULE_DESCRIPTION("DRM KMS helper");
 static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc)
+{
+	uint16_t *r_base, *g_base, *b_base;
+	if (crtc->funcs->gamma_set == NULL)
-	uint16_t *r_base, *g_base, *b_base;
+		return;
 	r_base = crtc->gamma_store;
 	g_base = r_base + crtc->gamma_size;
 	b_base = g_base + crtc->gamma_size;
-	crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);
-}
-static void drm_fb_helper_on(struct fb_info *info)
-{
-	struct drm_fb_helper *fb_helper = info->par;
-	struct drm_device *dev = fb_helper->dev;
-	struct drm_crtc *crtc;
-	struct drm_crtc_helper_funcs *crtc_funcs;
-	struct drm_connector *connector;
-	struct drm_encoder *encoder;
-	int i, j;
-	/*
-	 * For each CRTC in this fb, turn the crtc on then,
-	 * find all associated encoders and turn them on.
-	 */
-	mutex_lock(&dev->mode_config.mutex);
-	for (i = 0; i < fb_helper->crtc_count; i++) {
-		crtc = fb_helper->crtc_info[i].mode_set.crtc;
-		crtc_funcs = crtc->helper_private;
-		if (!crtc->enabled)
-				continue;
-			crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-		/* Walk the connectors & encoders on this fb turning them on */
-		for (j = 0; j < fb_helper->connector_count; j++) {
-			connector = fb_helper->connector_info[j]->connector;
-			connector->dpms = DRM_MODE_DPMS_ON;
-			drm_connector_property_set_value(connector,
-							 dev->mode_config.dpms_property,
-							 DRM_MODE_DPMS_ON);
-		}
-			/* Found a CRTC on this fb, now find encoders */
-			list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-				if (encoder->crtc == crtc) {
-					struct drm_encoder_helper_funcs *encoder_funcs;
-					encoder_funcs = encoder->helper_private;
-					encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-			}
 	crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);
+}
 	mutex_unlock(&dev->mode_config.mutex);
 static void drm_fb_helper_off(struct fb_info *info, int dpms_mode)
-{
-	struct drm_fb_helper *fb_helper = info->par;
+static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
 	struct drm_device *dev = fb_helper->dev;
-	struct drm_crtc *crtc;
+	struct drm_fb_helper *fb_helper = info->par;
-	struct drm_crtc_helper_funcs *crtc_funcs;
-	struct drm_connector *connector;
+	struct drm_device *dev = fb_helper->dev;
-	struct drm_encoder *encoder;
+	struct drm_crtc *crtc;
-	int i, j;
+	struct drm_connector *connector;
 	int i, j;
-	/*
 	 * For each CRTC in this fb, find all associated encoders
-	 * and turn them off, then turn off the CRTC.
+	/*
-	 */
+	 * For each CRTC in this fb, turn the connectors on/off.
-	mutex_lock(&dev->mode_config.mutex);
+	 */
-	for (i = 0; i < fb_helper->crtc_count; i++) {
+	mutex_lock(&dev->mode_config.mutex);
-		crtc = fb_helper->crtc_info[i].mode_set.crtc;
+	for (i = 0; i < fb_helper->crtc_count; i++) {
-		crtc_funcs = crtc->helper_private;
+		crtc = fb_helper->crtc_info[i].mode_set.crtc;
-		if (!crtc->enabled)
-				continue;
-		/* Walk the connectors on this fb and mark them off */
-		for (j = 0; j < fb_helper->connector_count; j++) {
-			connector = fb_helper->connector_info[j]->connector;
-			connector->dpms = dpms_mode;
-			drm_connector_property_set_value(connector,
-							 dev->mode_config.dpms_property,
-							 dpms_mode);
 		if (!crtc->enabled)
-			/* Found a CRTC on this fb, now find encoders */
-			list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+				continue;
 				if (encoder->crtc == crtc) {
-					struct drm_encoder_helper_funcs *encoder_funcs;
+		/* Walk the connectors & encoders on this fb turning them on/off */
 		for (j = 0; j < fb_helper->connector_count; j++) {
-					encoder_funcs = encoder->helper_private;
+			connector = fb_helper->connector_info[j]->connector;
-					encoder_funcs->dpms(encoder, dpms_mode);
+			connector->funcs->dpms(connector, dpms_mode);
 			drm_connector_property_set_value(connector,
 				dev->mode_config.dpms_property, dpms_mode);
-			    crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+		}
+	}
 				mutex_unlock(&dev->mode_config.mutex);
+}
 int drm_fb_helper_blank(int blank, struct fb_info *info)
+{
 	switch (blank) {
 	/* Display: On; HSync: On, VSync: On */
 	case FB_BLANK_UNBLANK:
-		drm_fb_helper_on(info);
+		drm_fb_helper_dpms(info, DRM_MODE_DPMS_ON);
 		break;
 	/* Display: Off; HSync: On, VSync: On */
 	case FB_BLANK_NORMAL:
-		drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
+		drm_fb_helper_dpms(info, DRM_MODE_DPMS_STANDBY);
 		break;
 	/* Display: Off; HSync: Off, VSync: On */
 	case FB_BLANK_HSYNC_SUSPEND:
-		drm_fb_helper_off(info, DRM_MODE_DPMS_STANDBY);
+		drm_fb_helper_dpms(info, DRM_MODE_DPMS_STANDBY);
 		break;
 	/* Display: Off; HSync: On, VSync: Off */
 	case FB_BLANK_VSYNC_SUSPEND:
 	int i;
 	for (i = 0; i < helper->connector_count; i++)
 		kfree(helper->connector_info[i]);
 	kfree(helper->connector_info);
-	for (i = 0; i < helper->crtc_count; i++)
+	for (i = 0; i < helper->crtc_count; i++) {
+		kfree(helper->crtc_info[i].mode_set.connectors);
+		if (helper->crtc_info[i].mode_set.mode)
+			drm_mode_destroy(helper->dev, helper->crtc_info[i].mode_set.mode);
 		kfree(helper->crtc_info[i].mode_set.connectors);
 	kfree(helper->crtc_info);
+}
 int drm_fb_helper_init(struct drm_device *dev,
 		       struct drm_fb_helper *fb_helper,
 		       int crtc_count, int max_conn_count)
-{
 	struct drm_crtc *crtc;
-	int ret = 0;
+	struct drm_crtc *crtc;
 	int i;
 		fb_helper->crtc_info[i].mode_set.connectors =
 			kcalloc(max_conn_count,
 				sizeof(struct drm_connector *),
 				GFP_KERNEL);
-		if (!fb_helper->crtc_info[i].mode_set.connectors) {
-			ret = -ENOMEM;
+		if (!fb_helper->crtc_info[i].mode_set.connectors)
-			goto out_free;
 			goto out_free;
 		fb_helper->crtc_info[i].mode_set.num_connectors = 0;
+	}
-	i = 0;
-	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+	i = 0;
-		fb_helper->crtc_info[i].crtc_id = crtc->base.id;
+	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		fb_helper->crtc_info[i].mode_set.crtc = crtc;
-		i++;
+		i++;
+	}
 	fb_helper->conn_limit = max_conn_count;
 	return 0;
 out_free:
 	drm_fb_helper_crtc_free(fb_helper);
 	if (var->pixclock != 0 || in_dbg_master())
 		return -EINVAL;
+	/* Need to resize the fb object !!! */
+	if (var->bits_per_pixel > fb->bits_per_pixel ||
-	/* Need to resize the fb object !!! */
+	    var->xres > fb->width || var->yres > fb->height ||
+	    var->xres_virtual > fb->width || var->yres_virtual > fb->height) {
-	if (var->bits_per_pixel > fb->bits_per_pixel || var->xres > fb->width || var->yres > fb->height) {
+		DRM_DEBUG("fb userspace requested width/height/bpp is greater than current fb "
+			  "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n",
-		DRM_DEBUG("fb userspace requested width/height/bpp is greater than current fb "
+			  var->xres, var->yres, var->bits_per_pixel,
-			  "object %dx%d-%d > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel,
+			  var->xres_virtual, var->yres_virtual,
 			  fb->width, fb->height, fb->bits_per_pixel);
 		return -EINVAL;
 	sizes.surface_depth = 24;
 	sizes.surface_bpp = 32;
 	sizes.fb_width = (unsigned)-1;
 	sizes.fb_height = (unsigned)-1;
+	/* if driver picks 8 or 16 by default use that
+	   for both depth/bpp */
+	if (preferred_bpp != sizes.surface_bpp) {
+		sizes.surface_depth = sizes.surface_bpp = preferred_bpp;
+	}
+	/* first up get a count of crtcs now in use and new min/maxes width/heights */
+	for (i = 0; i < fb_helper->connector_count; i++) {
+		struct drm_fb_helper_connector *fb_helper_conn = fb_helper->connector_info[i];
+		struct drm_cmdline_mode *cmdline_mode;
+		cmdline_mode = &fb_helper_conn->cmdline_mode;
+		if (cmdline_mode->bpp_specified) {
+			switch (cmdline_mode->bpp) {
+			case 8:
+				sizes.surface_depth = sizes.surface_bpp = 8;
+				break;
+			case 15:
+				sizes.surface_depth = 15;
+				sizes.surface_bpp = 16;
+				break;
+			case 16:
+				sizes.surface_depth = sizes.surface_bpp = 16;
+				break;
+			case 24:
+				sizes.surface_depth = sizes.surface_bpp = 24;
+				break;
 			case 32:
     sizes.surface_depth = 24;
+    sizes.surface_bpp = 32;
+				break;
+			}
+			break;
+		}
     sizes.surface_bpp = 32;
 	crtc_count = 0;
 	for (i = 0; i < fb_helper->crtc_count; i++) {
 static void drm_setup_crtcs(struct drm_fb_helper *fb_helper)
+{
 	struct drm_device *dev = fb_helper->dev;
 	struct drm_fb_helper_crtc **crtcs;
 	struct drm_display_mode **modes;
-	struct drm_encoder *encoder;
 	struct drm_mode_set *modeset;
 	bool *enabled;
 	int width, height;
 	int i, ret;
 	DRM_DEBUG_KMS("\n");
-	width = dev->mode_config.max_width;
-	height = dev->mode_config.max_height;
-	/* clean out all the encoder/crtc combos */
-   list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-		encoder->crtc = NULL;
+	width = dev->mode_config.max_width;
 	height = dev->mode_config.max_height;
 	crtcs = kcalloc(dev->mode_config.num_connector,
 			sizeof(struct drm_fb_helper_crtc *), GFP_KERNEL);
+{
 	struct drm_device *dev = fb_helper->dev;
 	int count = 0;
 	/* disable all the possible outputs/crtcs before entering KMS mode */
-//   drm_helper_disable_unused_functions(fb_helper->dev);
+	drm_helper_disable_unused_functions(fb_helper->dev);
 //   drm_fb_helper_parse_command_line(fb_helper);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_fb_helper.c – Rev 2160 → 3031