* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits) drm: integer overflow in drm_mode_dirtyfb_ioctl() drivers/gpu/vga/vgaarb.c: add missing kfree drm/radeon/kms/atom: unify i2c gpio table handling drm/radeon/kms: fix up gpio i2c mask bits for r4xx for real ttm: Don't return the bo reserved on error path drm/radeon/kms: add a CS ioctl flag not to rewrite tiling flags in the CS drm/i915: Fix inconsistent backlight level during disabled drm, i915: Fix memory leak in i915_gem_busy_ioctl(). drm/i915: Use DPCD value for max DP lanes. drm/i915: Initiate DP link training only on the lanes we'll be using drm/i915: Remove trailing white space drm/i915: Try harder during dp pattern 1 link training drm/i915: Make DP prepare/commit consistent with DP dpms drm/i915: Let panel power sequencing hardware do its job drm/i915: Treat PCH eDP like DP in most places drm/i915: Remove link_status field from intel_dp structure drm/i915: Move common PCH_PP_CONTROL setup to ironlake_get_pp_control drm/i915: Module parameters using '-1' as default must be signed type drm/i915: Turn on another required clock gating bit on gen6. drm/i915: Turn on a required 3D clock gating bit on Sandybridge. ...
Showing the changes to include (2 of 22 files). Show all
Unified · Split
| @@ -235,6 +235,8 @@ struct drm_mode_fb_cmd { · 234 unmodified lines | ||
| 235 | 235 | #define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02 |
| 236 | 236 | #define DRM_MODE_FB_DIRTY_FLAGS 0x03 |
| 237 | 237 | |
| 238 | +#define DRM_MODE_FB_DIRTY_MAX_CLIPS 256 | |
| 239 | + | |
| 238 | 240 | /* |
| 239 | 241 | * Mark a region of a framebuffer as dirty. |
| 240 | 242 | * |
| @@ -874,6 +874,10 @@ struct drm_radeon_gem_pwrite { · 873 unmodified lines | ||
| 874 | 874 | |
| 875 | 875 | #define RADEON_CHUNK_ID_RELOCS 0x01 |
| 876 | 876 | #define RADEON_CHUNK_ID_IB 0x02 |
| 877 | +#define RADEON_CHUNK_ID_FLAGS 0x03 | |
| 878 | + | |
| 879 | +/* The first dword of RADEON_CHUNK_ID_FLAGS is a uint32 of these flags: */ | |
| 880 | +#define RADEON_CS_KEEP_TILING_FLAGS 0x01 | |
| 877 | 881 | |
| 878 | 882 | struct drm_radeon_cs_chunk { |
| 879 | 883 | uint32_t chunk_id; |