Attachment 11286 Details for Bug 43458 – Патч для ядра 5.18, но легко переделать для 5.10

[patch] Патч для ядра 5.18, но легко переделать для 5.10

linux-arm-20220805-5.18-next.patch (text/plain), 1.30 KB, created by Nikolay Zhuravlev on 2022-08-05 12:26:07 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolay Zhuravlev

Created: 2022-08-05 12:26:07 MSK

Size: 1.30 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
>index cf8761bbaf8e..b1e6d238674f 100644
>--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
>+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
>@@ -563,10 +563,6 @@ static int panfrost_probe(struct platform_device *pdev)
> 		return -ENODEV;
> 
> 	pfdev->coherent = device_get_dma_attr(&pdev->dev) == DEV_DMA_COHERENT;
>-	if (!pfdev->coherent && of_device_is_compatible(of_root, "baikal,baikal-m")) {
>-		pfdev->coherent = true;
>-		dev_warn(&pdev->dev, "marking as DMA coherent on BE-M1000");
>-	}
> 
> 	/* Allocate and initialize the DRM device. */
> 	ddev = drm_dev_alloc(&panfrost_drm_driver, &pdev->dev);
>diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
>index b285a8001b1d..03728dff1f80 100644
>--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
>+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
>@@ -136,6 +136,10 @@ static void panfrost_mmu_enable(struct panfrost_device *pfdev, struct panfrost_m
> 	/* Need to revisit mem attrs.
> 	 * NC is the default, Mali driver is inner WT.
> 	 */
>+	if (panfrost_model_eq(pfdev, 0x620)) {
>+		memattr &= ~0xf0f0f0ULL;
>+		memattr |= 0x404040;
>+	}
> 	mmu_write(pfdev, AS_MEMATTR_LO(as_nr), lower_32_bits(memattr));
> 	mmu_write(pfdev, AS_MEMATTR_HI(as_nr), upper_32_bits(memattr));
>

Actions: View | Diff

Attachments on bug 43458: 11286 | 13336 | 14174 | 14175