drm: Add driver for PowerPC OF displays
Subsystems (3)
Thomas Zimmermann
maintainerv3 cover drm: Add driver for PowerPC OF displays
PowerPC's Open Firmware offers a simple display buffer for graphics output. Add ofdrm, a DRM driver for the device. As with the existing simpledrm driver, the graphics hardware is pre-initialized by the firmware. The driver only provides blitting, no actual DRM modesetting is possible.
For version 3 of this patchset, all preparatory changes have been merged into the DRM codebase. Only ofdrm changes are left.
Patch 1 adds ofdrm, which has again been significantly reworked. The FWFB library has been removed infavor of various functions in existing DRM helper libraries. Ofdrm now supports damage iterators and synchronization for imported GEM BOs.
Patches 2 to 4 add support for color management. The code has been taken from fbdev's offb. I have no hardware available for testing the functionality. Qemu's stdvga apparently does not support gamma tables in RGB modes. I verified that the color management code is executed by running Gnome's night-mode settings, but the display's color tone does not change.
Thomas Zimmermann (4):
drm/ofdrm: Add ofdrm for Open Firmware framebuffers drm/ofdrm: Add CRTC state
drm/ofdrm: Add per-model device function drm/ofdrm: Support color management
MAINTAINERS | 1 + drivers/gpu/drm/tiny/Kconfig | 13 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/ofdrm.c | 1351 +++++++++++++++++++++++++++++++++ drivers/video/fbdev/Kconfig | 1 + 5 files changed, 1367 insertions(+) create mode 100644 drivers/gpu/drm/tiny/ofdrm.c
base-commit: a7d5d07d5ac5ac58ec81932b3f732e3127d17af9
Signature · 1 line
2.37.3
Thomas Zimmermann
maintainerPATCH v3 1/4 drm/ofdrm: Add ofdrm for Open Firmware framebuffers
Open Firmware provides basic display output via the 'display' node. DT platform code already provides a device that represents the node's framebuffer. Add a DRM driver for the device. The display mode and color format is pre-initialized by the system's firmware. Runtime modesetting via DRM is not possible. The display is useful during early boot stages or as error fallback.
Similar functionality is already provided by fbdev's offb driver, which is insufficient for modern userspace. The old driver includes support for BootX device tree, which can be found on old 32-bit PowerPC Macintosh systems. If these are still in use, the functionality can be added to ofdrm or implemented in a new driver. As with simpledrm, the fbdev driver cannot be selected if ofdrm is already enabled.
Two notable points about the driver:
* Reading the framebuffer aperture from the device tree is not
reliable on all systems. Ofdrm takes the heuristics and a comment from offb to pick the correct range.
* No resource management may be tied to the underlying PCI device.
Otherwise the handover to the native driver will fail with a resource conflict. PCI management is therefore done as part of the platform device's cleanup.
The driver has been tested on qemu's ppc64le emulation. The device hand-over has been tested with bochs.
v3:
* reintegrate FWFB helpers into ofdrm
* use damage iterator
* sync GEM BOs with drm_gem_fb_{begin,end}_cpu_access()
* fix various atomic_check helpers
* remove CRTC atomic_{enable,disable} (Javier)
* compute stride with drm_format_info_min_pitch() (Daniel)
v2:
* removed simple-pipe helpers
* built driver on top of FWFB helpers
* merged all init code into single function
* make PCI support optional (Michal)
* support COMPILE_TEST (Javier)
--- MAINTAINERS | 1 + drivers/gpu/drm/tiny/Kconfig | 13 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/ofdrm.c | 741 ++++++++++++++++++++++++++++++++++ drivers/video/fbdev/Kconfig | 1 + 5 files changed, 757 insertions(+) create mode 100644 drivers/gpu/drm/tiny/ofdrm.c
MAINTAINERS +1 -0
@@ -6655,6 +6655,7 @@ L: [email protected] S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc F: drivers/gpu/drm/drm_aperture.c +F: drivers/gpu/drm/tiny/ofdrm.c F: drivers/gpu/drm/tiny/simpledrm.c F: drivers/video/aperture.c F: include/drm/drm_aperture.h
drivers/gpu/drm/tiny/Kconfig +13 -0
@@ -51,6 +51,19 @@ config DRM_GM12U320 This is a KMS driver for projectors which use the GM12U320 chipset for video transfer over USB2/3, such as the Acer C120 mini projector. +config DRM_OFDRM + tristate "Open Firmware display driver" + depends on DRM && OF && (PPC || COMPILE_TEST) + select APERTURE_HELPERS + select DRM_GEM_SHMEM_HELPER + select DRM_KMS_HELPER + help + DRM driver for Open Firmware framebuffers. + + This driver assumes that the display hardware has been initialized + by the Open Firmware before the kernel boots. Scanout buffer, size, + and display format must be provided via device tree. + config DRM_PANEL_MIPI_DBI tristate "DRM support for MIPI DBI compatible panels" depends on DRM && SPI
drivers/gpu/drm/tiny/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o obj-$(CONFIG_DRM_BOCHS) += bochs.o obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o obj-$(CONFIG_DRM_GM12U320) += gm12u320.o +obj-$(CONFIG_DRM_OFDRM) += ofdrm.o obj-$(CONFIG_DRM_PANEL_MIPI_DBI) += panel-mipi-dbi.o obj-$(CONFIG_DRM_SIMPLEDRM) += simpledrm.o obj-$(CONFIG_TINYDRM_HX8357D) += hx8357d.o
drivers/gpu/drm/tiny/ofdrm.c new file +741 -0
741 lines not on this page · raw message
drivers/video/fbdev/Kconfig +1 -0
@@ -455,6 +455,7 @@ config FB_ATARI config FB_OF bool "Open Firmware frame buffer device support" depends on (FB = y) && PPC && (!PPC_PSERIES || PCI) + depends on !DRM_OFDRM select APERTURE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA
Signature · 1 line
2.37.3
Re: [PATCH v3 1/4] drm/ofdrm: Add ofdrm for Open Firmware framebuffers
Hi Thomas,
Quoted 7 lines · Thomas Zimmermann
Open Firmware provides basic display output via the 'display' node. DT platform code already provides a device that represents the node's framebuffer. Add a DRM driver for the device. The display mode and color format is pre-initialized by the system's firmware. Runtime modesetting via DRM is not possible. The display is useful during early boot stages or as error fallback.
Quoted 7 lines
Similar functionality is already provided by fbdev's offb driver, which is insufficient for modern userspace. The old driver includes support for BootX device tree, which can be found on old 32-bit PowerPC Macintosh systems. If these are still in use, the functionality can be added to ofdrm or implemented in a new driver. As with simpledrm, the fbdev driver cannot be selected if ofdrm is already enabled.
Thanks for your patch!
Quoted 2 lines
The driver has been tested on qemu's ppc64le emulation. The device hand-over has been tested with bochs.
Oh, tested on little-endian only ;-)
Quoted 8 lines
drivers/gpu/drm/tiny/ofdrm.c new file +6
-0+static const struct drm_format_info *display_get_validated_format (struct drm_device *dev, +u32 depth) +{ +const struct drm_format_info *info; +u32 format; +
drivers/gpu/drm/tiny/ofdrm.c line 68
Quoted 10 lines
drivers/gpu/drm/tiny/ofdrm.c new file +10
-0+switch (depth) { +case 8 : + format =drm_mode_legacy_fb_format (8 ,8 ); +break ; +case 15 : +case 16 : + format =drm_mode_legacy_fb_format (16 , depth); +break ; +case 32 : + format =drm_mode_legacy_fb_format (32 ,24 );
Shouldn't all of these use drm_driver_legacy_fb_format() (and the driver set drm_mode_config.quirk_addfb_prefer_host_byte_order) to have a chance of working on traditional big-endian PPC?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Thomas Zimmermann
maintainerRe: [PATCH v3 1/4] drm/ofdrm: Add ofdrm for Open Firmware framebuffers
Hi Geert
Am 23.09.22 um 09:14 schrieb Geert Uytterhoeven:
Quoted 18 lines
Hi Thomas,
Quoted 7 lines · Thomas Zimmermann
Open Firmware provides basic display output via the 'display' node. DT platform code already provides a device that represents the node's framebuffer. Add a DRM driver for the device. The display mode and color format is pre-initialized by the system's firmware. Runtime modesetting via DRM is not possible. The display is useful during early boot stages or as error fallback.
Quoted 7 lines
Similar functionality is already provided by fbdev's offb driver, which is insufficient for modern userspace. The old driver includes support for BootX device tree, which can be found on old 32-bit PowerPC Macintosh systems. If these are still in use, the functionality can be added to ofdrm or implemented in a new driver. As with simpledrm, the fbdev driver cannot be selected if ofdrm is already enabled.
Quoted 6 lines
Thanks for your patch!
Quoted 2 lines
The driver has been tested on qemu's ppc64le emulation. The device hand-over has been tested with bochs.
Oh, tested on little-endian only ;-)
I wish it was easier to test. But it's hard to find hardware and a Linux for PowerPC these days, so I have limited options for testing. It's just qemu + a compatible distribution for me. My assumption has been that people who what to use it on anything else would send me a patch.
Quoted 15 lines
Quoted 15 lines
drivers/gpu/drm/tiny/ofdrm.c new file +12
-0+static const struct drm_format_info *display_get_validated_format (struct drm_device *dev, +u32 depth) +{ +const struct drm_format_info *info; +u32 format; + +switch (depth) { +case 8 : + format =drm_mode_legacy_fb_format (8 ,8 ); +break ; +case 15 : +case 16 :
Quoted 8 lines
drivers/gpu/drm/tiny/ofdrm.c line 68
Quoted 4 lines
drivers/gpu/drm/tiny/ofdrm.c new file +4
-0+ format =drm_mode_legacy_fb_format (16 , depth); +break ; +case 32 : + format =drm_mode_legacy_fb_format (32 ,24 );Shouldn't all of these use
drm_driver_legacy_fb_format()(and the driver set drm_mode_config.quirk_addfb_prefer_host_byte_order) to have a chance of working on traditional big-endian PPC?
That's a good point. The offb driver reads the endianess property. Ofdrm could do this and set the quirk bit accordingly. I won't have the option to test it, but the code seems easy enough to add it. I'll make an extra patch for this in the next iteration.
Best regards
Thomas
Quoted 11 lines
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev
Thomas Zimmermann
maintainerRe: [PATCH v3 1/4] drm/ofdrm: Add ofdrm for Open Firmware framebuffers
In reply to Geert UytterhoevenHi
Am 23.09.22 um 09:14 schrieb Geert Uytterhoeven:
Quoted 39 lines
Hi Thomas,
Quoted 7 lines · Thomas Zimmermann
Open Firmware provides basic display output via the 'display' node. DT platform code already provides a device that represents the node's framebuffer. Add a DRM driver for the device. The display mode and color format is pre-initialized by the system's firmware. Runtime modesetting via DRM is not possible. The display is useful during early boot stages or as error fallback.
Quoted 7 lines
Similar functionality is already provided by fbdev's offb driver, which is insufficient for modern userspace. The old driver includes support for BootX device tree, which can be found on old 32-bit PowerPC Macintosh systems. If these are still in use, the functionality can be added to ofdrm or implemented in a new driver. As with simpledrm, the fbdev driver cannot be selected if ofdrm is already enabled.
Thanks for your patch!
Quoted 2 lines
The driver has been tested on qemu's ppc64le emulation. The device hand-over has been tested with bochs.
Oh, tested on little-endian only ;-)
Quoted 14 lines
drivers/gpu/drm/tiny/ofdrm.c new file +12
-0+static const struct drm_format_info *display_get_validated_format (struct drm_device *dev, +u32 depth) +{ +const struct drm_format_info *info; +u32 format; + +switch (depth) { +case 8 : + format =drm_mode_legacy_fb_format (8 ,8 ); +break ; +case 15 : +case 16 :
Quoted 8 lines
drivers/gpu/drm/tiny/ofdrm.c line 68
Quoted 4 lines
drivers/gpu/drm/tiny/ofdrm.c new file +4
-0+ format =drm_mode_legacy_fb_format (16 , depth); +break ; +case 32 : + format =drm_mode_legacy_fb_format (32 ,24 );Shouldn't all of these use
drm_driver_legacy_fb_format()(and the driver set drm_mode_config.quirk_addfb_prefer_host_byte_order) to have a chance of working on traditional big-endian PPC?
Big thanks to Michal Suchanek, who pointed me to a Tumbleweed installer for big-endian PPC64. I've added code to support BE scanout buffers. I'll add the patch to the next iteration. But Userspace isn't really ready yet. Pixman mostly works on my test system, but GL rendering displays incorrect colors.
Best regards
Thomas
Quoted 11 lines
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev
Thomas Zimmermann
maintainerPATCH v3 2/4 drm/ofdrm: Add CRTC state
In reply to Thomas ZimmermannAdd a dedicated CRTC state to ofdrm to later store information for palette updates.
v3:
* rework CRTC state helpers (Javier)
--- drivers/gpu/drm/tiny/ofdrm.c | 59 ++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-)
drivers/gpu/drm/tiny/ofdrm.c +56 -3
@@ -279,6 +279,21 @@ static struct resource *ofdrm_find_fb_resource(struct ofdrm_device *odev,* Modesetting */ +struct ofdrm_crtc_state { +struct drm_crtc_state base; +}; + +static struct ofdrm_crtc_state *to_ofdrm_crtc_state (struct drm_crtc_state *base) +{ + return container_of(base, struct ofdrm_crtc_state, base); +} + +static void ofdrm_crtc_state_destroy (struct ofdrm_crtc_state *ofdrm_crtc_state) +{ +__drm_atomic_helper_crtc_destroy_state (&ofdrm_crtc_state->base); +kfree (ofdrm_crtc_state); +} +/* * Support all formats of OF display and maybe more; in order * of preference. The display's update function will do any
@@ -429,13 +444,51 @@ static const struct drm_crtc_helper_funcs ofdrm_crtc_helper_funcs = { .atomic_check = ofdrm_crtc_helper_atomic_check, }; +static void ofdrm_crtc_reset (struct drm_crtc *crtc) +{ +struct ofdrm_crtc_state *ofdrm_crtc_state = +kzalloc (sizeof (*ofdrm_crtc_state),GFP_KERNEL ); + +if (crtc->state) +ofdrm_crtc_state_destroy (to_ofdrm_crtc_state (crtc->state)); + +if (ofdrm_crtc_state) +__drm_atomic_helper_crtc_reset (crtc, &ofdrm_crtc_state->base); +else +__drm_atomic_helper_crtc_reset (crtc,NULL ); +} + +static struct drm_crtc_state *ofdrm_crtc_atomic_duplicate_state (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct drm_crtc_state *crtc_state = crtc->state; +struct ofdrm_crtc_state *new_ofdrm_crtc_state; + +if (drm_WARN_ON (dev, !crtc_state)) +return NULL ; + + new_ofdrm_crtc_state =kzalloc (sizeof (*new_ofdrm_crtc_state),GFP_KERNEL ); +if (!new_ofdrm_crtc_state) +return NULL ; + +__drm_atomic_helper_crtc_duplicate_state (crtc, &new_ofdrm_crtc_state->base); + +return &new_ofdrm_crtc_state->base; +} + +static void ofdrm_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *crtc_state) +{ +ofdrm_crtc_state_destroy (to_ofdrm_crtc_state (crtc_state)); +} +static const struct drm_crtc_funcs ofdrm_crtc_funcs = { - .reset = drm_atomic_helper_crtc_reset, + .reset = ofdrm_crtc_reset, .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, - .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .atomic_duplicate_state = ofdrm_crtc_atomic_duplicate_state, + .atomic_destroy_state = ofdrm_crtc_atomic_destroy_state, };static int ofdrm_connector_helper_get_modes (struct drm_connector *connector)
Signature · 1 line
2.37.3
Thomas Zimmermann
maintainerPATCH v3 3/4 drm/ofdrm: Add per-model device function
In reply to Thomas ZimmermannAdd a per-model device-function structure in preparation of adding color-management support. Detection of the individual models has been taken from fbdev's offb.
v3:
* define constants for PCI ids (Javier)
--- drivers/gpu/drm/tiny/ofdrm.c | 125 +++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+)
drivers/gpu/drm/tiny/ofdrm.c +125 -0
@@ -28,6 +28,21 @@#define DRIVER_MAJOR 1#define DRIVER_MINOR 0 +#define PCI_VENDOR_ID_ATI_R520 0x7100 +#define PCI_VENDOR_ID_ATI_R600 0x9400 + +enum ofdrm_model { +OFDRM_MODEL_UNKNOWN , +OFDRM_MODEL_MACH64 ,/* ATI Mach64 */ +OFDRM_MODEL_RAGE128 ,/* ATI Rage128 */ +OFDRM_MODEL_RAGE_M3A ,/* ATI Rage Mobility M3 Head A */ +OFDRM_MODEL_RAGE_M3B ,/* ATI Rage Mobility M3 Head B */ +OFDRM_MODEL_RADEON ,/* ATI Radeon */ +OFDRM_MODEL_GXT2000 ,/* IBM GXT2000 */ +OFDRM_MODEL_AVIVO ,/* ATI R5xx */ +OFDRM_MODEL_QEMU ,/* QEMU VGA */ +}; +/* * Helpers for display nodes */
@@ -149,14 +164,63 @@ static u64 display_get_address_of(struct drm_device *dev, struct device_node *ofreturn address; } +static bool is_avivo (__be32 vendor,__be32 device) +{ +/* This will match most R5xx */ +return (vendor ==PCI_VENDOR_ID_ATI ) && + ((device >=PCI_VENDOR_ID_ATI_R520 && device <0x7800 ) || + (PCI_VENDOR_ID_ATI_R600 >=0x9400 )); +} + +static enum ofdrm_model display_get_model_of (struct drm_device *dev,struct device_node *of_node) +{ +enum ofdrm_model model =OFDRM_MODEL_UNKNOWN ; + +if (of_node_name_prefix (of_node,"ATY,Rage128" )) { + model =OFDRM_MODEL_RAGE128 ; + }else if (of_node_name_prefix (of_node,"ATY,RageM3pA" ) || +of_node_name_prefix (of_node,"ATY,RageM3p12A" )) { + model =OFDRM_MODEL_RAGE_M3A ; + }else if (of_node_name_prefix (of_node,"ATY,RageM3pB" )) { + model =OFDRM_MODEL_RAGE_M3B ; + }else if (of_node_name_prefix (of_node,"ATY,Rage6" )) { + model =OFDRM_MODEL_RADEON ; + }else if (of_node_name_prefix (of_node,"ATY," )) { +return OFDRM_MODEL_MACH64 ; + }else if (of_device_is_compatible (of_node,"pci1014,b7" ) || +of_device_is_compatible (of_node,"pci1014,21c" )) { + model =OFDRM_MODEL_GXT2000 ; + }else if (of_node_name_prefix (of_node,"vga,Display-" )) { +struct device_node *of_parent; +const __be32 *vendor_p, *device_p; + +/* Look for AVIVO initialized by SLOF */ + of_parent =of_get_parent (of_node); + vendor_p =of_get_property (of_parent,"vendor-id" ,NULL ); + device_p =of_get_property (of_parent,"device-id" ,NULL ); +if (vendor_p && device_p &&is_avivo (*vendor_p, *device_p)) + model =OFDRM_MODEL_AVIVO ; +of_node_put (of_parent); + }else if (of_device_is_compatible (of_node,"qemu,std-vga" )) { + model =OFDRM_MODEL_QEMU ; + } + +return model; +} +/* * Open Firmware display device */ +struct ofdrm_device_funcs { +}; +struct ofdrm_device {struct drm_device dev;struct platform_device *pdev; +const struct ofdrm_device_funcs *funcs; +/* simplefb settings */ struct iosys_map screen_base;struct drm_display_mode mode;
@@ -520,6 +584,33 @@ static const struct drm_mode_config_funcs ofdrm_mode_config_funcs = {* Init / Cleanup */ +static const struct ofdrm_device_funcs ofdrm_unknown_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_mach64_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_rage128_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_rage_m3a_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_rage_m3b_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_radeon_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_gxt2000_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_avivo_device_funcs = { +}; + +static const struct ofdrm_device_funcs ofdrm_qemu_device_funcs = { +}; +static struct drm_display_mode ofdrm_mode (unsigned int width,unsigned int height) {/*
@@ -541,6 +632,7 @@ static struct ofdrm_device *ofdrm_device_create(struct drm_driver *drv,struct device_node *of_node = pdev->dev.of_node;struct ofdrm_device *odev;struct drm_device *dev; +enum ofdrm_model model;int width, height, linebytes;const struct drm_format_info *format;u64 address;
@@ -569,6 +661,39 @@ static struct ofdrm_device *ofdrm_device_create(struct drm_driver *drv,* OF display-node settings */ + model =display_get_model_of (dev, of_node); +drm_dbg (dev,"detected model %d\n" , model); + +switch (model) { +case OFDRM_MODEL_UNKNOWN : + odev->funcs = &ofdrm_unknown_device_funcs; +break ; +case OFDRM_MODEL_MACH64 : + odev->funcs = &ofdrm_mach64_device_funcs; +break ; +case OFDRM_MODEL_RAGE128 : + odev->funcs = &ofdrm_rage128_device_funcs; +break ; +case OFDRM_MODEL_RAGE_M3A : + odev->funcs = &ofdrm_rage_m3a_device_funcs; +break ; +case OFDRM_MODEL_RAGE_M3B : + odev->funcs = &ofdrm_rage_m3b_device_funcs; +break ; +case OFDRM_MODEL_RADEON : + odev->funcs = &ofdrm_radeon_device_funcs; +break ; +case OFDRM_MODEL_GXT2000 : + odev->funcs = &ofdrm_gxt2000_device_funcs; +break ; +case OFDRM_MODEL_AVIVO : + odev->funcs = &ofdrm_avivo_device_funcs; +break ; +case OFDRM_MODEL_QEMU : + odev->funcs = &ofdrm_qemu_device_funcs; +break ; + } + width =display_get_width_of (dev, of_node);if (width <0 )return ERR_PTR (width);
Signature · 1 line
2.37.3
Thomas Zimmermann
maintainerPATCH v3 4/4 drm/ofdrm: Support color management
In reply to Thomas ZimmermannSupport the CRTC's color-management property and implement each model's palette support.
The OF hardware has different methods of setting the palette. The respective code has been taken from fbdev's offb and refactored into per-model device functions. The device functions integrate this functionality into the overall modesetting.
As palette handling is a CRTC property that depends on the primary plane's color format, the plane's atomic_check helper now updates the format field in ofdrm's custom CRTC state. The CRTC's atomic_flush helper updates the palette for the format as needed.
v3:
* lookup CRTC state with drm_atomic_get_new_crtc_state()
* access HW palette with writeb(), writel(), and readl() (Ben)
* declare register values as u32
--- drivers/gpu/drm/tiny/ofdrm.c | 442 ++++++++++++++++++++++++++++++++++- 1 file changed, 437 insertions(+), 5 deletions(-)
drivers/gpu/drm/tiny/ofdrm.c +437 -5
@@ -13,6 +13,7 @@#include <drm/drm_drv.h> #include <drm/drm_fb_helper.h> #include <drm/drm_format_helper.h> +#include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_gem_shmem_helper.h>
@@ -31,6 +32,33 @@#define PCI_VENDOR_ID_ATI_R520 0x7100#define PCI_VENDOR_ID_ATI_R600 0x9400 +#define OFDRM_GAMMA_LUT_SIZE 256 + +/* Definitions used by the Avivo palette */ +#define AVIVO_DC_LUT_RW_SELECT 0x6480 +#define AVIVO_DC_LUT_RW_MODE 0x6484 +#define AVIVO_DC_LUT_RW_INDEX 0x6488 +#define AVIVO_DC_LUT_SEQ_COLOR 0x648c +#define AVIVO_DC_LUT_PWL_DATA 0x6490 +#define AVIVO_DC_LUT_30_COLOR 0x6494 +#define AVIVO_DC_LUT_READ_PIPE_SELECT 0x6498 +#define AVIVO_DC_LUT_WRITE_EN_MASK 0x649c +#define AVIVO_DC_LUT_AUTOFILL 0x64a0 +#define AVIVO_DC_LUTA_CONTROL 0x64c0 +#define AVIVO_DC_LUTA_BLACK_OFFSET_BLUE 0x64c4 +#define AVIVO_DC_LUTA_BLACK_OFFSET_GREEN 0x64c8 +#define AVIVO_DC_LUTA_BLACK_OFFSET_RED 0x64cc +#define AVIVO_DC_LUTA_WHITE_OFFSET_BLUE 0x64d0 +#define AVIVO_DC_LUTA_WHITE_OFFSET_GREEN 0x64d4 +#define AVIVO_DC_LUTA_WHITE_OFFSET_RED 0x64d8 +#define AVIVO_DC_LUTB_CONTROL 0x6cc0 +#define AVIVO_DC_LUTB_BLACK_OFFSET_BLUE 0x6cc4 +#define AVIVO_DC_LUTB_BLACK_OFFSET_GREEN 0x6cc8 +#define AVIVO_DC_LUTB_BLACK_OFFSET_RED 0x6ccc +#define AVIVO_DC_LUTB_WHITE_OFFSET_BLUE 0x6cd0 +#define AVIVO_DC_LUTB_WHITE_OFFSET_GREEN 0x6cd4 +#define AVIVO_DC_LUTB_WHITE_OFFSET_RED 0x6cd8 +enum ofdrm_model {OFDRM_MODEL_UNKNOWN ,OFDRM_MODEL_MACH64 ,/* ATI Mach64 */
@@ -212,7 +240,14 @@ static enum ofdrm_model display_get_model_of(struct drm_device *dev, struct devi* Open Firmware display device */ +struct ofdrm_device ; +struct ofdrm_device_funcs { +void __iomem *(*cmap_ioremap)(struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_bas); +void (*cmap_write)(struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b); };struct ofdrm_device {
@@ -227,6 +262,9 @@ struct ofdrm_device {const struct drm_format_info *format;unsigned int pitch; +/* colormap */ +void __iomem *cmap_base; +/* modesetting */ uint32_t formats[8 ];struct drm_plane primary_plane;
@@ -339,12 +377,322 @@ static struct resource *ofdrm_find_fb_resource(struct ofdrm_device *odev,return max_res; } +/* +* Colormap / Palette +*/ + +static void __iomem *get_cmap_address_of (struct ofdrm_device *odev,struct device_node *of_node, +int bar_no,unsigned long offset,unsigned long size) +{ +struct drm_device *dev = &odev->dev; +const __be32 *addr_p; +u64 max_size, address; +unsigned int flags; +void __iomem *mem; + + addr_p =of_get_pci_address (of_node, bar_no, &max_size, &flags); +if (!addr_p) + addr_p =of_get_address (of_node, bar_no, &max_size, &flags); +if (!addr_p) +return ERR_PTR (-ENODEV ); + +if ((flags & (IORESOURCE_IO |IORESOURCE_MEM )) ==0 ) +return ERR_PTR (-ENODEV ); + +if ((offset + size) >= max_size) +return ERR_PTR (-ENODEV ); + + address =of_translate_address (of_node, addr_p); +if (address ==OF_BAD_ADDR ) +return ERR_PTR (-ENODEV ); + + mem =devm_ioremap (dev->dev, address + offset, size); +if (!mem) +return ERR_PTR (-ENOMEM ); + +return mem; +} + +static void __iomem *ofdrm_mach64_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +struct drm_device *dev = &odev->dev; +u64 address; +void __iomem *cmap_base; + + address = fb_base &0xff000000ul ; + address +=0x7ff000 ; + + cmap_base =devm_ioremap (dev->dev, address,0x1000 ); +if (!cmap_base) +return ERR_PTR (-ENOMEM ); + +return cmap_base; +} + +static void ofdrm_mach64_cmap_write (struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b) +{ +void __iomem *addr = odev->cmap_base +0xcc0 ; +void __iomem *data = odev->cmap_base +0xcc0 +1 ; + +writeb (index, addr); +writeb (r, data); +writeb (g, data); +writeb (b, data); +} + +static void __iomem *ofdrm_rage128_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +return get_cmap_address_of (odev, of_node,2 ,0 ,0x1fff ); +} + +static void ofdrm_rage128_cmap_write (struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b) +{ +void __iomem *addr = odev->cmap_base +0xb0 ; +void __iomem *data = odev->cmap_base +0xb4 ; +u32 color = (r <<16 ) | (g <<8 ) | b; + +writeb (index, addr); +writel (color, data); +} + +static void __iomem *ofdrm_rage_m3a_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +return get_cmap_address_of (odev, of_node,2 ,0 ,0x1fff ); +} + +static void ofdrm_rage_m3a_cmap_write (struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b) +{ +void __iomem *dac_ctl = odev->cmap_base +0x58 ; +void __iomem *addr = odev->cmap_base +0xb0 ; +void __iomem *data = odev->cmap_base +0xb4 ; +u32 color = (r <<16 ) | (g <<8 ) | b; +u32 val; + +/* Clear PALETTE_ACCESS_CNTL in DAC_CNTL */ + val =readl (dac_ctl); + val &= ~0x20 ; +writel (val, dac_ctl); + +/* Set color at palette index */ +writeb (index, addr); +writel (color, data); +} + +static void __iomem *ofdrm_rage_m3b_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +return get_cmap_address_of (odev, of_node,2 ,0 ,0x1fff ); +} + +static void ofdrm_rage_m3b_cmap_write (struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b) +{ +void __iomem *dac_ctl = odev->cmap_base +0x58 ; +void __iomem *addr = odev->cmap_base +0xb0 ; +void __iomem *data = odev->cmap_base +0xb4 ; +u32 color = (r <<16 ) | (g <<8 ) | b; +u32 val; + +/* Set PALETTE_ACCESS_CNTL in DAC_CNTL */ + val =readl (dac_ctl); + val |=0x20 ; +writel (val, dac_ctl); + +/* Set color at palette index */ +writeb (index, addr); +writel (color, data); +} + +static void __iomem *ofdrm_radeon_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +return get_cmap_address_of (odev, of_node,1 ,0 ,0x1fff ); +} + +static void __iomem *ofdrm_gxt2000_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +return get_cmap_address_of (odev, of_node,0 ,0x6000 ,0x1000 ); +} + +static void ofdrm_gxt2000_cmap_write (struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b) +{ +void __iomem *data = ((unsigned int __iomem *)odev->cmap_base) + index; +u32 color = (r <<16 ) | (g <<8 ) | b; + +writel (color, data); +} + +static void __iomem *ofdrm_avivo_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +struct device_node *of_parent; +void __iomem *cmap_base; + + of_parent =of_get_parent (of_node); + cmap_base =get_cmap_address_of (odev, of_parent,0 ,0 ,0x10000 ); +of_node_put (of_parent); + +return cmap_base; +} + +static void ofdrm_avivo_cmap_write (struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b) +{ +void __iomem *lutsel = odev->cmap_base +AVIVO_DC_LUT_RW_SELECT ; +void __iomem *addr = odev->cmap_base +AVIVO_DC_LUT_RW_INDEX ; +void __iomem *data = odev->cmap_base +AVIVO_DC_LUT_30_COLOR ; +u32 color = (r <<22 ) | (g <<12 ) | (b <<2 ); + +/* Write to both LUTs for now */ + +writel (1 , lutsel); +writeb (index, addr); +writel (color, data); + +writel (0 , lutsel); +writeb (index, addr); +writel (color, data); +} + +static void __iomem *ofdrm_qemu_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +#ifdef __BIG_ENDIAN +static const __be32 io_of_addr[3 ] = {0x01000000 ,0x0 ,0x0 }; +#else +static const __be32 io_of_addr[3 ] = {0x00000001 ,0x0 ,0x0 }; +#endif + +struct drm_device *dev = &odev->dev; +u64 address; +void __iomem *cmap_base; + + address =of_translate_address (of_node, io_of_addr); +if (address ==OF_BAD_ADDR ) +return ERR_PTR (-ENODEV ); + + cmap_base =devm_ioremap (dev->dev, address +0x3c8 ,2 ); +if (!cmap_base) +return ERR_PTR (-ENOMEM ); + +return cmap_base; +} + +static void ofdrm_qemu_cmap_write (struct ofdrm_device *odev,unsigned char index, +unsigned char r,unsigned char g,unsigned char b) +{ +void __iomem *addr = odev->cmap_base; +void __iomem *data = odev->cmap_base +1 ; + +writeb (index, addr); +writeb (r, data); +writeb (g, data); +writeb (b, data); +} + +static void ofdrm_device_set_gamma_linear (struct ofdrm_device *odev, +const struct drm_format_info *format) +{ +struct drm_device *dev = &odev->dev; +int i; + +switch (format->format) { +case DRM_FORMAT_RGB565 : +/* Use better interpolation, to take 32 values from 0 to 255 */ +for (i =0 ; i <OFDRM_GAMMA_LUT_SIZE /8 ; i++) { +unsigned char r = i *8 + i /4 ; +unsigned char g = i *4 + i /16 ; +unsigned char b = i *8 + i /4 ; + + odev->funcs->cmap_write (odev, i, r, g, b); + } +/* Green has one more bit, so add padding with 0 for red and blue. */ +for (i =OFDRM_GAMMA_LUT_SIZE /8 ; i <OFDRM_GAMMA_LUT_SIZE /4 ; i++) { +unsigned char r =0 ; +unsigned char g = i *4 + i /16 ; +unsigned char b =0 ; + + odev->funcs->cmap_write (odev, i, r, g, b); + } +break ; +case DRM_FORMAT_XRGB8888 : +for (i =0 ; i <OFDRM_GAMMA_LUT_SIZE ; i++) + odev->funcs->cmap_write (odev, i, i, i, i); +break ; +default : +drm_warn_once (dev,"Unsupported format %p4cc for gamma correction\n" , + &format->format); +break ; + } +} + +static void ofdrm_device_set_gamma (struct ofdrm_device *odev, +const struct drm_format_info *format, +struct drm_color_lut *lut) +{ +struct drm_device *dev = &odev->dev; +int i; + +switch (format->format) { +case DRM_FORMAT_RGB565 : +/* Use better interpolation, to take 32 values from lut[0] to lut[255] */ +for (i =0 ; i <OFDRM_GAMMA_LUT_SIZE /8 ; i++) { +unsigned char r = lut[i *8 + i /4 ].red >>8 ; +unsigned char g = lut[i *4 + i /16 ].green >>8 ; +unsigned char b = lut[i *8 + i /4 ].blue >>8 ; + + odev->funcs->cmap_write (odev, i, r, g, b); + } +/* Green has one more bit, so add padding with 0 for red and blue. */ +for (i =OFDRM_GAMMA_LUT_SIZE /8 ; i <OFDRM_GAMMA_LUT_SIZE /4 ; i++) { +unsigned char r =0 ; +unsigned char g = lut[i *4 + i /16 ].green >>8 ; +unsigned char b =0 ; + + odev->funcs->cmap_write (odev, i, r, g, b); + } +break ; +case DRM_FORMAT_XRGB8888 : +for (i =0 ; i <OFDRM_GAMMA_LUT_SIZE ; i++) { +unsigned char r = lut[i].red >>8 ; +unsigned char g = lut[i].green >>8 ; +unsigned char b = lut[i].blue >>8 ; + + odev->funcs->cmap_write (odev, i, r, g, b); + } +break ; +default : +drm_warn_once (dev,"Unsupported format %p4cc for gamma correction\n" , + &format->format); +break ; + } +} +/* * Modesetting */ struct ofdrm_crtc_state {struct drm_crtc_state base; + +/* Primary-plane format; required for color mgmt. */ +const struct drm_format_info *format; };static struct ofdrm_crtc_state *to_ofdrm_crtc_state (struct drm_crtc_state *base)
@@ -382,16 +730,30 @@ static int ofdrm_primary_plane_helper_atomic_check(struct drm_plane *plane, struct drm_atomic_state *new_state) {struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (new_state, plane); +struct drm_framebuffer *new_fb = new_plane_state->fb;struct drm_crtc *new_crtc = new_plane_state->crtc;struct drm_crtc_state *new_crtc_state =NULL ; +struct ofdrm_crtc_state *new_ofdrm_crtc_state; +int ret;if (new_crtc) new_crtc_state =drm_atomic_get_new_crtc_state (new_state, new_plane_state->crtc); -return drm_atomic_helper_check_plane_state (new_plane_state, new_crtc_state, -DRM_PLANE_NO_SCALING , -DRM_PLANE_NO_SCALING , - false, false); + ret =drm_atomic_helper_check_plane_state (new_plane_state, new_crtc_state, +DRM_PLANE_NO_SCALING , +DRM_PLANE_NO_SCALING , + false, false); +if (ret) +return ret; +else if (!new_plane_state->visible) +return 0 ; + + new_crtc_state =drm_atomic_get_new_crtc_state (new_state, new_plane_state->crtc); + + new_ofdrm_crtc_state =to_ofdrm_crtc_state (new_crtc_state); + new_ofdrm_crtc_state->format = new_fb->format; + +return 0 ; } static void ofdrm_primary_plane_helper_atomic_update(struct drm_plane *plane,
@@ -493,9 +855,42 @@ static enum drm_mode_status ofdrm_crtc_helper_mode_valid(struct drm_crtc *crtc,static int ofdrm_crtc_helper_atomic_check (struct drm_crtc *crtc,struct drm_atomic_state *new_state) { +static const size_t gamma_lut_length =OFDRM_GAMMA_LUT_SIZE *sizeof (struct drm_color_lut ); + +struct drm_device *dev = crtc->dev;struct drm_crtc_state *new_crtc_state =drm_atomic_get_new_crtc_state (new_state, crtc); +int ret; + + ret =drm_atomic_helper_check_crtc_state (new_crtc_state, false); +if (ret) +return ret; + +if (new_crtc_state->color_mgmt_changed) { +struct drm_property_blob *gamma_lut = new_crtc_state->gamma_lut; -return drm_atomic_helper_check_crtc_state (new_crtc_state, false); +if (gamma_lut && (gamma_lut->length != gamma_lut_length)) { +drm_dbg (dev,"Incorrect gamma_lut length %zu\n" , gamma_lut->length); +return -EINVAL ; + } + } + +return 0 ; +} + +static void ofdrm_crtc_helper_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) +{ +struct ofdrm_device *odev =ofdrm_device_of_dev (crtc->dev); +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, crtc); +struct ofdrm_crtc_state *ofdrm_crtc_state =to_ofdrm_crtc_state (crtc_state); + +if (crtc_state->enable && crtc_state->color_mgmt_changed) { +const struct drm_format_info *format = ofdrm_crtc_state->format; + +if (crtc_state->gamma_lut) +ofdrm_device_set_gamma (odev, format, crtc_state->gamma_lut->data); +else +ofdrm_device_set_gamma_linear (odev, format); + } }/*
@@ -506,6 +901,7 @@ static int ofdrm_crtc_helper_atomic_check(struct drm_crtc *crtc,static const struct drm_crtc_helper_funcs ofdrm_crtc_helper_funcs = { .mode_valid = ofdrm_crtc_helper_mode_valid, .atomic_check = ofdrm_crtc_helper_atomic_check, + .atomic_flush = ofdrm_crtc_helper_atomic_flush, };static void ofdrm_crtc_reset (struct drm_crtc *crtc)
@@ -527,6 +923,7 @@ static struct drm_crtc_state *ofdrm_crtc_atomic_duplicate_state(struct drm_crtcstruct drm_device *dev = crtc->dev;struct drm_crtc_state *crtc_state = crtc->state;struct ofdrm_crtc_state *new_ofdrm_crtc_state; +struct ofdrm_crtc_state *ofdrm_crtc_state;if (drm_WARN_ON (dev, !crtc_state))return NULL ;
@@ -535,7 +932,10 @@ static struct drm_crtc_state *ofdrm_crtc_atomic_duplicate_state(struct drm_crtcif (!new_ofdrm_crtc_state)return NULL ; + ofdrm_crtc_state =to_ofdrm_crtc_state (crtc_state); +__drm_atomic_helper_crtc_duplicate_state (crtc, &new_ofdrm_crtc_state->base); + new_ofdrm_crtc_state->format = ofdrm_crtc_state->format;return &new_ofdrm_crtc_state->base; }
@@ -588,27 +988,43 @@ static const struct ofdrm_device_funcs ofdrm_unknown_device_funcs = { };static const struct ofdrm_device_funcs ofdrm_mach64_device_funcs = { + .cmap_ioremap = ofdrm_mach64_cmap_ioremap, + .cmap_write = ofdrm_mach64_cmap_write, };static const struct ofdrm_device_funcs ofdrm_rage128_device_funcs = { + .cmap_ioremap = ofdrm_rage128_cmap_ioremap, + .cmap_write = ofdrm_rage128_cmap_write, };static const struct ofdrm_device_funcs ofdrm_rage_m3a_device_funcs = { + .cmap_ioremap = ofdrm_rage_m3a_cmap_ioremap, + .cmap_write = ofdrm_rage_m3a_cmap_write, };static const struct ofdrm_device_funcs ofdrm_rage_m3b_device_funcs = { + .cmap_ioremap = ofdrm_rage_m3b_cmap_ioremap, + .cmap_write = ofdrm_rage_m3b_cmap_write, };static const struct ofdrm_device_funcs ofdrm_radeon_device_funcs = { + .cmap_ioremap = ofdrm_radeon_cmap_ioremap, + .cmap_write = ofdrm_rage128_cmap_write,/* same as Rage128 */ };static const struct ofdrm_device_funcs ofdrm_gxt2000_device_funcs = { + .cmap_ioremap = ofdrm_gxt2000_cmap_ioremap, + .cmap_write = ofdrm_gxt2000_cmap_write, };static const struct ofdrm_device_funcs ofdrm_avivo_device_funcs = { + .cmap_ioremap = ofdrm_avivo_cmap_ioremap, + .cmap_write = ofdrm_avivo_cmap_write, };static const struct ofdrm_device_funcs ofdrm_qemu_device_funcs = { + .cmap_ioremap = ofdrm_qemu_cmap_ioremap, + .cmap_write = ofdrm_qemu_cmap_write, };static struct drm_display_mode ofdrm_mode (unsigned int width,unsigned int height)
@@ -767,6 +1183,17 @@ static struct ofdrm_device *ofdrm_device_create(struct drm_driver *drv,return ERR_PTR (-ENOMEM );iosys_map_set_vaddr_iomem (&odev->screen_base, screen_base); +if (odev->funcs->cmap_ioremap) { +void __iomem *cmap_base = odev->funcs->cmap_ioremap (odev, of_node, fb_base); + +if (IS_ERR (cmap_base)) { +/* Don't fail; continue without colormap */ + ret =PTR_ERR (cmap_base); + }else { + odev->cmap_base = cmap_base; + } + } +/* * Firmware framebuffer */
@@ -819,6 +1246,11 @@ static struct ofdrm_device *ofdrm_device_create(struct drm_driver *drv,return ERR_PTR (ret);drm_crtc_helper_add (crtc, &ofdrm_crtc_helper_funcs); +if (odev->cmap_base) { +drm_mode_crtc_set_gamma_size (crtc,OFDRM_GAMMA_LUT_SIZE ); +drm_crtc_enable_color_mgmt (crtc,0 , false,OFDRM_GAMMA_LUT_SIZE ); + } +/* Encoder */ encoder = &odev->encoder;
Signature · 1 line
2.37.3
Re: [PATCH v3 4/4] drm/ofdrm: Support color management
Hi Thomas,
Quoted 13 lines · Thomas Zimmermann
Support the CRTC's color-management property and implement each model's palette support.
The OF hardware has different methods of setting the palette. The respective code has been taken from fbdev's offb and refactored into per-model device functions. The device functions integrate this functionality into the overall modesetting.
As palette handling is a CRTC property that depends on the primary plane's color format, the plane's
atomic_checkhelper now updates the format field in ofdrm's custom CRTC state. The CRTC'satomic_flushhelper updates the palette for the format as needed.
Quoted 7 lines
v3:
* lookup CRTC state withdrm_atomic_get_new_crtc_state()
* access HW palette withwriteb(),writel(), andreadl()(Ben)
* declare register values as u32Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>
Thanks for your patch!
drivers/gpu/drm/tiny/ofdrm.c static struct resource *ofdrm_find_fb_resource(struct ofdrm_device *odev, · line 580
Quoted 12 lines
drivers/gpu/drm/tiny/ofdrm.c +9
-0+static void __iomem *ofdrm_qemu_cmap_ioremap (struct ofdrm_device *odev, +struct device_node *of_node, +u64 fb_base) +{ +#ifdef __BIG_ENDIAN +static const __be32 io_of_addr[3 ] = {0x01000000 ,0x0 ,0x0 }; +#else +static const __be32 io_of_addr[3 ] = {0x00000001 ,0x0 ,0x0 }; +#endif
You can easily get rid of the #ifdef:
static const __be32 io_of_addr[3] = { cpu_to_be32(0x01000000), 0x0, 0x0 };And probably sparse ("make C=2") will complain about the plain zeros, so "cpu_to_be32(0x0)" as well.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds