From 5b70f7cc2e4221ed8839121c87d3aee586ef32a8 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 21 Jun 2023 21:03:41 +0200 Subject: [PATCH 1/5] fixup! gpu: drm: adp: Add Apple Display Pipe driver Signed-off-by: Janne Grunau --- drivers/gpu/drm/adp/adp_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/adp/adp_drv.c b/drivers/gpu/drm/adp/adp_drv.c index 55ff439d1263f3..f24b3fb34d893c 100644 --- a/drivers/gpu/drm/adp/adp_drv.c +++ b/drivers/gpu/drm/adp/adp_drv.c @@ -252,7 +252,8 @@ static const u32 plane_formats[] = { #define ALL_CRTCS 1 -struct adp_plane *adp_plane_new(struct adp_drv_private *adp, u8 id) +static struct adp_plane *adp_plane_new(struct adp_drv_private *adp, + u8 id) { struct drm_device *drm = &adp->drm; struct adp_plane *plane; @@ -434,7 +435,7 @@ static int adp_get_modes(struct drm_connector *connector) return 1; } -int adp_detect_ctx(struct drm_connector *connector, +static int adp_detect_ctx(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { connector->display_info.non_desktop = true; From f2a9320fb0a23853c6eee06b9a10892bd1a4a033 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 21 Jun 2023 21:05:51 +0200 Subject: [PATCH 2/5] fixup! gpu: drm: adp: Refuse X* as client in open() --- drivers/gpu/drm/adp/adp_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/adp/adp_drv.c b/drivers/gpu/drm/adp/adp_drv.c index f24b3fb34d893c..7debd51194e437 100644 --- a/drivers/gpu/drm/adp/adp_drv.c +++ b/drivers/gpu/drm/adp/adp_drv.c @@ -82,7 +82,7 @@ #define GEN_RD_CMD_BUSY BIT(6) #define CMD_PKT_STATUS_TIMEOUT_US 20000 -int adp_open(struct inode *inode, struct file *filp) +static int adp_open(struct inode *inode, struct file *filp) { /* * The modesetting driver does not check the non-desktop connector From 1f2430c3c87df6c00ed80b3aa6aa4dc31a5d71f5 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 21 Jun 2023 22:15:00 +0200 Subject: [PATCH 3/5] fixup! arm64: dts: apple: t8103: Add touchbar screen bindings --- arch/arm64/boot/dts/apple/t8103-j293.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts index b58541891636f6..2a8cf09f196b5b 100644 --- a/arch/arm64/boot/dts/apple/t8103-j293.dts +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts @@ -144,6 +144,7 @@ dfr_panel: panel@0 { compatible = "apple,summit"; reg = <0>; + rotation = <90>; }; }; From 8395bccd70f86910d70296dea2f815dfab0571b2 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 21 Jun 2023 22:15:00 +0200 Subject: [PATCH 4/5] fixup! arm64: dts: apple: Add touchbar display nodes for t8112-j493 --- arch/arm64/boot/dts/apple/t8112-j493.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/apple/t8112-j493.dts b/arch/arm64/boot/dts/apple/t8112-j493.dts index a94c2508a01bac..b8ac8243d2fe78 100644 --- a/arch/arm64/boot/dts/apple/t8112-j493.dts +++ b/arch/arm64/boot/dts/apple/t8112-j493.dts @@ -53,6 +53,7 @@ dfr_panel: panel@0 { compatible = "apple,summit"; reg = <0>; + rotation = <90>; }; }; From 4a1cdecd4a542428b15b24c356d7442e3705bfe6 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 21 Jun 2023 21:40:47 +0200 Subject: [PATCH 5/5] gpu: drm: adp: Export panel orientatioon This should come from the panel node in the device tree. Signed-off-by: Janne Grunau --- drivers/gpu/drm/adp/adp_drv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/adp/adp_drv.c b/drivers/gpu/drm/adp/adp_drv.c index 7debd51194e437..125769d3ab025c 100644 --- a/drivers/gpu/drm/adp/adp_drv.c +++ b/drivers/gpu/drm/adp/adp_drv.c @@ -513,6 +513,12 @@ static int adp_setup_mode_config(struct adp_drv_private *adp) if (ret) return ret; + /* This should come from the dts / panel */ + ret = drm_connector_set_panel_orientation(&adp->connector, + DRM_MODE_PANEL_ORIENTATION_RIGHT_UP); + if (ret) + return ret; + drm_connector_attach_encoder(&adp->connector, &adp->encoder); ret = drm_vblank_init(drm, drm->mode_config.num_crtc);