From: Zsolt Kajtar <soci@c64.rulez.org>
Date: Mon, 10 Mar 2025 06:57:45 +0000 (+0100)
Subject: fbdev: mach64_cursor: Remove fb_draw.h includes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b8389cbe2dd9227f9a1fd63c7ea554efe37142fc;p=users%2Fjedix%2Flinux-maple.git

fbdev: mach64_cursor: Remove fb_draw.h includes

Remove dependency on fb_draw.h to allow fbcon packed pixel drawing refactoring.

Signed-off-by: Zsolt Kajtar <soci@c64.rulez.org>
Signed-off-by: Helge Deller <deller@gmx.de>
---

diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
index 971355c2cd7e1..e826cb7dd55da 100644
--- a/drivers/video/fbdev/aty/mach64_cursor.c
+++ b/drivers/video/fbdev/aty/mach64_cursor.c
@@ -6,7 +6,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/string.h>
-#include "../core/fb_draw.h"
 
 #include <asm/io.h>
 
@@ -57,6 +56,12 @@
  * definitation and CUR_VERT_POSN must be saturated to zero.
  */
 
+/* compose pixels based on mask */
+static inline unsigned long comp(unsigned long set, unsigned long unset, unsigned long mask)
+{
+	return ((set ^ unset) & mask) ^ unset;
+}
+
     /*
      *  Hardware Cursor support.
      */