mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
dc257cf154
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPpvY9AAoJEHm+PkMAQRiGpEoIAJgbu+Y8gITnBK/wh9O6zy3S 5jie5KK4YWdbJsvO58WbNr3CyVIwGIqQ2dUZLiU59aBVLarlGw8xor0MmW+cZwhp 6fBHaf0qDYAV0MZjD+mnnExOiCRyISa2lPmsfu9dAWywh5KGe6/oAP6/qcXIyok3 KZyl3qQf4ENpaZPHwZPXCEkUvtuyHgNiszN+QXEadA3s19Ot4VGe9A3VGw+GNrSm JqFIq3acQAbKa5BYaqf7TQC02v2FI7//eqt6QHxTqbE6a7LGbTvLfX3HlJ2mnfqa 1R6QHhM4y4OZDHbaMT2raHZ8WuLXzhehJzhP8Co7AHFOKwVKOb5XbcUr2RrukMU= =HkMd -----END PGP SIGNATURE----- Merge tag 'v3.4-rc6' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_display.c Ok, this is a fun story of git totally messing things up. There /shouldn't/ be any conflict in here, because the fixes in -rc6 do only touch functions that have not been changed in -next. The offending commits in drm-next are 14415745b2..1fa611065 which simply move a few functions from intel_display.c to intel_pm.c. The problem seems to be that git diff gets completely confused: $ git diff 14415745b2..1fa611065 is a nice mess in intel_display.c, and the diff leaks into totally unrelated functions, whereas $git diff --minimal 14415745b2..1fa611065 is exactly what we want. Unfortunately there seems to be no way to teach similar smarts to the merge diff and conflict generation code, because with the minimal diff there really shouldn't be any conflicts. For added hilarity, every time something in that area changes the + and - lines in the diff move around like crazy, again resulting in new conflicts. So I fear this mess will stay with us for a little longer (and might result in another backmerge down the road). Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
294 lines
7.6 KiB
C
294 lines
7.6 KiB
C
/*
|
|
* Copyright © 2007 David Airlie
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* David Airlie
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/string.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/sysrq.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/init.h>
|
|
#include <linux/vga_switcheroo.h>
|
|
|
|
#include "drmP.h"
|
|
#include "drm.h"
|
|
#include "drm_crtc.h"
|
|
#include "drm_fb_helper.h"
|
|
#include "intel_drv.h"
|
|
#include "i915_drm.h"
|
|
#include "i915_drv.h"
|
|
|
|
static struct fb_ops intelfb_ops = {
|
|
.owner = THIS_MODULE,
|
|
.fb_check_var = drm_fb_helper_check_var,
|
|
.fb_set_par = drm_fb_helper_set_par,
|
|
.fb_fillrect = cfb_fillrect,
|
|
.fb_copyarea = cfb_copyarea,
|
|
.fb_imageblit = cfb_imageblit,
|
|
.fb_pan_display = drm_fb_helper_pan_display,
|
|
.fb_blank = drm_fb_helper_blank,
|
|
.fb_setcmap = drm_fb_helper_setcmap,
|
|
.fb_debug_enter = drm_fb_helper_debug_enter,
|
|
.fb_debug_leave = drm_fb_helper_debug_leave,
|
|
};
|
|
|
|
static int intelfb_create(struct intel_fbdev *ifbdev,
|
|
struct drm_fb_helper_surface_size *sizes)
|
|
{
|
|
struct drm_device *dev = ifbdev->helper.dev;
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
struct fb_info *info;
|
|
struct drm_framebuffer *fb;
|
|
struct drm_mode_fb_cmd2 mode_cmd;
|
|
struct drm_i915_gem_object *obj;
|
|
struct device *device = &dev->pdev->dev;
|
|
int size, ret;
|
|
|
|
/* we don't do packed 24bpp */
|
|
if (sizes->surface_bpp == 24)
|
|
sizes->surface_bpp = 32;
|
|
|
|
mode_cmd.width = sizes->surface_width;
|
|
mode_cmd.height = sizes->surface_height;
|
|
|
|
mode_cmd.pitches[0] = ALIGN(mode_cmd.width * ((sizes->surface_bpp + 7) /
|
|
8), 64);
|
|
mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
|
|
sizes->surface_depth);
|
|
|
|
size = mode_cmd.pitches[0] * mode_cmd.height;
|
|
size = ALIGN(size, PAGE_SIZE);
|
|
obj = i915_gem_alloc_object(dev, size);
|
|
if (!obj) {
|
|
DRM_ERROR("failed to allocate framebuffer\n");
|
|
ret = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
mutex_lock(&dev->struct_mutex);
|
|
|
|
/* Flush everything out, we'll be doing GTT only from now on */
|
|
ret = intel_pin_and_fence_fb_obj(dev, obj, NULL);
|
|
if (ret) {
|
|
DRM_ERROR("failed to pin fb: %d\n", ret);
|
|
goto out_unref;
|
|
}
|
|
|
|
info = framebuffer_alloc(0, device);
|
|
if (!info) {
|
|
ret = -ENOMEM;
|
|
goto out_unpin;
|
|
}
|
|
|
|
info->par = ifbdev;
|
|
|
|
ret = intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, obj);
|
|
if (ret)
|
|
goto out_unpin;
|
|
|
|
fb = &ifbdev->ifb.base;
|
|
|
|
ifbdev->helper.fb = fb;
|
|
ifbdev->helper.fbdev = info;
|
|
|
|
strcpy(info->fix.id, "inteldrmfb");
|
|
|
|
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
|
|
info->fbops = &intelfb_ops;
|
|
|
|
ret = fb_alloc_cmap(&info->cmap, 256, 0);
|
|
if (ret) {
|
|
ret = -ENOMEM;
|
|
goto out_unpin;
|
|
}
|
|
/* setup aperture base/size for vesafb takeover */
|
|
info->apertures = alloc_apertures(1);
|
|
if (!info->apertures) {
|
|
ret = -ENOMEM;
|
|
goto out_unpin;
|
|
}
|
|
info->apertures->ranges[0].base = dev->mode_config.fb_base;
|
|
info->apertures->ranges[0].size =
|
|
dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT;
|
|
|
|
info->fix.smem_start = dev->mode_config.fb_base + obj->gtt_offset;
|
|
info->fix.smem_len = size;
|
|
|
|
info->screen_base = ioremap_wc(dev->agp->base + obj->gtt_offset, size);
|
|
if (!info->screen_base) {
|
|
ret = -ENOSPC;
|
|
goto out_unpin;
|
|
}
|
|
info->screen_size = size;
|
|
|
|
// memset(info->screen_base, 0, size);
|
|
|
|
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
|
|
drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);
|
|
|
|
/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
|
|
|
|
DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n",
|
|
fb->width, fb->height,
|
|
obj->gtt_offset, obj);
|
|
|
|
|
|
mutex_unlock(&dev->struct_mutex);
|
|
vga_switcheroo_client_fb_set(dev->pdev, info);
|
|
return 0;
|
|
|
|
out_unpin:
|
|
i915_gem_object_unpin(obj);
|
|
out_unref:
|
|
drm_gem_object_unreference(&obj->base);
|
|
mutex_unlock(&dev->struct_mutex);
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int intel_fb_find_or_create_single(struct drm_fb_helper *helper,
|
|
struct drm_fb_helper_surface_size *sizes)
|
|
{
|
|
struct intel_fbdev *ifbdev = (struct intel_fbdev *)helper;
|
|
int new_fb = 0;
|
|
int ret;
|
|
|
|
if (!helper->fb) {
|
|
ret = intelfb_create(ifbdev, sizes);
|
|
if (ret)
|
|
return ret;
|
|
new_fb = 1;
|
|
}
|
|
return new_fb;
|
|
}
|
|
|
|
static struct drm_fb_helper_funcs intel_fb_helper_funcs = {
|
|
.gamma_set = intel_crtc_fb_gamma_set,
|
|
.gamma_get = intel_crtc_fb_gamma_get,
|
|
.fb_probe = intel_fb_find_or_create_single,
|
|
};
|
|
|
|
static void intel_fbdev_destroy(struct drm_device *dev,
|
|
struct intel_fbdev *ifbdev)
|
|
{
|
|
struct fb_info *info;
|
|
struct intel_framebuffer *ifb = &ifbdev->ifb;
|
|
|
|
if (ifbdev->helper.fbdev) {
|
|
info = ifbdev->helper.fbdev;
|
|
unregister_framebuffer(info);
|
|
iounmap(info->screen_base);
|
|
if (info->cmap.len)
|
|
fb_dealloc_cmap(&info->cmap);
|
|
framebuffer_release(info);
|
|
}
|
|
|
|
drm_fb_helper_fini(&ifbdev->helper);
|
|
|
|
drm_framebuffer_cleanup(&ifb->base);
|
|
if (ifb->obj) {
|
|
drm_gem_object_unreference_unlocked(&ifb->obj->base);
|
|
ifb->obj = NULL;
|
|
}
|
|
}
|
|
|
|
int intel_fbdev_init(struct drm_device *dev)
|
|
{
|
|
struct intel_fbdev *ifbdev;
|
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
|
int ret;
|
|
|
|
ifbdev = kzalloc(sizeof(struct intel_fbdev), GFP_KERNEL);
|
|
if (!ifbdev)
|
|
return -ENOMEM;
|
|
|
|
dev_priv->fbdev = ifbdev;
|
|
ifbdev->helper.funcs = &intel_fb_helper_funcs;
|
|
|
|
ret = drm_fb_helper_init(dev, &ifbdev->helper,
|
|
dev_priv->num_pipe,
|
|
INTELFB_CONN_LIMIT);
|
|
if (ret) {
|
|
kfree(ifbdev);
|
|
return ret;
|
|
}
|
|
|
|
drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
|
|
drm_fb_helper_initial_config(&ifbdev->helper, 32);
|
|
return 0;
|
|
}
|
|
|
|
void intel_fbdev_fini(struct drm_device *dev)
|
|
{
|
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
|
if (!dev_priv->fbdev)
|
|
return;
|
|
|
|
intel_fbdev_destroy(dev, dev_priv->fbdev);
|
|
kfree(dev_priv->fbdev);
|
|
dev_priv->fbdev = NULL;
|
|
}
|
|
|
|
void intel_fbdev_set_suspend(struct drm_device *dev, int state)
|
|
{
|
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
|
if (!dev_priv->fbdev)
|
|
return;
|
|
|
|
fb_set_suspend(dev_priv->fbdev->helper.fbdev, state);
|
|
}
|
|
|
|
MODULE_LICENSE("GPL and additional rights");
|
|
|
|
void intel_fb_output_poll_changed(struct drm_device *dev)
|
|
{
|
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
|
drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper);
|
|
}
|
|
|
|
void intel_fb_restore_mode(struct drm_device *dev)
|
|
{
|
|
int ret;
|
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
struct drm_plane *plane;
|
|
|
|
mutex_lock(&dev->mode_config.mutex);
|
|
|
|
ret = drm_fb_helper_restore_fbdev_mode(&dev_priv->fbdev->helper);
|
|
if (ret)
|
|
DRM_DEBUG("failed to restore crtc mode\n");
|
|
|
|
/* Be sure to shut off any planes that may be active */
|
|
list_for_each_entry(plane, &config->plane_list, head)
|
|
plane->funcs->disable_plane(plane);
|
|
|
|
mutex_unlock(&dev->mode_config.mutex);
|
|
}
|