geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only initialise modes when fbcon or fbset asks for it

main
Dave Airlie 2007-04-12 11:54:49 +10:00
parent b49b3ba4c1
commit fb6c5aacb9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux-core/drm_fb.c
View File

@ -77,6 +77,15 @@ static int drmfb_setcolreg(unsigned regno, unsigned red, unsigned green,
return 0; return 0;
} }
/* this will let fbcon do the mode init */
static int drmfb_set_par(struct fb_info *info)
{
struct drmfb_par *par = info->par;
struct drm_device *dev = par->dev;
drm_set_desired_modes(dev);
}
static struct fb_ops drmfb_ops = { static struct fb_ops drmfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
// .fb_open = drmfb_open, // .fb_open = drmfb_open,
@ -84,6 +93,7 @@ static struct fb_ops drmfb_ops = {
// .fb_write = drmfb_write, // .fb_write = drmfb_write,
// .fb_release = drmfb_release, // .fb_release = drmfb_release,
// .fb_ioctl = drmfb_ioctl, // .fb_ioctl = drmfb_ioctl,
.fb_set_par = drmfb_set_par,
.fb_setcolreg = drmfb_setcolreg, .fb_setcolreg = drmfb_setcolreg,
.fb_fillrect = cfb_fillrect, .fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea, .fb_copyarea = cfb_copyarea,

2
shared-core/i915_init.c
View File

@ -213,8 +213,6 @@ int i915_driver_load(drm_device_t *dev, unsigned long flags)
drm_initial_config(dev, fb, false); drm_initial_config(dev, fb, false);
drmfb_probe(dev, fb); drmfb_probe(dev, fb);
drm_set_desired_modes(dev);
#if 0 #if 0
/* FIXME: command ring needs AGP space, do we own it at this point? */ /* FIXME: command ring needs AGP space, do we own it at this point? */
dev_priv->ring.Start = dev_priv->baseaddr; dev_priv->ring.Start = dev_priv->baseaddr;