drm: renesas: shmobile: Atomic conversion + DT support
Subsystems (7)
Geert Uytterhoeven
maintainerv3 cover drm: renesas: shmobile: Atomic conversion + DT support
Hi all,
It has been 3 years since the last conversion of a DRM driver to atomic modesetting, so I guess it's time for another one? ;-)
Currently, there are two drivers for the LCD controller on Renesas SuperH-based and ARM-based SH-Mobile and R-Mobile SoCs:
1. sh_mobile_lcdcfb, using the fbdev framework,
2. shmob_drm, using the DRM framework.
However, only the former driver is used, as all platform support integrates the former. None of these drivers support DT-based systems.
This patch series converts the SH-Mobile DRM driver to atomic modesetting, and adds DT support, complemented by the customary set of fixes and improvements.
Overview:
- Patch 1 adds a separate maintainer entry.
- Patch 2 adds DT bindings for the SH-Mobile LCD controller,
- Patch 3 adds definitions for RGB666 9:9 media bus formats,
- Patches 4-35 contains miscellaneous fixes, improvements, and cleanups for the SH-Mobile DRM driver,
- Patches 36-40 convert the SH-Mobile DRM driver to atomic modesetting,
- Patch 41 adds DT support to the SH-Mobile DRM driver.
To reduce strain on the audience, I have CCed the DT and media people only on the cover letter and the DT resp. media patches. If interested, the full series should be available through lore.kernel.org.
Some comments and questions can be found in the individual patches.
Changes compared to v2[1]:
- Add Reviewed-by.
Changes compared to v1[2]:
- New patches
- "[PATCH v2 01/41] MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers",
- "[PATCH v2 18/41] drm: renesas: shmobile: Remove custom plane destroy callback",
- Add myself as co-maintainer,
- Make fck clock required,
- Drop ports description referring to obsolete graph.txt,
- Condition ports to compatible strings,
- Drop label and status from example,
- Add Reviewed-by,
- Drop unused MEDIA_BUS_FMT_RGB666_2X9_LE, as requested by Laurent,
- Move explicit clock handling to Runtime PM callbacks,
- Move devm_pm_runtime_enable() after shmob_drm_setup_clocks(),
- Depend on PM,
- Split off removal of call to drm_plane_force_disable(),
- Select VIDEOMODE_HELPERS,
- Keep table instead of replacing it by a switch() statement,
- Fix shmob_drm_interface_data.bus_fmt comment,
- Drop superfluous blank lines,
- Keep initialization of info fields together,
- Use shmob_drm_bus_fmts[],
- Keep bus format validation at probe time,
- Pass plane type to shmob_drm_plane_create() to avoid having to shift all overlay plane indices by one,
- Rename primary_plane_funcs to shmob_drm_primary_plane_funcs,
- Rename shmob_drm_plane_funcs to shmob_drm_overlay_plane_funcs,
- Move shmob_drm_crtc_finish_page_flip() further up,
- Inline shmob_drm_crtc_st{art,op}(),
- Use devm_drm_of_get_bridge(),
- Don't print bridge->of_node on failure, as this field depends on CONFIG_OF.
This has been tested on the R-Mobile A1-based Atmark Techno Armadillo-800-EVA development board, using both legacy[3] and DT-based[4] instantiation, with the fbdev-emulated text console and modetest, a.o.
modetest -M shmob-drm -s 43:800x480@RG16 -P 33@41:640x320+80+80@RG16
modetest -M shmob-drm -s 43:800x480@RG16The output of "modetest -M shmob-drm" can be found below[5].
Thanks for your comments!
[1] "[PATCH v2 00/41] drm: renesas: shmobile: Atomic conversion + DT
support"
https://lore.kernel.org/r/[email protected][2] "[PATCH 00/39] drm: renesas: shmobile: Atomic conversion + DT
support"
https://lore.kernel.org/r/[email protected]/[3] "[PATCH/RFC] staging: board: armadillo800eva: Add DRM support"
https://lore.kernel.org/r/f7874a9da4bcb20fbc9cd133147b67862ebcf0b9.1687418281.git.geert+renesas@glider.be
[4] "[PATCH 0/2] ARM: dts: r8a7740/armadillo800eva: Add LCD support"
https://lore.kernel.org/r/[email protected]
[5] Encoders:
id crtc type possible crtcs possible clones
42 41 DPI 0x00000001 0x00000001
Connectors:
id encoder status name size (mm) modes encoders
43 42 connected DPI-1 111x67 1 42
modes:
index name refresh (Hz) hdisp hss hse htot vdisp vss vse vtot
#0 800x480 59.99 800 840 968 1056 480 515 517 525 33260 flags: nhsync, nvsync; type: preferred, driver
props:
1 EDID:
flags: immutable blob
blobs:
value:
2 DPMS:
flags: enum
enums: On=0 Standby=1 Suspend=2 Off=3
value: 0
5 link-status:
flags: enum
enums: Good=0 Bad=1
value: 0
6 non-desktop:
flags: immutable range
values: 0 1
value: 0
4 TILE:
flags: immutable blob
blobs:
value:
CRTCs:
id fb pos size
41 44 (0,0) (800x480)
#0 800x480 59.99 800 840 968 1056 480 515 517 525 33260 flags: nhsync, nvsync; type: preferred, driver
props:
24 VRR_ENABLED:
flags: range
values: 0 1
value: 0
Planes:
id crtc fb CRTC x,y x,y gamma size possible crtcs
31 41 44 0,0 0,0 0 0x00000001
formats: RG16 RG24 AR24 XR24 NV12 NV21 NV16 NV61 NV24 NV42
props:
8 type:
flags: immutable enum
enums: Overlay=0 Primary=1 Cursor=2
value: 1
30 IN_FORMATS:
flags: immutable blob
blobs:
value:
01000000000000000a00000018000000
01000000400000005247313652473234
41523234585232344e5631324e563231
4e5631364e5636314e5632344e563432
ff030000000000000000000000000000
0000000000000000
in_formats blob decoded:
RG16: LINEAR
RG24: LINEAR
AR24: LINEAR
XR24: LINEAR
NV12: LINEAR
NV21: LINEAR
NV16: LINEAR
NV61: LINEAR
NV24: LINEAR
NV42: LINEAR
33 0 0 0,0 0,0 0 0x00000001
formats: RG16 RG24 AR24 XR24 NV12 NV21 NV16 NV61 NV24 NV42
props:
8 type:
flags: immutable enum
enums: Overlay=0 Primary=1 Cursor=2
value: 0
30 IN_FORMATS:
flags: immutable blob
blobs:
value:
01000000000000000a00000018000000
01000000400000005247313652473234
41523234585232344e5631324e563231
4e5631364e5636314e5632344e563432
ff030000000000000000000000000000
0000000000000000
in_formats blob decoded:
RG16: LINEAR
RG24: LINEAR
AR24: LINEAR
XR24: LINEAR
NV12: LINEAR
NV21: LINEAR
NV16: LINEAR
NV61: LINEAR
NV24: LINEAR
NV42: LINEAR
35 0 0 0,0 0,0 0 0x00000001
formats: RG16 RG24 AR24 XR24 NV12 NV21 NV16 NV61 NV24 NV42
props:
8 type:
flags: immutable enum
enums: Overlay=0 Primary=1 Cursor=2
value: 0
30 IN_FORMATS:
flags: immutable blob
blobs:
value:
01000000000000000a00000018000000
01000000400000005247313652473234
41523234585232344e5631324e563231
4e5631364e5636314e5632344e563432
ff030000000000000000000000000000
0000000000000000
in_formats blob decoded:
RG16: LINEAR
RG24: LINEAR
AR24: LINEAR
XR24: LINEAR
NV12: LINEAR
NV21: LINEAR
NV16: LINEAR
NV61: LINEAR
NV24: LINEAR
NV42: LINEAR
37 0 0 0,0 0,0 0 0x00000001
formats: RG16 RG24 AR24 XR24 NV12 NV21 NV16 NV61 NV24 NV42
props:
8 type:
flags: immutable enum
enums: Overlay=0 Primary=1 Cursor=2
value: 0
30 IN_FORMATS:
flags: immutable blob
blobs:
value:
01000000000000000a00000018000000
01000000400000005247313652473234
41523234585232344e5631324e563231
4e5631364e5636314e5632344e563432
ff030000000000000000000000000000
0000000000000000
in_formats blob decoded:
RG16: LINEAR
RG24: LINEAR
AR24: LINEAR
XR24: LINEAR
NV12: LINEAR
NV21: LINEAR
NV16: LINEAR
NV61: LINEAR
NV24: LINEAR
NV42: LINEAR
39 0 0 0,0 0,0 0 0x00000001
formats: RG16 RG24 AR24 XR24 NV12 NV21 NV16 NV61 NV24 NV42
props:
8 type:
flags: immutable enum
enums: Overlay=0 Primary=1 Cursor=2
value: 0
30 IN_FORMATS:
flags: immutable blob
blobs:
value:
01000000000000000a00000018000000
01000000400000005247313652473234
41523234585232344e5631324e563231
4e5631364e5636314e5632344e563432
ff030000000000000000000000000000
0000000000000000
in_formats blob decoded:
RG16: LINEAR
RG24: LINEAR
AR24: LINEAR
XR24: LINEAR
NV12: LINEAR
NV21: LINEAR
NV16: LINEAR
NV61: LINEAR
NV24: LINEAR
NV42: LINEAR
Frame buffers:
id size pitchGeert Uytterhoeven (36):
MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers
dt-bindings: display: Add Renesas SH-Mobile LCDC bindings
media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9_BE format
drm: renesas: shmobile: Fix overlay plane disable
drm: renesas: shmobile: Fix ARGB32 overlay format typo
drm: renesas: shmobile: Correct encoder/connector types
drm: renesas: shmobile: Add support for Runtime PM
drm: renesas: shmobile: Restore indentation of
shmob_drm_setup_clocks()
drm: renesas: shmobile: Use %p4cc to print fourcc code
drm: renesas: shmobile: Add missing YCbCr formats
drm: renesas: shmobile: Improve shmob_drm_format_info table
drm: renesas: shmobile: Improve error handling
drm: renesas: shmobile: Convert to use devm_request_irq()
drm: renesas: shmobile: Remove custom plane destroy callback
drm: renesas: shmobile: Use drmm_universal_plane_alloc()
drm: renesas: shmobile: Embed drm_device in shmob_drm_device
drm: renesas: shmobile: Convert container helpers to static inline
functions
drm: renesas: shmobile: Replace .dev_private with container_of()
drm: renesas: shmobile: Use media bus formats in platform data
drm: renesas: shmobile: Move interface handling to connector setup
drm: renesas: shmobile: Unify plane allocation
drm: renesas: shmobile: Rename shmob_drm_crtc.crtc
drm: renesas: shmobile: Rename shmob_drm_connector.connector
drm: renesas: shmobile: Rename shmob_drm_plane.plane
drm: renesas: shmobile: Use drm_crtc_handle_vblank()
drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip()
drm: renesas: shmobile: Wait for page flip when turning CRTC off
drm: renesas: shmobile: Turn vblank on/off when enabling/disabling
CRTC
drm: renesas: shmobile: Shutdown the display on remove
drm: renesas: shmobile: Cleanup encoder
drm: renesas: shmobile: Atomic conversion part 1
drm: renesas: shmobile: Atomic conversion part 2
drm: renesas: shmobile: Use suspend/resume helpers
drm: renesas: shmobile: Remove internal CRTC state tracking
drm: renesas: shmobile: Atomic conversion part 3
drm: renesas: shmobile: Add DT support
Laurent Pinchart (5):
drm: renesas: shmobile: Remove backlight support
drm: renesas: shmobile: Don't set display info width and height twice
drm: renesas: shmobile: Rename input clocks
drm: renesas: shmobile: Remove support for SYS panels
drm: renesas: shmobile: Use struct videomode in platform data
.../display/renesas,shmobile-lcdc.yaml | 130 ++++ .../media/v4l/subdev-formats.rst | 72 ++ MAINTAINERS | 13 +- drivers/gpu/drm/renesas/shmobile/Kconfig | 3 +- drivers/gpu/drm/renesas/shmobile/Makefile | 3 +- .../renesas/shmobile/shmob_drm_backlight.c | 82 --- .../renesas/shmobile/shmob_drm_backlight.h | 19 - .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 650 ++++++++---------- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 27 +- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 180 +++-- .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 18 +- .../gpu/drm/renesas/shmobile/shmob_drm_kms.c | 77 ++- .../gpu/drm/renesas/shmobile/shmob_drm_kms.h | 9 +- .../drm/renesas/shmobile/shmob_drm_plane.c | 326 +++++---- .../drm/renesas/shmobile/shmob_drm_plane.h | 5 +- include/linux/platform_data/shmob_drm.h | 57 +- include/uapi/linux/media-bus-format.h | 3 +- 17 files changed, 860 insertions(+), 814 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.c delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.h
Signature · 12 lines
2.34.1
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 TorvaldsGeert Uytterhoeven
maintainerPATCH v3 1/41 MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers
Split off DRM drivers for Renesas SH-Mobile into its own entry, and add Geert Uytterhoeven as a maintainer.
---
Kieran: do you want to join the club, too? ;-)
v3:
- No changes,
v2:
- New.
--- MAINTAINERS | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
MAINTAINERS +10 -2
@@ -7007,7 +7007,7 @@ F: drivers/gpu/host1x/ F: include/linux/host1x.h F: include/uapi/drm/tegra_drm.h -DRM DRIVERS FOR RENESAS +DRM DRIVERS FOR RENESAS R-CAR M: Laurent Pinchart <[email protected]> M: Kieran Bingham <[email protected]> L: [email protected]
@@ -7018,7 +7018,15 @@ F: Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml F: Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml F: Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml F: Documentation/devicetree/bindings/display/renesas,du.yaml -F: drivers/gpu/drm/renesas/ +F: drivers/gpu/drm/renesas/rcar-du/ + +DRM DRIVERS FOR RENESAS SHMOBILE +M: Laurent Pinchart <[email protected]> +M: Geert Uytterhoeven <[email protected]> +L: [email protected] +L: [email protected] +S: Supported +F: drivers/gpu/drm/renesas/shmobile/ F: include/linux/platform_data/shmob_drm.h DRM DRIVERS FOR ROCKCHIP
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 2/41 dt-bindings: display: Add Renesas SH-Mobile LCDC bindings
In reply to Geert UytterhoevenAdd device tree bindings for the LCD Controller (LCDC) found in Renesas SuperH SH-Mobile and ARM SH/R-Mobile SOCs.
Based on a plain text prototype by Laurent Pinchart.
---
Cc: Rob Herring <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Conor Dooley <[email protected]>
Cc: [email protected]
v3:
- Add Reviewed-by,
v2:
- Add myself as co-maintainer,
- Make fck clock required,
- Drop ports description referring to obsolete graph.txt,
- Condition ports to compatible strings,
- Drop label and status from example.
Changes compared to Laurent's original:
- Convert to json-schema,
- Rename compatible values from "renesas,lcdc-<SoC>" to
"renesas,<SoC>-lcdc", - Add power-domains property, - Add MIPI-DSI port on SH-Mobile AG5, - Update example to reflect reality, - Add to MAINTAINERS. --- .../display/renesas,shmobile-lcdc.yaml | 130 ++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 131 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml new file +130 -0
@@ -0,0 +1,130 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/renesas,shmobile-lcdc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Renesas SH-Mobile LCD Controller (LCDC) + +maintainers: + - Laurent Pinchart <[email protected]> + - Geert Uytterhoeven <[email protected]> + +properties: + compatible: + enum: + - renesas,r8a7740-lcdc # R-Mobile A1 + - renesas,sh73a0-lcdc # SH-Mobile AG5 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 1 + maxItems: 5 + description: + Only the functional clock is mandatory. + Some of the optional clocks are model-dependent (e.g. "video" (a.k.a. + "vou" or "dv_clk") is available on R-Mobile A1 only). + + clock-names: + minItems: 1 + items: + - const: fck + - enum: [ media, lclk, hdmi, video ] + - enum: [ media, lclk, hdmi, video ] + - enum: [ media, lclk, hdmi, video ] + - enum: [ media, lclk, hdmi, video ] + + power-domains: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: LCD port (R-Mobile A1 and SH-Mobile AG5) + unevaluatedProperties: false + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: HDMI port (R-Mobile A1 LCDC1 and SH-Mobile AG5) + unevaluatedProperties: false + + port@2: + $ref: /schemas/graph.yaml#/properties/port + description: MIPI-DSI port (SH-Mobile AG5) + unevaluatedProperties: false + + required: + - port@0 + + unevaluatedProperties: false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - power-domains + - ports + +additionalProperties: false + +allOf: + - if: + properties: + compatible: + contains: + const: renesas,r8a7740-lcdc + then: + properties: + ports: + properties: + port@2: false + + - if: + properties: + compatible: + contains: + const: renesas,sh73a0-lcdc + then: + properties: + ports: + required: + - port@1 + - port@2 + +examples: + - | + #include <dt-bindings/clock/r8a7740-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + lcd-controller@fe940000 { + compatible = "renesas,r8a7740-lcdc"; + reg = <0xfe940000 0x4000>; + interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp1_clks R8A7740_CLK_LCDC0>, + <&cpg_clocks R8A7740_CLK_M3>, <&lcdlclk0_clk>, + <&vou_clk>; + clock-names = "fck", "media", "lclk", "video"; + power-domains = <&pd_a4lc>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + lcdc0_rgb: endpoint { + }; + }; + }; + };
MAINTAINERS +1 -0
@@ -7026,6 +7026,7 @@ M: Geert Uytterhoeven <[email protected]> L: [email protected] L: [email protected] S: Supported +F: Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml F: drivers/gpu/drm/renesas/shmobile/ F: include/linux/platform_data/shmob_drm.h
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 3/41 media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9_BE format
In reply to Geert UytterhoevenAdd the RGB666 9:9 format MEDIA_BUS_FMT_RGB666_2X9_BE, which is supported by the SH-Mobile LCD Controller.
---
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Hans Verkuil <[email protected]>
Cc: [email protected]
v3:
- No changes,
v2:
- Add Reviewed-by,
- Drop unused MEDIA_BUS_FMT_RGB666_2X9_LE, as requested by Laurent.
--- .../media/v4l/subdev-formats.rst | 72 +++++++++++++++++++ include/uapi/linux/media-bus-format.h | 3 +- 2 files changed, 74 insertions(+), 1 deletion(-)
Documentation/userspace-api/media/v4l/subdev-formats.rst +72 -0
@@ -949,6 +949,78 @@ The following tables list existing packed RGB formats. - b\ :sub:`2` - b\ :sub:`1` - b\ :sub:`0` + * .. _MEDIA-BUS-FMT-RGB666-2X9-BE: + + - MEDIA_BUS_FMT_RGB666_2X9_BE + - 0x1025 + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - r\ :sub:`5` + - r\ :sub:`4` + - r\ :sub:`3` + - r\ :sub:`2` + - r\ :sub:`1` + - r\ :sub:`0` + - g\ :sub:`5` + - g\ :sub:`4` + - g\ :sub:`3` + * - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - g\ :sub:`2` + - g\ :sub:`1` + - g\ :sub:`0` + - b\ :sub:`5` + - b\ :sub:`4` + - b\ :sub:`3` + - b\ :sub:`2` + - b\ :sub:`1` + - b\ :sub:`0` * .. _MEDIA-BUS-FMT-BGR666-1X18: - MEDIA_BUS_FMT_BGR666_1X18
include/uapi/linux/media-bus-format.h +2 -1
@@ -34,7 +34,7 @@#define MEDIA_BUS_FMT_FIXED 0x0001 -/* RGB - next is 0x1025 */ +/* RGB - next is 0x1026 */ #define MEDIA_BUS_FMT_RGB444_1X12 0x1016#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002
@@ -46,6 +46,7 @@#define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007#define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008#define MEDIA_BUS_FMT_RGB666_1X18 0x1009 +#define MEDIA_BUS_FMT_RGB666_2X9_BE 0x1025#define MEDIA_BUS_FMT_BGR666_1X18 0x1023#define MEDIA_BUS_FMT_RBG888_1X24 0x100e#define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 4/41 drm: renesas: shmobile: Fix overlay plane disable
In reply to Geert UytterhoevenMerely writing zero to the CHn Source Image Format Register is not sufficient to disable a plane, as the programmed register value is not propagated immediately to the current side. This can be seen when using the -P option of modetest: the extra plane is displayed correctly, but does not disappear after exit.
Fix this by doing the full update dance using the Blend Control Register, like is done when enabling the plane.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +3 -0
@@ -215,7 +215,10 @@ static int shmob_drm_plane_disable(struct drm_plane *plane, splane->format =NULL ; +lcdc_write (sdev,LDBCR ,LDBCR_UPC (splane->index));lcdc_write (sdev,LDBnBSIFR (splane->index),0 ); +lcdc_write (sdev,LDBCR , +LDBCR_UPF (splane->index) |LDBCR_UPD (splane->index));return 0 ; }
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 5/41 drm: renesas: shmobile: Fix ARGB32 overlay format typo
In reply to Geert UytterhoevenWhen configuring a CHn Source Image Format Register (LDBBSIFR), one should use the corresponding LDBBSIFR_RPKF_* definition for overlay planes, not the DDFR_PKF_* definition for the primary plane.
Fortunately both definitions resolve to the same value, so this bug did not cause any harm.
---
v3:
- No changes,
v2:
- s/configurating/configuring/,
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +2 -2
@@ -94,10 +94,10 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, format |=LDBBSIFR_AL_1 |LDBBSIFR_RY |LDBBSIFR_RPKF_RGB24 ;break ;case DRM_FORMAT_ARGB8888 : - format |=LDBBSIFR_AL_PK |LDBBSIFR_RY |LDDFR_PKF_ARGB32 ; + format |=LDBBSIFR_AL_PK |LDBBSIFR_RY |LDBBSIFR_RPKF_ARGB32 ;break ;case DRM_FORMAT_XRGB8888 : - format |=LDBBSIFR_AL_1 |LDBBSIFR_RY |LDDFR_PKF_ARGB32 ; + format |=LDBBSIFR_AL_1 |LDBBSIFR_RY |LDBBSIFR_RPKF_ARGB32 ;break ;case DRM_FORMAT_NV12 :case DRM_FORMAT_NV21 :
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 6/41 drm: renesas: shmobile: Correct encoder/connector types
In reply to Geert UytterhoevenThe first encoder output on the SH-Mobile LCD Controller is a DPI parallel bus. However, at the time of introduction of the driver, no encoder or connector types were defined yet for the DPI parallel bus, hence the driver used the ones for LVDS instead.
Adjust the types accordingly.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +2 -2
@@ -598,7 +598,7 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev) encoder->possible_crtcs =1 ; ret =drm_simple_encoder_init (sdev->ddev, encoder, -DRM_MODE_ENCODER_LVDS ); +DRM_MODE_ENCODER_DPI );if (ret <0 )return ret;
@@ -684,7 +684,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, connector->display_info.height_mm = sdev->pdata->panel.height_mm; ret =drm_connector_init (sdev->ddev, connector, &connector_funcs, -DRM_MODE_CONNECTOR_LVDS ); +DRM_MODE_CONNECTOR_DPI );if (ret <0 )return ret;
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 7/41 drm: renesas: shmobile: Add support for Runtime PM
In reply to Geert UytterhoevenThe SH-Mobile LCD Controller is part of a PM Domain on all relevant SoCs (clock domain on all, power domain on some). Hence it may not be sufficient to manage the LCDC module clock explicitly (e.g. if the selected clock source differs from SHMOB_DRM_CLK_BUS).
Fix this by using Runtime PM for all clock handling. Add an explicit dependency on CONFIG_PM, which should already be met on all affected platforms.
---
v3:
- No changes,
v2:
- Move explicit clock handling to Runtime PM callbacks,
- Move devm_pm_runtime_enable() after shmob_drm_setup_clocks(),
- Depend on PM.
--- drivers/gpu/drm/renesas/shmobile/Kconfig | 2 +- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 32 ++-------------- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 38 +++++++++++++++++-- 3 files changed, 40 insertions(+), 32 deletions(-)
drivers/gpu/drm/renesas/shmobile/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 config DRM_SHMOBILE tristate "DRM Support for SH Mobile" - depends on DRM + depends on DRM && PM depends on ARCH_RENESAS || ARCH_SHMOBILE || COMPILE_TEST select BACKLIGHT_CLASS_DEVICE select DRM_KMS_HELPER
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +4 -28
@@ -9,6 +9,7 @@#include <linux/backlight.h> #include <linux/clk.h> +#include <linux/pm_runtime.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h>
@@ -34,29 +35,6 @@* TODO: panel support */ -/* ----------------------------------------------------------------------------- -* Clock management -*/ - -static int shmob_drm_clk_on (struct shmob_drm_device *sdev) -{ -int ret; - -if (sdev->clock) { - ret =clk_prepare_enable (sdev->clock); -if (ret <0 ) -return ret; - } - -return 0 ; -} - -static void shmob_drm_clk_off (struct shmob_drm_device *sdev) -{ -if (sdev->clock) -clk_disable_unprepare (sdev->clock); -} -/* ----------------------------------------------------------------------------- * CRTC */
@@ -170,9 +148,8 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)if (WARN_ON (format ==NULL ))return ; -/* Enable clocks before accessing the hardware. */ - ret =shmob_drm_clk_on (sdev); -if (ret <0 ) + ret =pm_runtime_resume_and_get (sdev->dev); +if (ret)return ;/* Reset and enable the LCDC. */
@@ -268,8 +245,7 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)/* Disable the display output. */ lcdc_write (sdev,LDCNT1R ,0 ); -/* Stop clocks. */ -shmob_drm_clk_off (sdev); +pm_runtime_put (sdev->dev); scrtc->started = false; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +35 -3
@@ -13,6 +13,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <drm/drm_drv.h>
@@ -165,8 +166,35 @@ static int shmob_drm_pm_resume(struct device *dev)return 0 ; } -static DEFINE_SIMPLE_DEV_PM_OPS(shmob_drm_pm_ops, - shmob_drm_pm_suspend, shmob_drm_pm_resume); +static int shmob_drm_pm_runtime_suspend (struct device *dev) +{ +struct shmob_drm_device *sdev =dev_get_drvdata (dev); + +if (sdev->clock) +clk_disable_unprepare (sdev->clock); + +return 0 ; +} + +static int shmob_drm_pm_runtime_resume (struct device *dev) +{ +struct shmob_drm_device *sdev =dev_get_drvdata (dev); +int ret; + +if (sdev->clock) { + ret =clk_prepare_enable (sdev->clock); +if (ret <0 ) +return ret; + } + +return 0 ; +} + +static const struct dev_pm_ops shmob_drm_pm_ops = { + SYSTEM_SLEEP_PM_OPS(shmob_drm_pm_suspend, shmob_drm_pm_resume) +RUNTIME_PM_OPS (shmob_drm_pm_runtime_suspend, + shmob_drm_pm_runtime_resume,NULL ) +};/* ----------------------------------------------------------------------------- * Platform driver
@@ -220,6 +248,10 @@ static int shmob_drm_probe(struct platform_device *pdev)if (ret <0 )return ret; + ret =devm_pm_runtime_enable (&pdev->dev); +if (ret) +return ret; + ret =shmob_drm_init_interface (sdev);if (ret <0 )return ret;
@@ -291,7 +323,7 @@ static struct platform_driver shmob_drm_platform_driver = { .remove = shmob_drm_remove, .driver = { .name = "shmob-drm", - .pm = pm_sleep_ptr(&shmob_drm_pm_ops), + .pm = &shmob_drm_pm_ops, }, };
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 8/41 drm: renesas: shmobile: Restore indentation of shmob_drm_setup_clocks()
In reply to Geert UytterhoevenCommit 56550d94cbaeaa19 ("Drivers: gpu: remove __dev* attributes.") forgot to realign the continuation of the parameter section of shmob_drm_setup_clocks().
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +1 -1
@@ -67,7 +67,7 @@ static int shmob_drm_init_interface(struct shmob_drm_device *sdev) }static int shmob_drm_setup_clocks (struct shmob_drm_device *sdev, -enum shmob_drm_clk_source clksrc) +enum shmob_drm_clk_source clksrc) {struct clk *clk;char *clkname;
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 9/41 drm: renesas: shmobile: Use %p4cc to print fourcc code
In reply to Geert UytterhoevenReplace the last printing of an hexadecimal fourcc format code by a pretty-printed format name, using the "%p4cc" format specifier.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +2 -2
@@ -184,8 +184,8 @@ shmob_drm_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, format =shmob_drm_format_info (fb->format->format);if (format ==NULL ) { -dev_dbg (sdev->dev,"update_plane: unsupported format %08x\n" , - fb->format->format); +dev_dbg (sdev->dev,"update_plane: unsupported format %p4cc\n" , + &fb->format->format);return -EINVAL ; }
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 10/41 drm: renesas: shmobile: Add missing YCbCr formats
In reply to Geert UytterhoevenThe primary plane supports various YCbCr formats, and the CRTC code already knows how to handle them. Enable support for the missing formats by adding them to the table of supported modes.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +6 -0
@@ -460,6 +460,12 @@ static const uint32_t modeset_formats[] = {DRM_FORMAT_RGB888 ,DRM_FORMAT_ARGB8888 ,DRM_FORMAT_XRGB8888 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV21 , +DRM_FORMAT_NV16 , +DRM_FORMAT_NV61 , +DRM_FORMAT_NV24 , + DRM_FORMAT_NV42, }; static const struct drm_plane_funcs primary_plane_funcs = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 11/41 drm: renesas: shmobile: Improve shmob_drm_format_info table
In reply to Geert UytterhoevenImprove the table containing hardware information related to the supported plane formats:
1. Move (part of) the overlay format register settings from multiple switch() statements spread across the code into the table, like is already done for the primary plane register settings,
2. Remove the .yuv field, as that information can easily be extracted from the register settings using a new helper macro,
3. Shrink and move the .bpp field to reduce table size.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 29 ++-------- .../gpu/drm/renesas/shmobile/shmob_drm_kms.c | 42 ++++++++++---- .../gpu/drm/renesas/shmobile/shmob_drm_kms.h | 9 ++- .../drm/renesas/shmobile/shmob_drm_plane.c | 56 ++----------------- 4 files changed, 47 insertions(+), 89 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +5 -24
@@ -191,31 +191,12 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)lcdc_write (sdev,LDDFR , format->lddfr |LDDFR_CF1 );lcdc_write (sdev,LDMLSR , scrtc->line_size);lcdc_write (sdev,LDSA1R , scrtc->dma[0 ]); -if (format->yuv) +if (shmob_drm_format_is_yuv (format))lcdc_write (sdev,LDSA2R , scrtc->dma[1 ]);lcdc_write (sdev,LDSM1R ,0 );/* Word and long word swap. */ -switch (format->fourcc) { -case DRM_FORMAT_RGB565 : -case DRM_FORMAT_NV21 : -case DRM_FORMAT_NV61 : -case DRM_FORMAT_NV42 : - value =LDDDSR_LS |LDDDSR_WS ; -break ; -case DRM_FORMAT_RGB888 : -case DRM_FORMAT_NV12 : -case DRM_FORMAT_NV16 : -case DRM_FORMAT_NV24 : - value =LDDDSR_LS |LDDDSR_WS |LDDDSR_BS ; -break ; -case DRM_FORMAT_ARGB8888 : -case DRM_FORMAT_XRGB8888 : -default : - value =LDDDSR_LS ; -break ; - } -lcdc_write (sdev,LDDDSR , value); +lcdc_write (sdev,LDDDSR , format->ldddsr);/* Setup planes. */ drm_for_each_legacy_plane (plane, dev) {
@@ -271,12 +252,12 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,struct drm_gem_dma_object *gem;unsigned int bpp; - bpp = scrtc->format->yuv ?8 : scrtc->format->bpp; + bpp =shmob_drm_format_is_yuv (scrtc->format) ?8 : scrtc->format->bpp; gem =drm_fb_dma_get_gem_obj (fb,0 ); scrtc->dma[0 ] = gem->dma_addr + fb->offsets[0 ] + y * fb->pitches[0 ] + x * bpp /8 ; -if (scrtc->format->yuv) { +if (shmob_drm_format_is_yuv (scrtc->format)) { bpp = scrtc->format->bpp -8 ; gem =drm_fb_dma_get_gem_obj (fb,1 ); scrtc->dma[1 ] = gem->dma_addr + fb->offsets[1 ]
@@ -293,7 +274,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)shmob_drm_crtc_compute_base (scrtc, crtc->x, crtc->y);lcdc_write_mirror (sdev,LDSA1R , scrtc->dma[0 ]); -if (scrtc->format->yuv) +if (shmob_drm_format_is_yuv (scrtc->format))lcdc_write_mirror (sdev,LDSA2R , scrtc->dma[1 ]);lcdc_write (sdev,LDRCNTR ,lcdc_read (sdev,LDRCNTR ) ^LDRCNTR_MRS );
drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c +31 -11
91 lines not on this page · raw message
drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h +6 -3
@@ -17,11 +17,14 @@ struct shmob_drm_device;struct shmob_drm_format_info {u32 fourcc; -unsigned int bpp; -bool yuv; -u32 lddfr; +u32 lddfr;/* LCD Data Format Register */ +u16 ldbbsifr;/* CHn Source Image Format Register low bits */ +u8 ldddsr;/* LCDC Input Image Data Swap Register low bits */ +u8 bpp; }; +#define shmob_drm_format_is_yuv (format) ((format)->lddfr & LDDFR_CC) +const struct shmob_drm_format_info *shmob_drm_format_info (u32 fourcc);int shmob_drm_modeset_init (struct shmob_drm_device *sdev);
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +5 -51
78 lines not on this page · raw message
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 12/41 drm: renesas: shmobile: Remove backlight support
In reply to Geert UytterhoevenFrom: Laurent Pinchart <[email protected]>
Backlight support should be implemented by panels, not by the LCDC driver. As the feature is currently unused anyway, remove it.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
Changes compared to Laurent's original:
- Rebase,
- Remove unused variable ‘scon’,
- Remove now unused to_shmob_encoder() macro,
- Remove now empty shmob_drm_encoder wrapper.
--- drivers/gpu/drm/renesas/shmobile/Makefile | 3 +- .../renesas/shmobile/shmob_drm_backlight.c | 82 ------------------- .../renesas/shmobile/shmob_drm_backlight.h | 19 ----- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 33 +------- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 8 -- .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 2 +- .../gpu/drm/renesas/shmobile/shmob_drm_kms.c | 2 +- include/linux/platform_data/shmob_drm.h | 8 -- 8 files changed, 7 insertions(+), 150 deletions(-) delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.c delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.h
drivers/gpu/drm/renesas/shmobile/Makefile +1 -2
@@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -shmob-drm-y := shmob_drm_backlight.o \ - shmob_drm_crtc.o \ +shmob-drm-y := shmob_drm_crtc.o \ shmob_drm_drv.o \ shmob_drm_kms.o \ shmob_drm_plane.o
drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.c deleted +0 -82
82 lines not on this page · raw message
drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* shmob_drm_backlight.h -- SH Mobile DRM Backlight -* -* Copyright (C) 2012 Renesas Electronics Corporation -* -* Laurent Pinchart ([email protected]) -*/ - -#ifndef __SHMOB_DRM_BACKLIGHT_H__ -#define __SHMOB_DRM_BACKLIGHT_H__ - -struct shmob_drm_connector ; - -void shmob_drm_backlight_dpms (struct shmob_drm_connector *scon,int mode); -int shmob_drm_backlight_init (struct shmob_drm_connector *scon); -void shmob_drm_backlight_exit (struct shmob_drm_connector *scon); - -#endif /* __SHMOB_DRM_BACKLIGHT_H__ */
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +4 -29
@@ -7,7 +7,6 @@* Laurent Pinchart ([email protected]) */ -#include <linux/backlight.h> #include <linux/clk.h> #include <linux/pm_runtime.h>
@@ -24,7 +23,6 @@#include <drm/drm_simple_kms_helper.h> #include <drm/drm_vblank.h> -#include "shmob_drm_backlight.h" #include "shmob_drm_crtc.h" #include "shmob_drm_drv.h" #include "shmob_drm_kms.h"
@@ -487,21 +485,9 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)* Encoder */ -#define to_shmob_encoder (e) \ - container_of(e, struct shmob_drm_encoder, encoder) -static void shmob_drm_encoder_dpms (struct drm_encoder *encoder,int mode) { -struct shmob_drm_encoder *senc =to_shmob_encoder (encoder); -struct shmob_drm_device *sdev = encoder->dev->dev_private; -struct shmob_drm_connector *scon = &sdev->connector; - -if (senc->dpms == mode) -return ; - -shmob_drm_backlight_dpms (scon, mode); - - senc->dpms = mode; +/* No-op, everything is handled in the CRTC code. */ } static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder,
@@ -553,11 +539,9 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = {int shmob_drm_encoder_create (struct shmob_drm_device *sdev) { -struct drm_encoder *encoder = &sdev->encoder.encoder; +struct drm_encoder *encoder = &sdev->encoder;int ret; - sdev->encoder.dpms =DRM_MODE_DPMS_OFF ; - encoder->possible_crtcs =1 ; ret = drm_simple_encoder_init(sdev->ddev, encoder,
@@ -622,9 +606,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = {static void shmob_drm_connector_destroy (struct drm_connector *connector) { -struct shmob_drm_connector *scon =to_shmob_connector (connector); - -shmob_drm_backlight_exit (scon);drm_connector_unregister (connector);drm_connector_cleanup (connector); }
@@ -653,13 +634,9 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,drm_connector_helper_add (connector, &connector_helper_funcs); - ret =shmob_drm_backlight_init (&sdev->connector); -if (ret <0 ) - goto err_cleanup; - ret =drm_connector_attach_encoder (connector, encoder);if (ret <0 ) - goto err_backlight; + goto error;drm_helper_connector_dpms (connector,DRM_MODE_DPMS_OFF ); drm_object_property_set_value(&connector->base,
@@ -667,9 +644,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,return 0 ; -err_backlight: -shmob_drm_backlight_exit (&sdev->connector); -err_cleanup: +error:drm_connector_cleanup (connector);return ret; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +0 -8
@@ -14,7 +14,6 @@#include <drm/drm_connector.h> #include <drm/drm_encoder.h> -struct backlight_device ;struct drm_pending_vblank_event ;struct shmob_drm_device ;struct shmob_drm_format_info ;
@@ -31,16 +30,9 @@ struct shmob_drm_crtc {bool started; }; -struct shmob_drm_encoder { -struct drm_encoder encoder; -int dpms; -}; -struct shmob_drm_connector {struct drm_connector connector;struct drm_encoder *encoder; - -struct backlight_device *backlight; };int shmob_drm_crtc_create (struct shmob_drm_device *sdev);
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h +1 -1
@@ -35,7 +35,7 @@ struct shmob_drm_device {struct drm_device *ddev;struct shmob_drm_crtc crtc; -struct shmob_drm_encoder encoder; +struct drm_encoder encoder;struct shmob_drm_connector connector; };
drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c +1 -1
@@ -159,7 +159,7 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev)shmob_drm_crtc_create (sdev);shmob_drm_encoder_create (sdev); -shmob_drm_connector_create (sdev, &sdev->encoder.encoder); +shmob_drm_connector_create (sdev, &sdev->encoder);drm_kms_helper_poll_init (sdev->ddev);
include/linux/platform_data/shmob_drm.h +0 -8
@@ -40,13 +40,6 @@ enum shmob_drm_interface { SHMOB_DRM_IFACE_SYS24, /* 24bpp */ }; -struct shmob_drm_backlight_data { -const char *name; -int max_brightness; -int (*get_brightness)(void ); -int (*set_brightness)(int brightness); -}; -struct shmob_drm_panel_data {unsigned int width_mm;/* Panel width in mm */ unsigned int height_mm;/* Panel height in mm */
@@ -83,7 +76,6 @@ struct shmob_drm_platform_data {enum shmob_drm_clk_source clk_source;struct shmob_drm_interface_data iface; struct shmob_drm_panel_data panel; - struct shmob_drm_backlight_data backlight; };#endif /* __SHMOB_DRM_H__ */
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 13/41 drm: renesas: shmobile: Don't set display info width and height twice
In reply to Geert UytterhoevenFrom: Laurent Pinchart <[email protected]>
The display info width_mm and height_mm fields are set at init time and never overwritten, don't set them a second time when getting modes.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +0 -3
@@ -585,9 +585,6 @@ static int shmob_drm_connector_get_modes(struct drm_connector *connector)drm_mode_set_name (mode);drm_mode_probed_add (connector, mode); - connector->display_info.width_mm = sdev->pdata->panel.width_mm; - connector->display_info.height_mm = sdev->pdata->panel.height_mm; -return 1 ; }
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 14/41 drm: renesas: shmobile: Rename input clocks
In reply to Geert UytterhoevenFrom: Laurent Pinchart <[email protected]>
Prepare for DT bindings by using more appropriate names for the input clocks.
Note that all LDDCKR_ICKSEL_* definitions but the one for the bus clock are valid only for SH7724, so the clock selection code needs to be updated when extending clock support to other SoCs.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +3 -3
@@ -74,15 +74,15 @@ static int shmob_drm_setup_clocks(struct shmob_drm_device *sdev,switch (clksrc) {case SHMOB_DRM_CLK_BUS : - clkname ="bus_clk" ; + clkname ="fck" ; sdev->lddckr =LDDCKR_ICKSEL_BUS ;break ;case SHMOB_DRM_CLK_PERIPHERAL : - clkname ="peripheral_clk" ; + clkname ="media" ; sdev->lddckr =LDDCKR_ICKSEL_MIPI ;break ;case SHMOB_DRM_CLK_EXTERNAL : - clkname =NULL ; + clkname ="lclk" ; sdev->lddckr =LDDCKR_ICKSEL_HDMI ;break ;default :
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 15/41 drm: renesas: shmobile: Remove support for SYS panels
In reply to Geert UytterhoevenFrom: Laurent Pinchart <[email protected]>
SYS panels are not used, and have no defined DT bindings. Remove their support to avoid impeding DT support. It can always be added back later.
---
v3:
- No changes,
v2:
- No changes.
Changes compared to Laurent's original:
- Remove "/* TODO: Setup SYS panel */" comment.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 20 --------------- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 11 -------- include/linux/platform_data/shmob_drm.h | 25 ------------------- 3 files changed, 56 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +0 -20
@@ -55,24 +55,6 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) | ((idata->flags & SHMOB_DRM_IFACE_FL_DWCNT) ? LDMT1R_DWCNT : 0);lcdc_write (sdev,LDMT1R , value); -if (idata->interface >=SHMOB_DRM_IFACE_SYS8A && - idata->interface <=SHMOB_DRM_IFACE_SYS24 ) { -/* Setup SYS bus. */ - value = (idata->sys.cs_setup <<LDMT2R_CSUP_SHIFT ) - | (idata->sys.vsync_active_high ?LDMT2R_RSV :0 ) - | (idata->sys.vsync_dir_input ?LDMT2R_VSEL :0 ) - | (idata->sys.write_setup <<LDMT2R_WCSC_SHIFT ) - | (idata->sys.write_cycle <<LDMT2R_WCEC_SHIFT ) - | (idata->sys.write_strobe <<LDMT2R_WCLW_SHIFT ); -lcdc_write (sdev,LDMT2R , value); - - value = (idata->sys.read_latch <<LDMT3R_RDLC_SHIFT ) - | (idata->sys.read_setup <<LDMT3R_RCSC_SHIFT ) - | (idata->sys.read_cycle <<LDMT3R_RCEC_SHIFT ) - | (idata->sys.read_strobe <<LDMT3R_RCLW_SHIFT ); -lcdc_write (sdev,LDMT3R , value); - } - value = ((mode->hdisplay /8 ) <<16 )/* HDCN */ | (mode->htotal /8 );/* HTCN */ lcdc_write (sdev,LDHCNR , value);
@@ -180,8 +162,6 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)lcdc_write (sdev,LDDCKSTPR ,0 );lcdc_wait_bit (sdev,LDDCKSTPR , ~0 ,0 ); -/* TODO: Setup SYS panel */ -/* Setup geometry, format, frame buffer memory and operation mode. */ shmob_drm_crtc_setup_geometry (scrtc);
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +0 -11
@@ -43,17 +43,6 @@ static int shmob_drm_init_interface(struct shmob_drm_device *sdev) [SHMOB_DRM_IFACE_RGB18] = LDMT1R_MIFTYP_RGB18, [SHMOB_DRM_IFACE_RGB24] = LDMT1R_MIFTYP_RGB24, [SHMOB_DRM_IFACE_YUV422] = LDMT1R_MIFTYP_YCBCR, - [SHMOB_DRM_IFACE_SYS8A] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8A, - [SHMOB_DRM_IFACE_SYS8B] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8B, - [SHMOB_DRM_IFACE_SYS8C] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8C, - [SHMOB_DRM_IFACE_SYS8D] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS8D, - [SHMOB_DRM_IFACE_SYS9] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS9, - [SHMOB_DRM_IFACE_SYS12] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS12, - [SHMOB_DRM_IFACE_SYS16A] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS16A, - [SHMOB_DRM_IFACE_SYS16B] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS16B, - [SHMOB_DRM_IFACE_SYS16C] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS16C, - [SHMOB_DRM_IFACE_SYS18] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS18, - [SHMOB_DRM_IFACE_SYS24] = LDMT1R_IFM | LDMT1R_MIFTYP_SYS24, };if (sdev->pdata->iface.interface >=ARRAY_SIZE (ldmt1r)) {
include/linux/platform_data/shmob_drm.h +0 -25
@@ -27,17 +27,6 @@ enum shmob_drm_interface {SHMOB_DRM_IFACE_RGB18 ,/* 18bpp */ SHMOB_DRM_IFACE_RGB24 ,/* 24bpp */ SHMOB_DRM_IFACE_YUV422, /* 16bpp */ -SHMOB_DRM_IFACE_SYS8A ,/* 24bpp, 8:8:8 */ -SHMOB_DRM_IFACE_SYS8B ,/* 18bpp, 8:8:2 */ -SHMOB_DRM_IFACE_SYS8C ,/* 18bpp, 2:8:8 */ -SHMOB_DRM_IFACE_SYS8D ,/* 16bpp, 8:8 */ -SHMOB_DRM_IFACE_SYS9 ,/* 18bpp, 9:9 */ -SHMOB_DRM_IFACE_SYS12 ,/* 24bpp, 12:12 */ -SHMOB_DRM_IFACE_SYS16A ,/* 16bpp */ -SHMOB_DRM_IFACE_SYS16B ,/* 18bpp, 16:2 */ -SHMOB_DRM_IFACE_SYS16C ,/* 18bpp, 2:16 */ -SHMOB_DRM_IFACE_SYS18 ,/* 18bpp */ - SHMOB_DRM_IFACE_SYS24, /* 24bpp */ }; struct shmob_drm_panel_data {
@@ -46,19 +35,6 @@ struct shmob_drm_panel_data {struct drm_mode_modeinfo mode; }; -struct shmob_drm_sys_interface_data { -unsigned int read_latch:6 ; -unsigned int read_setup:8 ; -unsigned int read_cycle:8 ; -unsigned int read_strobe:8 ; -unsigned int write_setup:8 ; -unsigned int write_cycle:8 ; -unsigned int write_strobe:8 ; -unsigned int cs_setup:3 ; -unsigned int vsync_active_high:1 ; -unsigned int vsync_dir_input:1 ; -}; -#define SHMOB_DRM_IFACE_FL_DWPOL (1 << 0)/* Rising edge dot clock data latch */ #define SHMOB_DRM_IFACE_FL_DIPOL (1 << 1)/* Active low display enable */ #define SHMOB_DRM_IFACE_FL_DAPOL (1 << 2)/* Active low display data */
@@ -67,7 +43,6 @@ struct shmob_drm_sys_interface_data {struct shmob_drm_interface_data {enum shmob_drm_interface interface; -struct shmob_drm_sys_interface_data sys;unsigned int clk_div;unsigned int flags; };
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 16/41 drm: renesas: shmobile: Improve error handling
In reply to Geert UytterhoevenPrepare for DT conversion, where panel probe can be deferred, by streamlining error propagation and handling:
- Use dev_err_probe() to avoid printing error messages in case of probe deferral,
- Propagate errors where needed.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 3 ++- drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +2 -1
@@ -255,7 +255,8 @@ static int shmob_drm_probe(struct platform_device *pdev) ret =shmob_drm_modeset_init (sdev);if (ret <0 ) { -dev_err (&pdev->dev,"failed to initialize mode setting\n" ); +dev_err_probe (&pdev->dev, ret, +"failed to initialize mode setting\n" ); goto err_free_drm_dev; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c +11 -3
@@ -157,9 +157,17 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev)if (ret)return ret; -shmob_drm_crtc_create (sdev); -shmob_drm_encoder_create (sdev); -shmob_drm_connector_create (sdev, &sdev->encoder); + ret =shmob_drm_crtc_create (sdev); +if (ret <0 ) +return ret; + + ret =shmob_drm_encoder_create (sdev); +if (ret <0 ) +return ret; + + ret =shmob_drm_connector_create (sdev, &sdev->encoder); +if (ret <0 ) +return ret;drm_kms_helper_poll_init (sdev->ddev);
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 17/41 drm: renesas: shmobile: Convert to use devm_request_irq()
In reply to Geert UytterhoevenConvert to managed IRQ handling, to simplify cleanup.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +3 -6
@@ -196,7 +196,6 @@ static int shmob_drm_remove(struct platform_device *pdev)drm_dev_unregister (ddev);drm_kms_helper_poll_fini (ddev); -free_irq (sdev->irq, ddev);drm_dev_put (ddev);return 0 ;
@@ -279,8 +278,8 @@ static int shmob_drm_probe(struct platform_device *pdev) goto err_modeset_cleanup; sdev->irq = ret; - ret =request_irq (sdev->irq, shmob_drm_irq,0 , ddev->driver->name, - ddev); + ret =devm_request_irq (&pdev->dev, sdev->irq, shmob_drm_irq,0 , + ddev->driver->name, ddev);if (ret <0 ) {dev_err (&pdev->dev,"failed to install IRQ handler\n" ); goto err_modeset_cleanup;
@@ -292,14 +291,12 @@ static int shmob_drm_probe(struct platform_device *pdev)*/ ret =drm_dev_register (ddev,0 );if (ret <0 ) - goto err_irq_uninstall; + goto err_modeset_cleanup;drm_fbdev_generic_setup (ddev,16 );return 0 ; -err_irq_uninstall: -free_irq (sdev->irq, ddev); err_modeset_cleanup:drm_kms_helper_poll_fini (ddev); err_free_drm_dev:
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 18/41 drm: renesas: shmobile: Remove custom plane destroy callback
In reply to Geert UytterhoevenThere is no need to call drm_plane_force_disable() from the plane's .destroy() callback, as the plane should have been disabled already before. See also commit 3c858a33858baa8c ("drm/plane_helper: don't disable plane in destroy function") for the generic plane helper case.
After removing this call, shmob_drm_plane_destroy() becomes a simple wrapper around shmob_drm_plane_destroy(), hence replace it by the latter.
---
v3:
- No changes,
v2:
- New.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +1 -7
@@ -176,16 +176,10 @@ static int shmob_drm_plane_disable(struct drm_plane *plane,return 0 ; } -static void shmob_drm_plane_destroy (struct drm_plane *plane) -{ -drm_plane_force_disable (plane); -drm_plane_cleanup (plane); -} -static const struct drm_plane_funcs shmob_drm_plane_funcs = { .update_plane = shmob_drm_plane_update, .disable_plane = shmob_drm_plane_disable, - .destroy = shmob_drm_plane_destroy, + .destroy = drm_plane_cleanup, };static const uint32_t formats[] = {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 19/41 drm: renesas: shmobile: Use drmm_universal_plane_alloc()
In reply to Geert UytterhoevenAccording to the comments for drm_universal_plane_init(), the plane structure should not be allocated with devm_kzalloc().
Fix lifetime issues by using drmm_universal_plane_alloc() instead.
---
v3:
- No changes,
v2:
- Split off removal of call to drm_plane_force_disable().
--- .../gpu/drm/renesas/shmobile/shmob_drm_plane.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +7 -11
@@ -179,7 +179,6 @@ static int shmob_drm_plane_disable(struct drm_plane *plane,static const struct drm_plane_funcs shmob_drm_plane_funcs = { .update_plane = shmob_drm_plane_update, .disable_plane = shmob_drm_plane_disable, - .destroy = drm_plane_cleanup, };static const uint32_t formats[] = {
@@ -198,19 +197,16 @@ static const uint32_t formats[] = {int shmob_drm_plane_create (struct shmob_drm_device *sdev,unsigned int index) {struct shmob_drm_plane *splane; -int ret; - splane =devm_kzalloc (sdev->dev,sizeof (*splane),GFP_KERNEL ); -if (splane ==NULL ) -return -ENOMEM ; + splane = drmm_universal_plane_alloc(sdev->ddev, struct shmob_drm_plane, + plane,1 , &shmob_drm_plane_funcs, + formats,ARRAY_SIZE (formats),NULL , +DRM_PLANE_TYPE_OVERLAY ,NULL ); +if (IS_ERR (splane)) +return PTR_ERR (splane); splane->index = index; splane->alpha =255 ; - ret =drm_universal_plane_init (sdev->ddev, &splane->plane,1 , - &shmob_drm_plane_funcs, - formats,ARRAY_SIZE (formats),NULL , -DRM_PLANE_TYPE_OVERLAY ,NULL ); - -return ret; +return 0 ; }
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 20/41 drm: renesas: shmobile: Embed drm_device in shmob_drm_device
In reply to Geert UytterhoevenEmbedding drm_device in shmob_drm_device allows us to use the DRM managed API to allocate both structures in one go, simplifying error handling.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 12 +++--- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 41 +++++++------------ .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 2 +- .../gpu/drm/renesas/shmobile/shmob_drm_kms.c | 16 ++++---- .../drm/renesas/shmobile/shmob_drm_plane.c | 8 ++-- 5 files changed, 34 insertions(+), 45 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +6 -6
@@ -116,7 +116,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)struct shmob_drm_device *sdev = crtc->dev->dev_private;const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;const struct shmob_drm_format_info *format; -struct drm_device *dev = sdev->ddev; +struct drm_device *dev = &sdev->ddev;struct drm_plane *plane;u32 value;int ret;
@@ -439,7 +439,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) sdev->crtc.dpms =DRM_MODE_DPMS_OFF ; - primary = __drm_universal_plane_alloc(sdev->ddev, sizeof(*primary), 0, + primary = __drm_universal_plane_alloc(&sdev->ddev, sizeof(*primary), 0, 0, &primary_plane_funcs, modeset_formats, ARRAY_SIZE(modeset_formats),
@@ -448,7 +448,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)if (IS_ERR (primary))return PTR_ERR (primary); - ret =drm_crtc_init_with_planes (sdev->ddev, crtc, primary,NULL , + ret =drm_crtc_init_with_planes (&sdev->ddev, crtc, primary,NULL , &crtc_funcs,NULL );if (ret <0 ) {drm_plane_cleanup (primary);
@@ -524,7 +524,7 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev) encoder->possible_crtcs =1 ; - ret =drm_simple_encoder_init (sdev->ddev, encoder, + ret =drm_simple_encoder_init (&sdev->ddev, encoder,DRM_MODE_ENCODER_DPI );if (ret <0 )return ret;
@@ -604,7 +604,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, connector->display_info.width_mm = sdev->pdata->panel.width_mm; connector->display_info.height_mm = sdev->pdata->panel.height_mm; - ret =drm_connector_init (sdev->ddev, connector, &connector_funcs, + ret =drm_connector_init (&sdev->ddev, connector, &connector_funcs,DRM_MODE_CONNECTOR_DPI );if (ret <0 )return ret;
@@ -617,7 +617,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,drm_helper_connector_dpms (connector,DRM_MODE_DPMS_OFF );drm_object_property_set_value (&connector->base, - sdev->ddev->mode_config.dpms_property,DRM_MODE_DPMS_OFF ); + sdev->ddev.mode_config.dpms_property,DRM_MODE_DPMS_OFF );return 0 ;
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +15 -26
87 lines not on this page · raw message
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h +1 -1
@@ -32,7 +32,7 @@ struct shmob_drm_device {unsigned int irq;spinlock_t irq_lock;/* Protects hardware LDINTR register */ -struct drm_device *ddev; +struct drm_device ddev;struct shmob_drm_crtc crtc;struct drm_encoder encoder;
drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c +8 -8
@@ -153,7 +153,7 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev) {int ret; - ret =drmm_mode_config_init (sdev->ddev); + ret =drmm_mode_config_init (&sdev->ddev);if (ret)return ret;
@@ -169,15 +169,15 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev)if (ret <0 )return ret; -drm_kms_helper_poll_init (sdev->ddev); +drm_kms_helper_poll_init (&sdev->ddev); - sdev->ddev->mode_config.min_width =0 ; - sdev->ddev->mode_config.min_height =0 ; - sdev->ddev->mode_config.max_width =4095 ; - sdev->ddev->mode_config.max_height =4095 ; - sdev->ddev->mode_config.funcs = &shmob_drm_mode_config_funcs; + sdev->ddev.mode_config.min_width =0 ; + sdev->ddev.mode_config.min_height =0 ; + sdev->ddev.mode_config.max_width =4095 ; + sdev->ddev.mode_config.max_height =4095 ; + sdev->ddev.mode_config.funcs = &shmob_drm_mode_config_funcs; -drm_helper_disable_unused_functions (sdev->ddev); +drm_helper_disable_unused_functions (&sdev->ddev);return 0 ; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +4 -4
@@ -68,7 +68,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, splane->format->ldbbsifr;#define plane_reg_dump (sdev, splane, reg) \ - dev_dbg(sdev->ddev->dev, "%s(%u): %s 0x%08x 0x%08x\n", __func__, \ + dev_dbg(sdev->ddev.dev, "%s(%u): %s 0x%08x 0x%08x\n", __func__, \ splane->index, #reg, \ lcdc_read(sdev, reg(splane->index)), \ lcdc_read(sdev, reg(splane->index) + LCDC_SIDE_B_OFFSET))
@@ -81,7 +81,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane,plane_reg_dump (sdev, splane, LDBnBSACR);lcdc_write (sdev,LDBCR ,LDBCR_UPC (splane->index)); -dev_dbg (sdev->ddev->dev,"%s(%u): %s 0x%08x\n" , __func__, splane->index, +dev_dbg (sdev->ddev.dev,"%s(%u): %s 0x%08x\n" , __func__, splane->index,"LDBCR" ,lcdc_read (sdev,LDBCR ));lcdc_write (sdev,LDBnBSIFR (splane->index), format);
@@ -103,7 +103,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane,lcdc_write (sdev,LDBCR ,LDBCR_UPF (splane->index) |LDBCR_UPD (splane->index)); -dev_dbg (sdev->ddev->dev,"%s(%u): %s 0x%08x\n" , __func__, splane->index, +dev_dbg (sdev->ddev.dev,"%s(%u): %s 0x%08x\n" , __func__, splane->index,"LDBCR" ,lcdc_read (sdev,LDBCR ));plane_reg_dump (sdev, splane, LDBnBSIFR);
@@ -198,7 +198,7 @@ int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index) {struct shmob_drm_plane *splane; - splane = drmm_universal_plane_alloc(sdev->ddev, struct shmob_drm_plane, + splane = drmm_universal_plane_alloc(&sdev->ddev, struct shmob_drm_plane, plane,1 , &shmob_drm_plane_funcs, formats,ARRAY_SIZE (formats),NULL ,DRM_PLANE_TYPE_OVERLAY ,NULL );
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 21/41 drm: renesas: shmobile: Convert container helpers to static inline functions
In reply to Geert UytterhoevenReplace to conversion helper macros using container_of() by static inline functions, to improve type-safety.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 11 ++++++++--- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +8 -3
@@ -258,7 +258,10 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)lcdc_write (sdev,LDRCNTR ,lcdc_read (sdev,LDRCNTR ) ^LDRCNTR_MRS ); } -#define to_shmob_crtc (c) container_of(c, struct shmob_drm_crtc, crtc) +static inline struct shmob_drm_crtc *to_shmob_crtc (struct drm_crtc *crtc) +{ + return container_of(crtc, struct shmob_drm_crtc, crtc); +}static void shmob_drm_crtc_dpms (struct drm_crtc *crtc,int mode) {
@@ -538,8 +541,10 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev)* Connector */ -#define to_shmob_connector (c) \ - container_of(c, struct shmob_drm_connector, connector) +static inline struct shmob_drm_connector *to_shmob_connector (struct drm_connector *connector) +{ + return container_of(connector, struct shmob_drm_connector, connector); +}static int shmob_drm_connector_get_modes (struct drm_connector *connector) {
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +4 -1
@@ -34,7 +34,10 @@ struct shmob_drm_plane {unsigned int crtc_h; }; -#define to_shmob_plane (p) container_of(p, struct shmob_drm_plane, plane) +static inline struct shmob_drm_plane *to_shmob_plane (struct drm_plane *plane) +{ + return container_of(plane, struct shmob_drm_plane, plane); +} static void shmob_drm_plane_compute_base(struct shmob_drm_plane *splane, struct drm_framebuffer *fb,
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 22/41 drm: renesas: shmobile: Replace .dev_private with container_of()
In reply to Geert UytterhoevenNow that drm_device is embedded in shmob_drm_device, we can use a container_of()-based helper to get the shmob_drm_device pointer from the drm_device, instead of using the deprecated drm_device.dev_private field.
While at it, restore reverse Xmas tree ordering of local variable declarations.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 20 +++++++++---------- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 4 +--- .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 5 +++++ .../drm/renesas/shmobile/shmob_drm_plane.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +10 -10
@@ -40,7 +40,7 @@static void shmob_drm_crtc_setup_geometry (struct shmob_drm_crtc *scrtc) {struct drm_crtc *crtc = &scrtc->crtc; -struct shmob_drm_device *sdev = crtc->dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;const struct drm_display_mode *mode = &crtc->mode;u32 value;
@@ -79,7 +79,7 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)static void shmob_drm_crtc_start_stop (struct shmob_drm_crtc *scrtc,bool start) { -struct shmob_drm_device *sdev = scrtc->crtc.dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (scrtc->crtc.dev);u32 value; value =lcdc_read (sdev,LDCNT2R );
@@ -113,7 +113,7 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)static void shmob_drm_crtc_start (struct shmob_drm_crtc *scrtc) {struct drm_crtc *crtc = &scrtc->crtc; -struct shmob_drm_device *sdev = crtc->dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;const struct shmob_drm_format_info *format;struct drm_device *dev = &sdev->ddev;
@@ -193,7 +193,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)static void shmob_drm_crtc_stop (struct shmob_drm_crtc *scrtc) {struct drm_crtc *crtc = &scrtc->crtc; -struct shmob_drm_device *sdev = crtc->dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);if (!scrtc->started)return ;
@@ -247,7 +247,7 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,static void shmob_drm_crtc_update_base (struct shmob_drm_crtc *scrtc) {struct drm_crtc *crtc = &scrtc->crtc; -struct shmob_drm_device *sdev = crtc->dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);shmob_drm_crtc_compute_base (scrtc, crtc->x, crtc->y);
@@ -289,8 +289,8 @@ static int shmob_drm_crtc_mode_set(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { + struct shmob_drm_device *sdev = to_shmob_device(crtc->dev);struct shmob_drm_crtc *scrtc =to_shmob_crtc (crtc); -struct shmob_drm_device *sdev = crtc->dev->dev_private;const struct shmob_drm_format_info *format; format =shmob_drm_format_info (crtc->primary->fb->format->format);
@@ -395,7 +395,7 @@ static void shmob_drm_crtc_enable_vblank(struct shmob_drm_device *sdev,static int shmob_drm_enable_vblank (struct drm_crtc *crtc) { -struct shmob_drm_device *sdev = crtc->dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);shmob_drm_crtc_enable_vblank (sdev, true);
@@ -404,7 +404,7 @@ static int shmob_drm_enable_vblank(struct drm_crtc *crtc)static void shmob_drm_disable_vblank (struct drm_crtc *crtc) { -struct shmob_drm_device *sdev = crtc->dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);shmob_drm_crtc_enable_vblank (sdev, false); }
@@ -478,7 +478,7 @@ static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *adjusted_mode) {struct drm_device *dev = encoder->dev; -struct shmob_drm_device *sdev = dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (dev);struct drm_connector *connector = &sdev->connector.connector;const struct drm_display_mode *panel_mode;
@@ -548,7 +548,7 @@ static inline struct shmob_drm_connector *to_shmob_connector(struct drm_connectostatic int shmob_drm_connector_get_modes (struct drm_connector *connector) { -struct shmob_drm_device *sdev = connector->dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (connector->dev);struct drm_display_mode *mode; mode =drm_mode_create (connector->dev);
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +1 -3
@@ -95,7 +95,7 @@ static int shmob_drm_setup_clocks(struct shmob_drm_device *sdev,static irqreturn_t shmob_drm_irq (int irq,void *arg) {struct drm_device *dev = arg; -struct shmob_drm_device *sdev = dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (dev);unsigned long flags;u32 status;
@@ -244,8 +244,6 @@ static int shmob_drm_probe(struct platform_device *pdev)if (ret <0 )return ret; - ddev->dev_private = sdev; - ret =shmob_drm_modeset_init (sdev);if (ret <0 ) return dev_err_probe(&pdev->dev, ret,
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h +5 -0
@@ -39,4 +39,9 @@ struct shmob_drm_device {struct shmob_drm_connector connector; }; +static inline struct shmob_drm_device *to_shmob_device (struct drm_device *dev) +{ + return container_of(dev, struct shmob_drm_device, ddev); +} +#endif /* __SHMOB_DRM_DRV_H__ */
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +3 -3
@@ -63,7 +63,7 @@ static void shmob_drm_plane_compute_base(struct shmob_drm_plane *splane,static void __shmob_drm_plane_setup (struct shmob_drm_plane *splane,struct drm_framebuffer *fb) { -struct shmob_drm_device *sdev = splane->plane.dev->dev_private; +struct shmob_drm_device *sdev =to_shmob_device (splane->plane.dev);u32 format;/* TODO: Support ROP3 mode */
@@ -135,8 +135,8 @@ shmob_drm_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, uint32_t src_w, uint32_t src_h, struct drm_modeset_acquire_ctx *ctx) { + struct shmob_drm_device *sdev = to_shmob_device(plane->dev);struct shmob_drm_plane *splane =to_shmob_plane (plane); -struct shmob_drm_device *sdev = plane->dev->dev_private;const struct shmob_drm_format_info *format; format =shmob_drm_format_info (fb->format->format);
@@ -167,8 +167,8 @@ shmob_drm_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,static int shmob_drm_plane_disable (struct drm_plane *plane,struct drm_modeset_acquire_ctx *ctx) { +struct shmob_drm_device *sdev =to_shmob_device (plane->dev);struct shmob_drm_plane *splane =to_shmob_plane (plane); -struct shmob_drm_device *sdev = plane->dev->dev_private; splane->format =NULL ;
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 23/41 drm: renesas: shmobile: Use struct videomode in platform data
In reply to Geert UytterhoevenFrom: Laurent Pinchart <[email protected]>
Replace the drm_mode_modeinfo field with videomode that includes more signal polarity flags. This simplifies driver handling of panel modes and prepares for DT support.
---
v3:
- No changes,
v2:
- Add Reviewed-by,
- Select VIDEOMODE_HELPERS.
Changes compared to Laurent's original:
- Rebase,
- Fix build,
- Remove unneeded {width,height}_mm intermediaries from shmob_drm_connector,
- Replace embedded videomode by a const pointer to pdata.
--- drivers/gpu/drm/renesas/shmobile/Kconfig | 1 + .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 35 ++++++++----------- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 3 ++ include/linux/platform_data/shmob_drm.h | 11 ++---- 4 files changed, 20 insertions(+), 30 deletions(-)
drivers/gpu/drm/renesas/shmobile/Kconfig +1 -0
@@ -6,6 +6,7 @@ config DRM_SHMOBILE select BACKLIGHT_CLASS_DEVICE select DRM_KMS_HELPER select DRM_GEM_DMA_HELPER + select VIDEOMODE_HELPERS help Choose this option if you have an SH Mobile chipset. If M is selected the module will be called shmob-drm.
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +14 -21
@@ -23,6 +23,8 @@#include <drm/drm_simple_kms_helper.h> #include <drm/drm_vblank.h> +#include <video/videomode.h> +#include "shmob_drm_crtc.h" #include "shmob_drm_drv.h" #include "shmob_drm_kms.h"
@@ -41,18 +43,16 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc) {struct drm_crtc *crtc = &scrtc->crtc;struct shmob_drm_device *sdev =to_shmob_device (crtc->dev); -const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; +enum display_flags dpy_flags = sdev->connector.mode->flags;const struct drm_display_mode *mode = &crtc->mode;u32 value; value = sdev->ldmt1r | ((mode->flags &DRM_MODE_FLAG_PVSYNC ) ?0 :LDMT1R_VPOL ) | ((mode->flags &DRM_MODE_FLAG_PHSYNC ) ?0 :LDMT1R_HPOL ) - | ((idata->flags &SHMOB_DRM_IFACE_FL_DWPOL ) ?LDMT1R_DWPOL :0 ) - | ((idata->flags &SHMOB_DRM_IFACE_FL_DIPOL ) ?LDMT1R_DIPOL :0 ) - | ((idata->flags &SHMOB_DRM_IFACE_FL_DAPOL ) ?LDMT1R_DAPOL :0 ) - | ((idata->flags &SHMOB_DRM_IFACE_FL_HSCNT ) ?LDMT1R_HSCNT :0 ) - | ((idata->flags &SHMOB_DRM_IFACE_FL_DWCNT ) ?LDMT1R_DWCNT :0 ); + | ((dpy_flags &DISPLAY_FLAGS_PIXDATA_POSEDGE ) ?LDMT1R_DWPOL :0 ) + | ((dpy_flags &DISPLAY_FLAGS_DE_LOW ) ?LDMT1R_DIPOL :0 ); +lcdc_write (sdev,LDMT1R , value); value = ((mode->hdisplay /8 ) <<16 )/* HDCN */
@@ -548,7 +548,7 @@ static inline struct shmob_drm_connector *to_shmob_connector(struct drm_connectostatic int shmob_drm_connector_get_modes (struct drm_connector *connector) { -struct shmob_drm_device *sdev =to_shmob_device (connector->dev); +struct shmob_drm_connector *scon =to_shmob_connector (connector);struct drm_display_mode *mode; mode =drm_mode_create (connector->dev);
@@ -556,18 +556,9 @@ static int shmob_drm_connector_get_modes(struct drm_connector *connector)return 0 ; mode->type =DRM_MODE_TYPE_PREFERRED |DRM_MODE_TYPE_DRIVER ; - mode->clock = sdev->pdata->panel.mode.clock; - mode->hdisplay = sdev->pdata->panel.mode.hdisplay; - mode->hsync_start = sdev->pdata->panel.mode.hsync_start; - mode->hsync_end = sdev->pdata->panel.mode.hsync_end; - mode->htotal = sdev->pdata->panel.mode.htotal; - mode->vdisplay = sdev->pdata->panel.mode.vdisplay; - mode->vsync_start = sdev->pdata->panel.mode.vsync_start; - mode->vsync_end = sdev->pdata->panel.mode.vsync_end; - mode->vtotal = sdev->pdata->panel.mode.vtotal; - mode->flags = sdev->pdata->panel.mode.flags; - -drm_mode_set_name (mode); + +drm_display_mode_from_videomode (scon->mode, mode); +drm_mode_probed_add (connector, mode);return 1 ;
@@ -601,10 +592,12 @@ static const struct drm_connector_funcs connector_funcs = {int shmob_drm_connector_create (struct shmob_drm_device *sdev,struct drm_encoder *encoder) { -struct drm_connector *connector = &sdev->connector.connector; +struct shmob_drm_connector *scon = &sdev->connector; +struct drm_connector *connector = &scon->connector;int ret; - sdev->connector.encoder = encoder; + scon->encoder = encoder; + scon->mode = &sdev->pdata->panel.mode; connector->display_info.width_mm = sdev->pdata->panel.width_mm; connector->display_info.height_mm = sdev->pdata->panel.height_mm;
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +3 -0
@@ -14,6 +14,8 @@#include <drm/drm_connector.h> #include <drm/drm_encoder.h> +#include <video/videomode.h> +struct drm_pending_vblank_event ;struct shmob_drm_device ;struct shmob_drm_format_info ;
@@ -33,6 +35,7 @@ struct shmob_drm_crtc {struct shmob_drm_connector {struct drm_connector connector;struct drm_encoder *encoder; +const struct videomode *mode; };int shmob_drm_crtc_create (struct shmob_drm_device *sdev);
include/linux/platform_data/shmob_drm.h +2 -9
@@ -10,7 +10,7 @@#ifndef __SHMOB_DRM_H__#define __SHMOB_DRM_H__ -#include <drm/drm_mode.h> +#include <video/videomode.h> enum shmob_drm_clk_source { SHMOB_DRM_CLK_BUS,
@@ -32,19 +32,12 @@ enum shmob_drm_interface {struct shmob_drm_panel_data {unsigned int width_mm;/* Panel width in mm */ unsigned int height_mm;/* Panel height in mm */ -struct drm_mode_modeinfo mode; +struct videomode mode; }; -#define SHMOB_DRM_IFACE_FL_DWPOL (1 << 0)/* Rising edge dot clock data latch */ -#define SHMOB_DRM_IFACE_FL_DIPOL (1 << 1)/* Active low display enable */ -#define SHMOB_DRM_IFACE_FL_DAPOL (1 << 2)/* Active low display data */ -#define SHMOB_DRM_IFACE_FL_HSCNT (1 << 3)/* Disable HSYNC during VBLANK */ -#define SHMOB_DRM_IFACE_FL_DWCNT (1 << 4)/* Disable dotclock during blanking */ -struct shmob_drm_interface_data {enum shmob_drm_interface interface;unsigned int clk_div; -unsigned int flags; };struct shmob_drm_platform_data {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 24/41 drm: renesas: shmobile: Use media bus formats in platform data
In reply to Geert UytterhoevenReplace the custom shmob_drm_interface enumeration values with standard media bus formats. This simplifies driver handling of bus formats and prepares for DT support.
---
v3:
- No changes,
v2:
- Keep table instead of replacing it by a switch() statement,
- Fix shmob_drm_interface_data.bus_fmt comment.
--- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 37 +++++++++++-------- include/linux/platform_data/shmob_drm.h | 13 +------ 2 files changed, 23 insertions(+), 27 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +22 -15
@@ -9,6 +9,7 @@#include <linux/clk.h> #include <linux/io.h> +#include <linux/media-bus-format.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/platform_device.h>
@@ -34,25 +35,31 @@static int shmob_drm_init_interface (struct shmob_drm_device *sdev) { -static const u32 ldmt1r[] = { - [SHMOB_DRM_IFACE_RGB8 ] =LDMT1R_MIFTYP_RGB8 , - [SHMOB_DRM_IFACE_RGB9 ] =LDMT1R_MIFTYP_RGB9 , - [SHMOB_DRM_IFACE_RGB12A ] =LDMT1R_MIFTYP_RGB12A , - [SHMOB_DRM_IFACE_RGB12B ] =LDMT1R_MIFTYP_RGB12B , - [SHMOB_DRM_IFACE_RGB16 ] =LDMT1R_MIFTYP_RGB16 , - [SHMOB_DRM_IFACE_RGB18 ] =LDMT1R_MIFTYP_RGB18 , - [SHMOB_DRM_IFACE_RGB24 ] =LDMT1R_MIFTYP_RGB24 , - [SHMOB_DRM_IFACE_YUV422 ] =LDMT1R_MIFTYP_YCBCR , +static const struct { +u32 fmt; +u32 ldmt1r; + } bus_fmts[] = { + {MEDIA_BUS_FMT_RGB888_3X8 ,LDMT1R_MIFTYP_RGB8 }, + {MEDIA_BUS_FMT_RGB666_2X9_BE ,LDMT1R_MIFTYP_RGB9 }, + {MEDIA_BUS_FMT_RGB888_2X12_BE ,LDMT1R_MIFTYP_RGB12A }, + {MEDIA_BUS_FMT_RGB444_1X12 ,LDMT1R_MIFTYP_RGB12B }, + {MEDIA_BUS_FMT_RGB565_1X16 ,LDMT1R_MIFTYP_RGB16 }, + {MEDIA_BUS_FMT_RGB666_1X18 ,LDMT1R_MIFTYP_RGB18 }, + {MEDIA_BUS_FMT_RGB888_1X24 ,LDMT1R_MIFTYP_RGB24 }, + {MEDIA_BUS_FMT_UYVY8_1X16 ,LDMT1R_MIFTYP_YCBCR }, }; +unsigned int i; -if (sdev->pdata->iface.interface >=ARRAY_SIZE (ldmt1r)) { -dev_err (sdev->dev,"invalid interface type %u\n" , - sdev->pdata->iface.interface); -return -EINVAL ; +for (i =0 ; i <ARRAY_SIZE (bus_fmts); i++) { +if (bus_fmts[i].fmt == sdev->pdata->iface.bus_fmt) { + sdev->ldmt1r = bus_fmts[i].ldmt1r; +return 0 ; + } } - sdev->ldmt1r = ldmt1r[sdev->pdata->iface.interface]; -return 0 ; +dev_err (sdev->dev,"unsupported bus format 0x%x\n" , + sdev->pdata->iface.bus_fmt); +return -EINVAL ; } static int shmob_drm_setup_clocks(struct shmob_drm_device *sdev,
include/linux/platform_data/shmob_drm.h +1 -12
@@ -18,17 +18,6 @@ enum shmob_drm_clk_source { SHMOB_DRM_CLK_EXTERNAL, }; -enum shmob_drm_interface { -SHMOB_DRM_IFACE_RGB8 ,/* 24bpp, 8:8:8 */ -SHMOB_DRM_IFACE_RGB9 ,/* 18bpp, 9:9 */ -SHMOB_DRM_IFACE_RGB12A ,/* 24bpp, 12:12 */ -SHMOB_DRM_IFACE_RGB12B ,/* 12bpp */ -SHMOB_DRM_IFACE_RGB16 ,/* 16bpp */ -SHMOB_DRM_IFACE_RGB18 ,/* 18bpp */ -SHMOB_DRM_IFACE_RGB24 ,/* 24bpp */ -SHMOB_DRM_IFACE_YUV422 ,/* 16bpp */ -}; -struct shmob_drm_panel_data {unsigned int width_mm;/* Panel width in mm */ unsigned int height_mm;/* Panel height in mm */
@@ -36,7 +25,7 @@ struct shmob_drm_panel_data { };struct shmob_drm_interface_data { -enum shmob_drm_interface interface; +unsigned int bus_fmt;/* MEDIA_BUS_FMT_* */ unsigned int clk_div; };
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 25/41 drm: renesas: shmobile: Move interface handling to connector setup
In reply to Geert UytterhoevenMove legacy interface handling to the connector setup code. Set up bus_flags and bus_formats in display_info according to the bus format and panel information from platform data, to make it more similar with DT-based connector/bridge/panel setup.
This will allow us to use the same LCD interface setup code for both legacy and DT-based systems.
---
v3:
- No changes,
v2:
- Drop superfluous blank lines,
- Keep initialization of info fields together,
- Use shmob_drm_bus_fmts[],
- Keep bus format validation at probe time.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 118 +++++++++++++++--- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 34 ----- .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 3 +- 3 files changed, 104 insertions(+), 51 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +103 -15
@@ -8,6 +8,7 @@*/ #include <linux/clk.h> +#include <linux/media-bus-format.h> #include <linux/pm_runtime.h> #include <drm/drm_crtc.h>
@@ -39,20 +40,55 @@* CRTC */ +static const struct { +u32 fmt; +u32 ldmt1r; +} shmob_drm_bus_fmts[] = { + {MEDIA_BUS_FMT_RGB888_3X8 ,LDMT1R_MIFTYP_RGB8 }, + {MEDIA_BUS_FMT_RGB666_2X9_BE ,LDMT1R_MIFTYP_RGB9 }, + {MEDIA_BUS_FMT_RGB888_2X12_BE ,LDMT1R_MIFTYP_RGB12A }, + {MEDIA_BUS_FMT_RGB444_1X12 ,LDMT1R_MIFTYP_RGB12B }, + {MEDIA_BUS_FMT_RGB565_1X16 ,LDMT1R_MIFTYP_RGB16 }, + {MEDIA_BUS_FMT_RGB666_1X18 ,LDMT1R_MIFTYP_RGB18 }, + {MEDIA_BUS_FMT_RGB888_1X24 ,LDMT1R_MIFTYP_RGB24 }, + {MEDIA_BUS_FMT_UYVY8_1X16 ,LDMT1R_MIFTYP_YCBCR }, +}; +static void shmob_drm_crtc_setup_geometry (struct shmob_drm_crtc *scrtc) {struct drm_crtc *crtc = &scrtc->crtc;struct shmob_drm_device *sdev =to_shmob_device (crtc->dev); -enum display_flags dpy_flags = sdev->connector.mode->flags; +const struct drm_display_info *info = &sdev->connector->display_info;const struct drm_display_mode *mode = &crtc->mode; +unsigned int i;u32 value; - value = sdev->ldmt1r - | ((mode->flags &DRM_MODE_FLAG_PVSYNC ) ?0 :LDMT1R_VPOL ) - | ((mode->flags &DRM_MODE_FLAG_PHSYNC ) ?0 :LDMT1R_HPOL ) - | ((dpy_flags &DISPLAY_FLAGS_PIXDATA_POSEDGE ) ?LDMT1R_DWPOL :0 ) - | ((dpy_flags &DISPLAY_FLAGS_DE_LOW ) ?LDMT1R_DIPOL :0 ); +if (!info->num_bus_formats || !info->bus_formats) { +dev_warn (sdev->dev,"No bus format reported, using RGB888\n" ); + value =LDMT1R_MIFTYP_RGB24 ; + }else { +for (i =0 ; i <ARRAY_SIZE (shmob_drm_bus_fmts); i++) { +if (shmob_drm_bus_fmts[i].fmt == info->bus_formats[0 ]) +break ; + } +if (i <ARRAY_SIZE (shmob_drm_bus_fmts)) { + value = shmob_drm_bus_fmts[i].ldmt1r; + }else { +dev_warn (sdev->dev, +"unsupported bus format 0x%x, using RGB888\n" , + info->bus_formats[0 ]); + value =LDMT1R_MIFTYP_RGB24 ; + } + } +if (info->bus_flags &DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE ) + value |=LDMT1R_DWPOL ; +if (info->bus_flags &DRM_BUS_FLAG_DE_LOW ) + value |=LDMT1R_DIPOL ; +if (mode->flags &DRM_MODE_FLAG_NVSYNC ) + value |=LDMT1R_VPOL ; +if (mode->flags &DRM_MODE_FLAG_NHSYNC ) + value |=LDMT1R_HPOL ;lcdc_write (sdev,LDMT1R , value); value = ((mode->hdisplay /8 ) <<16 )/* HDCN */
@@ -479,7 +515,7 @@ static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder, {struct drm_device *dev = encoder->dev;struct shmob_drm_device *sdev =to_shmob_device (dev); -struct drm_connector *connector = &sdev->connector.connector; +struct drm_connector *connector = sdev->connector;const struct drm_display_mode *panel_mode;if (list_empty (&connector->modes)) {
@@ -581,6 +617,8 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector) {drm_connector_unregister (connector);drm_connector_cleanup (connector); + +kfree (connector); }static const struct drm_connector_funcs connector_funcs = {
@@ -589,26 +627,74 @@ static const struct drm_connector_funcs connector_funcs = { .destroy = shmob_drm_connector_destroy, }; -int shmob_drm_connector_create (struct shmob_drm_device *sdev, -struct drm_encoder *encoder) +static struct drm_connector * +shmob_drm_connector_init (struct shmob_drm_device *sdev, +struct drm_encoder *encoder) { -struct shmob_drm_connector *scon = &sdev->connector; -struct drm_connector *connector = &scon->connector; +u32 bus_fmt = sdev->pdata->iface.bus_fmt; +struct shmob_drm_connector *scon; +struct drm_connector *connector; +struct drm_display_info *info; +unsigned int i;int ret; +for (i =0 ; i <ARRAY_SIZE (shmob_drm_bus_fmts); i++) { +if (shmob_drm_bus_fmts[i].fmt == bus_fmt) +break ; + } +if (i ==ARRAY_SIZE (shmob_drm_bus_fmts)) { +dev_err (sdev->dev,"unsupported bus format 0x%x\n" , bus_fmt); +return ERR_PTR (-EINVAL ); + } + + scon =kzalloc (sizeof (*scon),GFP_KERNEL ); +if (!scon) +return ERR_PTR (-ENOMEM ); + + connector = &scon->connector; scon->encoder = encoder; scon->mode = &sdev->pdata->panel.mode; - connector->display_info.width_mm = sdev->pdata->panel.width_mm; - connector->display_info.height_mm = sdev->pdata->panel.height_mm; + info = &connector->display_info; + info->width_mm = sdev->pdata->panel.width_mm; + info->height_mm = sdev->pdata->panel.height_mm; + +if (scon->mode->flags &DISPLAY_FLAGS_PIXDATA_POSEDGE ) + info->bus_flags |=DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE ; +if (scon->mode->flags &DISPLAY_FLAGS_DE_LOW ) + info->bus_flags |=DRM_BUS_FLAG_DE_LOW ; + + ret =drm_display_info_set_bus_formats (info, &bus_fmt,1 ); +if (ret <0 ) { +kfree (scon); +return ERR_PTR (ret); + } ret =drm_connector_init (&sdev->ddev, connector, &connector_funcs,DRM_MODE_CONNECTOR_DPI ); -if (ret <0 ) -return ret; +if (ret <0 ) { +kfree (scon); +return ERR_PTR (ret); + }drm_connector_helper_add (connector, &connector_helper_funcs); +return connector; +} + +int shmob_drm_connector_create (struct shmob_drm_device *sdev, +struct drm_encoder *encoder) +{ +struct drm_connector *connector; +int ret; + + connector =shmob_drm_connector_init (sdev, encoder); +if (IS_ERR (connector)) { +dev_err (sdev->dev,"failed to created connector: %pe\n" , + connector); +return PTR_ERR (connector); + } + ret =drm_connector_attach_encoder (connector, encoder);if (ret <0 ) goto error;
@@ -617,6 +703,8 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,drm_object_property_set_value (&connector->base, sdev->ddev.mode_config.dpms_property,DRM_MODE_DPMS_OFF ); + sdev->connector = connector; +return 0 ; error:
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +0 -34
@@ -9,7 +9,6 @@#include <linux/clk.h> #include <linux/io.h> -#include <linux/media-bus-format.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/platform_device.h>
@@ -33,35 +32,6 @@* Hardware initialization */ -static int shmob_drm_init_interface (struct shmob_drm_device *sdev) -{ -static const struct { -u32 fmt; -u32 ldmt1r; - } bus_fmts[] = { - {MEDIA_BUS_FMT_RGB888_3X8 ,LDMT1R_MIFTYP_RGB8 }, - {MEDIA_BUS_FMT_RGB666_2X9_BE ,LDMT1R_MIFTYP_RGB9 }, - {MEDIA_BUS_FMT_RGB888_2X12_BE ,LDMT1R_MIFTYP_RGB12A }, - {MEDIA_BUS_FMT_RGB444_1X12 ,LDMT1R_MIFTYP_RGB12B }, - {MEDIA_BUS_FMT_RGB565_1X16 ,LDMT1R_MIFTYP_RGB16 }, - {MEDIA_BUS_FMT_RGB666_1X18 ,LDMT1R_MIFTYP_RGB18 }, - {MEDIA_BUS_FMT_RGB888_1X24 ,LDMT1R_MIFTYP_RGB24 }, - {MEDIA_BUS_FMT_UYVY8_1X16 ,LDMT1R_MIFTYP_YCBCR }, - }; -unsigned int i; - -for (i =0 ; i <ARRAY_SIZE (bus_fmts); i++) { -if (bus_fmts[i].fmt == sdev->pdata->iface.bus_fmt) { - sdev->ldmt1r = bus_fmts[i].ldmt1r; -return 0 ; - } - } - -dev_err (sdev->dev,"unsupported bus format 0x%x\n" , - sdev->pdata->iface.bus_fmt); -return -EINVAL ; -} -static int shmob_drm_setup_clocks (struct shmob_drm_device *sdev,enum shmob_drm_clk_source clksrc) {
@@ -247,10 +217,6 @@ static int shmob_drm_probe(struct platform_device *pdev)if (ret)return ret; - ret =shmob_drm_init_interface (sdev); -if (ret <0 ) -return ret; - ret =shmob_drm_modeset_init (sdev);if (ret <0 ) return dev_err_probe(&pdev->dev, ret,
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h +1 -2
@@ -27,7 +27,6 @@ struct shmob_drm_device {void __iomem *mmio;struct clk *clock;u32 lddckr; -u32 ldmt1r;unsigned int irq;spinlock_t irq_lock;/* Protects hardware LDINTR register */
@@ -36,7 +35,7 @@ struct shmob_drm_device {struct shmob_drm_crtc crtc;struct drm_encoder encoder; -struct shmob_drm_connector connector; +struct drm_connector *connector; };static inline struct shmob_drm_device *to_shmob_device (struct drm_device *dev)
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 26/41 drm: renesas: shmobile: Unify plane allocation
In reply to Geert UytterhoevenUnify primary and overlay plane allocation:
- Enhance shmob_drm_plane_create() so it can be used to create the primary plane, too,
- Move overlay plane creation next to primary plane creation.
---
v3:
- No changes,
v2:
- Pass plane type to shmob_drm_plane_create() to avoid having to shift all overlay plane indices by one,
- Rename primary_plane_funcs to shmob_drm_primary_plane_funcs,
- Rename shmob_drm_plane_funcs to shmob_drm_overlay_plane_funcs.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 39 +++++-------------- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 9 ----- .../drm/renesas/shmobile/shmob_drm_plane.c | 31 +++++++++++---- .../drm/renesas/shmobile/shmob_drm_plane.h | 4 +- 4 files changed, 36 insertions(+), 47 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +10 -29
@@ -19,7 +19,6 @@#include <drm/drm_gem_dma_helper.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_modeset_helper_vtables.h> -#include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> #include <drm/drm_vblank.h>
@@ -453,47 +452,29 @@ static const struct drm_crtc_funcs crtc_funcs = { .disable_vblank = shmob_drm_disable_vblank, }; -static const uint32_t modeset_formats[] = { -DRM_FORMAT_RGB565 , -DRM_FORMAT_RGB888 , -DRM_FORMAT_ARGB8888 , -DRM_FORMAT_XRGB8888 , -DRM_FORMAT_NV12 , -DRM_FORMAT_NV21 , -DRM_FORMAT_NV16 , -DRM_FORMAT_NV61 , -DRM_FORMAT_NV24 , -DRM_FORMAT_NV42 , -}; - -static const struct drm_plane_funcs primary_plane_funcs = { -DRM_PLANE_NON_ATOMIC_FUNCS , -}; -int shmob_drm_crtc_create (struct shmob_drm_device *sdev) {struct drm_crtc *crtc = &sdev->crtc.crtc; -struct drm_plane *primary; +struct drm_plane *primary, *plane; +unsigned int i;int ret; sdev->crtc.dpms =DRM_MODE_DPMS_OFF ; - primary =__drm_universal_plane_alloc (&sdev->ddev,sizeof (*primary),0 , -0 , &primary_plane_funcs, - modeset_formats, -ARRAY_SIZE (modeset_formats), -NULL ,DRM_PLANE_TYPE_PRIMARY , -NULL ); + primary =shmob_drm_plane_create (sdev,DRM_PLANE_TYPE_PRIMARY ,0 );if (IS_ERR (primary))return PTR_ERR (primary); +for (i =1 ; i <5 ; ++i) { + plane =shmob_drm_plane_create (sdev,DRM_PLANE_TYPE_OVERLAY , i); +if (IS_ERR (plane)) +return PTR_ERR (plane); + } + ret =drm_crtc_init_with_planes (&sdev->ddev, crtc, primary,NULL , &crtc_funcs,NULL ); -if (ret <0 ) { -drm_plane_cleanup (primary); -kfree (primary); +if (ret <0 )return ret; - }drm_crtc_helper_add (crtc, &crtc_helper_funcs);
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +0 -9
@@ -181,7 +181,6 @@ static int shmob_drm_probe(struct platform_device *pdev)struct shmob_drm_platform_data *pdata = pdev->dev.platform_data;struct shmob_drm_device *sdev;struct drm_device *ddev; -unsigned int i;int ret;if (pdata ==NULL ) {
@@ -222,14 +221,6 @@ static int shmob_drm_probe(struct platform_device *pdev)return dev_err_probe (&pdev->dev, ret,"failed to initialize mode setting\n" ); -for (i =0 ; i <4 ; ++i) { - ret =shmob_drm_plane_create (sdev, i); -if (ret <0 ) { -dev_err (&pdev->dev,"failed to create plane %u\n" , i); - goto err_modeset_cleanup; - } - } - ret =drm_vblank_init (ddev,1 );if (ret <0 ) {dev_err (&pdev->dev,"failed to initialize vblank\n" );
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +23 -8
@@ -12,6 +12,7 @@#include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_dma_helper.h> +#include <drm/drm_plane_helper.h> #include "shmob_drm_drv.h" #include "shmob_drm_kms.h"
@@ -179,7 +180,12 @@ static int shmob_drm_plane_disable(struct drm_plane *plane,return 0 ; } -static const struct drm_plane_funcs shmob_drm_plane_funcs = { +static const struct drm_plane_funcs shmob_drm_primary_plane_funcs = { + .update_plane = drm_plane_helper_update_primary, + .disable_plane = drm_plane_helper_disable_primary, +}; + +static const struct drm_plane_funcs shmob_drm_overlay_plane_funcs = { .update_plane = shmob_drm_plane_update, .disable_plane = shmob_drm_plane_disable, };
@@ -197,19 +203,28 @@ static const uint32_t formats[] = { DRM_FORMAT_NV42, }; -int shmob_drm_plane_create (struct shmob_drm_device *sdev,unsigned int index) +struct drm_plane *shmob_drm_plane_create (struct shmob_drm_device *sdev, +enum drm_plane_type type, +unsigned int index) { +const struct drm_plane_funcs *funcs;struct shmob_drm_plane *splane; - splane = drmm_universal_plane_alloc(&sdev->ddev, struct shmob_drm_plane, - plane,1 , &shmob_drm_plane_funcs, - formats,ARRAY_SIZE (formats),NULL , -DRM_PLANE_TYPE_OVERLAY ,NULL ); +if (type ==DRM_PLANE_TYPE_PRIMARY ) + funcs = &shmob_drm_primary_plane_funcs; +else + funcs = &shmob_drm_overlay_plane_funcs; + + splane =drmm_universal_plane_alloc (&sdev->ddev, + struct shmob_drm_plane, plane, 1, + funcs, formats, +ARRAY_SIZE (formats),NULL , type, +NULL );if (IS_ERR (splane)) -return PTR_ERR (splane); +return ERR_CAST (splane); splane->index = index; splane->alpha =255 ; -return 0 ; +return &splane->plane; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h +3 -1
@@ -13,7 +13,9 @@struct drm_plane ;struct shmob_drm_device ; -int shmob_drm_plane_create (struct shmob_drm_device *sdev,unsigned int index); +struct drm_plane *shmob_drm_plane_create (struct shmob_drm_device *sdev, +enum drm_plane_type type, +unsigned int index);void shmob_drm_plane_setup (struct drm_plane *plane);#endif /* __SHMOB_DRM_PLANE_H__ */
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 27/41 drm: renesas: shmobile: Rename shmob_drm_crtc.crtc
In reply to Geert UytterhoevenRename the "crtc" member of the shmob_drm_crtc subclass structure to "base", to improve readability.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 26 +++++++++---------- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +13 -13
@@ -55,7 +55,7 @@ static const struct {static void shmob_drm_crtc_setup_geometry (struct shmob_drm_crtc *scrtc) { -struct drm_crtc *crtc = &scrtc->crtc; +struct drm_crtc *crtc = &scrtc->base;struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);const struct drm_display_info *info = &sdev->connector->display_info;const struct drm_display_mode *mode = &crtc->mode;
@@ -114,7 +114,7 @@ static void shmob_drm_crtc_setup_geometry(struct shmob_drm_crtc *scrtc)static void shmob_drm_crtc_start_stop (struct shmob_drm_crtc *scrtc,bool start) { -struct shmob_drm_device *sdev =to_shmob_device (scrtc->crtc.dev); +struct shmob_drm_device *sdev =to_shmob_device (scrtc->base.dev);u32 value; value =lcdc_read (sdev,LDCNT2R );
@@ -147,7 +147,7 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start)*/ static void shmob_drm_crtc_start (struct shmob_drm_crtc *scrtc) { -struct drm_crtc *crtc = &scrtc->crtc; +struct drm_crtc *crtc = &scrtc->base;struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;const struct shmob_drm_format_info *format;
@@ -227,7 +227,7 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)static void shmob_drm_crtc_stop (struct shmob_drm_crtc *scrtc) { -struct drm_crtc *crtc = &scrtc->crtc; +struct drm_crtc *crtc = &scrtc->base;struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);if (!scrtc->started)
@@ -260,7 +260,7 @@ void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc)static void shmob_drm_crtc_compute_base (struct shmob_drm_crtc *scrtc,int x,int y) { -struct drm_crtc *crtc = &scrtc->crtc; +struct drm_crtc *crtc = &scrtc->base;struct drm_framebuffer *fb = crtc->primary->fb;struct drm_gem_dma_object *gem;unsigned int bpp;
@@ -281,7 +281,7 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc,static void shmob_drm_crtc_update_base (struct shmob_drm_crtc *scrtc) { -struct drm_crtc *crtc = &scrtc->crtc; +struct drm_crtc *crtc = &scrtc->base;struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);shmob_drm_crtc_compute_base (scrtc, crtc->x, crtc->y);
@@ -295,7 +295,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc)static inline struct shmob_drm_crtc *to_shmob_crtc (struct drm_crtc *crtc) { - return container_of(crtc, struct shmob_drm_crtc, crtc); + return container_of(crtc, struct shmob_drm_crtc, base); }static void shmob_drm_crtc_dpms (struct drm_crtc *crtc,int mode)
@@ -367,15 +367,15 @@ static const struct drm_crtc_helper_funcs crtc_helper_funcs = {void shmob_drm_crtc_finish_page_flip (struct shmob_drm_crtc *scrtc) {struct drm_pending_vblank_event *event; -struct drm_device *dev = scrtc->crtc.dev; +struct drm_device *dev = scrtc->base.dev;unsigned long flags;spin_lock_irqsave (&dev->event_lock, flags); event = scrtc->event; scrtc->event =NULL ;if (event) { -drm_crtc_send_vblank_event (&scrtc->crtc, event); -drm_crtc_vblank_put (&scrtc->crtc); +drm_crtc_send_vblank_event (&scrtc->base, event); +drm_crtc_vblank_put (&scrtc->base); }spin_unlock_irqrestore (&dev->event_lock, flags); }
@@ -387,7 +387,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, struct drm_modeset_acquire_ctx *ctx) {struct shmob_drm_crtc *scrtc =to_shmob_crtc (crtc); -struct drm_device *dev = scrtc->crtc.dev; +struct drm_device *dev = scrtc->base.dev;unsigned long flags;spin_lock_irqsave (&dev->event_lock, flags);
@@ -402,7 +402,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,if (event) { event->pipe =0 ; -drm_crtc_vblank_get (&scrtc->crtc); +drm_crtc_vblank_get (&scrtc->base);spin_lock_irqsave (&dev->event_lock, flags); scrtc->event = event;spin_unlock_irqrestore (&dev->event_lock, flags);
@@ -454,7 +454,7 @@ static const struct drm_crtc_funcs crtc_funcs = {int shmob_drm_crtc_create (struct shmob_drm_device *sdev) { -struct drm_crtc *crtc = &sdev->crtc.crtc; +struct drm_crtc *crtc = &sdev->crtc.base;struct drm_plane *primary, *plane;unsigned int i;int ret;
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +1 -1
@@ -21,7 +21,7 @@ struct shmob_drm_device;struct shmob_drm_format_info ;struct shmob_drm_crtc { -struct drm_crtc crtc; +struct drm_crtc base;struct drm_pending_vblank_event *event;int dpms;
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 28/41 drm: renesas: shmobile: Rename shmob_drm_connector.connector
In reply to Geert UytterhoevenRename the "connector" member of the shmob_drm_connector subclass structure to "base", to improve readability.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 4 ++-- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +2 -2
@@ -560,7 +560,7 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev)static inline struct shmob_drm_connector *to_shmob_connector (struct drm_connector *connector) { - return container_of(connector, struct shmob_drm_connector, connector); + return container_of(connector, struct shmob_drm_connector, base); }static int shmob_drm_connector_get_modes (struct drm_connector *connector)
@@ -632,7 +632,7 @@ shmob_drm_connector_init(struct shmob_drm_device *sdev,if (!scon)return ERR_PTR (-ENOMEM ); - connector = &scon->connector; + connector = &scon->base; scon->encoder = encoder; scon->mode = &sdev->pdata->panel.mode;
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +1 -1
@@ -33,7 +33,7 @@ struct shmob_drm_crtc { };struct shmob_drm_connector { -struct drm_connector connector; +struct drm_connector base;struct drm_encoder *encoder;const struct videomode *mode; };
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 29/41 drm: renesas: shmobile: Rename shmob_drm_plane.plane
In reply to Geert UytterhoevenRename the "plane" member of the shmob_drm_plane subclass structure to "base", to improve readability.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +5 -5
@@ -20,7 +20,7 @@#include "shmob_drm_regs.h" struct shmob_drm_plane { -struct drm_plane plane; +struct drm_plane base;unsigned int index;unsigned int alpha;
@@ -37,7 +37,7 @@ struct shmob_drm_plane {static inline struct shmob_drm_plane *to_shmob_plane (struct drm_plane *plane) { - return container_of(plane, struct shmob_drm_plane, plane); + return container_of(plane, struct shmob_drm_plane, base); } static void shmob_drm_plane_compute_base(struct shmob_drm_plane *splane,
@@ -64,7 +64,7 @@ static void shmob_drm_plane_compute_base(struct shmob_drm_plane *splane,static void __shmob_drm_plane_setup (struct shmob_drm_plane *splane,struct drm_framebuffer *fb) { -struct shmob_drm_device *sdev =to_shmob_device (splane->plane.dev); +struct shmob_drm_device *sdev =to_shmob_device (splane->base.dev);u32 format;/* TODO: Support ROP3 mode */
@@ -216,7 +216,7 @@ struct drm_plane *shmob_drm_plane_create(struct shmob_drm_device *sdev, funcs = &shmob_drm_overlay_plane_funcs; splane =drmm_universal_plane_alloc (&sdev->ddev, - struct shmob_drm_plane, plane, 1, + struct shmob_drm_plane, base, 1, funcs, formats,ARRAY_SIZE (formats),NULL , type,NULL );
@@ -226,5 +226,5 @@ struct drm_plane *shmob_drm_plane_create(struct shmob_drm_device *sdev, splane->index = index; splane->alpha =255 ; -return &splane->plane; +return &splane->base; }
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 30/41 drm: renesas: shmobile: Use drm_crtc_handle_vblank()
In reply to Geert UytterhoevenReplace the call to the legacy drm_handle_vblank() function with a call to the new drm_crtc_handle_vblank() helper.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +1 -1
@@ -86,7 +86,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg)spin_unlock_irqrestore (&sdev->irq_lock, flags);if (status &LDINTR_VES ) { -drm_handle_vblank (dev,0 ); +drm_crtc_handle_vblank (&sdev->crtc.base);shmob_drm_crtc_finish_page_flip (&sdev->crtc); }
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 31/41 drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip()
In reply to Geert UytterhoevenMove the shmob_drm_crtc_finish_page_flip() function up, to avoid having to move it during the modification in the next change.
---
v3:
- No changes,
v2:
- Add Reviewed-by,
- Move further up.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +20 -16
@@ -35,6 +35,26 @@* TODO: panel support */ +/* ----------------------------------------------------------------------------- +* Page Flip +*/ + +void shmob_drm_crtc_finish_page_flip (struct shmob_drm_crtc *scrtc) +{ +struct drm_pending_vblank_event *event; +struct drm_device *dev = scrtc->base.dev; +unsigned long flags; + +spin_lock_irqsave (&dev->event_lock, flags); + event = scrtc->event; + scrtc->event =NULL ; +if (event) { +drm_crtc_send_vblank_event (&scrtc->base, event); +drm_crtc_vblank_put (&scrtc->base); + } +spin_unlock_irqrestore (&dev->event_lock, flags); +} +/* ----------------------------------------------------------------------------- * CRTC */
@@ -364,22 +384,6 @@ static const struct drm_crtc_helper_funcs crtc_helper_funcs = { .mode_set_base = shmob_drm_crtc_mode_set_base, }; -void shmob_drm_crtc_finish_page_flip (struct shmob_drm_crtc *scrtc) -{ -struct drm_pending_vblank_event *event; -struct drm_device *dev = scrtc->base.dev; -unsigned long flags; - -spin_lock_irqsave (&dev->event_lock, flags); - event = scrtc->event; - scrtc->event =NULL ; -if (event) { -drm_crtc_send_vblank_event (&scrtc->base, event); -drm_crtc_vblank_put (&scrtc->base); - } -spin_unlock_irqrestore (&dev->event_lock, flags); -} - static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_pending_vblank_event *event,
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 32/41 drm: renesas: shmobile: Wait for page flip when turning CRTC off
In reply to Geert UytterhoevenTurning a CRTC off will prevent a queued page flip from ever completing, potentially confusing userspace. Wait for queued page flips to complete before turning the CRTC off to avoid this.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 37 +++++++++++++++++++ .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 3 ++ 2 files changed, 40 insertions(+)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +37 -0
@@ -50,11 +50,40 @@ void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) scrtc->event =NULL ;if (event) {drm_crtc_send_vblank_event (&scrtc->base, event); +wake_up (&scrtc->flip_wait);drm_crtc_vblank_put (&scrtc->base); }spin_unlock_irqrestore (&dev->event_lock, flags); } +static bool shmob_drm_crtc_page_flip_pending (struct shmob_drm_crtc *scrtc) +{ +struct drm_device *dev = scrtc->base.dev; +unsigned long flags; +bool pending; + +spin_lock_irqsave (&dev->event_lock, flags); + pending = scrtc->event !=NULL ; +spin_unlock_irqrestore (&dev->event_lock, flags); + +return pending; +} + +static void shmob_drm_crtc_wait_page_flip (struct shmob_drm_crtc *scrtc) +{ +struct drm_crtc *crtc = &scrtc->base; +struct shmob_drm_device *sdev =to_shmob_device (crtc->dev); + +if (wait_event_timeout (scrtc->flip_wait, + !shmob_drm_crtc_page_flip_pending (scrtc), +msecs_to_jiffies (50 ))) +return ; + +dev_warn (sdev->dev,"page flip timeout\n" ); + +shmob_drm_crtc_finish_page_flip (scrtc); +} +/* ----------------------------------------------------------------------------- * CRTC */
@@ -253,6 +282,12 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)if (!scrtc->started)return ; +/* +* Wait for page flip completion before stopping the CRTC as userspace +* expects page flips to eventually complete. +*/ +shmob_drm_crtc_wait_page_flip (scrtc); +/* Stop the LCDC. */ shmob_drm_crtc_start_stop (scrtc, false);
@@ -463,6 +498,8 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)unsigned int i;int ret; +init_waitqueue_head (&sdev->crtc.flip_wait); + sdev->crtc.dpms =DRM_MODE_DPMS_OFF ; primary =shmob_drm_plane_create (sdev,DRM_PLANE_TYPE_PRIMARY ,0 );
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +3 -0
@@ -14,6 +14,8 @@#include <drm/drm_connector.h> #include <drm/drm_encoder.h> +#include <linux/wait.h> +#include <video/videomode.h> struct drm_pending_vblank_event ;
@@ -24,6 +26,7 @@ struct shmob_drm_crtc {struct drm_crtc base;struct drm_pending_vblank_event *event; +wait_queue_head_t flip_wait;int dpms;const struct shmob_drm_format_info *format;
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 33/41 drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC
In reply to Geert UytterhoevenThe DRM core vblank handling mechanism requires drivers to forcefully turn vblank reporting off when disabling the CRTC, and to restore the vblank reporting status when enabling the CRTC.
Implement this using the drm_crtc_vblank_{on,off}() helpers.
Note that drm_crtc_vblank_off() must be called at startup to synchronize the state of the vblank core code with the hardware, which is initially disabled. This is performed at CRTC creation time, requiring vertical blank initialization to be moved before creating CRTCs.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 10 +++++++++- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +9 -1
@@ -271,6 +271,9 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)shmob_drm_crtc_start_stop (scrtc, true); +/* Turn vertical blank interrupt reporting back on. */ +drm_crtc_vblank_on (crtc); + scrtc->started = true; }
@@ -283,10 +286,12 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)return ;/* -* Wait for page flip completion before stopping the CRTC as userspace +* Disable vertical blank interrupt reporting. We first need to wait +* for page flip completion before stopping the CRTC as userspace * expects page flips to eventually complete. */ shmob_drm_crtc_wait_page_flip (scrtc); +drm_crtc_vblank_off (crtc);/* Stop the LCDC. */ shmob_drm_crtc_start_stop (scrtc, false);
@@ -519,6 +524,9 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)drm_crtc_helper_add (crtc, &crtc_helper_funcs); +/* Start with vertical blank interrupt reporting disabled. */ +drm_crtc_vblank_off (crtc); +return 0 ; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +6 -6
@@ -216,17 +216,17 @@ static int shmob_drm_probe(struct platform_device *pdev)if (ret)return ret; - ret =shmob_drm_modeset_init (sdev); -if (ret <0 ) -return dev_err_probe (&pdev->dev, ret, -"failed to initialize mode setting\n" ); - ret =drm_vblank_init (ddev,1 );if (ret <0 ) {dev_err (&pdev->dev,"failed to initialize vblank\n" ); - goto err_modeset_cleanup; +return ret; } + ret =shmob_drm_modeset_init (sdev); +if (ret <0 ) +return dev_err_probe (&pdev->dev, ret, +"failed to initialize mode setting\n" ); + ret =platform_get_irq (pdev,0 );if (ret <0 ) goto err_modeset_cleanup;
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 34/41 drm: renesas: shmobile: Shutdown the display on remove
In reply to Geert UytterhoevenWhen the device is unbound from the driver, the display may be active. Make sure it gets shut down.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +2 -0
@@ -16,6 +16,7 @@#include <linux/pm_runtime.h> #include <linux/slab.h> +#include <drm/drm_crtc_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fbdev_generic.h> #include <drm/drm_gem_dma_helper.h>
@@ -172,6 +173,7 @@ static int shmob_drm_remove(struct platform_device *pdev)struct drm_device *ddev = &sdev->ddev;drm_dev_unregister (ddev); +drm_helper_force_disable_all (ddev);drm_kms_helper_poll_fini (ddev);return 0 ; }
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 35/41 drm: renesas: shmobile: Cleanup encoder
In reply to Geert UytterhoevenMost unused callbacks can be NULL pointers these days. Drop a bunch of empty encoder callbacks.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 26 ------------------- 1 file changed, 26 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +0 -26
@@ -534,11 +534,6 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)* Encoder */ -static void shmob_drm_encoder_dpms (struct drm_encoder *encoder,int mode) -{ -/* No-op, everything is handled in the CRTC code. */ -} -static bool shmob_drm_encoder_mode_fixup (struct drm_encoder *encoder,const struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode)
@@ -561,29 +556,8 @@ static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder,return true; } -static void shmob_drm_encoder_mode_prepare (struct drm_encoder *encoder) -{ -/* No-op, everything is handled in the CRTC code. */ -} - -static void shmob_drm_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) -{ -/* No-op, everything is handled in the CRTC code. */ -} - -static void shmob_drm_encoder_mode_commit (struct drm_encoder *encoder) -{ -/* No-op, everything is handled in the CRTC code. */ -} -static const struct drm_encoder_helper_funcs encoder_helper_funcs = { - .dpms = shmob_drm_encoder_dpms, .mode_fixup = shmob_drm_encoder_mode_fixup, - .prepare = shmob_drm_encoder_mode_prepare, - .commit = shmob_drm_encoder_mode_commit, - .mode_set = shmob_drm_encoder_mode_set, };int shmob_drm_encoder_create (struct shmob_drm_device *sdev)
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 36/41 drm: renesas: shmobile: Atomic conversion part 1
In reply to Geert UytterhoevenImplement atomic mode setting for both the primary and overlay planes. This involves:
- Moving the primary plane handling code from CRTC mode setting to plane handling shared by primary and overlay planes,
- Adding basic CRTC and mode config atomic mode setting ops, which don't do much yet.
---
v3:
- No changes,
v2:
- No changes.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 126 +++------ .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 3 - .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 4 +- .../gpu/drm/renesas/shmobile/shmob_drm_kms.c | 13 +- .../drm/renesas/shmobile/shmob_drm_plane.c | 253 ++++++++++++------ .../drm/renesas/shmobile/shmob_drm_plane.h | 1 - 6 files changed, 217 insertions(+), 183 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +36 -90
@@ -11,6 +11,9 @@#include <linux/media-bus-format.h> #include <linux/pm_runtime.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_atomic_state_helper.h> +#include <drm/drm_atomic_uapi.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_dma_helper.h>
@@ -199,20 +202,14 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)struct drm_crtc *crtc = &scrtc->base;struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; -const struct shmob_drm_format_info *format; -struct drm_device *dev = &sdev->ddev; -struct drm_plane *plane; +struct device *dev = sdev->dev;u32 value;int ret;if (scrtc->started)return ; - format =shmob_drm_format_info (crtc->primary->fb->format->format); -if (WARN_ON (format ==NULL )) -return ; - - ret =pm_runtime_resume_and_get (sdev->dev); + ret =pm_runtime_resume_and_get (dev);if (ret)return ;
@@ -249,23 +246,8 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)/* Setup geometry, format, frame buffer memory and operation mode. */ shmob_drm_crtc_setup_geometry (scrtc); -/* TODO: Handle YUV colorspaces. Hardcode REC709 for now. */ -lcdc_write (sdev,LDDFR , format->lddfr |LDDFR_CF1 ); -lcdc_write (sdev,LDMLSR , scrtc->line_size); -lcdc_write (sdev,LDSA1R , scrtc->dma[0 ]); -if (shmob_drm_format_is_yuv (format)) -lcdc_write (sdev,LDSA2R , scrtc->dma[1 ]);lcdc_write (sdev,LDSM1R ,0 ); -/* Word and long word swap. */ -lcdc_write (sdev,LDDDSR , format->ldddsr); - -/* Setup planes. */ -drm_for_each_legacy_plane (plane, dev) { -if (plane->crtc == crtc) -shmob_drm_plane_setup (plane); - } -/* Enable the display output. */ lcdc_write (sdev,LDCNT1R ,LDCNT1R_DE );
@@ -317,42 +299,6 @@ void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc)shmob_drm_crtc_start (scrtc); } -static void shmob_drm_crtc_compute_base (struct shmob_drm_crtc *scrtc, -int x,int y) -{ -struct drm_crtc *crtc = &scrtc->base; -struct drm_framebuffer *fb = crtc->primary->fb; -struct drm_gem_dma_object *gem; -unsigned int bpp; - - bpp =shmob_drm_format_is_yuv (scrtc->format) ?8 : scrtc->format->bpp; - gem =drm_fb_dma_get_gem_obj (fb,0 ); - scrtc->dma[0 ] = gem->dma_addr + fb->offsets[0 ] - + y * fb->pitches[0 ] + x * bpp /8 ; - -if (shmob_drm_format_is_yuv (scrtc->format)) { - bpp = scrtc->format->bpp -8 ; - gem =drm_fb_dma_get_gem_obj (fb,1 ); - scrtc->dma[1 ] = gem->dma_addr + fb->offsets[1 ] - + y / (bpp ==4 ?2 :1 ) * fb->pitches[1 ] - + x * (bpp ==16 ?2 :1 ); - } -} - -static void shmob_drm_crtc_update_base (struct shmob_drm_crtc *scrtc) -{ -struct drm_crtc *crtc = &scrtc->base; -struct shmob_drm_device *sdev =to_shmob_device (crtc->dev); - -shmob_drm_crtc_compute_base (scrtc, crtc->x, crtc->y); - -lcdc_write_mirror (sdev,LDSA1R , scrtc->dma[0 ]); -if (shmob_drm_format_is_yuv (scrtc->format)) -lcdc_write_mirror (sdev,LDSA2R , scrtc->dma[1 ]); - -lcdc_write (sdev,LDRCNTR ,lcdc_read (sdev,LDRCNTR ) ^LDRCNTR_MRS ); -} -static inline struct shmob_drm_crtc *to_shmob_crtc (struct drm_crtc *crtc) { return container_of(crtc, struct shmob_drm_crtc, base);
@@ -378,50 +324,45 @@ static void shmob_drm_crtc_mode_prepare(struct drm_crtc *crtc)shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_OFF ); } -static int shmob_drm_crtc_mode_set (struct drm_crtc *crtc, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode, -int x,int y, -struct drm_framebuffer *old_fb) +static void shmob_drm_crtc_mode_commit (struct drm_crtc *crtc) { -struct shmob_drm_device *sdev =to_shmob_device (crtc->dev); -struct shmob_drm_crtc *scrtc =to_shmob_crtc (crtc); -const struct shmob_drm_format_info *format; - - format =shmob_drm_format_info (crtc->primary->fb->format->format); -if (format ==NULL ) { -dev_dbg (sdev->dev,"mode_set: unsupported format %p4cc\n" , - &crtc->primary->fb->format->format); -return -EINVAL ; - } - - scrtc->format = format; - scrtc->line_size = crtc->primary->fb->pitches[0 ]; - -shmob_drm_crtc_compute_base (scrtc, x, y); +shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_ON ); +} +static int shmob_drm_crtc_atomic_check (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{return 0 ; } -static void shmob_drm_crtc_mode_commit (struct drm_crtc *crtc) +static void shmob_drm_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_atomic_state *state) { -shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_ON ); } -static int shmob_drm_crtc_mode_set_base (struct drm_crtc *crtc,int x,int y, -struct drm_framebuffer *old_fb) +static void shmob_drm_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_state *state) { -shmob_drm_crtc_update_base (to_shmob_crtc (crtc)); +struct drm_pending_vblank_event *event; +struct drm_device *dev = crtc->dev; +unsigned long flags; -return 0 ; +if (crtc->state->event) { +spin_lock_irqsave (&dev->event_lock, flags); + event = crtc->state->event; + crtc->state->event =NULL ; +drm_crtc_send_vblank_event (crtc, event); +spin_unlock_irqrestore (&dev->event_lock, flags); + } }static const struct drm_crtc_helper_funcs crtc_helper_funcs = { .dpms = shmob_drm_crtc_dpms, .prepare = shmob_drm_crtc_mode_prepare, .commit = shmob_drm_crtc_mode_commit, - .mode_set = shmob_drm_crtc_mode_set, - .mode_set_base = shmob_drm_crtc_mode_set_base, + .atomic_check = shmob_drm_crtc_atomic_check, + .atomic_begin = shmob_drm_crtc_atomic_begin, + .atomic_flush = shmob_drm_crtc_atomic_flush, }; static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
@@ -441,8 +382,7 @@ static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc, }spin_unlock_irqrestore (&dev->event_lock, flags); - crtc->primary->fb = fb; -shmob_drm_crtc_update_base (scrtc); +drm_atomic_set_fb_for_plane (crtc->primary->state, fb);if (event) { event->pipe =0 ;
@@ -489,9 +429,12 @@ static void shmob_drm_disable_vblank(struct drm_crtc *crtc) }static const struct drm_crtc_funcs crtc_funcs = { + .reset = drm_atomic_helper_crtc_reset, .destroy = drm_crtc_cleanup, - .set_config = drm_crtc_helper_set_config, + .set_config = drm_atomic_helper_set_config, .page_flip = shmob_drm_crtc_page_flip, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, .enable_vblank = shmob_drm_enable_vblank, .disable_vblank = shmob_drm_disable_vblank, };
@@ -627,8 +570,11 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector)static const struct drm_connector_funcs connector_funcs = { .dpms = drm_helper_connector_dpms, + .reset = drm_atomic_helper_connector_reset, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = shmob_drm_connector_destroy, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; static struct drm_connector *
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +0 -3
@@ -29,9 +29,6 @@ struct shmob_drm_crtc {wait_queue_head_t flip_wait;int dpms; -const struct shmob_drm_format_info *format; -unsigned long dma[2 ]; -unsigned int line_size;bool started; };
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +2 -2
@@ -16,7 +16,7 @@#include <linux/pm_runtime.h> #include <linux/slab.h> -#include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_fbdev_generic.h> #include <drm/drm_gem_dma_helper.h>
@@ -173,7 +173,7 @@ static int shmob_drm_remove(struct platform_device *pdev)struct drm_device *ddev = &sdev->ddev;drm_dev_unregister (ddev); -drm_helper_force_disable_all (ddev); +drm_atomic_helper_shutdown (ddev);drm_kms_helper_poll_fini (ddev);return 0 ; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c +9 -4
@@ -7,6 +7,7 @@* Laurent Pinchart ([email protected]) */ +#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fourcc.h>
@@ -17,6 +18,7 @@#include "shmob_drm_crtc.h" #include "shmob_drm_drv.h" #include "shmob_drm_kms.h" +#include "shmob_drm_plane.h" #include "shmob_drm_regs.h" /* -----------------------------------------------------------------------------
@@ -147,13 +149,16 @@ shmob_drm_fb_create(struct drm_device *dev, struct drm_file *file_priv,static const struct drm_mode_config_funcs shmob_drm_mode_config_funcs = { .fb_create = shmob_drm_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, };int shmob_drm_modeset_init (struct shmob_drm_device *sdev) { +struct drm_device *dev = &sdev->ddev;int ret; - ret =drmm_mode_config_init (&sdev->ddev); + ret =drmm_mode_config_init (dev);if (ret)return ret;
@@ -169,7 +174,9 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev)if (ret <0 )return ret; -drm_kms_helper_poll_init (&sdev->ddev); +drm_mode_config_reset (dev); + +drm_kms_helper_poll_init (dev); sdev->ddev.mode_config.min_width =0 ; sdev->ddev.mode_config.min_height =0 ;
@@ -177,7 +184,5 @@ int shmob_drm_modeset_init(struct shmob_drm_device *sdev) sdev->ddev.mode_config.max_height =4095 ; sdev->ddev.mode_config.funcs = &shmob_drm_mode_config_funcs; -drm_helper_disable_unused_functions (&sdev->ddev); -return 0 ; }
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c +170 -83
348 lines not on this page · raw message
drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h +0 -1
@@ -16,6 +16,5 @@ struct shmob_drm_device;struct drm_plane *shmob_drm_plane_create (struct shmob_drm_device *sdev,enum drm_plane_type type,unsigned int index); -void shmob_drm_plane_setup (struct drm_plane *plane);#endif /* __SHMOB_DRM_PLANE_H__ */
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 37/41 drm: renesas: shmobile: Atomic conversion part 2
In reply to Geert UytterhoevenImplement atomic mode setting for the CRTC, using the existing dpms callback.
---
This works, but I had expected that crtc_helper_funcs.atomic_check should point to drm_crtc_helper_atomic_check() instead, as the primary plane cannot be disabled. However in doing so, when drm_atomic_helper_check_crtc_primary_plane() fails:
[drm:drm_atomic_helper_check_crtc_primary_plane] [CRTC:41:crtc-0] primary plane missing
the display fails to restore after running "modetest -s", until I run modetest without -s.
Letting shmob_drm_plane_atomic_check() return -EINVAL if !new_plane_state->crtc && is_primary would fix that, but causes an ugly warning:
WARNING: CPU: 0 PID: 21 at drivers/gpu/drm/drm_framebuffer.c:1130 drm_framebuffer_remove+0x374/0x4b0
atomic remove_fb failed with -22v3:
- No changes,
v2:
- No changes.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 41 +++++++------------ 1 file changed, 15 insertions(+), 26 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +15 -26
@@ -11,6 +11,7 @@#include <linux/media-bus-format.h> #include <linux/pm_runtime.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_state_helper.h> #include <drm/drm_atomic_uapi.h>
@@ -319,27 +320,6 @@ static void shmob_drm_crtc_dpms(struct drm_crtc *crtc, int mode) scrtc->dpms = mode; } -static void shmob_drm_crtc_mode_prepare (struct drm_crtc *crtc) -{ -shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_OFF ); -} - -static void shmob_drm_crtc_mode_commit (struct drm_crtc *crtc) -{ -shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_ON ); -} - -static int shmob_drm_crtc_atomic_check (struct drm_crtc *crtc, -struct drm_atomic_state *state) -{ -return 0 ; -} - -static void shmob_drm_crtc_atomic_begin (struct drm_crtc *crtc, -struct drm_atomic_state *state) -{ -} -static void shmob_drm_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) {
@@ -356,13 +336,22 @@ static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc, } } +static void shmob_drm_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_ON ); +} + +static void shmob_drm_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_OFF ); +} +static const struct drm_crtc_helper_funcs crtc_helper_funcs = { - .dpms = shmob_drm_crtc_dpms, - .prepare = shmob_drm_crtc_mode_prepare, - .commit = shmob_drm_crtc_mode_commit, - .atomic_check = shmob_drm_crtc_atomic_check, - .atomic_begin = shmob_drm_crtc_atomic_begin, .atomic_flush = shmob_drm_crtc_atomic_flush, + .atomic_enable = shmob_drm_crtc_atomic_enable, + .atomic_disable = shmob_drm_crtc_atomic_disable, }; static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 38/41 drm: renesas: shmobile: Use suspend/resume helpers
In reply to Geert UytterhoevenReplace the custom suspend/resume handling by calls into drm_mode_config_helper_{suspend,resume}().
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 13 ------------- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 2 -- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 13 +++---------- 3 files changed, 3 insertions(+), 25 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +0 -13
@@ -287,19 +287,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc) scrtc->started = false; } -void shmob_drm_crtc_suspend (struct shmob_drm_crtc *scrtc) -{ -shmob_drm_crtc_stop (scrtc); -} - -void shmob_drm_crtc_resume (struct shmob_drm_crtc *scrtc) -{ -if (scrtc->dpms !=DRM_MODE_DPMS_ON ) -return ; - -shmob_drm_crtc_start (scrtc); -} -static inline struct shmob_drm_crtc *to_shmob_crtc (struct drm_crtc *crtc) { return container_of(crtc, struct shmob_drm_crtc, base);
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +0 -2
@@ -40,8 +40,6 @@ struct shmob_drm_connector {int shmob_drm_crtc_create (struct shmob_drm_device *sdev);void shmob_drm_crtc_finish_page_flip (struct shmob_drm_crtc *scrtc); -void shmob_drm_crtc_suspend (struct shmob_drm_crtc *scrtc); -void shmob_drm_crtc_resume (struct shmob_drm_crtc *scrtc);int shmob_drm_encoder_create (struct shmob_drm_device *sdev); int shmob_drm_connector_create(struct shmob_drm_device *sdev,
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +3 -10
@@ -20,6 +20,7 @@#include <drm/drm_drv.h> #include <drm/drm_fbdev_generic.h> #include <drm/drm_gem_dma_helper.h> +#include <drm/drm_modeset_helper.h> #include <drm/drm_module.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h>
@@ -115,22 +116,14 @@ static int shmob_drm_pm_suspend(struct device *dev) {struct shmob_drm_device *sdev =dev_get_drvdata (dev); -drm_kms_helper_poll_disable (&sdev->ddev); -shmob_drm_crtc_suspend (&sdev->crtc); - -return 0 ; +return drm_mode_config_helper_suspend (&sdev->ddev); }static int shmob_drm_pm_resume (struct device *dev) {struct shmob_drm_device *sdev =dev_get_drvdata (dev); -drm_modeset_lock_all (&sdev->ddev); -shmob_drm_crtc_resume (&sdev->crtc); -drm_modeset_unlock_all (&sdev->ddev); - -drm_kms_helper_poll_enable (&sdev->ddev); -return 0 ; +return drm_mode_config_helper_resume (&sdev->ddev); }static int shmob_drm_pm_runtime_suspend (struct device *dev)
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 39/41 drm: renesas: shmobile: Remove internal CRTC state tracking
In reply to Geert UytterhoevenNow the suspend/resume methods no longer need to look at internal driver state, the dpms and started fields in the shmob_drm_crtc structure can be removed, as well as the shmob_drm_crtc_dpms() wrapper. After this, shmob_drm_crtc_atomic_{en,dis}able() became just wrappers around shmob_drm_crtc_st{art,op}(), so inline the latter.
---
v3:
- No changes,
v2:
- Add Reviewed-by,
- Inline shmob_drm_crtc_st{art,op}().
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 66 ++++--------------- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 3 - 2 files changed, 11 insertions(+), 58 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +11 -55
@@ -191,25 +191,21 @@ static void shmob_drm_crtc_start_stop(struct shmob_drm_crtc *scrtc, bool start) } } -/* -* shmob_drm_crtc_start - Configure and start the LCDC -* @scrtc: the SH Mobile CRTC -* -* Configure and start the LCDC device. External devices (clocks, MERAM, panels, -* ...) are not touched by this function. -*/ -static void shmob_drm_crtc_start (struct shmob_drm_crtc *scrtc) +static inline struct shmob_drm_crtc *to_shmob_crtc (struct drm_crtc *crtc) { -struct drm_crtc *crtc = &scrtc->base; + return container_of(crtc, struct shmob_drm_crtc, base); +} + +static void shmob_drm_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct shmob_drm_crtc *scrtc =to_shmob_crtc (crtc);struct shmob_drm_device *sdev =to_shmob_device (crtc->dev);const struct shmob_drm_interface_data *idata = &sdev->pdata->iface;struct device *dev = sdev->dev;u32 value;int ret; -if (scrtc->started) -return ; - ret =pm_runtime_resume_and_get (dev);if (ret)return ;
@@ -256,18 +252,14 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc)/* Turn vertical blank interrupt reporting back on. */ drm_crtc_vblank_on (crtc); - - scrtc->started = true; } -static void shmob_drm_crtc_stop (struct shmob_drm_crtc *scrtc) +static void shmob_drm_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) { -struct drm_crtc *crtc = &scrtc->base; +struct shmob_drm_crtc *scrtc =to_shmob_crtc (crtc);struct shmob_drm_device *sdev =to_shmob_device (crtc->dev); -if (!scrtc->started) -return ; -/* * Disable vertical blank interrupt reporting. We first need to wait * for page flip completion before stopping the CRTC as userspace
@@ -283,28 +275,6 @@ static void shmob_drm_crtc_stop(struct shmob_drm_crtc *scrtc)lcdc_write (sdev,LDCNT1R ,0 );pm_runtime_put (sdev->dev); - - scrtc->started = false; -} - -static inline struct shmob_drm_crtc *to_shmob_crtc (struct drm_crtc *crtc) -{ - return container_of(crtc, struct shmob_drm_crtc, base); -} - -static void shmob_drm_crtc_dpms (struct drm_crtc *crtc,int mode) -{ -struct shmob_drm_crtc *scrtc =to_shmob_crtc (crtc); - -if (scrtc->dpms == mode) -return ; - -if (mode ==DRM_MODE_DPMS_ON ) -shmob_drm_crtc_start (scrtc); -else -shmob_drm_crtc_stop (scrtc); - - scrtc->dpms = mode; } static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc,
@@ -323,18 +293,6 @@ static void shmob_drm_crtc_atomic_flush(struct drm_crtc *crtc, } } -static void shmob_drm_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_atomic_state *state) -{ -shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_ON ); -} - -static void shmob_drm_crtc_atomic_disable (struct drm_crtc *crtc, -struct drm_atomic_state *state) -{ -shmob_drm_crtc_dpms (crtc,DRM_MODE_DPMS_OFF ); -} -static const struct drm_crtc_helper_funcs crtc_helper_funcs = { .atomic_flush = shmob_drm_crtc_atomic_flush, .atomic_enable = shmob_drm_crtc_atomic_enable,
@@ -424,8 +382,6 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev)init_waitqueue_head (&sdev->crtc.flip_wait); - sdev->crtc.dpms =DRM_MODE_DPMS_OFF ; - primary =shmob_drm_plane_create (sdev,DRM_PLANE_TYPE_PRIMARY ,0 );if (IS_ERR (primary))return PTR_ERR (primary);
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +0 -3
@@ -27,9 +27,6 @@ struct shmob_drm_crtc {struct drm_pending_vblank_event *event;wait_queue_head_t flip_wait; -int dpms; - -bool started; };struct shmob_drm_connector {
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 40/41 drm: renesas: shmobile: Atomic conversion part 3
In reply to Geert UytterhoevenComplete the conversion to atomic mode setting by converting the connector, and setting the DRIVER_ATOMIC flag.
---
v3:
- No changes,
v2:
- Add Reviewed-by.
--- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 5 +---- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +1 -4
@@ -501,7 +501,6 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector) }static const struct drm_connector_funcs connector_funcs = { - .dpms = drm_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = shmob_drm_connector_destroy,
@@ -581,9 +580,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,if (ret <0 ) goto error; -drm_helper_connector_dpms (connector,DRM_MODE_DPMS_OFF ); -drm_object_property_set_value (&connector->base, - sdev->ddev.mode_config.dpms_property,DRM_MODE_DPMS_OFF ); + connector->dpms =DRM_MODE_DPMS_OFF ; sdev->connector = connector;
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +1 -1
@@ -98,7 +98,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg)DEFINE_DRM_GEM_DMA_FOPS (shmob_drm_fops);static const struct drm_driver shmob_drm_driver = { - .driver_features =DRIVER_GEM |DRIVER_MODESET , + .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC ,DRM_GEM_DMA_DRIVER_OPS , .fops = &shmob_drm_fops, .name ="shmob-drm" ,
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH v3 41/41 drm: renesas: shmobile: Add DT support
In reply to Geert UytterhoevenAdd DT support, by:
1. Creating a panel bridge from DT, and attaching it to the encoder,
2. Replacing the custom connector with a bridge connector,
3. Obtaining clock configuration based on the compatible value.
Note that for now the driver uses a fixed clock configuration selecting the bus clock, as the current code to select other clock inputs needs changes to support any other SoCs than SH7724.
---
v3:
- No changes,
v2:
- Use devm_drm_of_get_bridge(),
- Don't print bridge->of_node on failure, as this field depends on CONFIG_OF.
Notes:
- SH-Mobile AG5 (SH73A0) support is untested.
- Unbind crashes when drm_encoder_cleanup() calls drm_bridge_detach(), as the bridge (allocated by devm_drm_panel_bridge_add()) has already been freed by that time. This is a known issue with the bridge code.
--- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 56 ++++++++++++++----- .../gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 1 + .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 27 ++++++++- .../gpu/drm/renesas/shmobile/shmob_drm_drv.h | 6 ++ 4 files changed, 74 insertions(+), 16 deletions(-)
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +43 -13
@@ -9,12 +9,16 @@#include <linux/clk.h> #include <linux/media-bus-format.h> +#include <linux/of.h> +#include <linux/of_graph.h> #include <linux/pm_runtime.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_state_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_bridge.h> +#include <drm/drm_bridge_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_dma_helper.h>
@@ -23,6 +27,7 @@#include <drm/drm_gem_dma_helper.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_panel.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> #include <drm/drm_vblank.h>
@@ -35,10 +40,6 @@#include "shmob_drm_plane.h" #include "shmob_drm_regs.h" -/* -* TODO: panel support -*/ -/* ----------------------------------------------------------------------------- * Page Flip */
@@ -201,7 +202,7 @@ static void shmob_drm_crtc_atomic_enable(struct drm_crtc *crtc, {struct shmob_drm_crtc *scrtc =to_shmob_crtc (crtc);struct shmob_drm_device *sdev =to_shmob_device (crtc->dev); -const struct shmob_drm_interface_data *idata = &sdev->pdata->iface; +unsigned int clk_div = sdev->config.clk_div;struct device *dev = sdev->dev;u32 value;int ret;
@@ -223,17 +224,17 @@ static void shmob_drm_crtc_atomic_enable(struct drm_crtc *crtc,lcdc_write (sdev,LDPMR ,0 ); value = sdev->lddckr; -if (idata->clk_div) { +if (clk_div) {/* FIXME: sh7724 can only use 42, 48, 54 and 60 for the divider * denominator. */ lcdc_write (sdev,LDDCKPAT1R ,0 ); -lcdc_write (sdev,LDDCKPAT2R , (1 << (idata->clk_div /2 )) -1 ); +lcdc_write (sdev,LDDCKPAT2R , (1 << (clk_div /2 )) -1 ); -if (idata->clk_div ==1 ) +if (clk_div ==1 ) value |=LDDCKR_MOSEL ;else - value |= idata->clk_div; + value |= clk_div; }lcdc_write (sdev,LDDCKR , value);
@@ -406,7 +407,7 @@ int shmob_drm_crtc_create(struct shmob_drm_device *sdev) }/* ----------------------------------------------------------------------------- -* Encoder +* Legacy Encoder */ static bool shmob_drm_encoder_mode_fixup(struct drm_encoder *encoder,
@@ -435,9 +436,14 @@ static const struct drm_encoder_helper_funcs encoder_helper_funcs = { .mode_fixup = shmob_drm_encoder_mode_fixup, }; +/* ----------------------------------------------------------------------------- +* Encoder +*/ +int shmob_drm_encoder_create (struct shmob_drm_device *sdev) {struct drm_encoder *encoder = &sdev->encoder; +struct drm_bridge *bridge;int ret; encoder->possible_crtcs =1 ;
@@ -447,13 +453,30 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev)if (ret <0 )return ret; -drm_encoder_helper_add (encoder, &encoder_helper_funcs); +if (sdev->pdata) { +drm_encoder_helper_add (encoder, &encoder_helper_funcs); +return 0 ; + } + +/* Create a panel bridge */ + bridge =devm_drm_of_get_bridge (sdev->dev, sdev->dev->of_node,0 ,0 ); +if (IS_ERR (bridge)) +return PTR_ERR (bridge); + +/* Attach the bridge to the encoder */ + ret =drm_bridge_attach (encoder, bridge,NULL , +DRM_BRIDGE_ATTACH_NO_CONNECTOR ); +if (ret) { +dev_err (sdev->dev,"failed to attach bridge: %pe\n" , +ERR_PTR (ret)); +return ret; + }return 0 ; }/* ----------------------------------------------------------------------------- -* Connector +* Legacy Connector */ static inline struct shmob_drm_connector *to_shmob_connector (struct drm_connector *connector)
@@ -563,13 +586,20 @@ shmob_drm_connector_init(struct shmob_drm_device *sdev,return connector; } +/* ----------------------------------------------------------------------------- +* Connector +*/ +int shmob_drm_connector_create (struct shmob_drm_device *sdev,struct drm_encoder *encoder) {struct drm_connector *connector;int ret; - connector =shmob_drm_connector_init (sdev, encoder); +if (sdev->pdata) + connector =shmob_drm_connector_init (sdev, encoder); +else + connector =drm_bridge_connector_init (&sdev->ddev, encoder);if (IS_ERR (connector)) {dev_err (sdev->dev,"failed to created connector: %pe\n" , connector);
drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h +1 -0
@@ -29,6 +29,7 @@ struct shmob_drm_crtc {wait_queue_head_t flip_wait; }; +/* Legacy connector */ struct shmob_drm_connector {struct drm_connector base;struct drm_encoder *encoder;
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +24 -3
@@ -11,6 +11,7 @@#include <linux/io.h> #include <linux/mm.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h>
@@ -174,11 +175,13 @@ static int shmob_drm_remove(struct platform_device *pdev)static int shmob_drm_probe (struct platform_device *pdev) {struct shmob_drm_platform_data *pdata = pdev->dev.platform_data; +const struct shmob_drm_config *config;struct shmob_drm_device *sdev;struct drm_device *ddev;int ret; -if (pdata ==NULL ) { + config =of_device_get_match_data (&pdev->dev); +if (!config && !pdata) {dev_err (&pdev->dev,"no platform data\n" );return -EINVAL ; }
@@ -194,7 +197,13 @@ static int shmob_drm_probe(struct platform_device *pdev) ddev = &sdev->ddev; sdev->dev = &pdev->dev; - sdev->pdata = pdata; +if (config) { + sdev->config = *config; + }else { + sdev->pdata = pdata; + sdev->config.clk_source = pdata->clk_source; + sdev->config.clk_div = pdata->iface.clk_div; + }spin_lock_init (&sdev->irq_lock);platform_set_drvdata (pdev, sdev);
@@ -203,7 +212,7 @@ static int shmob_drm_probe(struct platform_device *pdev)if (IS_ERR (sdev->mmio))return PTR_ERR (sdev->mmio); - ret =shmob_drm_setup_clocks (sdev, pdata->clk_source); + ret =shmob_drm_setup_clocks (sdev, sdev->config.clk_source);if (ret <0 )return ret;
@@ -251,11 +260,23 @@ static int shmob_drm_probe(struct platform_device *pdev)return ret; } +static const struct shmob_drm_config shmob_arm_config = { + .clk_source =SHMOB_DRM_CLK_BUS , + .clk_div =5 , +}; + +static const struct of_device_id shmob_drm_of_table[]__maybe_unused = { + { .compatible ="renesas,r8a7740-lcdc" , .data = &shmob_arm_config, }, + { .compatible ="renesas,sh73a0-lcdc" , .data = &shmob_arm_config, }, + {/* sentinel */ } +}; +static struct platform_driver shmob_drm_platform_driver = { .probe = shmob_drm_probe, .remove = shmob_drm_remove, .driver = { .name ="shmob-drm" , + .of_match_table =of_match_ptr (shmob_drm_of_table), .pm = &shmob_drm_pm_ops, }, };
drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h +6 -0
@@ -20,9 +20,15 @@ struct clk;struct device ;struct drm_device ; +struct shmob_drm_config { +enum shmob_drm_clk_source clk_source; +unsigned int clk_div; +}; +struct shmob_drm_device {struct device *dev;const struct shmob_drm_platform_data *pdata; +struct shmob_drm_config config;void __iomem *mmio;struct clk *clock;
Signature · 1 line
2.34.1