Ville Syrjälä 334810f820 drm/i915: Fix watermark calculations for DG2 CCS+CC modifier ...

Take the DG2 CCS+CC modifier into account when calculating the
watermarks. Othwerwise we'll calculate the watermarks thinking this
tile-4 modifier is linear.

The rc_surface part is actually a nop since that is not used
for any glk+ platform.

Cc: stable@vger.kernel.org
Fixes: 680025dcc4 ("drm/i915/dg2: Add support for DG2 clear color compression")
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-6-ville.syrjala@linux.intel.com

2022-10-03 18:45:38 +03:00

..

accessibility

Merge tag 'tty-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2022-08-08 11:31:40 -07:00

acpi

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

2022-08-11 13:26:09 -07:00

amba

ARM: 9220/1: amba: Remove deferred device addition

2022-07-28 15:09:23 +01:00

android

Merge tag 'mm-stable-2022-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2022-08-05 16:32:45 -07:00

ata

ata: libata-eh: Add missing command name

2022-08-16 05:42:51 +09:00

atm

atm: idt77252: fix use-after-free bugs caused by tst_timer

2022-08-08 20:51:59 -07:00

auxdisplay

…

base

Merge tag 'driver-core-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2022-08-04 11:31:20 -07:00

bcma

…

block

Merge tag 'block-6.0-2022-08-19' of git://git.kernel.dk/linux-block

2022-08-20 10:17:05 -07:00

bluetooth

Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

2022-08-04 12:12:54 -07:00

bus

Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

2022-08-04 12:12:54 -07:00

cdrom

…

char

Merge tag 's390-5.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2022-08-06 17:05:21 -07:00

clk

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

2022-08-04 18:40:08 -07:00

clocksource

RISC-V: Add Sstc extension support

2022-08-11 14:41:52 -07:00

comedi

Merge tag 'pci-v5.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2022-08-04 19:30:35 -07:00

connector

…

counter

…

cpufreq

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

2022-08-08 14:29:00 -07:00

cpuidle

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

2022-08-08 14:29:00 -07:00

crypto

Merge tag 'v5.20-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2022-08-02 17:45:14 -07:00

cxl

cxl/hdm: Fix skip allocations vs multiple pmem allocations

2022-08-05 16:11:38 -07:00

dax

dax: introduce holder for dax_device

2022-07-17 17:14:30 -07:00

dca

…

devfreq

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

2022-08-08 14:29:00 -07:00

dio

…

dma

Merge tag 'pci-v5.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2022-08-04 19:30:35 -07:00

dma-buf

Merge tag 'drm-misc-next-2022-09-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

2022-09-11 22:03:07 +10:00

edac

Merge tag 'powerpc-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2022-08-06 16:38:17 -07:00

eisa

…

extcon

…

firewire

firewire: net: Make use of get_unaligned_be48(), put_unaligned_be48()

2022-07-28 22:21:54 -07:00

firmware

Merge tag 'drm-misc-next-2022-08-20-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

2022-09-06 10:56:04 +02:00

fpga

…

fsi

…

gnss

…

gpio

Merge tag 'gpio-updates-for-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux

2022-08-04 18:34:05 -07:00

gpu

drm/i915: Fix watermark calculations for DG2 CCS+CC modifier

2022-10-03 18:45:38 +03:00

greybus

…

hid

Merge tag 'platform-drivers-x86-v6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

2022-08-04 18:19:14 -07:00

hsi

…

hte

…

hv

Drivers: hv: Create debugfs file with hyper-v balloon usage information

2022-07-18 11:19:02 +00:00

hwmon

hwmon: (nct6775) Fix platform driver suspend regression

2022-08-10 06:37:01 -07:00

hwspinlock

hwspinlock: qcom: Add support for mmio usage to sfpb-mutex

2022-07-16 21:47:44 -05:00

hwtracing

Merge tag 'asm-generic-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2022-08-05 10:07:23 -07:00

i2c

i2c: imx: Make sure to unregister adapter on remove()

2022-08-21 10:27:33 +02:00

i3c

…

idle

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

2022-08-02 11:17:00 -07:00

iio

iio: light: isl29028: Fix the warning in isl29028_remove()

2022-07-19 09:42:11 +01:00

infiniband

RDMA: Handle the return code from dma_resv_wait_timeout() properly

2022-08-16 17:13:23 +03:00

input

Merge tag 'input-for-v5.20-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2022-08-11 09:23:08 -07:00

interconnect

Merge branch 'icc-rpm' into icc-next

2022-07-15 17:56:31 +03:00

iommu

Merge tag 'irqchip-fixes-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

2022-08-18 17:37:22 +02:00

ipack

…

irqchip

Merge tag 'irqchip-fixes-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

2022-08-18 17:37:22 +02:00

isdn

…

leds

Merge tag 'leds-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds

2022-08-08 11:36:21 -07:00

macintosh

macintosh/adb: fix oob read in do_adb_query() function

2022-07-20 22:06:30 +10:00

mailbox

Merge tag 'mailbox-v5.20' of git://git.linaro.org/landing-teams/working/fujitsu/integration

2022-08-08 10:19:40 -07:00

