From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Larouche Subject: Re: [PATCH 1/3] drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal. Date: Fri, 05 Apr 2013 12:38:13 -0400 Message-ID: <515EFDF5.8070707@matrox.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mtxmxout3.matrox.com (mtxmxout3.matrox.com [138.11.2.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B593BE5F12 for ; Fri, 5 Apr 2013 09:57:54 -0700 (PDT) Received: from mars.matrox.com (mars.matrox.com [192.168.1.29]) by mtxmxout3.matrox.com (Postfix) with ESMTP id C14242A4AFE for ; Fri, 5 Apr 2013 12:38:13 -0400 (EDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Christopher Harvey Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On 05/04/2013 10:51 AM, Christopher Harvey wrote: > This change properly enables the "requester" in G200ER cards that is > responsible for getting pixels out of memory and clocking them out to > the screen. > > Signed-off-by: Christopher Harvey Signed-off-by: Mathieu Larouche > --- > drivers/gpu/drm/mgag200/mgag200_mode.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c > index 7337013..f988965 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c > @@ -751,8 +751,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc, > int i; > unsigned char misc = 0; > unsigned char ext_vga[6]; > - unsigned char ext_vga_index24; > - unsigned char dac_index90 = 0; > u8 bppshift; > > static unsigned char dacvalue[] = { > @@ -803,7 +801,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc, > option2 = 0x0000b000; > break; > case G200_ER: > - dac_index90 = 0; > break; > } > > @@ -852,10 +849,8 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc, > WREG_DAC(i, dacvalue[i]); > } > > - if (mdev->type == G200_ER) { > - WREG_DAC(0x90, dac_index90); > - } > - > + if (mdev->type == G200_ER) > + WREG_DAC(0x90, 0); > > if (option) > pci_write_config_dword(dev->pdev, PCI_MGA_OPTION, option); > @@ -952,8 +947,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc, > if (mdev->type == G200_WB) > ext_vga[1] |= 0x88; > > - ext_vga_index24 = 0x05; > - > /* Set pixel clocks */ > misc = 0x2d; > WREG8(MGA_MISC_OUT, misc); > @@ -965,7 +958,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc, > } > > if (mdev->type == G200_ER) > - WREG_ECRT(24, ext_vga_index24); > + WREG_ECRT(0x24, 0x5); > > if (mdev->type == G200_EV) { > WREG_ECRT(6, 0); -- Mathieu Larouche Ing./Eng. Software Designer Matrox Graphics Inc. Phone : 514 822-6000 x7905 Email : mathieu.larouche@matrox.com