Move initial framebuffer allocation and configuration to drm_initial_config,
remove i915_driver_load fb related stuff. Add a small helper for setting up outputs.main
Jesse Barnes
parent
eeb5de0594
commit
4e4d9cbeb3
|
|
@ -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)
|
||||
|
|
@ -500,6 +500,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
|
||||
|
|
@ -510,13 +519,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 */
|
||||
|
|
@ -532,8 +549,8 @@ 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 (!dvi_crtc) {
|
||||
dvi_crtc = crtc;
|
||||
} else if (!tmds_crtc) {
|
||||
tmds_crtc = crtc;
|
||||
crtc->enabled = 1;
|
||||
crtc->desired_x = 0;
|
||||
crtc->desired_y = 0;
|
||||
|
|
@ -557,28 +574,42 @@ bool drm_initial_config(drm_device_t *dev, struct drm_framebuffer *fb,
|
|||
break;
|
||||
}
|
||||
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\n", fb->width, fb->height,
|
||||
fbo->offset);
|
||||
fb->offset = fbo->offset;
|
||||
fb->bo = fbo;
|
||||
drmfb_probe(dev, fb);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -452,8 +452,7 @@ extern int drm_mode_vrefresh(struct drm_display_mode *mode);
|
|||
extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
|
||||
int adjust_flags);
|
||||
extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
|
||||
extern bool drm_initial_config(struct drm_device *dev,
|
||||
struct drm_framebuffer *fb, bool cangrow);
|
||||
extern bool drm_initial_config(struct drm_device *dev, bool cangrow);
|
||||
extern void drm_framebuffer_set_object(struct drm_device *dev,
|
||||
unsigned long handle);
|
||||
extern bool drm_set_desired_modes(struct drm_device *dev);
|
||||
|
|
|
|||
|
|
@ -112,13 +112,9 @@ int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
|
|||
int i915_driver_load(drm_device_t *dev, unsigned long flags)
|
||||
{
|
||||
drm_i915_private_t *dev_priv;
|
||||
drm_i915_init_t init;
|
||||
drm_buffer_object_t *entry;
|
||||
drm_local_map_t *map;
|
||||
struct drm_framebuffer *fb;
|
||||
unsigned long agp_size, prealloc_size;
|
||||
unsigned long sareapage;
|
||||
int hsize, vsize, bytes_per_pixel, size, ret;
|
||||
int size, ret;
|
||||
|
||||
dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
|
||||
if (dev_priv == NULL)
|
||||
|
|
@ -150,6 +146,8 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
DRM_DEBUG("fb_base: 0x%08lx\n", dev_priv->baseaddr);
|
||||
|
||||
ret = drm_addmap(dev, dev_priv->mmiobase, dev_priv->mmiolen,
|
||||
_DRM_REGISTERS, _DRM_READ_ONLY|_DRM_DRIVER, &dev_priv->mmio_map);
|
||||
if (ret != 0) {
|
||||
|
|
@ -177,7 +175,7 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
|
|||
drm_bo_driver_init(dev);
|
||||
|
||||
i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
|
||||
DRM_DEBUG("setting up %d bytes of PRIV0 space\n", prealloc_size);
|
||||
DRM_DEBUG("setting up %ld bytes of PRIV0 space\n", prealloc_size);
|
||||
drm_bo_init_mm(dev, DRM_BO_MEM_PRIV0, dev_priv->baseaddr,
|
||||
prealloc_size >> PAGE_SHIFT);
|
||||
|
||||
|
|
@ -199,13 +197,14 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
|
|||
dev_priv->ring.Size = size;
|
||||
dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
|
||||
|
||||
|
||||
/* FIXME: need wrapper with PCI mem checks */
|
||||
ret = drm_mem_reg_ioremap(dev, &dev_priv->ring_buffer->mem,
|
||||
&dev_priv->ring.virtual_start);
|
||||
if (ret)
|
||||
DRM_ERROR("error mapping ring buffer: %d\n", ret);
|
||||
|
||||
DRM_DEBUG("ring start %08X, %08X, %08X\n", dev_priv->ring.Start, dev_priv->ring.virtual_start, dev_priv->ring.Size);
|
||||
DRM_DEBUG("ring start %08lX, %p, %08lX\n", dev_priv->ring.Start,
|
||||
dev_priv->ring.virtual_start, dev_priv->ring.Size);
|
||||
I915_WRITE(LP_RING + RING_HEAD, 0);
|
||||
I915_WRITE(LP_RING + RING_TAIL, 0);
|
||||
I915_WRITE(LP_RING + RING_START, dev_priv->ring.Start);
|
||||
|
|
@ -242,46 +241,15 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
|
|||
I915_WRITE(0x02080, dev_priv->dma_status_page);
|
||||
DRM_DEBUG("Enabled hardware status page\n");
|
||||
|
||||
#if 1
|
||||
/* Allocate scanout buffer and command ring */
|
||||
/* FIXME: types and other args correct? */
|
||||
hsize = 1280;
|
||||
vsize = 800;
|
||||
bytes_per_pixel = 4;
|
||||
size = hsize * vsize * 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,
|
||||
&entry);
|
||||
#endif
|
||||
intel_modeset_init(dev);
|
||||
drm_initial_config(dev, false);
|
||||
|
||||
#if 1
|
||||
fb = drm_framebuffer_create(dev);
|
||||
if (!fb) {
|
||||
DRM_ERROR("failed to allocate fb\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
fb->width = hsize;
|
||||
fb->height = vsize;
|
||||
fb->pitch = hsize;
|
||||
fb->bits_per_pixel = bytes_per_pixel * 8;
|
||||
fb->depth = bytes_per_pixel * 8;
|
||||
fb->offset = entry->offset;
|
||||
fb->bo = entry;
|
||||
|
||||
drm_initial_config(dev, fb, false);
|
||||
drmfb_probe(dev, fb);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
int i915_driver_unload(drm_device_t *dev)
|
||||
{
|
||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||
struct drm_framebuffer *fb;
|
||||
|
||||
if (dev_priv->status_page_dmah) {
|
||||
drm_pci_free(dev, dev_priv->status_page_dmah);
|
||||
|
|
|
|||
Loading…
Reference in New Issue