mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
612a9aab56
Pull drm merge (part 1) from Dave Airlie:
"So first of all my tree and uapi stuff has a conflict mess, its my
fault as the nouveau stuff didn't hit -next as were trying to rebase
regressions out of it before we merged.
Highlights:
- SH mobile modesetting driver and associated helpers
- some DRM core documentation
- i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write
combined pte writing, ilk rc6 support,
- nouveau: major driver rework into a hw core driver, makes features
like SLI a lot saner to implement,
- psb: add eDP/DP support for Cedarview
- radeon: 2 layer page tables, async VM pte updates, better PLL
selection for > 2 screens, better ACPI interactions
The rest is general grab bag of fixes.
So why part 1? well I have the exynos pull req which came in a bit
late but was waiting for me to do something they shouldn't have and it
looks fairly safe, and David Howells has some more header cleanups
he'd like me to pull, that seem like a good idea, but I'd like to get
this merge out of the way so -next dosen't get blocked."
Tons of conflicts mostly due to silly include line changes, but mostly
mindless. A few other small semantic conflicts too, noted from Dave's
pre-merged branch.
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits)
drm/nv98/crypt: fix fuc build with latest envyas
drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
drm/nv41/vm: fix and enable use of "real" pciegart
drm/nv44/vm: fix and enable use of "real" pciegart
drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
drm/nouveau: store supported dma mask in vmmgr
drm/nvc0/ibus: initial implementation of subdev
drm/nouveau/therm: add support for fan-control modes
drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
drm/nouveau/therm: calculate the pwm divisor on nv50+
drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
drm/nouveau/therm: move thermal-related functions to the therm subdev
drm/nouveau/bios: parse the pwm divisor from the perf table
drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
drm/nouveau/therm: rework thermal table parsing
drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
drm/nouveau: fix pm initialization order
drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
drm/nouveau: log channel debug/error messages from client object rather than drm client
drm/nouveau: have drm debugging macros build on top of core macros
...
71 lines
2.8 KiB
C
71 lines
2.8 KiB
C
/*
|
|
* Copyright (C) 2008 Maarten Maathuis.
|
|
* All Rights Reserved.
|
|
*
|
|
* 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
|
|
*
|
|
*/
|
|
|
|
#ifndef __NOUVEAU_FBCON_H__
|
|
#define __NOUVEAU_FBCON_H__
|
|
|
|
#include <drm/drm_fb_helper.h>
|
|
|
|
#include "nouveau_display.h"
|
|
|
|
struct nouveau_fbdev {
|
|
struct drm_fb_helper helper;
|
|
struct nouveau_framebuffer nouveau_fb;
|
|
struct list_head fbdev_list;
|
|
struct drm_device *dev;
|
|
unsigned int saved_flags;
|
|
};
|
|
|
|
void nouveau_fbcon_restore(void);
|
|
|
|
int nv04_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region);
|
|
int nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
|
|
int nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image);
|
|
int nv04_fbcon_accel_init(struct fb_info *info);
|
|
|
|
int nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
|
|
int nv50_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region);
|
|
int nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image);
|
|
int nv50_fbcon_accel_init(struct fb_info *info);
|
|
|
|
int nvc0_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
|
|
int nvc0_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region);
|
|
int nvc0_fbcon_imageblit(struct fb_info *info, const struct fb_image *image);
|
|
int nvc0_fbcon_accel_init(struct fb_info *info);
|
|
|
|
void nouveau_fbcon_gpu_lockup(struct fb_info *info);
|
|
|
|
int nouveau_fbcon_init(struct drm_device *dev);
|
|
void nouveau_fbcon_fini(struct drm_device *dev);
|
|
void nouveau_fbcon_set_suspend(struct drm_device *dev, int state);
|
|
void nouveau_fbcon_zfill_all(struct drm_device *dev);
|
|
void nouveau_fbcon_save_disable_accel(struct drm_device *dev);
|
|
void nouveau_fbcon_restore_accel(struct drm_device *dev);
|
|
|
|
void nouveau_fbcon_output_poll_changed(struct drm_device *dev);
|
|
#endif /* __NV50_FBCON_H__ */
|
|
|