package/kernel/linux/hotfix-sgi-o2-gbe.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/linux/hotfix-sgi-o2-gbe.patch
   3 # Copyright (C) 2024 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 --- linux-6.6/drivers/video/fbdev/gbefb.c.vanilla       2024-01-07 20:50:29.647506488 +0100
  15 +++ linux-6.6/drivers/video/fbdev/gbefb.c       2024-01-08 00:28:01.651948701 +0100
  16 @@ -12,6 +12,7 @@
  17  #include <linux/delay.h>
  18  #include <linux/platform_device.h>
  19  #include <linux/dma-mapping.h>
  20 +#include <linux/dma-direct.h>
  21  #include <linux/errno.h>
  22  #include <linux/gfp.h>
  23  #include <linux/fb.h>
  24 @@ -65,7 +66,7 @@
  25  static unsigned int gbe_mem_size = CONFIG_FB_GBE_MEM * 1024*1024;
  26  static void *gbe_mem;
  27  static dma_addr_t gbe_dma_addr;
  28 -static unsigned long gbe_mem_phys;
  29 +static phys_addr_t gbe_mem_phys;
  30
  31  static struct {
  32         uint16_t *cpu;
  33 @@ -1182,7 +1182,7 @@
  34                         goto out_release_mem_region;
  35                 }
  36
  37 -               gbe_mem_phys = (unsigned long) gbe_dma_addr;
  38 +               gbe_mem_phys = dma_to_phys(&p_dev->dev, gbe_dma_addr);
  39         }
  40
  41         par = info->par;