Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d92df868 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/nouveau: Add local 'fb' variables 



Add a local 'fb' variable to a few places to get rid of the
'crtc->primary->fb' stuff. Looks neater and helps me with my poor
coccinelle skills later.

Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479498793-31021-12-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bdcb2f91

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode) 
	struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);

	struct nv04_crtc_reg *regp = &nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];

	struct nv04_crtc_reg *savep = &nv04_display(dev)->saved_reg.crtc_reg[nv_crtc->index];

	const struct drm_framebuffer *fb = crtc->primary->fb;

	struct drm_encoder *encoder;

	bool lvds_output = false, tmds_output = false, tv_output = false,

		off_chip_digital = false;
@@ -569,7 +570,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode) 
		regp->CRTC[NV_CIO_CRE_86] = 0x1;

	}



	regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] = (crtc->primary->fb->depth + 1) / 8;

	regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] = (fb->depth + 1) / 8;

	/* Enable slaved mode (called MODE_TV in nv4ref.h) */

	if (lvds_output || tmds_output || tv_output)

		regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] |= (1 << 7);
@@ -583,7 +584,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode) 
	regp->ramdac_gen_ctrl = NV_PRAMDAC_GENERAL_CONTROL_BPC_8BITS |

				NV_PRAMDAC_GENERAL_CONTROL_VGA_STATE_SEL |

				NV_PRAMDAC_GENERAL_CONTROL_PIXMIX_ON;

	if (crtc->primary->fb->depth == 16)

	if (fb->depth == 16)

		regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;

	if (drm->device.info.chipset >= 0x11)

		regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_PIPE_LONG;

drivers/gpu/drm/nouveau/dispnv04/dfp.c

+2 −1
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder, 
	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct drm_display_mode *output_mode = &nv_encoder->mode;

	struct drm_connector *connector = &nv_connector->base;

	const struct drm_framebuffer *fb = encoder->crtc->primary->fb;

	uint32_t mode_ratio, panel_ratio;



	NV_DEBUG(drm, "Output mode on CRTC %d:\n", nv_crtc->index);
@@ -415,7 +416,7 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder, 
	/* Output property. */

	if ((nv_connector->dithering_mode == DITHERING_MODE_ON) ||

	    (nv_connector->dithering_mode == DITHERING_MODE_AUTO &&

	     encoder->crtc->primary->fb->depth > connector->display_info.bpc * 3)) {

	     fb->depth > connector->display_info.bpc * 3)) {

		if (drm->device.info.chipset == 0x11)

			regp->dither = savep->dither | 0x00010000;

		else {