diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 02:46:01 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 02:46:01 +0200 |
| commit | 0ed537b5fd18c38b526fd0e6837a00f96aee30c4 (patch) | |
| tree | 01744d89b09aaaaad77696265fb4732ef9a8fc32 /drivers/gpu/drm/nouveau/nv50_fbcon.c | |
| parent | 72e624de6e6f0d5a638fbc23842aa76ae048e9e7 (diff) | |
| parent | 50a3cb04a5f9cd5323a76db9ee409a7f3004259a (diff) | |
| download | linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.tar.gz linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.tar.bz2 linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.zip | |
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_fbcon.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_fbcon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c index 394c89abcc97..901130b06072 100644 --- a/drivers/gpu/drm/nouveau/nv50_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c @@ -188,7 +188,7 @@ nv50_fbcon_accel_init(struct fb_info *info) if (ret) return ret; - ret = RING_SPACE(chan, 59); + ret = RING_SPACE(chan, 58); if (ret) { nouveau_fbcon_gpu_lockup(info); return ret; @@ -252,6 +252,7 @@ nv50_fbcon_accel_init(struct fb_info *info) OUT_RING(chan, info->var.yres_virtual); OUT_RING(chan, upper_32_bits(fb->vma.offset)); OUT_RING(chan, lower_32_bits(fb->vma.offset)); + FIRE_RING(chan); return 0; } |