Ville Syrjälä 6cef2b8a56 drm/i915: Fix LP1 sprite watermarks for ILK/SNB ...

ILK/SNB don't have LP2+ watermarks for sprites. Also the LP1 sprite
watermark register has its own enable bit. Take these differences
into account when programming the LP1+ registers.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2013-12-17 13:17:52 +01:00

..

accessibility

…

acpi

Merge branch 'acpica'

2013-11-27 01:03:27 +01:00

amba

…

ata

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2013-12-06 08:30:18 -08:00

atm

atm: idt77252: fix dev refcnt leak

2013-11-19 15:53:02 -05:00

auxdisplay

…

base

Merge branches 'pm-cpuidle' and 'pm-cpufreq'

2013-12-06 02:17:59 +01:00

bcma

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2013-11-13 17:40:34 +09:00

block

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2013-12-05 15:33:27 -08:00

bluetooth

…

bus

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2013-11-14 08:51:29 +09:00

cdrom

…

char

Merge tag 'v3.13-rc3' into drm-intel-next-queued

2013-12-09 09:19:14 +01:00

clk

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2013-11-15 16:47:22 -08:00

clocksource

clocksource: arm_arch_timer: Hide eventstream Kconfig on non-ARM

2013-11-21 00:06:52 +01:00

connector

connector: improved unaligned access error fix

2013-11-14 17:19:20 -05:00

cpufreq

Merge branches 'pm-cpuidle' and 'pm-cpufreq'

2013-12-06 02:17:59 +01:00

cpuidle

cpuidle: Check for dev before deregistering it.

2013-12-03 22:05:22 +01:00

crypto

crypto: talitos - fix aead sglen for case 'dst != src'

2013-11-28 22:25:17 +08:00

dca

…

devfreq

…

dio

…

dma

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-11-20 13:20:24 -08:00

edac

Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

2013-11-18 14:51:52 -08:00

eisa

…

extcon

…

firewire

[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers

2013-11-29 08:48:39 +04:00

firmware

efi-pstore: Make efi-pstore return a unique id

2013-11-29 10:11:06 +00:00

fmc

…

gpio

gpiolib: change a warning to debug message when failing to get gpio

2013-12-03 13:10:48 +01:00

gpu

drm/i915: Fix LP1 sprite watermarks for ILK/SNB

2013-12-17 13:17:52 +01:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2013-11-27 20:41:54 -08:00

hsi

…

hv

…

hwmon

Merge branch 'acpica'

2013-11-27 01:03:27 +01:00

hwspinlock

…

i2c

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2013-11-29 09:55:13 -08:00

ide

Merge tag 'pm+acpi-2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2013-11-20 13:25:04 -08:00

idle

intel_idle: Fixed C6 state on Avoton/Rangeley processors

2013-11-28 14:35:26 +01:00

iio

Merge tag 'fixes-for-3.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

2013-11-25 12:50:11 -08:00

infiniband

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-11-22 10:52:03 -08:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2013-11-24 10:45:29 -08:00

iommu

Don't try to compile shmobile-iommu outside of ARM

2013-11-15 18:57:42 -08:00

ipack

…

irqchip

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2013-12-02 10:15:39 -08:00

isdn

net: rework recvmsg handler msg_name and msg_namelen logic

2013-11-20 21:52:30 -05:00

leds

leds: pwm: Fix for deferred probe in DT booted mode

2013-12-02 11:53:17 -08:00

lguest

…

macintosh

powerpc/windfarm: Fix XServe G5 fan control Makefile issue

2013-11-27 11:35:47 +11:00

mailbox

…

md

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2013-12-05 15:33:27 -08:00

media

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-11-20 13:20:24 -08:00

memory

…

memstick

tree-wide: use reinit_completion instead of INIT_COMPLETION

2013-11-15 09:32:21 +09:00

message

drivers/message/i2o/driver.c: add missing destroy_workqueue() on error in i2o_driver_register()

2013-11-13 12:09:26 +09:00

mfd

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2013-11-15 16:47:22 -08:00

misc

[SCSI] enclosure: fix WARN_ON in dual path device removing

2013-12-02 11:13:14 -08:00

mmc

mmc: omap: Fix I2C dependency and make driver usable with device tree

2013-11-26 15:51:16 -08:00

mtd

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-11-20 13:20:24 -08:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-12-02 10:09:07 -08:00

nfc

…

ntb

Merge tag 'ntb-3.13' of git://github.com/jonmason/ntb

2013-11-26 11:15:12 -08:00

nubus

…

of

Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm

2013-11-14 07:55:21 +09:00

oprofile

…

parisc

…

parport

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

2013-11-15 14:05:15 -08:00

pci

remove obsolete references to powertweak

2013-11-27 20:34:32 -08:00

pcmcia

Merge tag 'devicetree-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

2013-11-12 16:52:17 +09:00

phy

…

pinctrl

sh-pfc: sh7372: Fix pin bias setup

2013-12-03 10:38:41 +01:00

platform

sony-laptop: do not scribble keyboard backlight registers on resume

2013-11-26 13:03:36 +09:00

pnp

PNP: fix restoring devices after hibernation

2013-12-05 02:01:55 +01:00

power

Merge tag 'for-v3.13' of git://git.infradead.org/battery-2.6

2013-11-18 15:35:09 -08:00

powercap

PowerCap: Fix mode for energy counter

2013-12-05 02:05:48 +01:00

pps

drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr

2013-11-13 12:09:35 +09:00

ps3

…

ptp

…

pwm

…

rapidio

…

regulator

Merge remote-tracking branch 'regulator/fix/pfuze100' into regulator-linus

2013-11-24 14:02:50 +00:00

remoteproc

…

reset

…

rpmsg

…

rtc

ARM: drivers/rtc/rtc-at91rm9200.c: disable interrupts at shutdown

2013-11-21 16:42:27 -08:00

s390

s390/dasd: validate request size before building CCW/TCW request

2013-11-20 09:04:54 +01:00

sbus

…

scsi

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2013-12-06 08:30:18 -08:00

sfi

…

sh

…

sn

…

spi

Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x-psc', 'spi/fix/mxs', 'spi/fix/pxa2xx', 'spi/fix/qspi', 'spi/fix/rspi' and 'spi/fix/txx9' into spi-linus

2013-11-28 11:31:35 +00:00

ssb

…

staging

Staging: tidspbridge: disable driver

2013-11-27 09:32:49 -08:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-11-22 10:52:03 -08:00

tc

…

thermal

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-11-19 15:50:47 -08:00

tty

Revert "n_gsm: race between ld close and gsmtty open"

2013-11-25 18:30:21 -08:00

uio

uio: we cannot mmap unaligned page contents

2013-12-02 11:50:37 -08:00

usb

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-11-22 10:52:03 -08:00

uwb

…

vfio

…

vhost

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2013-11-22 10:52:03 -08:00

video

video: vt8500: fix error handling in probe()

2013-12-04 10:50:16 +02:00

virt

…

virtio

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2013-11-15 13:28:47 +09:00

vlynq

…

vme

…

w1

drivers/w1/masters/w1-gpio.c: use dev_get_platdata()

2013-11-15 09:32:21 +09:00

watchdog

watchdog: w83627hf: Use helper functions to access superio registers

2013-11-18 21:34:19 +01:00

xen

Merge tag 'stable/for-linus-3.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2013-12-02 10:12:01 -08:00

zorro

…

Kconfig

Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2013-11-14 13:41:48 +09:00

Makefile

Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2013-11-14 13:41:48 +09:00