mcb

…

md

Merge tag 'for-6.0/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

2022-08-11 19:46:48 -07:00

media

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

2022-08-08 14:29:00 -07:00

memory

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

2022-08-08 14:29:00 -07:00

memstick

Merge tag 'mmc-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

2022-08-04 19:41:09 -07:00

message

…

mfd

Merge tag 'mfd-next-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2022-08-06 10:25:16 -07:00

misc

Merge tag 'mm-stable-2022-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2022-08-05 16:32:45 -07:00

mmc

mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC

2022-08-15 19:31:04 +02:00

most

…

mtd

Merge tag 'mtd/for-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

2022-08-05 14:13:45 -07:00

mux

…

net

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

2022-08-20 10:49:02 -07:00

nfc

…

ntb

NTB: epf: Allow more flexibility in the memory BAR map method

2022-08-09 17:54:03 -04:00

nubus

…

nvdimm

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2022-08-12 09:50:34 -07:00

nvme

Merge tag 'block-6.0-2022-08-12' of git://git.kernel.dk/linux-block

2022-08-13 13:37:36 -07:00

nvmem

Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

2022-08-04 12:12:54 -07:00

of

Merge tag 'riscv-for-linus-5.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux

2022-08-12 18:39:43 -07:00

opp

Merge tag 'opp-updates-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm

2022-08-03 17:49:38 +02:00

parisc

Merge tag 'for-5.20/parisc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

2022-08-05 09:58:58 -07:00

parport

…

pci

Merge tag 'ntb-5.20' of https://github.com/jonmason/ntb

2022-08-13 14:00:45 -07:00

pcmcia

…

peci

…

perf

perf: riscv legacy: fix kerneldoc comment warning

2022-08-18 14:19:26 -07:00

phy

Merge tag 'pci-v5.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2022-08-04 19:30:35 -07:00

pinctrl

Merge tag 'pinctrl-v6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2022-08-10 11:01:44 -07:00

platform

Merge tag 'sound-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2022-08-19 09:46:11 -07:00

pnp

PCI: Remove pci_get_legacy_ide_irq() and asm-generic/pci.h

2022-07-22 17:23:45 -05:00

power

Merge tag 'for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

2022-08-12 09:37:33 -07:00

powercap

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

2022-08-02 11:17:00 -07:00

pps

…

ps3

…

ptp

Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

2022-08-04 12:12:54 -07:00

pwm

Merge tag 'spdx-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

2022-08-04 12:12:54 -07:00

rapidio

…

ras

…

regulator

Merge tag 'regulator-fix-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

2022-08-16 11:36:38 -07:00

remoteproc

virtio: Revert "virtio: find_vqs() add arg sizes"

2022-08-16 01:40:24 -04:00

reset

Merge tag 'arm-late-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2022-08-05 10:02:33 -07:00

rpmsg

rpmsg: convert sysfs snprintf to sysfs_emit

2022-07-16 23:08:47 -05:00

rtc

rtc: spear: set range max

2022-08-09 00:56:41 +02:00

s390

Merge tag 's390-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2022-08-20 11:29:01 -07:00

sbus

…

scsi

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

2022-08-13 13:41:48 -07:00

sh

…

siox

…

slimbus

…

soc

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

2022-08-08 14:29:00 -07:00

soundwire

Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2022-08-06 10:19:51 -07:00

spi

Merge tag 'spi-fix-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

2022-08-16 11:40:15 -07:00

spmi

…

ssb

…

staging

Merge tag 'drm-misc-next-2022-08-20-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

2022-09-06 10:56:04 +02:00

target

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

2022-08-13 13:41:48 -07:00

tc

…

tee

tee: add overflow check in register_shm_helper()

2022-08-18 09:20:27 -07:00

thermal

Merge tag 'thermal-5.20-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2022-08-08 14:23:37 -07:00

thunderbolt

Merge tag 'usb-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2022-08-04 11:41:28 -07:00

tty

Merge tag 'tty-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2022-08-08 11:31:40 -07:00

ufs

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

2022-08-13 13:41:48 -07:00

uio

…

usb

Merge tag 'tty-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2022-08-08 11:31:40 -07:00

vdpa

vdpa/mlx5: Fix possible uninitialized return value

2022-08-11 10:00:36 -04:00

vfio

vfio: Move vfio.c to vfio_main.c

2022-08-08 14:33:41 -06:00

vhost

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2022-08-12 09:50:34 -07:00

video

Merge tag 'drm-misc-next-2022-09-09' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

2022-09-11 22:03:07 +10:00

virt

Merge tag 'char-misc-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2022-08-04 11:05:48 -07:00

virtio

virtio: kerneldocs fixes and enhancements

2022-08-16 01:40:24 -04:00

vlynq

…

w1

…

watchdog

Merge tag 'linux-watchdog-5.20-rc1' of git://www.linux-watchdog.org/linux-watchdog

2022-08-08 15:04:04 -07:00

xen

Merge tag 'for-linus-6.0-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2022-08-14 09:28:54 -07:00

zorro

…

Kconfig

…

Makefile

Merge tag 'staging-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2022-08-04 12:01:42 -07:00