Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f6a5580 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Florian Tobias Schandinat
Browse files

fbdev: Make pixel_to_pat() failure mode more friendly 



If we accidentally pass an incorrect bpp value to pixel_to_pat(),
it panics. This is pretty useless, as we generally have the various
console locks held at that point, so nothing will be displayed,
and there is no reason to make this a fatal event.

Let's WARN instead.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent f7c848b6

drivers/video/fb_draw.h

+5 −2
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ 




#include <asm/types.h>

#include <asm/types.h>

#include <linux/fb.h>

#include <linux/fb.h>

#include <linux/bug.h>





    /*

    /*

     *  Compose two values, using a bitmask as decision value

     *  Compose two values, using a bitmask as decision value
@@ -41,7 +42,8 @@ pixel_to_pat( u32 bpp, u32 pixel) 
	case 32:

	case 32:

		return 0x0000000100000001ul*pixel;

		return 0x0000000100000001ul*pixel;

	default:

	default:

		panic("pixel_to_pat(): unsupported pixelformat\n");

		WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);

		return 0;

    }

    }

}

}

#else

#else
@@ -66,7 +68,8 @@ pixel_to_pat( u32 bpp, u32 pixel) 
	case 32:

	case 32:

		return 0x00000001ul*pixel;

		return 0x00000001ul*pixel;

	default:

	default:

		panic("pixel_to_pat(): unsupported pixelformat\n");

		WARN(1, "pixel_to_pat(): unsupported pixelformat %d\n", bpp);

		return 0;

    }

    }

}

}

#endif

#endif