From dfa295b29c20b174f80ab823eef41e5211a6a921 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 24 Aug 2016 14:13:19 +0200 Subject: [PATCH] modesetting: ms_covering_crtc: Remove unused arguments, make static Remove unused arguments from ms_covering_crtc, make it static as it is only used in vblank.c. While at it also change its first argument from a ScrnInfoPtr to a ScreenPtr, this makes the next patch in this patch-set cleaner. Signed-off-by: Hans de Goede Reviewed-by: Keith Packard --- hw/xfree86/drivers/modesetting/driver.h | 2 -- hw/xfree86/drivers/modesetting/vblank.c | 23 ++++++----------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/driver.h b/hw/xfree86/drivers/modesetting/driver.h index 761490ac1..aa00d055a 100644 --- a/hw/xfree86/drivers/modesetting/driver.h +++ b/hw/xfree86/drivers/modesetting/driver.h @@ -137,8 +137,6 @@ void ms_drm_abort_seq(ScrnInfoPtr scrn, uint32_t seq); Bool ms_crtc_on(xf86CrtcPtr crtc); xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw); -xf86CrtcPtr ms_covering_crtc(ScrnInfoPtr scrn, BoxPtr box, - xf86CrtcPtr desired, BoxPtr crtc_box_ret); int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc); diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c index d5a9ded35..6547d9dd1 100644 --- a/hw/xfree86/drivers/modesetting/vblank.c +++ b/hw/xfree86/drivers/modesetting/vblank.c @@ -92,14 +92,13 @@ ms_crtc_on(xf86CrtcPtr crtc) /* * Return the crtc covering 'box'. If two crtcs cover a portion of - * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc - * with greater coverage + * 'box', then prefer the crtc with greater coverage. */ -xf86CrtcPtr -ms_covering_crtc(ScrnInfoPtr scrn, - BoxPtr box, xf86CrtcPtr desired, BoxPtr crtc_box_ret) +static xf86CrtcPtr +ms_covering_crtc(ScreenPtr pScreen, BoxPtr box) { + ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcPtr crtc, best_crtc; int coverage, best_coverage; @@ -108,10 +107,6 @@ ms_covering_crtc(ScrnInfoPtr scrn, best_crtc = NULL; best_coverage = 0; - crtc_box_ret->x1 = 0; - crtc_box_ret->x2 = 0; - crtc_box_ret->y1 = 0; - crtc_box_ret->y2 = 0; for (c = 0; c < xf86_config->num_crtc; c++) { crtc = xf86_config->crtc[c]; @@ -122,12 +117,7 @@ ms_covering_crtc(ScrnInfoPtr scrn, ms_crtc_box(crtc, &crtc_box); ms_box_intersect(&cover_box, &crtc_box, box); coverage = ms_box_area(&cover_box); - if (coverage && crtc == desired) { - *crtc_box_ret = crtc_box; - return crtc; - } if (coverage > best_coverage) { - *crtc_box_ret = crtc_box; best_crtc = crtc; best_coverage = coverage; } @@ -139,15 +129,14 @@ xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw) { ScreenPtr pScreen = pDraw->pScreen; - ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - BoxRec box, crtcbox; + BoxRec box; box.x1 = pDraw->x; box.y1 = pDraw->y; box.x2 = box.x1 + pDraw->width; box.y2 = box.y1 + pDraw->height; - return ms_covering_crtc(pScrn, &box, NULL, &crtcbox); + return ms_covering_crtc(pScreen, &box); } static Bool