drm/mgag200: Move model-specific code into separate functions
Subsystems (3)
Thomas Zimmermann
maintainerv3 cover drm/mgag200: Move model-specific code into separate functions
Mgag200 still mixes model-specific code and generic code in the same functions. Separate it into distinct helpers.
As part of this effort, convert the driver from simple-KMS helpers to regular atomic helpers. The latter are way more flexible and can be adapted easily for each hardware model.
Tested on Matrox G200 and G200EH hardware.
v3:
* only flip SCROFF when enabling/disable the plane (Jocelyn)
* style clean-ups throughout the patchset
v2:
* don't duplicate DAC init values unecessarily (Sam, Jocelyn)
Thomas Zimmermann (14):
drm/mgag200: Split mgag200_modeset_init()
drm/mgag200: Move DAC-register setup into model-specific code dmr/mgag200: Move ER/EW3 register initialization to per-model code drm/mgag200: Acquire I/O-register lock in atomic_commit_tail function drm/mgag200: Store primary plane's color format in CRTC state drm/mgag200: Reorganize before dropping simple-KMS helpers drm/mgag200: Replace simple-KMS with regular atomic helpers drm/mgag200: Set SCROFF in primary-plane code
drm/mgag200: Add per-device callbacks
drm/mgag200: Provide per-device callbacks for BMC synchronization drm/mgag200: Provide per-device callbacks for PIXPLLC drm/mgag200: Move mode-config to model-specific code drm/mgag200: Move CRTC atomic_enable to model-specific code drm/mgag200: Remove type field from struct mga_device
drivers/gpu/drm/mgag200/Makefile | 4 +- drivers/gpu/drm/mgag200/mgag200_bmc.c | 99 +++ drivers/gpu/drm/mgag200/mgag200_drv.c | 21 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 208 ++++- drivers/gpu/drm/mgag200/mgag200_g200.c | 254 +++++- drivers/gpu/drm/mgag200/mgag200_g200eh.c | 277 +++++- drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 181 +++- drivers/gpu/drm/mgag200/mgag200_g200er.c | 315 ++++++- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 316 ++++++- drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 192 ++++- drivers/gpu/drm/mgag200/mgag200_g200se.c | 431 +++++++++- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 326 ++++++- drivers/gpu/drm/mgag200/mgag200_mode.c | 725 +++++----------- drivers/gpu/drm/mgag200/mgag200_pll.c | 997 ---------------------- 14 files changed, 2761 insertions(+), 1585 deletions(-) create mode 100644 drivers/gpu/drm/mgag200/mgag200_bmc.c delete mode 100644 drivers/gpu/drm/mgag200/mgag200_pll.c
base-commit: 15fbed4f822211fbb7653c2b8591594d92de9551
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 1/14 drm/mgag200: Split mgag200_modeset_init()
Split mgag200_modeset_init() into smaller helpers to initialize the mode_config structure and the pipeline. This will be helpful for transforming this code into per-model functions. No functional changes.
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 41 ++++++++++++++++++++------ 1 file changed, 32 insertions(+), 9 deletions(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +32 -9
@@ -1047,23 +1047,16 @@ static const struct drm_mode_config_funcs mgag200_mode_config_funcs = { .atomic_commit = drm_atomic_helper_commit, }; -int mgag200_modeset_init (struct mga_device *mdev,resource_size_t vram_available) +static int mgag200_mode_config_init (struct mga_device *mdev,resource_size_t vram_available) {struct drm_device *dev = &mdev->base; -struct mga_i2c_chan *i2c = &mdev->i2c; -struct drm_connector *connector = &mdev->connector; -struct drm_simple_display_pipe *pipe = &mdev->display_pipe; -size_t format_count =ARRAY_SIZE (mgag200_simple_display_pipe_formats);int ret; -mgag200_init_regs (mdev); - mdev->vram_available = vram_available; ret =drmm_mode_config_init (dev);if (ret) { -drm_err (dev,"drmm_mode_config_init() failed, error %d\n" , - ret); +drm_err (dev,"drmm_mode_config_init() failed: %d\n" , ret);return ret; }
@@ -1073,6 +1066,18 @@ int mgag200_modeset_init(struct mga_device *mdev, resource_size_t vram_available dev->mode_config.fb_base = mdev->vram_res->start; dev->mode_config.funcs = &mgag200_mode_config_funcs; +return 0 ; +} + +static int mgag200_pipeline_init (struct mga_device *mdev) +{ +struct drm_device *dev = &mdev->base; +struct mga_i2c_chan *i2c = &mdev->i2c; +struct drm_connector *connector = &mdev->connector; +struct drm_simple_display_pipe *pipe = &mdev->display_pipe; +size_t format_count =ARRAY_SIZE (mgag200_simple_display_pipe_formats); +int ret; + ret =mgag200_i2c_init (mdev, i2c);if (ret) {drm_err (dev,"failed to add DDC bus: %d\n" , ret);
@@ -1113,6 +1118,24 @@ int mgag200_modeset_init(struct mga_device *mdev, resource_size_t vram_availabledrm_crtc_enable_color_mgmt (&pipe->crtc,0 , false,MGAG200_LUT_SIZE ); +return 0 ; +} + +int mgag200_modeset_init (struct mga_device *mdev,resource_size_t vram_available) +{ +struct drm_device *dev = &mdev->base; +int ret; + +mgag200_init_regs (mdev); + + ret =mgag200_mode_config_init (mdev, vram_available); +if (ret) +return ret; + + ret =mgag200_pipeline_init (mdev); +if (ret) +return ret; +drm_mode_config_reset (dev);return 0 ;
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 2/14 drm/mgag200: Move DAC-register setup into model-specific code
In reply to Thomas ZimmermannProvide an init function for each model's DAC registers. Remove the shared helper.
The code for initializing the DAC registers consisted of a large table of default value, plus many exceptions for the various G200 models. Providing a per-model implementation makes if more readable. At some point, some of the initialization should probably move into the modesetting code.
v2:
* don't duplicate DAC values unnecessarily (Sam, Jocelyn)
--- drivers/gpu/drm/mgag200/mgag200_drv.h | 30 +++++++++ drivers/gpu/drm/mgag200/mgag200_g200.c | 25 +++++++ drivers/gpu/drm/mgag200/mgag200_g200eh.c | 26 ++++++++ drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 2 + drivers/gpu/drm/mgag200/mgag200_g200er.c | 25 +++++++ drivers/gpu/drm/mgag200/mgag200_g200ev.c | 27 ++++++++ drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 2 + drivers/gpu/drm/mgag200/mgag200_g200se.c | 30 +++++++++ drivers/gpu/drm/mgag200/mgag200_g200wb.c | 24 +++++++ drivers/gpu/drm/mgag200/mgag200_mode.c | 80 +---------------------- 10 files changed, 192 insertions(+), 79 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.h +30 -0
@@ -123,6 +123,33 @@#define MGA_MISC_OUT 0x1fc2#define MGA_MISC_IN 0x1fcc +/* +* TODO: This is a pretty large set of default values for all kinds of +* settings. It should be split and set in the various DRM helpers, +* such as the CRTC reset or atomic_enable helpers. The PLL values +* probably belong to each model's PLL code. +*/ +#define MGAG200_DAC_DEFAULT (xvrefctrl, xpixclkctrl, xmiscctrl, xsyspllm, xsysplln, xsyspllp) \ +/* 0x00: */ 0, 0, 0, 0, 0, 0, 0x00, 0, \ +/* 0x08: */ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , \ +/* 0x10: */ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , \ +/* 0x18: */ (xvrefctrl), \ +/* 0x19: */ 0 , \ +/* 0x1a: */ (xpixclkctrl), \ +/* 0x1b: */ 0xff ,0xbf ,0x20 , \ +/* 0x1e: */ (xmiscctrl), \ +/* 0x1f: */ 0x20 , \ +/* 0x20: */ 0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , \ +/* 0x28: */ 0x00 ,0x00 ,0x00 ,0x00 , \ +/* 0x2c: */ (xsyspllm), \ +/* 0x2d: */ (xsysplln), \ +/* 0x2e: */ (xsyspllp), \ +/* 0x2f: */ 0x40 , \ +/* 0x30: */ 0x00 ,0xb0 ,0x00 ,0xc2 ,0x34 ,0x14 ,0x02 ,0x83 , \ +/* 0x38: */ 0x00 ,0x93 ,0x00 ,0x77 ,0x00 ,0x00 ,0x00 ,0x3a , \ +/* 0x40: */ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , \ + /* 0x48: */ 0, 0, 0, 0, 0, 0, 0, 0 \ + #define MGAG200_MAX_FB_HEIGHT 4096 #define MGAG200_MAX_FB_WIDTH 4096
@@ -295,10 +322,12 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const struct enum mga_type type);struct mga_device *mgag200_g200se_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type); +void mgag200_g200wb_init_registers (struct mga_device *mdev);struct mga_device *mgag200_g200wb_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type);struct mga_device *mgag200_g200ev_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type); +void mgag200_g200eh_init_registers (struct mga_device *mdev);struct mga_device *mgag200_g200eh_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type); struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev, const struct drm_driver *drv,
@@ -310,6 +339,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev, const str/* mgag200_mode.c */ resource_size_t mgag200_device_probe_vram (struct mga_device *mdev); +void mgag200_init_registers (struct mga_device *mdev);int mgag200_modeset_init (struct mga_device *mdev,resource_size_t vram_fb_available);/* mgag200_i2c.c */
drivers/gpu/drm/mgag200/mgag200_g200.c +25 -0
@@ -30,6 +30,29 @@ static int mgag200_g200_init_pci_options(struct pci_dev *pdev)return mgag200_init_pci_options (pdev, option,0x00008000 ); } +static void mgag200_g200_init_registers (struct mgag200_g200_device *g200) +{ +static const u8 dacvalue[] = { +MGAG200_DAC_DEFAULT (0x00 ,0xc9 ,0x1f , +0x04 ,0x2d ,0x19 ) + }; + +struct mga_device *mdev = &g200->base; +size_t i; + +for (i =0 ; i <ARRAY_SIZE (dacvalue); ++i) { +if ((i <=0x17 ) || + (i ==0x1b ) || + (i ==0x1c ) || + ((i >=0x1f ) && (i <=0x29 )) || + ((i >=0x30 ) && (i <=0x37 ))) +continue ; +WREG_DAC (i, dacvalue[i]); + } + +mgag200_init_registers (mdev); +} +/* * DRM Device */
@@ -191,6 +214,8 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const structif (ret)return ERR_PTR (ret); +mgag200_g200_init_registers (g200); + vram_available =mgag200_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_g200eh.c +26 -0
@@ -6,6 +6,30 @@#include "mgag200_drv.h" +void mgag200_g200eh_init_registers (struct mga_device *mdev) +{ +static const u8 dacvalue[] = { +MGAG200_DAC_DEFAULT (0x00 ,0xc9 , +MGA1064_MISC_CTL_VGA8 |MGA1064_MISC_CTL_DAC_RAM_CS , +0x00 ,0x00 ,0x00 ) + }; + +size_t i; + +for (i =0 ; i <ARRAY_SIZE (dacvalue); i++) { +if ((i <=0x17 ) || + (i ==0x1b ) || + (i ==0x1c ) || + ((i >=0x1f ) && (i <=0x29 )) || + ((i >=0x30 ) && (i <=0x37 )) || + ((i >=0x44 ) && (i <=0x4e ))) +continue ; +WREG_DAC (i, dacvalue[i]); + } + +mgag200_init_registers (mdev); +} +/* * DRM device */
@@ -40,6 +64,8 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); +mgag200_g200eh_init_registers (mdev); + vram_available =mgag200_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +2 -0
@@ -41,6 +41,8 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev,if (ret)return ERR_PTR (ret); +mgag200_g200eh_init_registers (mdev);// same as G200EH + vram_available =mgag200_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_g200er.c +25 -0
@@ -6,6 +6,29 @@#include "mgag200_drv.h" +static void mgag200_g200er_init_registers (struct mga_device *mdev) +{ +static const u8 dacvalue[] = { +MGAG200_DAC_DEFAULT (0x00 ,0xc9 ,0x1f ,0x00 ,0x00 ,0x00 ) + }; + +size_t i; + +for (i =0 ; i <ARRAY_SIZE (dacvalue); i++) { +if ((i <=0x17 ) || + (i ==0x1b ) || + (i ==0x1c ) || + ((i >=0x1f ) && (i <=0x29 )) || + ((i >=0x30 ) && (i <=0x37 ))) +continue ; +WREG_DAC (i, dacvalue[i]); + } + +WREG_DAC (0x90 ,0 );/* G200ER specific */ + +mgag200_init_registers (mdev); +} +/* * DRM device */
@@ -36,6 +59,8 @@ struct mga_device *mgag200_g200er_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); +mgag200_g200er_init_registers (mdev); + vram_available =mgag200_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_g200ev.c +27 -0
@@ -6,6 +6,31 @@#include "mgag200_drv.h" +static void mgag200_g200ev_init_registers (struct mga_device *mdev) +{ +static const u8 dacvalue[] = { +MGAG200_DAC_DEFAULT (0x00 , +MGA1064_PIX_CLK_CTL_SEL_PLL , +MGA1064_MISC_CTL_VGA8 |MGA1064_MISC_CTL_DAC_RAM_CS , +0x00 ,0x00 ,0x00 ) + }; + +size_t i; + +for (i =0 ; i <ARRAY_SIZE (dacvalue); i++) { +if ((i <=0x17 ) || + (i ==0x1b ) || + (i ==0x1c ) || + ((i >=0x1f ) && (i <=0x29 )) || + ((i >=0x30 ) && (i <=0x37 )) || + ((i >=0x44 ) && (i <=0x4e ))) +continue ; +WREG_DAC (i, dacvalue[i]); + } + +mgag200_init_registers (mdev); +} +/* * DRM device */
@@ -40,6 +65,8 @@ struct mga_device *mgag200_g200ev_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); +mgag200_g200ev_init_registers (mdev); + vram_available =mgag200_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +2 -0
@@ -50,6 +50,8 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,if (ret)return ERR_PTR (ret); +mgag200_g200wb_init_registers (mdev);// same as G200WB + vram_available =mgag200_g200ew3_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_g200se.c +30 -0
@@ -28,6 +28,34 @@ static int mgag200_g200se_init_pci_options(struct pci_dev *pdev)return mgag200_init_pci_options (pdev, option,0x00008000 ); } +static void mgag200_g200se_init_registers (struct mgag200_g200se_device *g200se) +{ +static const u8 dacvalue[] = { +MGAG200_DAC_DEFAULT (0x03 , +MGA1064_PIX_CLK_CTL_SEL_PLL , +MGA1064_MISC_CTL_DAC_EN | +MGA1064_MISC_CTL_VGA8 | +MGA1064_MISC_CTL_DAC_RAM_CS , +0x00 ,0x00 ,0x00 ) + }; + +struct mga_device *mdev = &g200se->base; +size_t i; + +for (i =0 ; i <ARRAY_SIZE (dacvalue); i++) { +if ((i <=0x17 ) || + (i ==0x1b ) || + (i ==0x1c ) || + ((i >=0x1f ) && (i <=0x29 )) || + ((i ==0x2c ) || (i ==0x2d ) || (i ==0x2e )) || + ((i >=0x30 ) && (i <=0x37 ))) +continue ; +WREG_DAC (i, dacvalue[i]); + } + +mgag200_init_registers (mdev); +} +/* * DRM device */
@@ -120,6 +148,8 @@ struct mga_device *mgag200_g200se_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); +mgag200_g200se_init_registers (g200se); + vram_available =mgag200_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_g200wb.c +24 -0
@@ -6,6 +6,28 @@#include "mgag200_drv.h" +void mgag200_g200wb_init_registers (struct mga_device *mdev) +{ +static const u8 dacvalue[] = { +MGAG200_DAC_DEFAULT (0x07 ,0xc9 ,0x1f ,0x00 ,0x00 ,0x00 ) + }; + +size_t i; + +for (i =0 ; i <ARRAY_SIZE (dacvalue); i++) { +if ((i <=0x17 ) || + (i ==0x1b ) || + (i ==0x1c ) || + ((i >=0x1f ) && (i <=0x29 )) || + ((i >=0x30 ) && (i <=0x37 )) || + ((i >=0x44 ) && (i <=0x4e ))) +continue ; +WREG_DAC (i, dacvalue[i]); + } + +mgag200_init_registers (mdev); +} +/* * DRM device */
@@ -40,6 +62,8 @@ struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); +mgag200_g200wb_init_registers (mdev); + vram_available =mgag200_device_probe_vram (mdev); ret =mgag200_modeset_init (mdev, vram_available);
drivers/gpu/drm/mgag200/mgag200_mode.c +1 -79
95 lines not on this page · raw message
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 3/14 dmr/mgag200: Move ER/EW3 register initialization to per-model code
In reply to Thomas ZimmermannThe register initialization code contains special cases for G200ER and G200EW3 hardware. Move this to per-model code.
--- drivers/gpu/drm/mgag200/mgag200_g200er.c | 2 ++ drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 9 ++++++++- drivers/gpu/drm/mgag200/mgag200_mode.c | 6 ------ 3 files changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/mgag200/mgag200_g200er.c +2 -0
@@ -27,6 +27,8 @@ static void mgag200_g200er_init_registers(struct mga_device *mdev)WREG_DAC (0x90 ,0 );/* G200ER specific */ mgag200_init_registers (mdev); + +WREG_ECRT (0x24 ,0x5 );/* G200ER specific */ }/*
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +8 -1
@@ -6,6 +6,13 @@#include "mgag200_drv.h" +static void mgag200_g200ew3_init_registers (struct mga_device *mdev) +{ +mgag200_g200wb_init_registers (mdev);// same as G200WB + +WREG_ECRT (0x34 ,0x5 );// G200EW3 specific +} +/* * DRM device */
@@ -50,7 +57,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,if (ret)return ERR_PTR (ret); -mgag200_g200wb_init_registers (mdev);// same as G200WB +mgag200_g200ew3_init_registers (mdev); vram_available =mgag200_g200ew3_device_probe_vram (mdev);
drivers/gpu/drm/mgag200/mgag200_mode.c +0 -6
@@ -287,12 +287,6 @@ void mgag200_init_registers(struct mga_device *mdev) MGAREG_CRTC11_VINTCLR);WREG_CRT (0x11 , crtc11); -if (mdev->type ==G200_ER ) -WREG_ECRT (0x24 ,0x5 ); - -if (mdev->type ==G200_EW3 ) -WREG_ECRT (0x34 ,0x5 ); - misc =RREG8 (MGA_MISC_IN ); misc |=MGAREG_MISC_IOADSEL ;WREG8 (MGA_MISC_OUT , misc);
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 4/14 drm/mgag200: Acquire I/O-register lock in atomic_commit_tail function
In reply to Thomas ZimmermannHold I/O-register lock in atomic_commit_tail to protect all pipeline updates at once. Protects against concurrent I/O access in get-modes helper.
Complex modesetting operations involve mode changes, plane updates and possibly BMC updates. Make all this atomic wrt to reading display modes via EDID. It's not so much an issue with simple-KMS helpers, but will become necessary for using regular atomic helpers.
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 36 ++++++++++++++++---------- 1 file changed, 22 insertions(+), 14 deletions(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +22 -14
@@ -11,6 +11,7 @@#include <linux/delay.h> #include <linux/iosys-map.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_state_helper.h> #include <drm/drm_crtc_helper.h>
@@ -702,14 +703,6 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe, .y2 = fb->height, }; -/* -* Concurrent operations could possibly trigger a call to -* drm_connector_helper_funcs.get_modes by trying to read the -* display modes. Protect access to I/O registers by acquiring -* the I/O-register lock. -*/ -mutex_lock (&mdev->rmmio_lock); -if (mdev->type ==G200_WB || mdev->type ==G200_EW3 )mgag200_g200wb_hold_bmc (mdev);
@@ -741,8 +734,6 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,/* Always scanout image at VRAM offset 0 */ mgag200_set_startadd (mdev, (u32 )0 );mgag200_set_offset (mdev, fb); - -mutex_unlock (&mdev->rmmio_lock); } static void
@@ -812,8 +803,6 @@ mgag200_simple_display_pipe_update(struct drm_simple_display_pipe *pipe,if (!fb)return ; -mutex_lock (&mdev->rmmio_lock); -if (crtc->state->color_mgmt_changed && crtc->state->gamma_lut)mgag200_crtc_set_gamma (mdev, fb->format, crtc->state->gamma_lut->data);
@@ -824,8 +813,6 @@ mgag200_simple_display_pipe_update(struct drm_simple_display_pipe *pipe,/* Always scanout image at VRAM offset 0 */ mgag200_set_startadd (mdev, (u32 )0 );mgag200_set_offset (mdev, fb); - -mutex_unlock (&mdev->rmmio_lock); } static struct drm_crtc_state *
@@ -903,6 +890,26 @@ static const uint64_t mgag200_simple_display_pipe_fmtmods[] = {* Mode config */ +static void mgag200_mode_config_helper_atomic_commit_tail (struct drm_atomic_state *state) +{ +struct mga_device *mdev =to_mga_device (state->dev); + +/* +* Concurrent operations could possibly trigger a call to +* drm_connector_helper_funcs.get_modes by trying to read the +* display modes. Protect access to I/O registers by acquiring +* the I/O-register lock. +*/ +mutex_lock (&mdev->rmmio_lock); +drm_atomic_helper_commit_tail (state); +mutex_unlock (&mdev->rmmio_lock); +} + +static const struct drm_mode_config_helper_funcs mgag200_mode_config_helper_funcs = { + .atomic_commit_tail = mgag200_mode_config_helper_atomic_commit_tail, +}; + +/* Calculates a mode's required memory bandwidth (in KiB/sec). */ static uint32_t mgag200_calculate_mode_bandwidth (const struct drm_display_mode *mode,unsigned int bits_per_pixel)
@@ -983,6 +990,7 @@ static int mgag200_mode_config_init(struct mga_device *mdev, resource_size_t vra dev->mode_config.preferred_depth =24 ; dev->mode_config.fb_base = mdev->vram_res->start; dev->mode_config.funcs = &mgag200_mode_config_funcs; + dev->mode_config.helper_private = &mgag200_mode_config_helper_funcs;return 0 ; }
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 5/14 drm/mgag200: Store primary plane's color format in CRTC state
In reply to Thomas ZimmermannStore the primary plane's color format in the CRTC state and use it for programming the CRTC's gamma LUTs.
Gamma tables (i.e., color management) are provided by the CRTC, but depend in the primary plane's color format. Store the format in the CRTC state and use it. This has not been an issue with simple-KMS helpers, which mix-up plane and CRTC state to some extent. For using regular atomic helpers, it's necessary to distinguish between the two.
--- drivers/gpu/drm/mgag200/mgag200_drv.h | 3 +++ drivers/gpu/drm/mgag200/mgag200_mode.c | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.h +3 -0
@@ -187,6 +187,9 @@ struct mgag200_pll {struct mgag200_crtc_state {struct drm_crtc_state base; +/* Primary-plane format; required for modesetting and color mgmt. */ +const struct drm_format_info *format; +struct mgag200_pll_values pixpllc; };
drivers/gpu/drm/mgag200/mgag200_mode.c +12 -10
@@ -418,11 +418,9 @@ static void mgag200_set_offset(struct mga_device *mdev,WREG_ECRT (0x00 , crtcext0); } -static void mgag200_set_format_regs (struct mga_device *mdev, -const struct drm_framebuffer *fb) +static void mgag200_set_format_regs (struct mga_device *mdev,const struct drm_format_info *format) {struct drm_device *dev = &mdev->base; -const struct drm_format_info *format = fb->format;unsigned int bpp, bppshift, scale;u8 crtcext3, xmulctrl;
@@ -501,7 +499,7 @@ static void mgag200_g200er_reset_tagfifo(struct mga_device *mdev)static void mgag200_g200se_set_hiprilvl (struct mga_device *mdev,const struct drm_display_mode *mode, -const struct drm_framebuffer *fb) +const struct drm_format_info *format) {struct mgag200_g200se_device *g200se =to_mgag200_g200se_device (&mdev->base);unsigned int hiprilvl;
@@ -513,9 +511,9 @@ static void mgag200_g200se_set_hiprilvl(struct mga_device *mdev,unsigned int bpp;unsigned long mb; -if (fb->format->cpp[0 ] *8 >16 ) +if (format->cpp[0 ] *8 >16 ) bpp =32 ; -else if (fb->format->cpp[0 ] *8 >8 ) +else if (format->cpp[0 ] *8 >8 ) bpp =16 ;else bpp =8 ;
@@ -695,6 +693,7 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state);struct drm_framebuffer *fb = plane_state->fb; +const struct drm_format_info *format = mgag200_crtc_state->format;struct drm_shadow_plane_state *shadow_plane_state =to_drm_shadow_plane_state (plane_state);struct drm_rect fullscreen = { .x1 =0 ,
@@ -706,7 +705,7 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,if (mdev->type ==G200_WB || mdev->type ==G200_EW3 )mgag200_g200wb_hold_bmc (mdev); -mgag200_set_format_regs (mdev, fb); +mgag200_set_format_regs (mdev, format);mgag200_set_mode_regs (mdev, adjusted_mode); pixpll->funcs->update (pixpll, &mgag200_crtc_state->pixpllc);
@@ -715,7 +714,7 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,mgag200_g200er_reset_tagfifo (mdev);if (IS_G200_SE (mdev)) -mgag200_g200se_set_hiprilvl (mdev, adjusted_mode, fb); +mgag200_g200se_set_hiprilvl (mdev, adjusted_mode, format);else if (mdev->type ==G200_EV )mgag200_g200ev_set_hiprilvl (mdev);
@@ -723,9 +722,9 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,mgag200_g200wb_release_bmc (mdev);if (crtc_state->gamma_lut) -mgag200_crtc_set_gamma (mdev, fb->format, crtc_state->gamma_lut->data); +mgag200_crtc_set_gamma (mdev, format, crtc_state->gamma_lut->data);else -mgag200_crtc_set_gamma_linear (mdev, fb->format); +mgag200_crtc_set_gamma_linear (mdev, format);mgag200_enable_display (mdev);
@@ -768,6 +767,8 @@ mgag200_simple_display_pipe_check(struct drm_simple_display_pipe *pipe,if (!fb || (fb->format != new_fb->format)) crtc_state->mode_changed = true;/* update PLL settings */ + mgag200_crtc_state->format = new_fb->format; +if (crtc_state->mode_changed) { ret = pixpll->funcs->compute (pixpll, crtc_state->mode.clock, &mgag200_crtc_state->pixpllc);
@@ -831,6 +832,7 @@ mgag200_simple_display_pipe_duplicate_crtc_state(struct drm_simple_display_pipereturn NULL ;__drm_atomic_helper_crtc_duplicate_state (crtc, &new_mgag200_crtc_state->base); + new_mgag200_crtc_state->format = mgag200_crtc_state->format;memcpy (&new_mgag200_crtc_state->pixpllc, &mgag200_crtc_state->pixpllc,sizeof (new_mgag200_crtc_state->pixpllc));
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 6/14 drm/mgag200: Reorganize before dropping simple-KMS helpers
In reply to Thomas ZimmermannMove around some modesetting code before dropping simple-KMS helpers. Makes the next patch more readable. No functional changes.
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 95 +++++++++++++------------- 1 file changed, 47 insertions(+), 48 deletions(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +47 -48
@@ -603,42 +603,31 @@ static void mgag200_disable_display(struct mga_device *mdev)WREG_ECRT (0x01 , crtcext1); } -/* -* Connector -*/ - -static int mgag200_vga_connector_helper_get_modes (struct drm_connector *connector) +static void mgag200_handle_damage (struct mga_device *mdev,const struct iosys_map *vmap, +struct drm_framebuffer *fb,const struct drm_rect *clip) { -struct mga_device *mdev =to_mga_device (connector->dev); -int ret; - -/* -* Protect access to I/O registers from concurrent modesetting -* by acquiring the I/O-register lock. -*/ -mutex_lock (&mdev->rmmio_lock); - ret =drm_connector_helper_get_modes_from_ddc (connector); -mutex_unlock (&mdev->rmmio_lock); +void __iomem *dst = mdev->vram; +void *vaddr = vmap[0 ].vaddr;/* TODO: Use mapping abstraction properly */ -return ret; + dst +=drm_fb_clip_offset (fb->pitches[0 ], fb->format, clip); +drm_fb_memcpy_toio (dst, fb->pitches[0 ], vaddr, fb, clip); } -static const struct drm_connector_helper_funcs mga_vga_connector_helper_funcs = { - .get_modes = mgag200_vga_connector_helper_get_modes, -}; - -static const struct drm_connector_funcs mga_vga_connector_funcs = { - .reset = drm_atomic_helper_connector_reset, - .fill_modes = drm_helper_probe_single_connector_modes, - .destroy = drm_connector_cleanup, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, -}; -/* * Simple Display Pipe */ +static const uint32_t mgag200_simple_display_pipe_formats[] = { +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_RGB888 , +}; + +static const uint64_t mgag200_simple_display_pipe_fmtmods[] = { +DRM_FORMAT_MOD_LINEAR , +DRM_FORMAT_MOD_INVALID +}; +static enum drm_mode_status mgag200_simple_display_pipe_mode_valid (struct drm_simple_display_pipe *pipe,const struct drm_display_mode *mode)
@@ -670,17 +659,6 @@ mgag200_simple_display_pipe_mode_valid(struct drm_simple_display_pipe *pipe,return MODE_OK ; } -static void -mgag200_handle_damage (struct mga_device *mdev,struct drm_framebuffer *fb, -struct drm_rect *clip,const struct iosys_map *map) -{ -void __iomem *dst = mdev->vram; -void *vmap = map->vaddr;/* TODO: Use mapping abstraction properly */ - - dst +=drm_fb_clip_offset (fb->pitches[0 ], fb->format, clip); -drm_fb_memcpy_toio (dst, fb->pitches[0 ], vmap, fb, clip); -} - static void mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe, struct drm_crtc_state *crtc_state,
@@ -728,7 +706,7 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,mgag200_enable_display (mdev); -mgag200_handle_damage (mdev, fb, &fullscreen, &shadow_plane_state->data[0 ]); +mgag200_handle_damage (mdev, shadow_plane_state->data, fb, &fullscreen);/* Always scanout image at VRAM offset 0 */ mgag200_set_startadd (mdev, (u32 )0 );
@@ -809,7 +787,7 @@ mgag200_simple_display_pipe_update(struct drm_simple_display_pipe *pipe,drm_atomic_helper_damage_iter_init (&iter, old_state, state);drm_atomic_for_each_plane_damage (&iter, &damage) { -mgag200_handle_damage (mdev, fb, &damage, &shadow_plane_state->data[0 ]); +mgag200_handle_damage (mdev, shadow_plane_state->data, fb, &damage); }/* Always scanout image at VRAM offset 0 */ mgag200_set_startadd (mdev, (u32 )0 );
@@ -877,15 +855,36 @@ mgag200_simple_display_pipe_funcs = { DRM_GEM_SIMPLE_DISPLAY_PIPE_SHADOW_PLANE_FUNCS, }; -static const uint32_t mgag200_simple_display_pipe_formats[] = { -DRM_FORMAT_XRGB8888 , -DRM_FORMAT_RGB565 , -DRM_FORMAT_RGB888 , +/* +* Connector +*/ + +static int mgag200_vga_connector_helper_get_modes (struct drm_connector *connector) +{ +struct mga_device *mdev =to_mga_device (connector->dev); +int ret; + +/* +* Protect access to I/O registers from concurrent modesetting +* by acquiring the I/O-register lock. +*/ +mutex_lock (&mdev->rmmio_lock); + ret =drm_connector_helper_get_modes_from_ddc (connector); +mutex_unlock (&mdev->rmmio_lock); + +return ret; +} + +static const struct drm_connector_helper_funcs mga_vga_connector_helper_funcs = { + .get_modes = mgag200_vga_connector_helper_get_modes, }; -static const uint64_t mgag200_simple_display_pipe_fmtmods[] = { -DRM_FORMAT_MOD_LINEAR , -DRM_FORMAT_MOD_INVALID +static const struct drm_connector_funcs mga_vga_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, };/*
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 7/14 drm/mgag200: Replace simple-KMS with regular atomic helpers
In reply to Thomas ZimmermannDrop simple-KMS in favor of regular atomic helpers. Makes the code more modular and hence better to adapt to per-model requirements.
The simple-KMS helpers provide few extra features, so the patch is mostly about open-coding what simple-KMS does. The simple-KMS helpers do mix up plane and CRTC state. Changing to regular atomic helpers requires to split some of the simple-pipe functions into per-plane and per-CRTC code
No functional changes.
v3:
* always run drm_atomic_helper_check_plane_state()
* clean up style
--- drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 382 +++++++++++++++---------- 2 files changed, 233 insertions(+), 157 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.h +6 -2
@@ -15,11 +15,13 @@#include <video/vga.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_shmem_helper.h> -#include <drm/drm_simple_kms_helper.h> +#include <drm/drm_plane.h> #include "mgag200_reg.h"
@@ -276,9 +278,11 @@ struct mga_device {enum mga_type type;struct mgag200_pll pixpll; +struct drm_plane primary_plane; +struct drm_crtc crtc; +struct drm_encoder encoder;struct mga_i2c_chan i2c;struct drm_connector connector; -struct drm_simple_display_pipe display_pipe; };static inline struct mga_device *to_mga_device (struct drm_device *dev)
drivers/gpu/drm/mgag200/mgag200_mode.c +227 -155
476 lines not on this page · raw message
Signature · 1 line
2.37.1
Jocelyn Falempe
reviewerRe: [PATCH v3 07/14] drm/mgag200: Replace simple-KMS with regular atomic helpers
Quoted 96 lines · Thomas Zimmermann
Drop simple-KMS in favor of regular atomic helpers. Makes the code more modular and hence better to adapt to per-model requirements.
The simple-KMS helpers provide few extra features, so the patch is mostly about open-coding what simple-KMS does. The simple-KMS helpers do mix up plane and CRTC state. Changing to regular atomic helpers requires to split some of the simple-pipe functions into per-plane and per-CRTC code
No functional changes.
v3:
* always rundrm_atomic_helper_check_plane_state()
* clean up styleSigned-off-by Thomas Zimmermann <[email protected]>Reviewed-by Jocelyn Falempe <[email protected]>Tested-by Jocelyn Falempe <[email protected]>Acked-by Sam Ravnborg <[email protected]>--- drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 382 +++++++++++++++---------- 2 files changed, 233 insertions(+), 157 deletions(-)drivers/gpu/drm/mgag200/mgag200_drv.h +6
-2@@ -15,11 +15,13 @@#include <video/vga.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_shmem_helper.h> -#include <drm/drm_simple_kms_helper.h> +#include <drm/drm_plane.h> #include "mgag200_reg.h" @@ -276,9 +278,11 @@ struct mga_device {enum mga_type type;struct mgag200_pll pixpll; +struct drm_plane primary_plane; +struct drm_crtc crtc; +struct drm_encoder encoder;struct mga_i2c_chan i2c;struct drm_connector connector; -struct drm_simple_display_pipe display_pipe; };static inline struct mga_device *to_mga_device (struct drm_device *dev)drivers/gpu/drm/mgag200/mgag200_mode.c +5
-8@@ -23,7 +23,6 @@#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "mgag200_drv.h" @@ -614,25 +613,106 @@ static void mgag200_handle_damage(struct mga_device *mdev, const struct iosys_ma }/* -* Simple Display Pipe +* Primary plane */ -static const uint32_t mgag200_simple_display_pipe_formats[] = { +static const uint32_t mgag200_primary_plane_formats[] = {DRM_FORMAT_XRGB8888 ,DRM_FORMAT_RGB565 ,DRM_FORMAT_RGB888 , }; -static const uint64_t mgag200_simple_display_pipe_fmtmods[] = { +static const uint64_t mgag200_primary_plane_fmtmods[] = {DRM_FORMAT_MOD_LINEAR ,DRM_FORMAT_MOD_INVALID }; -static enum drm_mode_status -mgag200_simple_display_pipe_mode_valid (struct drm_simple_display_pipe *pipe, -const struct drm_display_mode *mode) +static int mgag200_primary_plane_helper_atomic_check (struct drm_plane *plane, +struct drm_atomic_state *new_state) { -struct mga_device *mdev =to_mga_device (pipe->crtc.dev);
drivers/gpu/drm/mgag200/mgag200_mode.c static void mgag200_handle_damage(struct mga_device *mdev, const struct iosys_ma · line 642
Quoted 10 lines
drivers/gpu/drm/mgag200/mgag200_mode.c +10
-0+struct drm_plane_state *new_plane_state =drm_atomic_get_new_plane_state (new_state, plane); +struct drm_framebuffer *new_fb = new_plane_state->fb; +struct drm_framebuffer *fb =NULL ; +struct drm_crtc *new_crtc = new_plane_state->crtc; +struct drm_crtc_state *new_crtc_state =NULL ; +struct mgag200_crtc_state *new_mgag200_crtc_state; +int ret; + +if (new_crtc) + new_crtc_state =drm_atomic_get_new_crtc_state (new_state, new_crtc);
If new_crtc is NULL, then new_crtc_state will be NULL too, and it's dereferenced in drm_atomic_helper_check_plane_state() and later in this function. So either there is a garantee that new_crtc is never NULL when calling this function, or it should return before trying to access it.
Quoted 428 lines
drivers/gpu/drm/mgag200/mgag200_mode.c +212
-140+ + ret =drm_atomic_helper_check_plane_state (new_plane_state, new_crtc_state, +DRM_PLANE_NO_SCALING , +DRM_PLANE_NO_SCALING , + false, true); +if (ret) +return ret; +else if (!new_plane_state->visible) +return 0 ; + +if (plane->state) + fb = plane->state->fb; + +if (!fb || (fb->format != new_fb->format)) + new_crtc_state->mode_changed = true;/* update PLL settings */ + + new_mgag200_crtc_state =to_mgag200_crtc_state (new_crtc_state); + new_mgag200_crtc_state->format = new_fb->format; + +return 0 ; +} + +static void mgag200_primary_plane_helper_atomic_update (struct drm_plane *plane, +struct drm_atomic_state *old_state) +{ +struct drm_device *dev = plane->dev; +struct mga_device *mdev =to_mga_device (dev); +struct drm_plane_state *plane_state = plane->state; +struct drm_plane_state *old_plane_state =drm_atomic_get_old_plane_state (old_state, plane); +struct drm_shadow_plane_state *shadow_plane_state =to_drm_shadow_plane_state (plane_state); +struct drm_framebuffer *fb = plane_state->fb; +struct drm_atomic_helper_damage_iter iter; +struct drm_rect damage; + +if (!fb) +return ; + +drm_atomic_helper_damage_iter_init (&iter, old_plane_state, plane_state); +drm_atomic_for_each_plane_damage (&iter, &damage) { +mgag200_handle_damage (mdev, shadow_plane_state->data, fb, &damage); + } + +/* Always scanout image at VRAM offset 0 */ +mgag200_set_startadd (mdev, (u32 )0 ); +mgag200_set_offset (mdev, fb); +} + +static void mgag200_primary_plane_helper_atomic_disable (struct drm_plane *plane, +struct drm_atomic_state *old_state) +{ } + +static const struct drm_plane_helper_funcs mgag200_primary_plane_helper_funcs = { +DRM_GEM_SHADOW_PLANE_HELPER_FUNCS , + .atomic_check = mgag200_primary_plane_helper_atomic_check, + .atomic_update = mgag200_primary_plane_helper_atomic_update, + .atomic_disable = mgag200_primary_plane_helper_atomic_disable, +}; + +static const struct drm_plane_funcs mgag200_primary_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, +DRM_GEM_SHADOW_PLANE_FUNCS , +}; + +/* +* CRTC +*/ + +static enum drm_mode_status mgag200_crtc_helper_mode_valid (struct drm_crtc *crtc, +const struct drm_display_mode *mode) +{ +struct mga_device *mdev =to_mga_device (crtc->dev);const struct mgag200_device_info *info = mdev->info;/* @@ -659,26 +739,69 @@ mgag200_simple_display_pipe_mode_valid(struct drm_simple_display_pipe *pipe,return MODE_OK ; } -static void -mgag200_simple_display_pipe_enable (struct drm_simple_display_pipe *pipe, -struct drm_crtc_state *crtc_state, -struct drm_plane_state *plane_state) +static int mgag200_crtc_helper_atomic_check (struct drm_crtc *crtc, +struct drm_atomic_state *new_state) { -struct drm_crtc *crtc = &pipe->crtc;struct drm_device *dev = crtc->dev;struct mga_device *mdev =to_mga_device (dev); +struct drm_crtc_state *new_crtc_state =drm_atomic_get_new_crtc_state (new_state, crtc);struct mgag200_pll *pixpll = &mdev->pixpll; +struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (new_crtc_state); +struct drm_property_blob *new_gamma_lut = new_crtc_state->gamma_lut; +int ret; + + ret =drm_atomic_helper_check_crtc_state (new_crtc_state, false); +if (ret) +return ret; + +if (!new_crtc_state->enable) +return 0 ; + +if (new_crtc_state->mode_changed) { + ret = pixpll->funcs->compute (pixpll, new_crtc_state->mode.clock, + &mgag200_crtc_state->pixpllc); +if (ret) +return ret; + } + +if (new_crtc_state->color_mgmt_changed && new_gamma_lut) { +if (new_gamma_lut->length !=MGAG200_LUT_SIZE *sizeof (struct drm_color_lut )) { +drm_dbg (dev,"Wrong size for gamma_lut %zu\n" , new_gamma_lut->length); +return -EINVAL ; + } + } + +return drm_atomic_add_affected_planes (new_state, crtc); +} + +static void mgag200_crtc_helper_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_crtc_state *crtc_state = crtc->state; +struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); +struct drm_device *dev = crtc->dev; +struct mga_device *mdev =to_mga_device (dev); + +if (crtc_state->enable && crtc_state->color_mgmt_changed) { +const struct drm_format_info *format = mgag200_crtc_state->format; + +if (crtc_state->gamma_lut) +mgag200_crtc_set_gamma (mdev, format, crtc_state->gamma_lut->data); +else +mgag200_crtc_set_gamma_linear (mdev, format); + } +} + +static void mgag200_crtc_helper_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_device *dev = crtc->dev; +struct mga_device *mdev =to_mga_device (dev); +struct drm_crtc_state *crtc_state = crtc->state;struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); -struct drm_framebuffer *fb = plane_state->fb;const struct drm_format_info *format = mgag200_crtc_state->format; -struct drm_shadow_plane_state *shadow_plane_state =to_drm_shadow_plane_state (plane_state); -struct drm_rect fullscreen = { - .x1 =0 , - .x2 = fb->width, - .y1 =0 , - .y2 = fb->height, - }; +struct mgag200_pll *pixpll = &mdev->pixpll;if (mdev->type ==G200_WB || mdev->type ==G200_EW3 )mgag200_g200wb_hold_bmc (mdev);@@ -696,108 +819,50 @@ mgag200_simple_display_pipe_enable(struct drm_simple_display_pipe *pipe,else if (mdev->type ==G200_EV )mgag200_g200ev_set_hiprilvl (mdev); -if (mdev->type ==G200_WB || mdev->type ==G200_EW3 ) -mgag200_g200wb_release_bmc (mdev); - -if (crtc_state->gamma_lut) -mgag200_crtc_set_gamma (mdev, format, crtc_state->gamma_lut->data); -else -mgag200_crtc_set_gamma_linear (mdev, format); -mgag200_enable_display (mdev); -mgag200_handle_damage (mdev, shadow_plane_state->data, fb, &fullscreen); - -/* Always scanout image at VRAM offset 0 */ -mgag200_set_startadd (mdev, (u32 )0 ); -mgag200_set_offset (mdev, fb); +if (mdev->type ==G200_WB || mdev->type ==G200_EW3 ) +mgag200_g200wb_release_bmc (mdev); } -static void -mgag200_simple_display_pipe_disable (struct drm_simple_display_pipe *pipe) +static void mgag200_crtc_helper_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) { -struct drm_crtc *crtc = &pipe->crtc;struct mga_device *mdev =to_mga_device (crtc->dev); -mgag200_disable_display (mdev); -} - -static int -mgag200_simple_display_pipe_check (struct drm_simple_display_pipe *pipe, -struct drm_plane_state *plane_state, -struct drm_crtc_state *crtc_state) -{ -struct drm_plane *plane = plane_state->plane; -struct drm_device *dev = plane->dev; -struct mga_device *mdev =to_mga_device (dev); -struct mgag200_pll *pixpll = &mdev->pixpll; -struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); -struct drm_framebuffer *new_fb = plane_state->fb; -struct drm_framebuffer *fb =NULL ; -int ret; - -if (!new_fb) -return 0 ; - -if (plane->state) - fb = plane->state->fb; - -if (!fb || (fb->format != new_fb->format)) - crtc_state->mode_changed = true;/* update PLL settings */ - - mgag200_crtc_state->format = new_fb->format; +if (mdev->type ==G200_WB || mdev->type ==G200_EW3 ) +mgag200_g200wb_hold_bmc (mdev); -if (crtc_state->mode_changed) { - ret = pixpll->funcs->compute (pixpll, crtc_state->mode.clock, - &mgag200_crtc_state->pixpllc); -if (ret) -return ret; - } +mgag200_disable_display (mdev); -if (crtc_state->color_mgmt_changed && crtc_state->gamma_lut) { -if (crtc_state->gamma_lut->length != -MGAG200_LUT_SIZE *sizeof (struct drm_color_lut )) { -drm_err (dev,"Wrong size for gamma_lut %zu\n" , - crtc_state->gamma_lut->length); -return -EINVAL ; - } - } -return 0 ; +if (mdev->type ==G200_WB || mdev->type ==G200_EW3 ) +mgag200_g200wb_release_bmc (mdev); } -static void -mgag200_simple_display_pipe_update (struct drm_simple_display_pipe *pipe, -struct drm_plane_state *old_state) -{ -struct drm_plane *plane = &pipe->plane; -struct drm_crtc *crtc = &pipe->crtc; -struct drm_device *dev = plane->dev; -struct mga_device *mdev =to_mga_device (dev); -struct drm_plane_state *state = plane->state; -struct drm_shadow_plane_state *shadow_plane_state =to_drm_shadow_plane_state (state); -struct drm_framebuffer *fb = state->fb; -struct drm_rect damage; -struct drm_atomic_helper_damage_iter iter; +static const struct drm_crtc_helper_funcs mgag200_crtc_helper_funcs = { + .mode_valid = mgag200_crtc_helper_mode_valid, + .atomic_check = mgag200_crtc_helper_atomic_check, + .atomic_flush = mgag200_crtc_helper_atomic_flush, + .atomic_enable = mgag200_crtc_helper_atomic_enable, + .atomic_disable = mgag200_crtc_helper_atomic_disable, +}; -if (!fb) -return ; +static void mgag200_crtc_reset (struct drm_crtc *crtc) +{ +struct mgag200_crtc_state *mgag200_crtc_state; -if (crtc->state->color_mgmt_changed && crtc->state->gamma_lut) -mgag200_crtc_set_gamma (mdev, fb->format, crtc->state->gamma_lut->data); +if (crtc->state) + crtc->funcs->atomic_destroy_state (crtc, crtc->state); -drm_atomic_helper_damage_iter_init (&iter, old_state, state); -drm_atomic_for_each_plane_damage (&iter, &damage) { -mgag200_handle_damage (mdev, shadow_plane_state->data, fb, &damage); - } -/* Always scanout image at VRAM offset 0 */ -mgag200_set_startadd (mdev, (u32 )0 ); -mgag200_set_offset (mdev, fb); + mgag200_crtc_state =kzalloc (sizeof (*mgag200_crtc_state),GFP_KERNEL ); +if (mgag200_crtc_state) +__drm_atomic_helper_crtc_reset (crtc, &mgag200_crtc_state->base); +else +__drm_atomic_helper_crtc_reset (crtc,NULL ); } -static struct drm_crtc_state * -mgag200_simple_display_pipe_duplicate_crtc_state (struct drm_simple_display_pipe *pipe) +static struct drm_crtc_state *mgag200_crtc_atomic_duplicate_state (struct drm_crtc *crtc) { -struct drm_crtc *crtc = &pipe->crtc;struct drm_crtc_state *crtc_state = crtc->state;struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state);struct mgag200_crtc_state *new_mgag200_crtc_state;@@ -817,8 +882,8 @@ mgag200_simple_display_pipe_duplicate_crtc_state(struct drm_simple_display_pipereturn &new_mgag200_crtc_state->base; } -static void mgag200_simple_display_pipe_destroy_crtc_state (struct drm_simple_display_pipe *pipe, -struct drm_crtc_state *crtc_state) +static void mgag200_crtc_atomic_destroy_state (struct drm_crtc *crtc, +struct drm_crtc_state *crtc_state) {struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state);@@ -826,33 +891,21 @@ static void mgag200_simple_display_pipe_destroy_crtc_state(struct drm_simple_diskfree (mgag200_crtc_state); } -static void mgag200_simple_display_pipe_reset_crtc (struct drm_simple_display_pipe *pipe) -{ -struct drm_crtc *crtc = &pipe->crtc; -struct mgag200_crtc_state *mgag200_crtc_state; - -if (crtc->state) { -mgag200_simple_display_pipe_destroy_crtc_state (pipe, crtc->state); - crtc->state =NULL ;/* must be set to NULL here */ - } +static const struct drm_crtc_funcs mgag200_crtc_funcs = { + .reset = mgag200_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = mgag200_crtc_atomic_duplicate_state, + .atomic_destroy_state = mgag200_crtc_atomic_destroy_state, +}; - mgag200_crtc_state =kzalloc (sizeof (*mgag200_crtc_state),GFP_KERNEL ); -if (!mgag200_crtc_state) -return ; -__drm_atomic_helper_crtc_reset (crtc, &mgag200_crtc_state->base); -} +/* +* Encoder +*/ -static const struct drm_simple_display_pipe_funcs -mgag200_simple_display_pipe_funcs = { - .mode_valid = mgag200_simple_display_pipe_mode_valid, - .enable = mgag200_simple_display_pipe_enable, - .disable = mgag200_simple_display_pipe_disable, - .check = mgag200_simple_display_pipe_check, - .update = mgag200_simple_display_pipe_update, - .reset_crtc = mgag200_simple_display_pipe_reset_crtc, - .duplicate_crtc_state = mgag200_simple_display_pipe_duplicate_crtc_state, - .destroy_crtc_state = mgag200_simple_display_pipe_destroy_crtc_state, -DRM_GEM_SIMPLE_DISPLAY_PIPE_SHADOW_PLANE_FUNCS , +static const struct drm_encoder_funcs mgag200_dac_encoder_funcs = { + .destroy = drm_encoder_cleanup, };/* @@ -999,12 +1052,49 @@ static int mgag200_mode_config_init(struct mga_device *mdev, resource_size_t vrastatic int mgag200_pipeline_init (struct mga_device *mdev) {struct drm_device *dev = &mdev->base; +struct drm_plane *primary_plane = &mdev->primary_plane; +struct drm_crtc *crtc = &mdev->crtc; +struct drm_encoder *encoder = &mdev->encoder;struct mga_i2c_chan *i2c = &mdev->i2c;struct drm_connector *connector = &mdev->connector; -struct drm_simple_display_pipe *pipe = &mdev->display_pipe; -size_t format_count =ARRAY_SIZE (mgag200_simple_display_pipe_formats);int ret; + ret =mgag200_pixpll_init (&mdev->pixpll, mdev); +if (ret) +return ret; + + ret =drm_universal_plane_init (dev, primary_plane,0 , + &mgag200_primary_plane_funcs, + mgag200_primary_plane_formats, +ARRAY_SIZE (mgag200_primary_plane_formats), + mgag200_primary_plane_fmtmods, +DRM_PLANE_TYPE_PRIMARY ,NULL ); +if (ret) { +drm_err (dev,"drm_universal_plane_init() failed: %d\n" , ret); +return ret; + } +drm_plane_helper_add (primary_plane, &mgag200_primary_plane_helper_funcs); +drm_plane_enable_fb_damage_clips (primary_plane); + + ret =drm_crtc_init_with_planes (dev, crtc, primary_plane,NULL , &mgag200_crtc_funcs,NULL ); +if (ret) { +drm_err (dev,"drm_crtc_init_with_planes() failed: %d\n" , ret); +return ret; + } +drm_crtc_helper_add (crtc, &mgag200_crtc_helper_funcs); + +/* FIXME: legacy gamma tables, but atomic gamma doesn't work without */ +drm_mode_crtc_set_gamma_size (crtc,MGAG200_LUT_SIZE ); +drm_crtc_enable_color_mgmt (crtc,0 , false,MGAG200_LUT_SIZE ); + + encoder->possible_crtcs =drm_crtc_mask (crtc); + ret =drm_encoder_init (dev, encoder, &mgag200_dac_encoder_funcs, +DRM_MODE_ENCODER_DAC ,NULL ); +if (ret) { +drm_err (dev,"drm_encoder_init() failed: %d\n" , ret); +return ret; + } + ret =mgag200_i2c_init (mdev, i2c);if (ret) {drm_err (dev,"failed to add DDC bus: %d\n" , ret);@@ -1021,30 +1111,12 @@ static int mgag200_pipeline_init(struct mga_device *mdev) }drm_connector_helper_add (connector, &mga_vga_connector_helper_funcs); - ret =mgag200_pixpll_init (&mdev->pixpll, mdev); -if (ret) -return ret; - - ret =drm_simple_display_pipe_init (dev, pipe, - &mgag200_simple_display_pipe_funcs, - mgag200_simple_display_pipe_formats, - format_count, - mgag200_simple_display_pipe_fmtmods, - connector); + ret =drm_connector_attach_encoder (connector, encoder);if (ret) { -drm_err (dev, -"drm_simple_display_pipe_init() failed, error %d\n" , - ret); +drm_err (dev,"drm_connector_attach_encoder() failed: %d\n" , ret);return ret; }
drivers/gpu/drm/mgag200/mgag200_mode.c static int mgag200_pipeline_init(struct mga_device *mdev) · line 1122
Quoted 10 lines
drivers/gpu/drm/mgag200/mgag200_mode.c +0
-7-drm_plane_enable_fb_damage_clips (&pipe->plane); - -/* FIXME: legacy gamma tables, but atomic gamma doesn't work without */ -drm_mode_crtc_set_gamma_size (&pipe->crtc,MGAG200_LUT_SIZE ); - -drm_crtc_enable_color_mgmt (&pipe->crtc,0 , false,MGAG200_LUT_SIZE ); -return 0 ; }
Everything else looks good to me.
Thanks,
Signature · 1 line
Jocelyn
Thomas Zimmermann
maintainerRe: [PATCH v3 07/14] drm/mgag200: Replace simple-KMS with regular atomic helpers
Hi Jocelyn
Am 28.07.22 um 17:09 schrieb Jocelyn Falempe:
Quoted 95 lines · Thomas Zimmermann
Quoted 94 lines
Drop simple-KMS in favor of regular atomic helpers. Makes the code more modular and hence better to adapt to per-model requirements.
The simple-KMS helpers provide few extra features, so the patch is mostly about open-coding what simple-KMS does. The simple-KMS helpers do mix up plane and CRTC state. Changing to regular atomic helpers requires to split some of the simple-pipe functions into per-plane and per-CRTC code
No functional changes.
v3:
* always rundrm_atomic_helper_check_plane_state()
* clean up styleSigned-off-by Thomas Zimmermann <[email protected]>Reviewed-by Jocelyn Falempe <[email protected]>Tested-by Jocelyn Falempe <[email protected]>Acked-by Sam Ravnborg <[email protected]>---
drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +-drivers/gpu/drm/mgag200/mgag200_mode.c| 382 +++++++++++++++----------2 files changed, 233 insertions(+), 157 deletions(-)drivers/gpu/drm/mgag200/mgag200_drv.h +6
-2@@ -15,11 +15,13 @@ #include <video/vga.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_shmem_helper.h> -#include <drm/drm_simple_kms_helper.h> +#include <drm/drm_plane.h> #include "mgag200_reg.h"@@ -276,9 +278,11 @@ struct mga_device { enum mga_type type; struct mgag200_pll pixpll; + struct drm_plane primary_plane; + struct drm_crtc crtc; + struct drm_encoder encoder; struct mga_i2c_chan i2c; struct drm_connector connector; - struct drm_simple_display_pipe display_pipe; }; static inline struct mga_device *to_mga_device(struct drm_device *dev)drivers/gpu/drm/mgag200/mgag200_mode.c +0
-1@@ -23,7 +23,6 @@ #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "mgag200_drv.h"@@ -614,25 +613,106 @@ static void mgag200_handle_damage(struct
mga_device*mdev, const structiosys_ma
}
/*
- * Simple Display Pipe
+ * Primary plane
*/drivers/gpu/drm/mgag200/mgag200_mode.c +1
-1-static const uint32_t mgag200_simple_display_pipe_formats[] = { +static const uint32_t mgag200_primary_plane_formats[] = {
DRM_FORMAT_XRGB8888,
DRM_FORMAT_RGB565,
DRM_FORMAT_RGB888,
};drivers/gpu/drm/mgag200/mgag200_mode.c +1
-1-static const uint64_t mgag200_simple_display_pipe_fmtmods[] = { +static const uint64_t mgag200_primary_plane_fmtmods[] = {
DRM_FORMAT_MOD_LINEAR,
DRM_FORMAT_MOD_INVALID
};drivers/gpu/drm/mgag200/mgag200_mode.c +0
-2-static enum drm_mode_status -mgag200_simple_display_pipe_mode_valid(struct drm_simple_display_pipe*pipe,
- const structdrm_display_mode*mode) +static int mgag200_primary_plane_helper_atomic_check(structdrm_plane*plane,
+ structdrm_atomic_state*new_state) {
- structmga_device*mdev =to_mga_device(pipe->crtc.dev); + structdrm_plane_state*new_plane_state=drm_atomic_get_new_plane_state(new_state, plane);
+ structdrm_framebuffer*new_fb=new_plane_state->fb; + structdrm_framebuffer*fb = NULL;
+ structdrm_crtc*new_crtc=new_plane_state->crtc;
+ structdrm_crtc_state*new_crtc_state= NULL;
+ structmgag200_crtc_state*new_mgag200_crtc_state;
Quoted 8 lines
Quoted 5 lines
+ int ret;
+
+ if (new_crtc)
+new_crtc_state=drm_atomic_get_new_crtc_state(new_state, new_crtc);If
new_crtcis NULL, thennew_crtc_statewill be NULL too, and it's dereferenced indrm_atomic_helper_check_plane_state()and later in this function. So either there is a garantee thatnew_crtcis never NULL when calling this function, or it should return before trying to access it.
That's a good observation. Luckily it's not a problem in practice. The logic in the DRM code is confusing, however.
Near the top of the function, drm_atomic_check_planes_state() will only deref crtc_state if the plane has a CRTC set, [1] so we're safe here.
That will work because every CRTC/plane/connector/encoder always has an associated state; even if it's disabled. Hence if the plane has a crtc, that crtc will have a state. Or else, both will be NULL.
Further down, drm_atomic_helper_check_plane_state() first tests for !plane->fb [2] and then for !plane->crtc. [3] In both cases, drm_atomic_helper_check_plane_state() clears the visibility field to 0 and returns 0. Our code in mgag200_primary_plane_helper_atomic_check() will return early for invisible planes before deref'ing new_crtc_state, so we're safe here as well.
Best regards
Thomas
[1] https://elixir.bootlin.com/linux/v5.18.14/source/drivers/gpu/drm/drm_atomic_helper.c#L814
[2] https://elixir.bootlin.com/linux/v5.18.14/source/drivers/gpu/drm/drm_atomic_helper.c#L819
[3] https://elixir.bootlin.com/linux/v5.18.14/source/drivers/gpu/drm/drm_atomic_helper.c#L825
Quoted 465 lines
Quoted 458 lines
+
+ ret = drm_atomic_helper_check_plane_state(new_plane_state,new_crtc_state,
+DRM_PLANE_NO_SCALING,
+DRM_PLANE_NO_SCALING,
+ false, true);
+ if (ret)
+ return ret;
+ else if (!new_plane_state->visible)
+ return 0;drivers/gpu/drm/mgag200/mgag200_mode.c +14
-0+ + if (plane->state) + fb = plane->state->fb; + + if (!fb || (fb->format != new_fb->format)) + new_crtc_state->mode_changed = true; /* update PLL settings */ + + new_mgag200_crtc_state = to_mgag200_crtc_state(new_crtc_state); + new_mgag200_crtc_state->format = new_fb->format; + + return 0; +} + +static void mgag200_primary_plane_helper_atomic_update(struct
drm_plane*plane,
+ structdrm_atomic_state*old_state) +{
+ structdrm_device*dev =plane->dev;
+ structmga_device*mdev =to_mga_device(dev);
+ structdrm_plane_state*plane_state=plane->state; + structdrm_plane_state*old_plane_state=drm_atomic_get_old_plane_state(old_state, plane);
+ structdrm_shadow_plane_state*shadow_plane_state=to_drm_shadow_plane_state(plane_state);
+ structdrm_framebuffer*fb =plane_state->fb;
+ structdrm_atomic_helper_damage_iteriter;
+ structdrm_rectdamage;drivers/gpu/drm/mgag200/mgag200_mode.c +5
-0+ + if (!fb) + return; + + drm_atomic_helper_damage_iter_init(&iter, old_plane_state,
plane_state);
+drm_atomic_for_each_plane_damage(&iter, &damage){ +mgag200_handle_damage(mdev, shadow_plane_state->data, fb, &damage);
+ }drivers/gpu/drm/mgag200/mgag200_mode.c +7
-0+ + /* Always scanout image at VRAM offset 0 */ + mgag200_set_startadd(mdev, (u32)0); + mgag200_set_offset(mdev, fb); +} + +static void mgag200_primary_plane_helper_atomic_disable(struct
drm_plane*plane,
+ structdrm_atomic_state*old_state)drivers/gpu/drm/mgag200/mgag200_mode.c +3
-0+{ } + +static const struct drm_plane_helper_funcs
mgag200_primary_plane_helper_funcs= {
+DRM_GEM_SHADOW_PLANE_HELPER_FUNCS,
+ .atomic_check =mgag200_primary_plane_helper_atomic_check, + .atomic_update =mgag200_primary_plane_helper_atomic_update, + .atomic_disable =mgag200_primary_plane_helper_atomic_disable,drivers/gpu/drm/mgag200/mgag200_mode.c +14
-0+}; + +static const struct drm_plane_funcs mgag200_primary_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, + DRM_GEM_SHADOW_PLANE_FUNCS, +}; + +/* +* CRTC +*/ + +static enum drm_mode_status mgag200_crtc_helper_mode_valid(struct
drm_crtc*crtc,
+ const structdrm_display_mode*mode) +{
+ structmga_device*mdev =to_mga_device(crtc->dev); const structmgag200_device_info*info =mdev->info; /*drivers/gpu/drm/mgag200/mgag200_mode.c +55
-5@@ -659,26 +739,69 @@ mgag200_simple_display_pipe_mode_valid(structdrm_simple_display_pipe *pipe, return MODE_OK; } -static void -mgag200_simple_display_pipe_enable (struct drm_simple_display_pipe *pipe, - struct drm_crtc_state *crtc_state, - struct drm_plane_state *plane_state) +static int mgag200_crtc_helper_atomic_check (struct drm_crtc *crtc, + struct drm_atomic_state *new_state) { - struct drm_crtc *crtc = &pipe->crtc; struct drm_device *dev = crtc->dev; struct mga_device *mdev = to_mga_device(dev); + struct drm_crtc_state *new_crtc_state =drm_atomic_get_new_crtc_state (new_state, crtc); struct mgag200_pll *pixpll = &mdev->pixpll; + struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (new_crtc_state); + struct drm_property_blob *new_gamma_lut = new_crtc_state->gamma_lut; + int ret; + + ret = drm_atomic_helper_check_crtc_state(new_crtc_state, false); + if (ret) + return ret; + + if (!new_crtc_state->enable) + return 0; + + if (new_crtc_state->mode_changed) { + ret = pixpll->funcs->compute(pixpll, new_crtc_state->mode.clock, + &mgag200_crtc_state->pixpllc); + if (ret) + return ret; + } + + if (new_crtc_state->color_mgmt_changed && new_gamma_lut) { + if (new_gamma_lut->length != MGAG200_LUT_SIZE * sizeof(structdrm_color_lut )) { + drm_dbg(dev, "Wrong size for gamma_lut %zu\n", new_gamma_lut->length); + return -EINVAL; + } + } + + return drm_atomic_add_affected_planes(new_state, crtc); +} + +static void mgag200_crtc_helper_atomic_flush (struct drm_crtc *crtc, + struct drm_atomic_state *old_state) +{ + struct drm_crtc_state *crtc_state = crtc->state; + struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); + struct drm_device *dev = crtc->dev; + struct mga_device *mdev = to_mga_device(dev); + + if (crtc_state->enable && crtc_state->color_mgmt_changed) { + const struct drm_format_info *format = mgag200_crtc_state->format; + + if (crtc_state->gamma_lut) + mgag200_crtc_set_gamma(mdev, format, crtc_state->gamma_lut->data); + else + mgag200_crtc_set_gamma_linear(mdev, format); + } +} + +static void mgag200_crtc_helper_atomic_enable (struct drm_crtc *crtc, + struct drm_atomic_state *old_state) +{ + struct drm_device *dev = crtc->dev; + struct mga_device *mdev = to_mga_device(dev); + struct drm_crtc_state *crtc_state = crtc->state;struct
drm_display_mode*adjusted_mode=&crtc_state->adjusted_mode; structmgag200_crtc_state*mgag200_crtc_state=to_mgag200_crtc_state(crtc_state); - structdrm_framebuffer*fb =plane_state->fb;
const structdrm_format_info*format =mgag200_crtc_state->format;
- structdrm_shadow_plane_state*shadow_plane_state=to_drm_shadow_plane_state(plane_state);
- structdrm_rectfullscreen = {
- .x1 = 0,
- .x2 =fb->width,
- .y1 = 0,
- .y2 =fb->height,
- };
+ structmgag200_pll*pixpll =&mdev->pixpll;
if (mdev->type==G200_WB||mdev->type==G200_EW3)mgag200_g200wb_hold_bmc(mdev);drivers/gpu/drm/mgag200/mgag200_mode.c +27
-85@@ -696,108 +819,50 @@ mgag200_simple_display_pipe_enable(structdrm_simple_display_pipe *pipe, else if (mdev->type == G200_EV) mgag200_g200ev_set_hiprilvl(mdev); - if (mdev->type == G200_WB || mdev->type == G200_EW3) - mgag200_g200wb_release_bmc(mdev); - - if (crtc_state->gamma_lut) - mgag200_crtc_set_gamma(mdev, format, crtc_state->gamma_lut->data); - else - mgag200_crtc_set_gamma_linear(mdev, format); - mgag200_enable_display(mdev); - mgag200_handle_damage(mdev, shadow_plane_state->data, fb, &fullscreen); - - /* Always scanout image at VRAM offset 0 */ - mgag200_set_startadd(mdev, (u32)0); - mgag200_set_offset(mdev, fb); + if (mdev->type == G200_WB || mdev->type == G200_EW3) + mgag200_g200wb_release_bmc(mdev); } -static void -mgag200_simple_display_pipe_disable (struct drm_simple_display_pipe *pipe) +static void mgag200_crtc_helper_atomic_disable (struct drm_crtc *crtc, + struct drm_atomic_state *old_state) { - struct drm_crtc *crtc = &pipe->crtc; struct mga_device *mdev = to_mga_device(crtc->dev); - mgag200_disable_display(mdev); -} - -static int -mgag200_simple_display_pipe_check (struct drm_simple_display_pipe *pipe, - struct drm_plane_state *plane_state, - struct drm_crtc_state *crtc_state) -{ - struct drm_plane *plane = plane_state->plane; - struct drm_device *dev = plane->dev; - struct mga_device *mdev = to_mga_device(dev); - struct mgag200_pll *pixpll = &mdev->pixpll; - struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); - struct drm_framebuffer *new_fb = plane_state->fb; - struct drm_framebuffer *fb = NULL; - int ret; - - if (!new_fb) - return 0; - - if (plane->state) - fb = plane->state->fb; - - if (!fb || (fb->format != new_fb->format)) - crtc_state->mode_changed = true; /* update PLL settings */ - - mgag200_crtc_state->format = new_fb->format; + if (mdev->type == G200_WB || mdev->type == G200_EW3) + mgag200_g200wb_hold_bmc(mdev); - if (crtc_state->mode_changed) { - ret = pixpll->funcs->compute(pixpll, crtc_state->mode.clock, - &mgag200_crtc_state->pixpllc); - if (ret) - return ret; - } + mgag200_disable_display(mdev); - if (crtc_state->color_mgmt_changed && crtc_state->gamma_lut) { - if (crtc_state->gamma_lut->length != - MGAG200_LUT_SIZE * sizeof(struct drm_color_lut)) { - drm_err(dev, "Wrong size for gamma_lut %zu\n", - crtc_state->gamma_lut->length); - return -EINVAL; - } - } - return 0; + if (mdev->type == G200_WB || mdev->type == G200_EW3) + mgag200_g200wb_release_bmc(mdev); } -static void -mgag200_simple_display_pipe_update (struct drm_simple_display_pipe *pipe, - struct drm_plane_state *old_state) -{ - struct drm_plane *plane = &pipe->plane; - struct drm_crtc *crtc = &pipe->crtc; - struct drm_device *dev = plane->dev; - struct mga_device *mdev = to_mga_device(dev); - struct drm_plane_state *state = plane->state; - struct drm_shadow_plane_state *shadow_plane_state =to_drm_shadow_plane_state (state); - struct drm_framebuffer *fb = state->fb; - struct drm_rect damage; - struct drm_atomic_helper_damage_iter iter; +static const struct drm_crtc_helper_funcs mgag200_crtc_helper_funcs = { + .mode_valid = mgag200_crtc_helper_mode_valid, + .atomic_check = mgag200_crtc_helper_atomic_check, + .atomic_flush = mgag200_crtc_helper_atomic_flush, + .atomic_enable = mgag200_crtc_helper_atomic_enable, + .atomic_disable = mgag200_crtc_helper_atomic_disable, +}; - if (!fb) - return; +static void mgag200_crtc_reset (struct drm_crtc *crtc) +{ + struct mgag200_crtc_state *mgag200_crtc_state; - if (crtc->state->color_mgmt_changed && crtc->state->gamma_lut) - mgag200_crtc_set_gamma(mdev, fb->format, crtc->state->gamma_lut->data); + if (crtc->state) + crtc->funcs->atomic_destroy_state(crtc, crtc->state); - drm_atomic_helper_damage_iter_init(&iter, old_state, state); - drm_atomic_for_each_plane_damage(&iter, &damage) { - mgag200_handle_damage(mdev, shadow_plane_state->data, fb, &damage); - } - /* Always scanout image at VRAM offset 0 */ - mgag200_set_startadd(mdev, (u32)0); - mgag200_set_offset(mdev, fb); + mgag200_crtc_state = kzalloc(sizeof(*mgag200_crtc_state),GFP_KERNEL ); + if (mgag200_crtc_state) + __drm_atomic_helper_crtc_reset(crtc, &mgag200_crtc_state->base); + else + __drm_atomic_helper_crtc_reset(crtc, NULL); } -static struct drm_crtc_state * -mgag200_simple_display_pipe_duplicate_crtc_state(struct drm_simple_display_pipe *pipe) +static struct drm_crtc_state *mgag200_crtc_atomic_duplicate_state (struct drm_crtc *crtc) { - struct drm_crtc *crtc = &pipe->crtc; struct drm_crtc_state *crtc_state = crtc->state; struct mgag200_crtc_state *mgag200_crtc_state = to_mgag200_crtc_state(crtc_state); struct mgag200_crtc_state *new_mgag200_crtc_state;@@ -817,8 +882,8 @@mgag200_simple_display_pipe_duplicate_crtc_state(struct
drm_simple_display_pipereturn&new_mgag200_crtc_state->base;
}
-static void mgag200_simple_display_pipe_destroy_crtc_state(structdrm_simple_display_pipe*pipe,
- structdrm_crtc_state*crtc_state)
+static void mgag200_crtc_atomic_destroy_state(structdrm_crtc*crtc,
+ structdrm_crtc_state*crtc_state)
{
structmgag200_crtc_state*mgag200_crtc_state=to_mgag200_crtc_state(crtc_state);drivers/gpu/drm/mgag200/mgag200_mode.c +0
-0@@ -826,33 +891,21 @@ static voidmgag200_simple_display_pipe_destroy_crtc_state(struct
drm_simple_diskfree(mgag200_crtc_state);
}
-static voidmgag200_simple_display_pipe_reset_crtc(struct drm_simple_display_pipe *pipe)drivers/gpu/drm/mgag200/mgag200_mode.c +0
-6-{ - struct drm_crtc *crtc = &pipe->crtc; - struct mgag200_crtc_state *mgag200_crtc_state; - - if (crtc->state) { - mgag200_simple_display_pipe_destroy_crtc_state(pipe,
crtc->state);
-crtc->state= NULL; /* must be set to NULL here */ - }drivers/gpu/drm/mgag200/mgag200_mode.c +8
-1+static const struct drm_crtc_funcs mgag200_crtc_funcs = { + .reset = mgag200_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = mgag200_crtc_atomic_duplicate_state, + .atomic_destroy_state = mgag200_crtc_atomic_destroy_state, +}; - mgag200_crtc_state = kzalloc(sizeof(*mgag200_crtc_state),
GFP_KERNEL);
- if (!mgag200_crtc_state)
- return;
-__drm_atomic_helper_crtc_reset(crtc, &mgag200_crtc_state->base);drivers/gpu/drm/mgag200/mgag200_mode.c +3
-10-} +/* +* Encoder +*/ -static const struct drm_simple_display_pipe_funcs -mgag200_simple_display_pipe_funcs = { - .mode_valid = mgag200_simple_display_pipe_mode_valid, - .enable = mgag200_simple_display_pipe_enable, - .disable = mgag200_simple_display_pipe_disable, - .check = mgag200_simple_display_pipe_check, - .update = mgag200_simple_display_pipe_update, - .reset_crtc = mgag200_simple_display_pipe_reset_crtc, - .duplicate_crtc_state =
mgag200_simple_display_pipe_duplicate_crtc_state,
- .destroy_crtc_state =mgag200_simple_display_pipe_destroy_crtc_state,
-DRM_GEM_SIMPLE_DISPLAY_PIPE_SHADOW_PLANE_FUNCS, +static const structdrm_encoder_funcsmgag200_dac_encoder_funcs= { + .destroy =drm_encoder_cleanup,
};
/*drivers/gpu/drm/mgag200/mgag200_mode.c +0
-0@@ -999,12 +1052,49 @@ static int mgag200_mode_config_init(struct
mga_device*mdev,resource_size_tvra
static intmgag200_pipeline_init(struct mga_device *mdev){
structdrm_device*dev =&mdev->base;
+ structdrm_plane*primary_plane=&mdev->primary_plane; + structdrm_crtc*crtc =&mdev->crtc;
+ structdrm_encoder*encoder =&mdev->encoder;
structmga_i2c_chan*i2c =&mdev->i2c;
structdrm_connector*connector =&mdev->connector;
- structdrm_simple_display_pipe*pipe =&mdev->display_pipe; -size_tformat_count=ARRAY_SIZE(mgag200_simple_display_pipe_formats);
int ret;
+ ret =mgag200_pixpll_init(&mdev->pixpll, mdev);
+ if (ret)
+ return ret;
+
+ ret = drm_universal_plane_init(dev,primary_plane, 0,
+&mgag200_primary_plane_funcs,
+mgag200_primary_plane_formats,
+ARRAY_SIZE(mgag200_primary_plane_formats), +mgag200_primary_plane_fmtmods,
+DRM_PLANE_TYPE_PRIMARY, NULL);
+ if (ret) {
+drm_err(dev, "drm_universal_plane_init() failed: %d\n", ret); + return ret;
+ }
+drm_plane_helper_add(primary_plane, &mgag200_primary_plane_helper_funcs);
+drm_plane_enable_fb_damage_clips(primary_plane);
+
+ ret =drm_crtc_init_with_planes(dev, crtc, primary_plane, NULL, &mgag200_crtc_funcs, NULL);
+ if (ret) {
+drm_err(dev, "drm_crtc_init_with_planes() failed: %d\n", ret); + return ret;
+ }
+drm_crtc_helper_add(crtc, &mgag200_crtc_helper_funcs); +
+ /* FIXME: legacy gamma tables, but atomic gamma doesn't work without */
+drm_mode_crtc_set_gamma_size(crtc, MGAG200_LUT_SIZE);
+drm_crtc_enable_color_mgmt(crtc, 0, false, MGAG200_LUT_SIZE);drivers/gpu/drm/mgag200/mgag200_mode.c +9
-0+ + encoder->possible_crtcs = drm_crtc_mask(crtc); + ret = drm_encoder_init(dev, encoder, &mgag200_dac_encoder_funcs, + DRM_MODE_ENCODER_DAC, NULL); + if (ret) { + drm_err(dev, "drm_encoder_init() failed: %d\n", ret); + return ret; + } +ret =
mgag200_i2c_init(mdev, i2c);
if (ret) {
drm_err(dev, "failed to add DDC bus: %d\n", ret);drivers/gpu/drm/mgag200/mgag200_mode.c +2
-16@@ -1021,30 +1111,12 @@ static int mgag200_pipeline_init(struct mga_device *mdev) } drm_connector_helper_add(connector, &mga_vga_connector_helper_funcs); - ret = mgag200_pixpll_init(&mdev->pixpll, mdev); - if (ret) - return ret; - - ret = drm_simple_display_pipe_init(dev, pipe, - &mgag200_simple_display_pipe_funcs, - mgag200_simple_display_pipe_formats, - format_count, - mgag200_simple_display_pipe_fmtmods, - connector); + ret = drm_connector_attach_encoder(connector, encoder); if (ret) { - drm_err(dev, - "drm_simple_display_pipe_init() failed, error %d\n", - ret); + drm_err(dev, "drm_connector_attach_encoder() failed: %d\n", ret); return ret; } - drm_plane_enable_fb_damage_clips(&pipe->plane); - - /* FIXME: legacy gamma tables, but atomic gamma doesn't workwithout */
-drm_mode_crtc_set_gamma_size(&pipe->crtc, MGAG200_LUT_SIZE);drivers/gpu/drm/mgag200/mgag200_mode.c +0
-3- - drm_crtc_enable_color_mgmt(&pipe->crtc, 0, false, MGAG200_LUT_SIZE); -Quoted 2 lines
return 0;
}Everything else looks good to me.
Thanks,
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev
Jocelyn Falempe
reviewerRe: [PATCH v3 07/14] drm/mgag200: Replace simple-KMS with regular atomic helpers
Quoted 115 lines · Thomas Zimmermann
Hi Jocelyn
Am 28.07.22 um 17:09 schrieb Jocelyn Falempe:
Quoted 95 lines · Thomas Zimmermann
Quoted 94 lines
Drop simple-KMS in favor of regular atomic helpers. Makes the code more modular and hence better to adapt to per-model requirements.
The simple-KMS helpers provide few extra features, so the patch is mostly about open-coding what simple-KMS does. The simple-KMS helpers do mix up plane and CRTC state. Changing to regular atomic helpers requires to split some of the simple-pipe functions into per-plane and per-CRTC code
No functional changes.
v3:
* always rundrm_atomic_helper_check_plane_state()
* clean up styleSigned-off-by Thomas Zimmermann <[email protected]>Reviewed-by Jocelyn Falempe <[email protected]>Tested-by Jocelyn Falempe <[email protected]>Acked-by Sam Ravnborg <[email protected]>---
drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +-drivers/gpu/drm/mgag200/mgag200_mode.c| 382 +++++++++++++++----------2 files changed, 233 insertions(+), 157 deletions(-)drivers/gpu/drm/mgag200/mgag200_drv.h +6
-2@@ -15,11 +15,13 @@ #include <video/vga.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_shmem_helper.h> -#include <drm/drm_simple_kms_helper.h> +#include <drm/drm_plane.h> #include "mgag200_reg.h"@@ -276,9 +278,11 @@ struct mga_device { enum mga_type type; struct mgag200_pll pixpll; + struct drm_plane primary_plane; + struct drm_crtc crtc; + struct drm_encoder encoder; struct mga_i2c_chan i2c; struct drm_connector connector; - struct drm_simple_display_pipe display_pipe; }; static inline struct mga_device *to_mga_device(struct drm_device *dev)drivers/gpu/drm/mgag200/mgag200_mode.c +0
-1@@ -23,7 +23,6 @@ #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "mgag200_drv.h"@@ -614,25 +613,106 @@ static void mgag200_handle_damage(struct
mga_device*mdev, const structiosys_ma
}
/*
- * Simple Display Pipe
+ * Primary plane
*/drivers/gpu/drm/mgag200/mgag200_mode.c +1
-1-static const uint32_t mgag200_simple_display_pipe_formats[] = { +static const uint32_t mgag200_primary_plane_formats[] = {
DRM_FORMAT_XRGB8888,
DRM_FORMAT_RGB565,
DRM_FORMAT_RGB888,
};drivers/gpu/drm/mgag200/mgag200_mode.c +1
-1-static const uint64_t mgag200_simple_display_pipe_fmtmods[] = { +static const uint64_t mgag200_primary_plane_fmtmods[] = {
DRM_FORMAT_MOD_LINEAR,
DRM_FORMAT_MOD_INVALID
};drivers/gpu/drm/mgag200/mgag200_mode.c +0
-2-static enum drm_mode_status -mgag200_simple_display_pipe_mode_valid(struct
drm_simple_display_pipe*pipe,
- const structdrm_display_mode*mode) +static int mgag200_primary_plane_helper_atomic_check(structdrm_plane*plane,
+ structdrm_atomic_state*new_state) {
- structmga_device*mdev =to_mga_device(pipe->crtc.dev); + structdrm_plane_state*new_plane_state=drm_atomic_get_new_plane_state(new_state, plane);
+ structdrm_framebuffer*new_fb=new_plane_state->fb; + structdrm_framebuffer*fb = NULL;
+ structdrm_crtc*new_crtc=new_plane_state->crtc; + structdrm_crtc_state*new_crtc_state= NULL;
+ structmgag200_crtc_state*new_mgag200_crtc_state;Quoted 8 lines
Quoted 5 lines
+ int ret;
+
+ if (new_crtc)
+new_crtc_state=drm_atomic_get_new_crtc_state(new_state, new_crtc);If
new_crtcis NULL, thennew_crtc_statewill be NULL too, and it's dereferenced indrm_atomic_helper_check_plane_state()and later in this function. So either there is a garantee thatnew_crtcis never NULL when calling this function, or it should return before trying to access it.That's a good observation. Luckily it's not a problem in practice. The logic in the DRM code is confusing, however.
Near the top of the function,
drm_atomic_check_planes_state()will only derefcrtc_stateif the plane has a CRTC set, [1] so we're safe here.That will work because every CRTC/plane/connector/encoder always has an associated state; even if it's disabled. Hence if the plane has a crtc, that crtc will have a state. Or else, both will be NULL.
Further down,
drm_atomic_helper_check_plane_state()first tests for !plane->fb [2] and then for !plane->crtc. [3] In both cases,drm_atomic_helper_check_plane_state()clears the visibility field to 0 and returns 0. Our code inmgag200_primary_plane_helper_atomic_check()will return early for invisible planes before deref'ingnew_crtc_state, so we're safe here as well.
Quoted 10 lines
Best regards
Thomas[1] https://elixir.bootlin.com/linux/v5.18.14/source/drivers/gpu/drm/drm_atomic_helper.c#L814
[2] https://elixir.bootlin.com/linux/v5.18.14/source/drivers/gpu/drm/drm_atomic_helper.c#L819
[3] https://elixir.bootlin.com/linux/v5.18.14/source/drivers/gpu/drm/drm_atomic_helper.c#L825
Thanks a lot for the detailed explanation, I agree that it's safe now.
Best regards,
Signature · 1 line
Jocelyn
Quoted 472 lines
Quoted 471 lines
Quoted 458 lines
+
+ ret = drm_atomic_helper_check_plane_state(new_plane_state,new_crtc_state,
+DRM_PLANE_NO_SCALING,
+DRM_PLANE_NO_SCALING,
+ false, true);
+ if (ret)
+ return ret;
+ else if (!new_plane_state->visible)
+ return 0;drivers/gpu/drm/mgag200/mgag200_mode.c +14
-0+ + if (plane->state) + fb = plane->state->fb; + + if (!fb || (fb->format != new_fb->format)) + new_crtc_state->mode_changed = true; /* update PLL settings */ + + new_mgag200_crtc_state = to_mgag200_crtc_state(new_crtc_state); + new_mgag200_crtc_state->format = new_fb->format; + + return 0; +} + +static void mgag200_primary_plane_helper_atomic_update(struct
drm_plane*plane,
+ structdrm_atomic_state*old_state) +{
+ structdrm_device*dev =plane->dev;
+ structmga_device*mdev =to_mga_device(dev);
+ structdrm_plane_state*plane_state=plane->state; + structdrm_plane_state*old_plane_state=drm_atomic_get_old_plane_state(old_state, plane);
+ structdrm_shadow_plane_state*shadow_plane_state=to_drm_shadow_plane_state(plane_state);
+ structdrm_framebuffer*fb =plane_state->fb;
+ structdrm_atomic_helper_damage_iteriter;
+ structdrm_rectdamage;drivers/gpu/drm/mgag200/mgag200_mode.c +5
-0+ + if (!fb) + return; + + drm_atomic_helper_damage_iter_init(&iter, old_plane_state,
plane_state);
+drm_atomic_for_each_plane_damage(&iter, &damage){ +mgag200_handle_damage(mdev, shadow_plane_state->data, fb, &damage);
+ }drivers/gpu/drm/mgag200/mgag200_mode.c +7
-0+ + /* Always scanout image at VRAM offset 0 */ + mgag200_set_startadd(mdev, (u32)0); + mgag200_set_offset(mdev, fb); +} + +static void mgag200_primary_plane_helper_atomic_disable(struct
drm_plane*plane,
+ structdrm_atomic_state*old_state)drivers/gpu/drm/mgag200/mgag200_mode.c +3
-0+{ } + +static const struct drm_plane_helper_funcs
mgag200_primary_plane_helper_funcs= {
+DRM_GEM_SHADOW_PLANE_HELPER_FUNCS,
+ .atomic_check =mgag200_primary_plane_helper_atomic_check, + .atomic_update =mgag200_primary_plane_helper_atomic_update, + .atomic_disable =mgag200_primary_plane_helper_atomic_disable,drivers/gpu/drm/mgag200/mgag200_mode.c +14
-0+}; + +static const struct drm_plane_funcs mgag200_primary_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, + DRM_GEM_SHADOW_PLANE_FUNCS, +}; + +/* +* CRTC +*/ + +static enum drm_mode_status mgag200_crtc_helper_mode_valid(struct
drm_crtc*crtc,
+ const structdrm_display_mode*mode) +{
+ structmga_device*mdev =to_mga_device(crtc->dev); const structmgag200_device_info*info =mdev->info; /*drivers/gpu/drm/mgag200/mgag200_mode.c +55
-5@@ -659,26 +739,69 @@ mgag200_simple_display_pipe_mode_valid(structdrm_simple_display_pipe *pipe, return MODE_OK; } -static void -mgag200_simple_display_pipe_enable (struct drm_simple_display_pipe *pipe, - struct drm_crtc_state *crtc_state, - struct drm_plane_state *plane_state) +static int mgag200_crtc_helper_atomic_check(struct drm_crtc *crtc, + struct drm_atomic_state *new_state) { - struct drm_crtc *crtc = &pipe->crtc; struct drm_device *dev = crtc->dev; struct mga_device *mdev = to_mga_device(dev); + struct drm_crtc_state *new_crtc_state =drm_atomic_get_new_crtc_state (new_state, crtc); struct mgag200_pll *pixpll = &mdev->pixpll; + struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (new_crtc_state); + struct drm_property_blob *new_gamma_lut = new_crtc_state->gamma_lut; + int ret; + + ret = drm_atomic_helper_check_crtc_state(new_crtc_state, false); + if (ret) + return ret; + + if (!new_crtc_state->enable) + return 0; + + if (new_crtc_state->mode_changed) { + ret = pixpll->funcs->compute(pixpll, new_crtc_state->mode.clock, + &mgag200_crtc_state->pixpllc); + if (ret) + return ret; + } + + if (new_crtc_state->color_mgmt_changed && new_gamma_lut) { + if (new_gamma_lut->length != MGAG200_LUT_SIZE *sizeof (struct drm_color_lut )) { + drm_dbg(dev, "Wrong size for gamma_lut %zu\n", new_gamma_lut->length); + return -EINVAL; + } + } + + return drm_atomic_add_affected_planes(new_state, crtc); +} + +static void mgag200_crtc_helper_atomic_flush (struct drm_crtc *crtc, + struct drm_atomic_state *old_state) +{ + struct drm_crtc_state *crtc_state = crtc->state; + struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); + struct drm_device *dev = crtc->dev; + struct mga_device *mdev = to_mga_device(dev); + + if (crtc_state->enable && crtc_state->color_mgmt_changed) { + const struct drm_format_info *format = mgag200_crtc_state->format; + + if (crtc_state->gamma_lut) + mgag200_crtc_set_gamma(mdev, format, crtc_state->gamma_lut->data); + else + mgag200_crtc_set_gamma_linear(mdev, format); + } +} + +static void mgag200_crtc_helper_atomic_enable (struct drm_crtc *crtc, + struct drm_atomic_state *old_state) +{ + struct drm_device *dev = crtc->dev; + struct mga_device *mdev = to_mga_device(dev); + struct drm_crtc_state *crtc_state = crtc->state;struct
drm_display_mode*adjusted_mode=&crtc_state->adjusted_mode; structmgag200_crtc_state*mgag200_crtc_state=to_mgag200_crtc_state(crtc_state); - structdrm_framebuffer*fb =plane_state->fb;
const structdrm_format_info*format =mgag200_crtc_state->format;
- structdrm_shadow_plane_state*shadow_plane_state=to_drm_shadow_plane_state(plane_state);
- structdrm_rectfullscreen = {
- .x1 = 0,
- .x2 =fb->width,
- .y1 = 0,
- .y2 =fb->height,
- };
+ structmgag200_pll*pixpll =&mdev->pixpll;
if (mdev->type==G200_WB||mdev->type==G200_EW3)mgag200_g200wb_hold_bmc(mdev);drivers/gpu/drm/mgag200/mgag200_mode.c +27
-85@@ -696,108 +819,50 @@ mgag200_simple_display_pipe_enable(structdrm_simple_display_pipe *pipe, else if (mdev->type == G200_EV) mgag200_g200ev_set_hiprilvl(mdev); - if (mdev->type == G200_WB || mdev->type == G200_EW3) - mgag200_g200wb_release_bmc(mdev); - - if (crtc_state->gamma_lut) - mgag200_crtc_set_gamma(mdev, format, crtc_state->gamma_lut->data); - else - mgag200_crtc_set_gamma_linear(mdev, format); - mgag200_enable_display(mdev); - mgag200_handle_damage(mdev, shadow_plane_state->data, fb, &fullscreen); - - /* Always scanout image at VRAM offset 0 */ - mgag200_set_startadd(mdev, (u32)0); - mgag200_set_offset(mdev, fb); + if (mdev->type == G200_WB || mdev->type == G200_EW3) + mgag200_g200wb_release_bmc(mdev); } -static void -mgag200_simple_display_pipe_disable (struct drm_simple_display_pipe *pipe) +static void mgag200_crtc_helper_atomic_disable (struct drm_crtc *crtc, + struct drm_atomic_state *old_state) { - struct drm_crtc *crtc = &pipe->crtc; struct mga_device *mdev = to_mga_device(crtc->dev); - mgag200_disable_display(mdev); -} - -static int -mgag200_simple_display_pipe_check (struct drm_simple_display_pipe *pipe, - struct drm_plane_state *plane_state, - struct drm_crtc_state *crtc_state) -{ - struct drm_plane *plane = plane_state->plane; - struct drm_device *dev = plane->dev; - struct mga_device *mdev = to_mga_device(dev); - struct mgag200_pll *pixpll = &mdev->pixpll; - struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); - struct drm_framebuffer *new_fb = plane_state->fb; - struct drm_framebuffer *fb = NULL; - int ret; - - if (!new_fb) - return 0; - - if (plane->state) - fb = plane->state->fb; - - if (!fb || (fb->format != new_fb->format)) - crtc_state->mode_changed = true; /* update PLL settings */ - - mgag200_crtc_state->format = new_fb->format; + if (mdev->type == G200_WB || mdev->type == G200_EW3) + mgag200_g200wb_hold_bmc(mdev); - if (crtc_state->mode_changed) { - ret = pixpll->funcs->compute(pixpll, crtc_state->mode.clock, - &mgag200_crtc_state->pixpllc); - if (ret) - return ret; - } + mgag200_disable_display(mdev); - if (crtc_state->color_mgmt_changed && crtc_state->gamma_lut) { - if (crtc_state->gamma_lut->length != - MGAG200_LUT_SIZE * sizeof(struct drm_color_lut)) { - drm_err(dev, "Wrong size for gamma_lut %zu\n", - crtc_state->gamma_lut->length); - return -EINVAL; - } - } - return 0; + if (mdev->type == G200_WB || mdev->type == G200_EW3) + mgag200_g200wb_release_bmc(mdev); } -static void -mgag200_simple_display_pipe_update (struct drm_simple_display_pipe *pipe, - struct drm_plane_state *old_state) -{ - struct drm_plane *plane = &pipe->plane; - struct drm_crtc *crtc = &pipe->crtc; - struct drm_device *dev = plane->dev; - struct mga_device *mdev = to_mga_device(dev); - struct drm_plane_state *state = plane->state; - struct drm_shadow_plane_state *shadow_plane_state =to_drm_shadow_plane_state (state); - struct drm_framebuffer *fb = state->fb; - struct drm_rect damage; - struct drm_atomic_helper_damage_iter iter; +static const struct drm_crtc_helper_funcs mgag200_crtc_helper_funcs = { + .mode_valid = mgag200_crtc_helper_mode_valid, + .atomic_check = mgag200_crtc_helper_atomic_check, + .atomic_flush = mgag200_crtc_helper_atomic_flush, + .atomic_enable = mgag200_crtc_helper_atomic_enable, + .atomic_disable = mgag200_crtc_helper_atomic_disable, +}; - if (!fb) - return; +static void mgag200_crtc_reset (struct drm_crtc *crtc) +{ + struct mgag200_crtc_state *mgag200_crtc_state; - if (crtc->state->color_mgmt_changed && crtc->state->gamma_lut) - mgag200_crtc_set_gamma(mdev, fb->format, crtc->state->gamma_lut->data); + if (crtc->state) + crtc->funcs->atomic_destroy_state(crtc, crtc->state); - drm_atomic_helper_damage_iter_init(&iter, old_state, state); - drm_atomic_for_each_plane_damage(&iter, &damage) { - mgag200_handle_damage(mdev, shadow_plane_state->data, fb, &damage); - } - /* Always scanout image at VRAM offset 0 */ - mgag200_set_startadd(mdev, (u32)0); - mgag200_set_offset(mdev, fb); + mgag200_crtc_state = kzalloc(sizeof(*mgag200_crtc_state),GFP_KERNEL ); + if (mgag200_crtc_state) + __drm_atomic_helper_crtc_reset(crtc, &mgag200_crtc_state->base); + else + __drm_atomic_helper_crtc_reset(crtc, NULL); } -static struct drm_crtc_state * -mgag200_simple_display_pipe_duplicate_crtc_state(struct drm_simple_display_pipe *pipe) +static struct drm_crtc_state *mgag200_crtc_atomic_duplicate_state (struct drm_crtc *crtc) { - struct drm_crtc *crtc = &pipe->crtc; struct drm_crtc_state *crtc_state = crtc->state;struct
mgag200_crtc_state*mgag200_crtc_state=to_mgag200_crtc_state(crtc_state); structmgag200_crtc_state*new_mgag200_crtc_state;drivers/gpu/drm/mgag200/mgag200_mode.c +0
-0@@ -817,8 +882,8 @@mgag200_simple_display_pipe_duplicate_crtc_state(struct
drm_simple_display_pipereturn&new_mgag200_crtc_state->base;
}
-static void mgag200_simple_display_pipe_destroy_crtc_state(structdrm_simple_display_pipe*pipe,
- structdrm_crtc_state*crtc_state)
+static void mgag200_crtc_atomic_destroy_state(structdrm_crtc*crtc,
+ structdrm_crtc_state*crtc_state)
{
structmgag200_crtc_state*mgag200_crtc_state=to_mgag200_crtc_state(crtc_state);drivers/gpu/drm/mgag200/mgag200_mode.c +0
-0@@ -826,33 +891,21 @@ static voidmgag200_simple_display_pipe_destroy_crtc_state(struct
drm_simple_diskfree(mgag200_crtc_state);
}
-static voidmgag200_simple_display_pipe_reset_crtc(struct drm_simple_display_pipe *pipe)drivers/gpu/drm/mgag200/mgag200_mode.c +0
-6-{ - struct drm_crtc *crtc = &pipe->crtc; - struct mgag200_crtc_state *mgag200_crtc_state; - - if (crtc->state) { - mgag200_simple_display_pipe_destroy_crtc_state(pipe,
crtc->state);
-crtc->state= NULL; /* must be set to NULL here */ - }drivers/gpu/drm/mgag200/mgag200_mode.c +8
-1+static const struct drm_crtc_funcs mgag200_crtc_funcs = { + .reset = mgag200_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = mgag200_crtc_atomic_duplicate_state, + .atomic_destroy_state = mgag200_crtc_atomic_destroy_state, +}; - mgag200_crtc_state = kzalloc(sizeof(*mgag200_crtc_state),
GFP_KERNEL);
- if (!mgag200_crtc_state)
- return;
-__drm_atomic_helper_crtc_reset(crtc, &mgag200_crtc_state->base);drivers/gpu/drm/mgag200/mgag200_mode.c +3
-10-} +/* +* Encoder +*/ -static const struct drm_simple_display_pipe_funcs -mgag200_simple_display_pipe_funcs = { - .mode_valid = mgag200_simple_display_pipe_mode_valid, - .enable = mgag200_simple_display_pipe_enable, - .disable = mgag200_simple_display_pipe_disable, - .check = mgag200_simple_display_pipe_check, - .update = mgag200_simple_display_pipe_update, - .reset_crtc = mgag200_simple_display_pipe_reset_crtc, - .duplicate_crtc_state =
mgag200_simple_display_pipe_duplicate_crtc_state,
- .destroy_crtc_state =mgag200_simple_display_pipe_destroy_crtc_state,
-DRM_GEM_SIMPLE_DISPLAY_PIPE_SHADOW_PLANE_FUNCS, +static const structdrm_encoder_funcsmgag200_dac_encoder_funcs= { + .destroy =drm_encoder_cleanup,
};
/*drivers/gpu/drm/mgag200/mgag200_mode.c +0
-0@@ -999,12 +1052,49 @@ static int mgag200_mode_config_init(struct
mga_device*mdev,resource_size_tvra
static intmgag200_pipeline_init(struct mga_device *mdev){
structdrm_device*dev =&mdev->base;
+ structdrm_plane*primary_plane=&mdev->primary_plane; + structdrm_crtc*crtc =&mdev->crtc;
+ structdrm_encoder*encoder =&mdev->encoder;
structmga_i2c_chan*i2c =&mdev->i2c;
structdrm_connector*connector =&mdev->connector;
- structdrm_simple_display_pipe*pipe =&mdev->display_pipe; -size_tformat_count=ARRAY_SIZE(mgag200_simple_display_pipe_formats);
int ret;
+ ret =mgag200_pixpll_init(&mdev->pixpll, mdev);
+ if (ret)
+ return ret;
+
+ ret = drm_universal_plane_init(dev,primary_plane, 0,
+&mgag200_primary_plane_funcs,
+mgag200_primary_plane_formats,
+ARRAY_SIZE(mgag200_primary_plane_formats), +mgag200_primary_plane_fmtmods,
+DRM_PLANE_TYPE_PRIMARY, NULL);
+ if (ret) {
+drm_err(dev, "drm_universal_plane_init() failed: %d\n", ret); + return ret;
+ }
+drm_plane_helper_add(primary_plane, &mgag200_primary_plane_helper_funcs);
+drm_plane_enable_fb_damage_clips(primary_plane);
+
+ ret =drm_crtc_init_with_planes(dev, crtc, primary_plane, NULL, &mgag200_crtc_funcs, NULL);
+ if (ret) {
+drm_err(dev, "drm_crtc_init_with_planes() failed: %d\n", ret); + return ret;
+ }
+drm_crtc_helper_add(crtc, &mgag200_crtc_helper_funcs); +
+ /* FIXME: legacy gamma tables, but atomic gamma doesn't work without */
+drm_mode_crtc_set_gamma_size(crtc, MGAG200_LUT_SIZE);
+drm_crtc_enable_color_mgmt(crtc, 0, false, MGAG200_LUT_SIZE);drivers/gpu/drm/mgag200/mgag200_mode.c +9
-0+ + encoder->possible_crtcs = drm_crtc_mask(crtc); + ret = drm_encoder_init(dev, encoder, &mgag200_dac_encoder_funcs, + DRM_MODE_ENCODER_DAC, NULL); + if (ret) { + drm_err(dev, "drm_encoder_init() failed: %d\n", ret); + return ret; + } +ret =
mgag200_i2c_init(mdev, i2c);
if (ret) {
drm_err(dev, "failed to add DDC bus: %d\n", ret);drivers/gpu/drm/mgag200/mgag200_mode.c +2
-16@@ -1021,30 +1111,12 @@ static int mgag200_pipeline_init(struct mga_device *mdev) } drm_connector_helper_add(connector, &mga_vga_connector_helper_funcs); - ret = mgag200_pixpll_init(&mdev->pixpll, mdev); - if (ret) - return ret; - - ret = drm_simple_display_pipe_init(dev, pipe, - &mgag200_simple_display_pipe_funcs, - mgag200_simple_display_pipe_formats, - format_count, - mgag200_simple_display_pipe_fmtmods, - connector); + ret = drm_connector_attach_encoder(connector, encoder); if (ret) { - drm_err(dev, - "drm_simple_display_pipe_init() failed, error %d\n", - ret); + drm_err(dev, "drm_connector_attach_encoder() failed: %d\n", ret); return ret; } - drm_plane_enable_fb_damage_clips(&pipe->plane); - - /* FIXME: legacy gamma tables, but atomic gamma doesn't workQuoted 8 lines
without */
-drm_mode_crtc_set_gamma_size(&pipe->crtc, MGAG200_LUT_SIZE); -
-drm_crtc_enable_color_mgmt(&pipe->crtc, 0, false, MGAG200_LUT_SIZE);
-
return 0;
}Everything else looks good to me.
Thanks,
Thomas Zimmermann
maintainerPATCH v3 8/14 drm/mgag200: Set SCROFF in primary-plane code
In reply to Thomas ZimmermannThe SCROFF bit controls reading the primary plane's scanout buffer from video memory. Set it from primary-plane code, instead of CRTC code.
v3:
* only flip SCROFF when enabling/disabling the plane (Jocelyn)
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 35 +++++++++++++++----------- 1 file changed, 20 insertions(+), 15 deletions(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +20 -15
@@ -549,7 +549,7 @@ static void mgag200_g200ev_set_hiprilvl(struct mga_device *mdev)static void mgag200_enable_display (struct mga_device *mdev) { -u8 seq0, seq1, crtcext1; +u8 seq0, crtcext1;RREG_SEQ (0x00 , seq0); seq0 |= MGAREG_SEQ0_SYNCRST |
@@ -563,12 +563,6 @@ static void mgag200_enable_display(struct mga_device *mdev)mga_wait_vsync (mdev);mga_wait_busy (mdev); -RREG_SEQ (0x01 , seq1); - seq1 &= ~MGAREG_SEQ1_SCROFF ; -WREG_SEQ (0x01 , seq1); - -msleep (20 ); -RREG_ECRT (0x01 , crtcext1); crtcext1 &= ~MGAREG_CRTCEXT1_VSYNCOFF ; crtcext1 &= ~MGAREG_CRTCEXT1_HSYNCOFF ;
@@ -577,7 +571,7 @@ static void mgag200_enable_display(struct mga_device *mdev)static void mgag200_disable_display (struct mga_device *mdev) { -u8 seq0, seq1, crtcext1; +u8 seq0, crtcext1;RREG_SEQ (0x00 , seq0); seq0 &= ~MGAREG_SEQ0_SYNCRST ;
@@ -590,12 +584,6 @@ static void mgag200_disable_display(struct mga_device *mdev)mga_wait_vsync (mdev);mga_wait_busy (mdev); -RREG_SEQ (0x01 , seq1); - seq1 |=MGAREG_SEQ1_SCROFF ; -WREG_SEQ (0x01 , seq1); - -msleep (20 ); -RREG_ECRT (0x01 , crtcext1); crtcext1 |=MGAREG_CRTCEXT1_VSYNCOFF |MGAREG_CRTCEXT1_HSYNCOFF ;
@@ -673,6 +661,7 @@ static void mgag200_primary_plane_helper_atomic_update(struct drm_plane *plane,struct drm_framebuffer *fb = plane_state->fb;struct drm_atomic_helper_damage_iter iter;struct drm_rect damage; +u8 seq1;if (!fb)return ;
@@ -685,11 +674,27 @@ static void mgag200_primary_plane_helper_atomic_update(struct drm_plane *plane,/* Always scanout image at VRAM offset 0 */ mgag200_set_startadd (mdev, (u32 )0 );mgag200_set_offset (mdev, fb); + +if (!old_plane_state->crtc && plane_state->crtc) {// enabling +RREG_SEQ (0x01 , seq1); + seq1 &= ~MGAREG_SEQ1_SCROFF ; +WREG_SEQ (0x01 , seq1); +msleep (20 ); + } }static void mgag200_primary_plane_helper_atomic_disable (struct drm_plane *plane,struct drm_atomic_state *old_state) -{ } +{ +struct drm_device *dev = plane->dev; +struct mga_device *mdev =to_mga_device (dev); +u8 seq1; + +RREG_SEQ (0x01 , seq1); + seq1 |=MGAREG_SEQ1_SCROFF ; +WREG_SEQ (0x01 , seq1); +msleep (20 ); +}static const struct drm_plane_helper_funcs mgag200_primary_plane_helper_funcs = {DRM_GEM_SHADOW_PLANE_HELPER_FUNCS ,
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 9/14 drm/mgag200: Add per-device callbacks
In reply to Thomas ZimmermannWhile currently empty, the device callbacks will allow mgag200's modesetting code to interact with the BMC and PIXPLLC.
--- drivers/gpu/drm/mgag200/mgag200_drv.c | 4 +++- drivers/gpu/drm/mgag200/mgag200_drv.h | 7 ++++++- drivers/gpu/drm/mgag200/mgag200_g200.c | 6 +++++- drivers/gpu/drm/mgag200/mgag200_g200eh.c | 6 +++++- drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 6 +++++- drivers/gpu/drm/mgag200/mgag200_g200er.c | 6 +++++- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 6 +++++- drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 6 +++++- drivers/gpu/drm/mgag200/mgag200_g200se.c | 5 ++++- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 6 +++++- 10 files changed, 48 insertions(+), 10 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.c +3 -1
@@ -156,13 +156,15 @@ int mgag200_device_preinit(struct mga_device *mdev) }int mgag200_device_init (struct mga_device *mdev,enum mga_type type, -const struct mgag200_device_info *info) +const struct mgag200_device_info *info, +const struct mgag200_device_funcs *funcs) {struct drm_device *dev = &mdev->base;u8 crtcext3, misc;int ret; mdev->info = info; + mdev->funcs = funcs; mdev->type = type; ret =drmm_mutex_init (dev, &mdev->rmmio_lock);
drivers/gpu/drm/mgag200/mgag200_drv.h +6 -1
@@ -262,10 +262,14 @@ struct mgag200_device_info { .bug_no_startadd = (_bug_no_startadd), \ } +struct mgag200_device_funcs { +}; +struct mga_device {struct drm_device base;const struct mgag200_device_info *info; +const struct mgag200_device_funcs *funcs;struct resource *rmmio_res;void __iomem *rmmio;
@@ -322,7 +326,8 @@ resource_size_t mgag200_probe_vram(void __iomem *mem, resource_size_t size);resource_size_t mgag200_device_probe_vram (struct mga_device *mdev);int mgag200_device_preinit (struct mga_device *mdev);int mgag200_device_init (struct mga_device *mdev,enum mga_type type, -const struct mgag200_device_info *info); +const struct mgag200_device_info *info, +const struct mgag200_device_funcs *funcs);/* mgag200_<device type>.c */ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const struct drm_driver *drv,
drivers/gpu/drm/mgag200/mgag200_g200.c +5 -1
@@ -183,6 +183,9 @@ static void mgag200_g200_init_refclk(struct mgag200_g200_device *g200)pci_unmap_rom (pdev, rom); } +static const struct mgag200_device_funcs mgag200_g200_device_funcs = { +}; +struct mga_device *mgag200_g200_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type) {
@@ -210,7 +213,8 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const structmgag200_g200_init_refclk (g200); - ret =mgag200_device_init (mdev, type, &mgag200_g200_device_info); + ret =mgag200_device_init (mdev, type, &mgag200_g200_device_info, + &mgag200_g200_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200eh.c +5 -1
@@ -37,6 +37,9 @@ void mgag200_g200eh_init_registers(struct mga_device *mdev)static const struct mgag200_device_info mgag200_g200eh_device_info =MGAG200_DEVICE_INFO_INIT (2048 ,2048 ,37500 , false,1 ,0 , false); +static const struct mgag200_device_funcs mgag200_g200eh_device_funcs = { +}; +struct mga_device *mgag200_g200eh_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type) {
@@ -60,7 +63,8 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200eh_device_info); + ret =mgag200_device_init (mdev, type, &mgag200_g200eh_device_info, + &mgag200_g200eh_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +5 -1
@@ -13,6 +13,9 @@static const struct mgag200_device_info mgag200_g200eh3_device_info =MGAG200_DEVICE_INFO_INIT (2048 ,2048 ,0 , false,1 ,0 , false); +static const struct mgag200_device_funcs mgag200_g200eh3_device_funcs = { +}; +struct mga_device *mgag200_g200eh3_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type)
@@ -37,7 +40,8 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev,if (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200eh3_device_info); + ret =mgag200_device_init (mdev, type, &mgag200_g200eh3_device_info, + &mgag200_g200eh3_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200er.c +5 -1
@@ -38,6 +38,9 @@ static void mgag200_g200er_init_registers(struct mga_device *mdev)static const struct mgag200_device_info mgag200_g200er_device_info =MGAG200_DEVICE_INFO_INIT (2048 ,2048 ,55000 , false,1 ,0 , false); +static const struct mgag200_device_funcs mgag200_g200er_device_funcs = { +}; +struct mga_device *mgag200_g200er_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type) {
@@ -57,7 +60,8 @@ struct mga_device *mgag200_g200er_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200er_device_info); + ret =mgag200_device_init (mdev, type, &mgag200_g200er_device_info, + &mgag200_g200er_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200ev.c +5 -1
@@ -38,6 +38,9 @@ static void mgag200_g200ev_init_registers(struct mga_device *mdev)static const struct mgag200_device_info mgag200_g200ev_device_info =MGAG200_DEVICE_INFO_INIT (2048 ,2048 ,32700 , false,0 ,1 , false); +static const struct mgag200_device_funcs mgag200_g200ev_device_funcs = { +}; +struct mga_device *mgag200_g200ev_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type) {
@@ -61,7 +64,8 @@ struct mga_device *mgag200_g200ev_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200ev_device_info); + ret =mgag200_device_init (mdev, type, &mgag200_g200ev_device_info, + &mgag200_g200ev_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +5 -1
@@ -20,6 +20,9 @@ static void mgag200_g200ew3_init_registers(struct mga_device *mdev)static const struct mgag200_device_info mgag200_g200ew3_device_info =MGAG200_DEVICE_INFO_INIT (2048 ,2048 ,0 , true,0 ,1 , false); +static const struct mgag200_device_funcs mgag200_g200ew3_device_funcs = { +}; +static resource_size_t mgag200_g200ew3_device_probe_vram (struct mga_device *mdev) {resource_size_t vram_size =resource_size (mdev->vram_res);
@@ -53,7 +56,8 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,if (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200ew3_device_info); + ret =mgag200_device_init (mdev, type, &mgag200_g200ew3_device_info, + &mgag200_g200ew3_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200se.c +4 -1
@@ -93,6 +93,9 @@ static int mgag200_g200se_init_unique_rev_id(struct mgag200_g200se_device *g200sreturn 0 ; } +static const struct mgag200_device_funcs mgag200_g200se_device_funcs = { +}; +struct mga_device *mgag200_g200se_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type) {
@@ -144,7 +147,7 @@ struct mga_device *mgag200_g200se_device_create(struct pci_dev *pdev, const strureturn ERR_PTR (-EINVAL ); } - ret =mgag200_device_init (mdev, type, info); + ret =mgag200_device_init (mdev, type, info, &mgag200_g200se_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200wb.c +5 -1
@@ -35,6 +35,9 @@ void mgag200_g200wb_init_registers(struct mga_device *mdev)static const struct mgag200_device_info mgag200_g200wb_device_info =MGAG200_DEVICE_INFO_INIT (1280 ,1024 ,31877 , true,0 ,1 , false); +static const struct mgag200_device_funcs mgag200_g200wb_device_funcs = { +}; +struct mga_device *mgag200_g200wb_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type) {
@@ -58,7 +61,8 @@ struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200wb_device_info); + ret =mgag200_device_init (mdev, type, &mgag200_g200wb_device_info, + &mgag200_g200wb_device_funcs);if (ret)return ERR_PTR (ret);
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 10/14 drm/mgag200: Provide per-device callbacks for BMC synchronization
In reply to Thomas ZimmermannMove the BMC-related code into its own file and wire it up with device callbacks.
While programming a new display mode, G200EW3 and G200WB have to de- synchronize with the BMC. Synchronization is done via VIDRST pins and controlled via VRSTEN and HRSTEN bits. Move the BMC code behind a serviceable interface and call it from the CRTC's enable and disable functions.
--- drivers/gpu/drm/mgag200/Makefile | 1 + drivers/gpu/drm/mgag200/mgag200_bmc.c | 99 ++++++++++++++++++++ drivers/gpu/drm/mgag200/mgag200_drv.h | 15 +++ drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 2 + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 2 + drivers/gpu/drm/mgag200/mgag200_mode.c | 107 ++-------------------- 6 files changed, 129 insertions(+), 97 deletions(-) create mode 100644 drivers/gpu/drm/mgag200/mgag200_bmc.c
drivers/gpu/drm/mgag200/Makefile +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only mgag200-y := \ + mgag200_bmc.o \ mgag200_drv.o \ mgag200_g200.o \ mgag200_g200eh.o \
drivers/gpu/drm/mgag200/mgag200_bmc.c new file +99 -0
99 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_drv.h +15 -0
@@ -263,6 +263,17 @@ struct mgag200_device_info { }struct mgag200_device_funcs { +/* +* Disables an external reset source (i.e., BMC) before programming +* a new display mode. +*/ +void (*disable_vidrst)(struct mga_device *mdev); + +/* +* Enables an external reset source (i.e., BMC) after programming +* a new display mode. +*/ +void (*enable_vidrst)(struct mga_device *mdev); };struct mga_device {
@@ -354,6 +365,10 @@ resource_size_t mgag200_device_probe_vram(struct mga_device *mdev);void mgag200_init_registers (struct mga_device *mdev);int mgag200_modeset_init (struct mga_device *mdev,resource_size_t vram_fb_available); +/* mgag200_bmc.c */ +void mgag200_bmc_disable_vidrst (struct mga_device *mdev); +void mgag200_bmc_enable_vidrst (struct mga_device *mdev); +/* mgag200_i2c.c */ int mgag200_i2c_init (struct mga_device *mdev,struct mga_i2c_chan *i2c);
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +2 -0
@@ -21,6 +21,8 @@ static const struct mgag200_device_info mgag200_g200ew3_device_info =MGAG200_DEVICE_INFO_INIT (2048 ,2048 ,0 , true,0 ,1 , false);static const struct mgag200_device_funcs mgag200_g200ew3_device_funcs = { + .disable_vidrst = mgag200_bmc_disable_vidrst, + .enable_vidrst = mgag200_bmc_enable_vidrst, };static resource_size_t mgag200_g200ew3_device_probe_vram (struct mga_device *mdev)
drivers/gpu/drm/mgag200/mgag200_g200wb.c +2 -0
@@ -36,6 +36,8 @@ static const struct mgag200_device_info mgag200_g200wb_device_info =MGAG200_DEVICE_INFO_INIT (1280 ,1024 ,31877 , true,0 ,1 , false);static const struct mgag200_device_funcs mgag200_g200wb_device_funcs = { + .disable_vidrst = mgag200_bmc_disable_vidrst, + .enable_vidrst = mgag200_bmc_enable_vidrst, }; struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const struct drm_driver *drv,
drivers/gpu/drm/mgag200/mgag200_mode.c +10 -97
141 lines not on this page · raw message
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 11/14 drm/mgag200: Provide per-device callbacks for PIXPLLC
In reply to Thomas ZimmermannMove the PIXPLLC code into per-model source files and wire it up with per-model callbacks. No functional changes.
The PIXPLLC pixel-clock is part of the CRTC, but really separate hardware that varies with each model of the G200. Move the PIXPLLC code for each model into the per-model source file and call it from CRTC helpers via device functions.
This allows to remove struct mgag200_pll and the related code. The new callbacks behave like the CRTC's atomic_check and atomic_enable functions.
v3:
* clean up style
--- drivers/gpu/drm/mgag200/Makefile | 3 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 32 +- drivers/gpu/drm/mgag200/mgag200_g200.c | 109 +++ drivers/gpu/drm/mgag200/mgag200_g200eh.c | 131 +++ drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 59 ++ drivers/gpu/drm/mgag200/mgag200_g200er.c | 120 +++ drivers/gpu/drm/mgag200/mgag200_g200ev.c | 132 +++ drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 61 ++ drivers/gpu/drm/mgag200/mgag200_g200se.c | 211 ++++- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 180 ++++ drivers/gpu/drm/mgag200/mgag200_mode.c | 20 +- drivers/gpu/drm/mgag200/mgag200_pll.c | 997 ---------------------- 12 files changed, 1026 insertions(+), 1029 deletions(-) delete mode 100644 drivers/gpu/drm/mgag200/mgag200_pll.c
drivers/gpu/drm/mgag200/Makefile +1 -2
@@ -11,7 +11,6 @@ mgag200-y := \ mgag200_g200se.o \ mgag200_g200wb.o \ mgag200_i2c.o \ - mgag200_mode.o \ - mgag200_pll.o + mgag200_mode.o obj-$(CONFIG_DRM_MGAG200) += mgag200.o
drivers/gpu/drm/mgag200/mgag200_drv.h +16 -16
@@ -156,7 +156,6 @@#define MGAG200_MAX_FB_WIDTH 4096struct mga_device ; -struct mgag200_pll ;/* * Stores parameters for programming the PLLs
@@ -175,17 +174,6 @@ struct mgag200_pll_values {unsigned int s; }; -struct mgag200_pll_funcs { -int (*compute)(struct mgag200_pll *pll,long clock,struct mgag200_pll_values *pllc); -void (*update)(struct mgag200_pll *pll,const struct mgag200_pll_values *pllc); -}; - -struct mgag200_pll { -struct mga_device *mdev; - -const struct mgag200_pll_funcs *funcs; -}; -struct mgag200_crtc_state {struct drm_crtc_state base;
@@ -274,6 +262,20 @@ struct mgag200_device_funcs {* a new display mode. */ void (*enable_vidrst)(struct mga_device *mdev); + +/* +* Validate that the given state can be programmed into PIXPLLC. On +* success, the calculated parameters should be stored in the CRTC's +* state in struct @mgag200_crtc_state.pixpllc. +*/ +int (*pixpllc_atomic_check)(struct drm_crtc *crtc,struct drm_atomic_state *new_state); + +/* +* Program PIXPLLC from the CRTC state. The parameters should have been +* stored in struct @mgag200_crtc_state.pixpllc by the corresponding +* implementation of @pixpllc_atomic_check. +*/ +void (*pixpllc_atomic_update)(struct drm_crtc *crtc,struct drm_atomic_state *old_state); };struct mga_device {
@@ -292,7 +294,6 @@ struct mga_device {enum mga_type type; -struct mgag200_pll pixpll;struct drm_plane primary_plane;struct drm_crtc crtc;struct drm_encoder encoder;
@@ -346,11 +347,13 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const structstruct mga_device *mgag200_g200se_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type);void mgag200_g200wb_init_registers (struct mga_device *mdev); +void mgag200_g200wb_pixpllc_atomic_update (struct drm_crtc *crtc,struct drm_atomic_state *old_state);struct mga_device *mgag200_g200wb_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type);struct mga_device *mgag200_g200ev_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type);void mgag200_g200eh_init_registers (struct mga_device *mdev); +void mgag200_g200eh_pixpllc_atomic_update (struct drm_crtc *crtc,struct drm_atomic_state *old_state);struct mga_device *mgag200_g200eh_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type); struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev, const struct drm_driver *drv,
@@ -372,7 +375,4 @@ void mgag200_bmc_enable_vidrst(struct mga_device *mdev);/* mgag200_i2c.c */ int mgag200_i2c_init (struct mga_device *mdev,struct mga_i2c_chan *i2c); -/* mgag200_pll.c */ -int mgag200_pixpll_init (struct mgag200_pll *pixpll,struct mga_device *mdev); -#endif /* __MGAG200_DRV_H__ */
drivers/gpu/drm/mgag200/mgag200_g200.c +109 -0
127 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200eh.c +131 -0
150 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +59 -0
75 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200er.c +120 -0
139 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200ev.c +132 -0
151 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +61 -0
79 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200se.c +209 -2
242 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200wb.c +180 -0
199 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_mode.c +8 -12
@@ -660,9 +660,8 @@ static int mgag200_crtc_helper_atomic_check(struct drm_crtc *crtc, {struct drm_device *dev = crtc->dev;struct mga_device *mdev =to_mga_device (dev); +const struct mgag200_device_funcs *funcs = mdev->funcs;struct drm_crtc_state *new_crtc_state =drm_atomic_get_new_crtc_state (new_state, crtc); -struct mgag200_pll *pixpll = &mdev->pixpll; -struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (new_crtc_state);struct drm_property_blob *new_gamma_lut = new_crtc_state->gamma_lut;int ret;
@@ -674,10 +673,11 @@ static int mgag200_crtc_helper_atomic_check(struct drm_crtc *crtc,return 0 ;if (new_crtc_state->mode_changed) { - ret = pixpll->funcs->compute (pixpll, new_crtc_state->mode.clock, - &mgag200_crtc_state->pixpllc); -if (ret) -return ret; +if (funcs->pixpllc_atomic_check) { + ret = funcs->pixpllc_atomic_check (crtc, new_state); +if (ret) +return ret; + } }if (new_crtc_state->color_mgmt_changed && new_gamma_lut) {
@@ -718,7 +718,6 @@ static void mgag200_crtc_helper_atomic_enable(struct drm_crtc *crtc,struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state);const struct drm_format_info *format = mgag200_crtc_state->format; -struct mgag200_pll *pixpll = &mdev->pixpll;if (funcs->disable_vidrst) funcs->disable_vidrst (mdev);
@@ -726,7 +725,8 @@ static void mgag200_crtc_helper_atomic_enable(struct drm_crtc *crtc,mgag200_set_format_regs (mdev, format);mgag200_set_mode_regs (mdev, adjusted_mode); - pixpll->funcs->update (pixpll, &mgag200_crtc_state->pixpllc); +if (funcs->pixpllc_atomic_update) + funcs->pixpllc_atomic_update (crtc, old_state);if (mdev->type ==G200_ER )mgag200_g200er_reset_tagfifo (mdev);
@@ -977,10 +977,6 @@ static int mgag200_pipeline_init(struct mga_device *mdev)struct drm_connector *connector = &mdev->connector;int ret; - ret =mgag200_pixpll_init (&mdev->pixpll, mdev); -if (ret) -return ret; - ret = drm_universal_plane_init(dev, primary_plane, 0, &mgag200_primary_plane_funcs, mgag200_primary_plane_formats,
drivers/gpu/drm/mgag200/mgag200_pll.c deleted +0 -997
997 lines not on this page · raw message
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 12/14 drm/mgag200: Move mode-config to model-specific code
In reply to Thomas ZimmermannMove the mode-config code into model-specific code and call the plane/CRTC helpers as needed. This will help with providing per- model implementations of individual helpers.
Duplication of the pipeline init function is accepted. Some macros simplify this for shared helpers.
v3:
* clean up style
--- drivers/gpu/drm/mgag200/mgag200_drv.h | 78 ++++++++- drivers/gpu/drm/mgag200/mgag200_g200.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200eh.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200er.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200se.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 111 ++++++++++++- drivers/gpu/drm/mgag200/mgag200_mode.c | 185 +++------------------- 10 files changed, 977 insertions(+), 174 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.h +76 -2
@@ -152,6 +152,8 @@ /* 0x40: */ 0, 0, 0, 0, 0, 0, 0, 0, \ /* 0x48: */ 0, 0, 0, 0, 0, 0, 0, 0 \ +#define MGAG200_LUT_SIZE 256 +#define MGAG200_MAX_FB_HEIGHT 4096#define MGAG200_MAX_FB_WIDTH 4096
@@ -363,10 +365,82 @@ struct mga_device *mgag200_g200er_device_create(struct pci_dev *pdev, const strustruct mga_device *mgag200_g200ew3_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type); -/* mgag200_mode.c */ +/* +* mgag200_mode.c +*/ + +struct drm_crtc ; +struct drm_crtc_state ; +struct drm_display_mode ; +struct drm_plane ; +struct drm_atomic_state ; + +extern const uint32_t mgag200_primary_plane_formats[]; +extern const size_t mgag200_primary_plane_formats_size; +extern const uint64_t mgag200_primary_plane_fmtmods[]; + +int mgag200_primary_plane_helper_atomic_check (struct drm_plane *plane, +struct drm_atomic_state *new_state); +void mgag200_primary_plane_helper_atomic_update (struct drm_plane *plane, +struct drm_atomic_state *old_state); +void mgag200_primary_plane_helper_atomic_disable (struct drm_plane *plane, +struct drm_atomic_state *old_state); +#define MGAG200_PRIMARY_PLANE_HELPER_FUNCS \ + DRM_GEM_SHADOW_PLANE_HELPER_FUNCS, \ + .atomic_check = mgag200_primary_plane_helper_atomic_check, \ + .atomic_update = mgag200_primary_plane_helper_atomic_update, \ + .atomic_disable = mgag200_primary_plane_helper_atomic_disable + +#define MGAG200_PRIMARY_PLANE_FUNCS \ + .update_plane = drm_atomic_helper_update_plane, \ + .disable_plane = drm_atomic_helper_disable_plane, \ + .destroy = drm_plane_cleanup, \ + DRM_GEM_SHADOW_PLANE_FUNCS + +enum drm_mode_status mgag200_crtc_helper_mode_valid (struct drm_crtc *crtc, +const struct drm_display_mode *mode); +int mgag200_crtc_helper_atomic_check (struct drm_crtc *crtc,struct drm_atomic_state *new_state); +void mgag200_crtc_helper_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *old_state); +void mgag200_crtc_helper_atomic_enable (struct drm_crtc *crtc,struct drm_atomic_state *old_state); +void mgag200_crtc_helper_atomic_disable (struct drm_crtc *crtc,struct drm_atomic_state *old_state); + +#define MGAG200_CRTC_HELPER_FUNCS \ + .mode_valid = mgag200_crtc_helper_mode_valid, \ + .atomic_check = mgag200_crtc_helper_atomic_check, \ + .atomic_flush = mgag200_crtc_helper_atomic_flush, \ + .atomic_enable = mgag200_crtc_helper_atomic_enable, \ + .atomic_disable = mgag200_crtc_helper_atomic_disable + +void mgag200_crtc_reset (struct drm_crtc *crtc); +struct drm_crtc_state *mgag200_crtc_atomic_duplicate_state (struct drm_crtc *crtc); +void mgag200_crtc_atomic_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *crtc_state); + +#define MGAG200_CRTC_FUNCS \ + .reset = mgag200_crtc_reset, \ + .destroy = drm_crtc_cleanup, \ + .set_config = drm_atomic_helper_set_config, \ + .page_flip = drm_atomic_helper_page_flip, \ + .atomic_duplicate_state = mgag200_crtc_atomic_duplicate_state, \ + .atomic_destroy_state = mgag200_crtc_atomic_destroy_state + +#define MGAG200_DAC_ENCODER_FUNCS \ + .destroy = drm_encoder_cleanup + +int mgag200_vga_connector_helper_get_modes (struct drm_connector *connector); + +#define MGAG200_VGA_CONNECTOR_HELPER_FUNCS \ + .get_modes = mgag200_vga_connector_helper_get_modes + +#define MGAG200_VGA_CONNECTOR_FUNCS \ + .reset = drm_atomic_helper_connector_reset, \ + .fill_modes = drm_helper_probe_single_connector_modes, \ + .destroy = drm_connector_cleanup, \ + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, \ + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state +resource_size_t mgag200_device_probe_vram (struct mga_device *mdev);void mgag200_init_registers (struct mga_device *mdev); -int mgag200_modeset_init (struct mga_device *mdev,resource_size_t vram_fb_available); +int mgag200_mode_config_init (struct mga_device *mdev,resource_size_t vram_available);/* mgag200_bmc.c */ void mgag200_bmc_disable_vidrst (struct mga_device *mdev);
drivers/gpu/drm/mgag200/mgag200_g200.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200eh.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200er.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200ev.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200se.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200wb.c +110 -1
132 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_mode.c +21 -164
301 lines not on this page · raw message
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 13/14 drm/mgag200: Move CRTC atomic_enable to model-specific code
In reply to Thomas ZimmermannThe CRTC atomic_enable helper contains per-model branches for G200ER, G200EV and G200SE devices. Implement a dedicated helper for each of them and remove the branches from the shared helper.
--- drivers/gpu/drm/mgag200/mgag200_drv.h | 6 +- drivers/gpu/drm/mgag200/mgag200_g200er.c | 50 ++++++++++++++- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 39 ++++++++++- drivers/gpu/drm/mgag200/mgag200_g200se.c | 80 ++++++++++++++++++++++- drivers/gpu/drm/mgag200/mgag200_mode.c | 82 +----------------------- 5 files changed, 172 insertions(+), 85 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.h +3 -3
@@ -210,8 +210,6 @@ enum mga_type { G200_EW3, }; -#define IS_G200_SE (mdev) (mdev->type == G200_SE_A || mdev->type == G200_SE_B) -struct mgag200_device_info {u16 max_hdisplay;u16 max_vdisplay;
@@ -438,7 +436,9 @@ int mgag200_vga_connector_helper_get_modes(struct drm_connector *connector); .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, \ .atomic_destroy_state = drm_atomic_helper_connector_destroy_state -resource_size_t mgag200_device_probe_vram (struct mga_device *mdev); +void mgag200_set_mode_regs (struct mga_device *mdev,const struct drm_display_mode *mode); +void mgag200_set_format_regs (struct mga_device *mdev,const struct drm_format_info *format); +void mgag200_enable_display (struct mga_device *mdev);void mgag200_init_registers (struct mga_device *mdev);int mgag200_mode_config_init (struct mga_device *mdev,resource_size_t vram_available);
drivers/gpu/drm/mgag200/mgag200_g200er.c +49 -1
63 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_g200ev.c +38 -1
@@ -36,6 +36,11 @@ static void mgag200_g200ev_init_registers(struct mga_device *mdev)mgag200_init_registers (mdev); } +static void mgag200_g200ev_set_hiprilvl (struct mga_device *mdev) +{ +WREG_ECRT (0x06 ,0x00 ); +} +/* * PIXPLLC */
@@ -176,8 +181,40 @@ static const struct drm_plane_funcs mgag200_g200ev_primary_plane_funcs = { MGAG200_PRIMARY_PLANE_FUNCS, }; +static void mgag200_g200ev_crtc_helper_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *old_state) +{ +struct drm_device *dev = crtc->dev; +struct mga_device *mdev =to_mga_device (dev); +const struct mgag200_device_funcs *funcs = mdev->funcs; +struct drm_crtc_state *crtc_state = crtc->state; +struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; +struct mgag200_crtc_state *mgag200_crtc_state =to_mgag200_crtc_state (crtc_state); +const struct drm_format_info *format = mgag200_crtc_state->format; + +if (funcs->disable_vidrst) + funcs->disable_vidrst (mdev); + +mgag200_set_format_regs (mdev, format); +mgag200_set_mode_regs (mdev, adjusted_mode); + +if (funcs->pixpllc_atomic_update) + funcs->pixpllc_atomic_update (crtc, old_state); + +mgag200_g200ev_set_hiprilvl (mdev); + +mgag200_enable_display (mdev); + +if (funcs->enable_vidrst) + funcs->enable_vidrst (mdev); +} +static const struct drm_crtc_helper_funcs mgag200_g200ev_crtc_helper_funcs = { -MGAG200_CRTC_HELPER_FUNCS , + .mode_valid = mgag200_crtc_helper_mode_valid, + .atomic_check = mgag200_crtc_helper_atomic_check, + .atomic_flush = mgag200_crtc_helper_atomic_flush, + .atomic_enable = mgag200_g200ev_crtc_helper_atomic_enable, + .atomic_disable = mgag200_crtc_helper_atomic_disable };static const struct drm_crtc_funcs mgag200_g200ev_crtc_funcs = {
drivers/gpu/drm/mgag200/mgag200_g200se.c +79 -1
93 lines not on this page · raw message
drivers/gpu/drm/mgag200/mgag200_mode.c +3 -79
106 lines not on this page · raw message
Signature · 1 line
2.37.1
Thomas Zimmermann
maintainerPATCH v3 14/14 drm/mgag200: Remove type field from struct mga_device
In reply to Thomas ZimmermannEach model's specific code is located in a separate file. The type field in struct mga_device is no unused. Remove it.
--- drivers/gpu/drm/mgag200/mgag200_drv.c | 17 +++++++------ drivers/gpu/drm/mgag200/mgag200_drv.h | 29 ++++++++++------------- drivers/gpu/drm/mgag200/mgag200_g200.c | 5 ++-- drivers/gpu/drm/mgag200/mgag200_g200eh.c | 5 ++-- drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 5 ++-- drivers/gpu/drm/mgag200/mgag200_g200er.c | 5 ++-- drivers/gpu/drm/mgag200/mgag200_g200ev.c | 5 ++-- drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 5 ++-- drivers/gpu/drm/mgag200/mgag200_g200se.c | 2 +- drivers/gpu/drm/mgag200/mgag200_g200wb.c | 5 ++-- 10 files changed, 35 insertions(+), 48 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.c +8 -9
@@ -155,7 +155,7 @@ int mgag200_device_preinit(struct mga_device *mdev)return 0 ; } -int mgag200_device_init (struct mga_device *mdev,enum mga_type type, +int mgag200_device_init (struct mga_device *mdev,const struct mgag200_device_info *info,const struct mgag200_device_funcs *funcs) {
@@ -165,7 +165,6 @@ int mgag200_device_init(struct mga_device *mdev, enum mga_type type, mdev->info = info; mdev->funcs = funcs; - mdev->type = type; ret =drmm_mutex_init (dev, &mdev->rmmio_lock);if (ret)
@@ -228,29 +227,29 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)switch (type) {case G200_PCI :case G200_AGP : - mdev =mgag200_g200_device_create (pdev, &mgag200_driver, type); + mdev =mgag200_g200_device_create (pdev, &mgag200_driver);break ;case G200_SE_A :case G200_SE_B : mdev =mgag200_g200se_device_create (pdev, &mgag200_driver, type);break ;case G200_WB : - mdev =mgag200_g200wb_device_create (pdev, &mgag200_driver, type); + mdev =mgag200_g200wb_device_create (pdev, &mgag200_driver);break ;case G200_EV : - mdev =mgag200_g200ev_device_create (pdev, &mgag200_driver, type); + mdev =mgag200_g200ev_device_create (pdev, &mgag200_driver);break ;case G200_EH : - mdev =mgag200_g200eh_device_create (pdev, &mgag200_driver, type); + mdev =mgag200_g200eh_device_create (pdev, &mgag200_driver);break ;case G200_EH3 : - mdev =mgag200_g200eh3_device_create (pdev, &mgag200_driver, type); + mdev =mgag200_g200eh3_device_create (pdev, &mgag200_driver);break ;case G200_ER : - mdev =mgag200_g200er_device_create (pdev, &mgag200_driver, type); + mdev =mgag200_g200er_device_create (pdev, &mgag200_driver);break ;case G200_EW3 : - mdev =mgag200_g200ew3_device_create (pdev, &mgag200_driver, type); + mdev =mgag200_g200ew3_device_create (pdev, &mgag200_driver);break ;default :dev_err (&pdev->dev,"Device type %d is unsupported\n" , type);
drivers/gpu/drm/mgag200/mgag200_drv.h +12 -17
@@ -292,8 +292,6 @@ struct mga_device {void __iomem *vram;resource_size_t vram_available; -enum mga_type type; -struct drm_plane primary_plane;struct drm_crtc crtc;struct drm_encoder encoder;
@@ -337,31 +335,28 @@ int mgag200_init_pci_options(struct pci_dev *pdev, u32 option, u32 option2);resource_size_t mgag200_probe_vram (void __iomem *mem,resource_size_t size);resource_size_t mgag200_device_probe_vram (struct mga_device *mdev);int mgag200_device_preinit (struct mga_device *mdev); -int mgag200_device_init (struct mga_device *mdev,enum mga_type type, +int mgag200_device_init (struct mga_device *mdev,const struct mgag200_device_info *info,const struct mgag200_device_funcs *funcs);/* mgag200_<device type>.c */ -struct mga_device *mgag200_g200_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type); +struct mga_device *mgag200_g200_device_create (struct pci_dev *pdev,const struct drm_driver *drv);struct mga_device *mgag200_g200se_device_create (struct pci_dev *pdev,const struct drm_driver *drv,enum mga_type type);void mgag200_g200wb_init_registers (struct mga_device *mdev);void mgag200_g200wb_pixpllc_atomic_update (struct drm_crtc *crtc,struct drm_atomic_state *old_state); -struct mga_device *mgag200_g200wb_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type); -struct mga_device *mgag200_g200ev_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type); +struct mga_device *mgag200_g200wb_device_create (struct pci_dev *pdev,const struct drm_driver *drv); +struct mga_device *mgag200_g200ev_device_create (struct pci_dev *pdev,const struct drm_driver *drv);void mgag200_g200eh_init_registers (struct mga_device *mdev);void mgag200_g200eh_pixpllc_atomic_update (struct drm_crtc *crtc,struct drm_atomic_state *old_state); -struct mga_device *mgag200_g200eh_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type); -struct mga_device *mgag200_g200eh3_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type); -struct mga_device *mgag200_g200er_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type); -struct mga_device *mgag200_g200ew3_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type); +struct mga_device *mgag200_g200eh_device_create (struct pci_dev *pdev, +const struct drm_driver *drv); +struct mga_device *mgag200_g200eh3_device_create (struct pci_dev *pdev, +const struct drm_driver *drv); +struct mga_device *mgag200_g200er_device_create (struct pci_dev *pdev, +const struct drm_driver *drv); +struct mga_device *mgag200_g200ew3_device_create (struct pci_dev *pdev, +const struct drm_driver *drv);/* * mgag200_mode.c
drivers/gpu/drm/mgag200/mgag200_g200.c +2 -3
@@ -398,8 +398,7 @@ static const struct mgag200_device_funcs mgag200_g200_device_funcs = { .pixpllc_atomic_update = mgag200_g200_pixpllc_atomic_update, }; -struct mga_device *mgag200_g200_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type) +struct mga_device *mgag200_g200_device_create (struct pci_dev *pdev,const struct drm_driver *drv) {struct mgag200_g200_device *g200;struct mga_device *mdev;
@@ -425,7 +424,7 @@ struct mga_device *mgag200_g200_device_create(struct pci_dev *pdev, const structmgag200_g200_init_refclk (g200); - ret =mgag200_device_init (mdev, type, &mgag200_g200_device_info, + ret =mgag200_device_init (mdev, &mgag200_g200_device_info, &mgag200_g200_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200eh.c +2 -3
@@ -274,8 +274,7 @@ static const struct mgag200_device_funcs mgag200_g200eh_device_funcs = { .pixpllc_atomic_update = mgag200_g200eh_pixpllc_atomic_update, }; -struct mga_device *mgag200_g200eh_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type) +struct mga_device *mgag200_g200eh_device_create (struct pci_dev *pdev,const struct drm_driver *drv) {struct mga_device *mdev;struct drm_device *dev;
@@ -297,7 +296,7 @@ struct mga_device *mgag200_g200eh_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200eh_device_info, + ret =mgag200_device_init (mdev, &mgag200_g200eh_device_info, &mgag200_g200eh_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200eh3.c +2 -3
@@ -179,8 +179,7 @@ static const struct mgag200_device_funcs mgag200_g200eh3_device_funcs = { };struct mga_device *mgag200_g200eh3_device_create (struct pci_dev *pdev, -const struct drm_driver *drv, -enum mga_type type) +const struct drm_driver *drv) {struct mga_device *mdev;struct drm_device *dev;
@@ -202,7 +201,7 @@ struct mga_device *mgag200_g200eh3_device_create(struct pci_dev *pdev,if (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200eh3_device_info, + ret =mgag200_device_init (mdev, &mgag200_g200eh3_device_info, &mgag200_g200eh3_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200er.c +2 -3
@@ -312,8 +312,7 @@ static const struct mgag200_device_funcs mgag200_g200er_device_funcs = { .pixpllc_atomic_update = mgag200_g200er_pixpllc_atomic_update, }; -struct mga_device *mgag200_g200er_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type) +struct mga_device *mgag200_g200er_device_create (struct pci_dev *pdev,const struct drm_driver *drv) {struct mga_device *mdev;struct drm_device *dev;
@@ -331,7 +330,7 @@ struct mga_device *mgag200_g200er_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200er_device_info, + ret =mgag200_device_init (mdev, &mgag200_g200er_device_info, &mgag200_g200er_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200ev.c +2 -3
@@ -313,8 +313,7 @@ static const struct mgag200_device_funcs mgag200_g200ev_device_funcs = { .pixpllc_atomic_update = mgag200_g200ev_pixpllc_atomic_update, }; -struct mga_device *mgag200_g200ev_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type) +struct mga_device *mgag200_g200ev_device_create (struct pci_dev *pdev,const struct drm_driver *drv) {struct mga_device *mdev;struct drm_device *dev;
@@ -336,7 +335,7 @@ struct mga_device *mgag200_g200ev_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200ev_device_info, + ret =mgag200_device_init (mdev, &mgag200_g200ev_device_info, &mgag200_g200ev_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200ew3.c +2 -3
@@ -199,8 +199,7 @@ static resource_size_t mgag200_g200ew3_device_probe_vram(struct mga_device *mdev }struct mga_device *mgag200_g200ew3_device_create (struct pci_dev *pdev, -const struct drm_driver *drv, -enum mga_type type) +const struct drm_driver *drv) {struct mga_device *mdev;struct drm_device *dev;
@@ -222,7 +221,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,if (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200ew3_device_info, + ret =mgag200_device_init (mdev, &mgag200_g200ew3_device_info, &mgag200_g200ew3_device_funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200se.c +1 -1
@@ -535,7 +535,7 @@ struct mga_device *mgag200_g200se_device_create(struct pci_dev *pdev, const struelse funcs = &mgag200_g200se_00_device_funcs; - ret =mgag200_device_init (mdev, type, info, funcs); + ret =mgag200_device_init (mdev, info, funcs);if (ret)return ERR_PTR (ret);
drivers/gpu/drm/mgag200/mgag200_g200wb.c +2 -3
@@ -323,8 +323,7 @@ static const struct mgag200_device_funcs mgag200_g200wb_device_funcs = { .pixpllc_atomic_update = mgag200_g200wb_pixpllc_atomic_update, }; -struct mga_device *mgag200_g200wb_device_create (struct pci_dev *pdev,const struct drm_driver *drv, -enum mga_type type) +struct mga_device *mgag200_g200wb_device_create (struct pci_dev *pdev,const struct drm_driver *drv) {struct mga_device *mdev;struct drm_device *dev;
@@ -346,7 +345,7 @@ struct mga_device *mgag200_g200wb_device_create(struct pci_dev *pdev, const struif (ret)return ERR_PTR (ret); - ret =mgag200_device_init (mdev, type, &mgag200_g200wb_device_info, + ret =mgag200_device_init (mdev, &mgag200_g200wb_device_info, &mgag200_g200wb_device_funcs);if (ret)return ERR_PTR (ret);
Signature · 1 line
2.37.1