This is the first set of patches to bring some sanity into gma500. The driver is a mashup of different out-of-tree drivers and it's been easier to keep them separated to find out what quirks are needed for each chip. As things have matured it is now time to start removing duplicated code. The number of patches might be a little excessive but in case of regressions it will be easier to revert them. This patch set mostly covers psb and cdv since that is what I can test, but Oaktrail will soon follow.
I've started using a new naming scheme. psb_intel_* was used for both generic and Poulsbo specific things. To differentiate between these we now use gma_* for generic stuff and keep psb_intel_* for the chip specifics. Eventually we'll just use gma_*, psb_*, cdv_*, etc... for everything.
Patrik Jakobsson (30): drm/gma500: Add generic code for clock calculation drm/gma500/cdv: Make use of the generic clock code drm/gma500: Make use of gma_pipe_has_type() drm/gma500/psb: Make use of generic clock code drm/gma500: Remove the unused psb_intel_display.h drm/gma500: Add generic pipe/crtc functions drm/gma500/cdv: Use identical generic crtc funcs drm/gma500: Make all chips use gma_wait_for_vblank drm/gma500/psb: Use identical generic crtc funcs drm/gma500/cdv: Convert to gma_pipe_set_base() drm/gma500: Add IS_CDV() macro drm/gma500/cdv: Convert to gma_crtc_dpms() drm/gma500/cdv: Convert to generic gamma funcs drm/gma500/psb: Convert to gma_pipe_set_base() drm/gma500: Convert to generic gamma funcs drm/gma500/psb: Convert to gma_crtc_dpms() drm/gma500/oak: Use identical generic crtc funcs drm/gma500/mdfld: Use identical generic crtc funcs drm/gma500/psb: Convert to generic crtc->destroy drm/gma500: Add generic cursor functions drm/gma500/cdv: Convert to generic cursor funcs drm/gma500/psb: Convert to generic cursor funcs drm/gma500: Add generic encoder functions drm/gma500: Convert to generic encoder funcs drm/gma500: Add generic crtc save/restore funcs drm/gma500/psb: Convert to generic save/restore drm/gma500/cdv: Convert to generic save/restore drm/gma500: Add generic set_config() function drm/gma500/psb: Convert to generic set_config() drm/gma500/cdv: Convert to generic set_config()
drivers/gpu/drm/gma500/Makefile | 1 + drivers/gpu/drm/gma500/cdv_device.c | 1 + drivers/gpu/drm/gma500/cdv_device.h | 10 +- drivers/gpu/drm/gma500/cdv_intel_crt.c | 13 +- drivers/gpu/drm/gma500/cdv_intel_display.c | 880 ++------------------------- drivers/gpu/drm/gma500/cdv_intel_dp.c | 20 +- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 19 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- drivers/gpu/drm/gma500/framebuffer.c | 2 +- drivers/gpu/drm/gma500/gma_display.c | 778 +++++++++++++++++++++++ drivers/gpu/drm/gma500/gma_display.h | 108 ++++ drivers/gpu/drm/gma500/mdfld_intel_display.c | 43 +- drivers/gpu/drm/gma500/oaktrail_crtc.c | 41 +- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 23 +- drivers/gpu/drm/gma500/oaktrail_lvds.c | 3 +- drivers/gpu/drm/gma500/psb_device.c | 3 +- drivers/gpu/drm/gma500/psb_device.h | 24 + drivers/gpu/drm/gma500/psb_drv.c | 4 +- drivers/gpu/drm/gma500/psb_drv.h | 3 + drivers/gpu/drm/gma500/psb_intel_display.c | 842 ++----------------------- drivers/gpu/drm/gma500/psb_intel_display.h | 25 - drivers/gpu/drm/gma500/psb_intel_drv.h | 20 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 15 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 19 +- 24 files changed, 1112 insertions(+), 1794 deletions(-) create mode 100644 drivers/gpu/drm/gma500/gma_display.c create mode 100644 drivers/gpu/drm/gma500/gma_display.h create mode 100644 drivers/gpu/drm/gma500/psb_device.h delete mode 100644 drivers/gpu/drm/gma500/psb_intel_display.h