diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-14 14:15:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-03-14 14:15:13 +1000 |
| commit | 34db18abd376b2075c760c38f0b861aed379415d (patch) | |
| tree | c4174e39a2f445f17c25ab206d45c66217bbbf85 /include/drm | |
| parent | e73f88af66fcc50083fae4b7e1c39b469179a97a (diff) | |
| parent | 47ae63e0c2e5fdb582d471dc906eb29be94c732f (diff) | |
Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next
* 'intel/drm-intel-next' of ../drm-next: (755 commits)
drm/i915: Only wait on a pending flip if we intend to write to the buffer
drm/i915/dp: Sanity check eDP existence
drm/i915: Rebind the buffer if its alignment constraints changes with tiling
drm/i915: Disable GPU semaphores by default
drm/i915: Do not overflow the MMADDR write FIFO
Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
drm/i915: Don't save/restore hardware status page address register
drm/i915: don't store the reg value for HWS_PGA
drm/i915: fix memory corruption with GM965 and >4GB RAM
Linux 2.6.38-rc7
Revert "TPM: Long default timeout fix"
drm/i915: Re-enable GPU semaphores for SandyBridge mobile
drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#"
Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU"
drm/i915: Allow relocation deltas outside of target bo
drm/i915: Silence an innocuous compiler warning for an unused variable
fs/block_dev.c: fix new kernel-doc warning
ACPI: Fix build for CONFIG_NET unset
mm: <asm-generic/pgtable.h> must include <linux/mm_types.h>
x86: Use u32 instead of long to set reset vector back to 0
...
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 2 | ||||
| -rw-r--r-- | include/drm/i915_drm.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 835214761d4..ad5770f2315 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1134,7 +1134,7 @@ struct drm_device { struct usb_device *usbdev; struct drm_sg_mem *sg; /**< Scatter gather memory */ - int num_crtcs; /**< Number of CRTCs on this device */ + unsigned int num_crtcs; /**< Number of CRTCs on this device */ void *dev_private; /**< device private data */ void *mm_private; struct address_space *dev_mapping; diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 0039f1f97ad..c4d6dbfa3ff 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -290,6 +290,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_HAS_RELAXED_FENCING 12 #define I915_PARAM_HAS_COHERENT_RINGS 13 #define I915_PARAM_HAS_EXEC_CONSTANTS 14 +#define I915_PARAM_HAS_RELAXED_DELTA 15 typedef struct drm_i915_getparam { int param; |