Skip to content

drm/mgag200: Move model-specific code into separate functions

Thomas Zimmermann dri-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest14 patches 3 repliesIn review
  2. v214 patches 2 repliesSuperseded
  3. v114 patches 13 repliesSuperseded

Changes in v3 from the cover letter

* only flip SCROFF when enabling/disable the plane (Jocelyn)
* style clean-ups throughout the patchset

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14drm/mgag200: Split mgag200_modeset_init()drivers/gpu/drm/mgag200/mgag200_mode.c+32 -90 replies
2/14drm/mgag200: Move DAC-register setup into model-specific codedrivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_g200.c drivers/gpu/drm/mgag200/mgag200_g200eh.c +7 more+192 -790 replies
3/14dmr/mgag200: Move ER/EW3 register initialization to per-model codedrivers/gpu/drm/mgag200/mgag200_g200er.c drivers/gpu/drm/mgag200/mgag200_g200ew3.c drivers/gpu/drm/mgag200/mgag200_mode.c+10 -70 replies
4/14drm/mgag200: Acquire I/O-register lock in atomic_commit_tail functiondrivers/gpu/drm/mgag200/mgag200_mode.c+22 -140 replies
5/14drm/mgag200: Store primary plane's color format in CRTC statedrivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_mode.c+15 -100 replies
6/14drm/mgag200: Reorganize before dropping simple-KMS helpersdrivers/gpu/drm/mgag200/mgag200_mode.c+47 -480 replies
7/14drm/mgag200: Replace simple-KMS with regular atomic helpersdrivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_mode.c+233 -1573 replies
8/14drm/mgag200: Set SCROFF in primary-plane codedrivers/gpu/drm/mgag200/mgag200_mode.c+20 -150 replies
9/14drm/mgag200: Add per-device callbacksdrivers/gpu/drm/mgag200/mgag200_drv.c drivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_g200.c +7 more+48 -100 replies
10/14drm/mgag200: Provide per-device callbacks for BMC synchronizationdrivers/gpu/drm/mgag200/Makefile drivers/gpu/drm/mgag200/mgag200_bmc.c drivers/gpu/drm/mgag200/mgag200_drv.h +3 more+129 -970 replies
11/14drm/mgag200: Provide per-device callbacks for PIXPLLCdrivers/gpu/drm/mgag200/Makefile drivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_g200.c +9 more+1026 -10290 replies
12/14drm/mgag200: Move mode-config to model-specific codedrivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_g200.c drivers/gpu/drm/mgag200/mgag200_g200eh.c +7 more+977 -1740 replies
13/14drm/mgag200: Move CRTC atomic_enable to model-specific codedrivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_g200er.c drivers/gpu/drm/mgag200/mgag200_g200ev.c +2 more+172 -850 replies
14/14drm/mgag200: Remove type field from struct mga_devicedrivers/gpu/drm/mgag200/mgag200_drv.c drivers/gpu/drm/mgag200/mgag200_drv.h drivers/gpu/drm/mgag200/mgag200_g200.c +7 more+35 -480 replies

Reviews trailers per patch

All 14 patches have a Reviewed-by or Acked-by.

PatchJocelyn FalempeSam Ravnborg
1/14R-b T-b A-b
2/14R-b T-b
3/14R-b T-b A-b
4/14R-b T-b A-b
5/14R-b T-b A-b
6/14R-b T-b A-b
7/14R-b T-b A-b
8/14R-b T-b A-b
9/14R-b T-b A-b
10/14R-b T-b A-b
11/14R-b T-b A-b
12/14R-b T-b A-b
13/14R-b T-b A-b
14/14R-b T-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 00/14] 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