summaryrefslogtreecommitdiff
path: root/linux-core/drm_crtc.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2007-04-18 11:55:09 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2007-04-18 11:55:09 +0100
commitef2bce3a16428feb89f447e528bdea00c1066b8b (patch)
tree7a7fcabf3a490200acd6da22c393df994bcbf9a3 /linux-core/drm_crtc.c
parent51e867c57880c85c87e187af0a667e9b99413206 (diff)
parent20b2949e3738bc900407d6aeddc6338f05b0b169 (diff)
Merge remote branch 'origin/modesetting-101' into modesetting-101
Diffstat (limited to 'linux-core/drm_crtc.c')
-rw-r--r--linux-core/drm_crtc.c104
1 files changed, 74 insertions, 30 deletions
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index bf019df3..e8f42feb 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -1,6 +1,6 @@
#include <linux/list.h>
-#include "drmP.h"
#include "drm.h"
+#include "drmP.h"
#include "drm_crtc.h"
int drm_mode_idr_get(struct drm_device *dev, void *ptr)
@@ -509,6 +509,15 @@ out_err:
return ret;
}
+static void drm_setup_output(struct drm_output *output, struct drm_crtc *crtc,
+ struct drm_display_mode *mode)
+{
+ output->crtc = crtc;
+ output->crtc->desired_mode = mode;
+ output->initial_x = 0;
+ output->initial_y = 0;
+}
+
/**
* drm_initial_config - setup a sane initial output configuration
* @dev: DRM device
@@ -519,13 +528,21 @@ out_err:
* At the moment, this is a cloned configuration across all heads with
* @fb as the backing store.
*/
-bool drm_initial_config(drm_device_t *dev, struct drm_framebuffer *fb,
- bool can_grow)
+bool drm_initial_config(drm_device_t *dev, bool can_grow)
{
/* do a hardcoded initial configuration here */
- struct drm_crtc *crtc, *vga_crtc = NULL, *dvi_crtc = NULL,
+ struct drm_crtc *crtc, *vga_crtc = NULL, *tmds_crtc = NULL,
*lvds_crtc = NULL;
- struct drm_output *output, *use_output = NULL;
+ struct drm_output *output;
+ struct drm_framebuffer *fb;
+ drm_buffer_object_t *fbo;
+ unsigned long size, bytes_per_pixel;
+
+ fb = drm_framebuffer_create(dev);
+ if (!fb) {
+ DRM_ERROR("failed to allocate fb.\n");
+ return true;
+ }
/* bind both CRTCs to this fb */
/* only initialise one crtc to enabled state */
@@ -536,16 +553,19 @@ bool drm_initial_config(drm_device_t *dev, struct drm_framebuffer *fb,
crtc->enabled = 1;
crtc->desired_x = 0;
crtc->desired_y = 0;
- } else if (!lvds_crtc) {
- lvds_crtc = crtc;
- crtc->enabled = 1;
- crtc->desired_x = 0;
- crtc->desired_y = 0;
- } else if (!dvi_crtc) {
- dvi_crtc = crtc;
- crtc->enabled = 1;
- crtc->desired_x = 0;
- crtc->desired_y = 0;
+ } else {
+ if (!lvds_crtc) {
+ lvds_crtc = crtc;
+ crtc->enabled = 1;
+ crtc->desired_x = 0;
+ crtc->desired_y = 0;
+ }
+ if (!tmds_crtc) {
+ tmds_crtc = crtc;
+ crtc->enabled = 1;
+ crtc->desired_x = 0;
+ crtc->desired_y = 0;
+ }
}
}
@@ -555,7 +575,7 @@ bool drm_initial_config(drm_device_t *dev, struct drm_framebuffer *fb,
/* bind analog output to one crtc */
list_for_each_entry(output, &dev->mode_config.output_list, head) {
- struct drm_display_mode *des_mode;
+ struct drm_display_mode *des_mode = NULL;
if (list_empty(&output->modes))
continue;
@@ -565,30 +585,48 @@ bool drm_initial_config(drm_device_t *dev, struct drm_framebuffer *fb,
if (des_mode->flags & DRM_MODE_TYPE_PREFERRED)
break;
}
+
+ if (!des_mode)
+ continue;
+
if (!strncmp(output->name, "VGA", 3)) {
- output->crtc = vga_crtc;
DRM_DEBUG("VGA preferred mode: %s\n", des_mode->name);
- output->crtc->desired_mode = des_mode;
- output->initial_x = 0;
- output->initial_y = 0;
- use_output = output;
+ drm_setup_output(output, vga_crtc, des_mode);
} else if (!strncmp(output->name, "TMDS", 4)) {
- output->crtc = vga_crtc;
DRM_DEBUG("TMDS preferred mode: %s\n", des_mode->name);
- output->crtc->desired_mode = des_mode;
- output->initial_x = 0;
- output->initial_y = 0;
+ drm_setup_output(output, tmds_crtc, des_mode);
} else if (!strncmp(output->name, "LVDS", 3)) {
- output->crtc = lvds_crtc;
DRM_DEBUG("LVDS preferred mode: %s\n", des_mode->name);
- output->crtc->desired_mode = des_mode;
- output->initial_x = 0;
- output->initial_y = 0;
+ drm_setup_output(output, lvds_crtc, des_mode);
} else
output->crtc = NULL;
-
+
+ /* FB config is max of above desired resolutions */
+ /* FIXME: per-output FBs/CRTCs */
+ if (des_mode->hdisplay > fb->width) {
+ fb->width = des_mode->hdisplay;
+ fb->pitch = fb->width;
+ }
+ if (des_mode->vdisplay > fb->height)
+ fb->height = des_mode->vdisplay;
}
+ /* FIXME: multiple depths */
+ bytes_per_pixel = 4;
+ fb->bits_per_pixel = bytes_per_pixel * 8;
+ fb->depth = bytes_per_pixel * 8;
+ size = fb->width * fb->height * bytes_per_pixel;
+ drm_buffer_object_create(dev, size, drm_bo_type_kernel,
+ DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
+ DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
+ 0, 0, 0,
+ &fbo);
+ DRM_DEBUG("allocated %dx%d fb: 0x%08lx, bo %p\n", fb->width,
+ fb->height, fbo->offset, fbo);
+ fb->offset = fbo->offset;
+ fb->bo = fbo;
+ drmfb_probe(dev, fb);
+
return false;
}
EXPORT_SYMBOL(drm_initial_config);
@@ -608,6 +646,12 @@ void drm_mode_config_cleanup(drm_device_t *dev)
list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) {
drmfb_remove(dev, fb);
+ /* If this FB was the kernel one, free it */
+ if (fb->bo->type == drm_bo_type_kernel) {
+ mutex_lock(&dev->struct_mutex);
+ drm_bo_usage_deref_locked(fb->bo);
+ mutex_unlock(&dev->struct_mutex);
+ }
drm_framebuffer_destroy(fb);
}
}