[PATCH] drm/mgag200: Remove pointless call to drm_fb_get_bpp_depth

[PATCH] drm/mgag200: Remove pointless call to drm_fb_get_bpp_depth

[Christopher Harvey]

Signed-off-by: Christopher Harvey <charvey@matrox.com>
---
 drivers/gpu/drm/mgag200/mgag200_fb.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index d2253f6..a5a1f34 100644
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -105,12 +105,9 @@ static int mgag200fb_create_object(struct mga_fbdev *afbdev,
 				   struct drm_gem_object **gobj_p)
 {
 	struct drm_device *dev = afbdev->helper.dev;
-	u32 bpp, depth;
 	u32 size;
 	struct drm_gem_object *gobj;
-
 	int ret = 0;
-	drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
 
 	size = mode_cmd->pitches[0] * mode_cmd->height;
 	ret = mgag200_gem_create(dev, size, true, &gobj);
-- 
1.8.1.5

[PATCH] drm/mgag200: Pass driver specific mga_device in driver functions

[Christopher Harvey]

Signed-off-by: Christopher Harvey <charvey@matrox.com>
---
 drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 78d8e91..f988965 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1254,9 +1254,8 @@ static const struct drm_crtc_helper_funcs mga_helper_funcs = {
 };
 
 /* CRTC setup */
-static void mga_crtc_init(struct drm_device *dev)
+static void mga_crtc_init(struct mga_device *mdev)
 {
-	struct mga_device *mdev = dev->dev_private;
 	struct mga_crtc *mga_crtc;
 	int i;
 
@@ -1267,7 +1266,7 @@ static void mga_crtc_init(struct drm_device *dev)
 	if (mga_crtc == NULL)
 		return;
 
-	drm_crtc_init(dev, &mga_crtc->base, &mga_crtc_funcs);
+	drm_crtc_init(mdev->dev, &mga_crtc->base, &mga_crtc_funcs);
 
 	drm_mode_crtc_set_gamma_size(&mga_crtc->base, MGAG200_LUT_SIZE);
 	mdev->mode_info.crtc = mga_crtc;
@@ -1522,7 +1521,7 @@ int mgag200_modeset_init(struct mga_device *mdev)
 
 	mdev->dev->mode_config.fb_base = mdev->mc.vram_base;
 
-	mga_crtc_init(mdev->dev);
+	mga_crtc_init(mdev);
 
 	encoder = mga_encoder_init(mdev->dev);
 	if (!encoder) {
-- 
1.8.1.5

[PATCH] drm/mgag200: Remove extra variable assigns

[Christopher Harvey]

These two variables are set again immediately in 'mgag200_modeset_init'

Signed-off-by: Christopher Harvey <charvey@matrox.com>
---
 drivers/gpu/drm/mgag200/mgag200_main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index 64297c7..b762bfb 100644
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -234,8 +234,6 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags)
 
 	drm_mode_config_init(dev);
 	dev->mode_config.funcs = (void *)&mga_mode_funcs;
-	dev->mode_config.min_width = 0;
-	dev->mode_config.min_height = 0;
 	dev->mode_config.preferred_depth = 24;
 	dev->mode_config.prefer_shadow = 1;
 
-- 
1.8.1.5

[PATCH] mgag200 code cleanup patches

[Christopher Harvey]

I submitted these a while ago, but I think they got lost in the
mailing list. Just wanted to make sure they get a shot at the merge
window.

thanks,

Christopher Harvey (3):
  drm/mgag200: Remove pointless call to drm_fb_get_bpp_depth
  drm/mgag200: Pass driver specific mga_device in driver functions
  drm/mgag200: Remove extra variable assigns

 drivers/gpu/drm/mgag200/mgag200_fb.c   | 3 ---
 drivers/gpu/drm/mgag200/mgag200_main.c | 2 --
 drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +++----
 3 files changed, 3 insertions(+), 9 deletions(-)

-- 
1.8.1.5

Re: [PATCH] mgag200 code cleanup patches

[Christopher Harvey]

Christopher Harvey <charvey@matrox.com> writes:

> I submitted these a while ago, but I think they got lost in the
> mailing list. Just wanted to make sure they get a shot at the merge
> window.
>
> thanks,
>
> Christopher Harvey (3):
>   drm/mgag200: Remove pointless call to drm_fb_get_bpp_depth
>   drm/mgag200: Pass driver specific mga_device in driver functions
>   drm/mgag200: Remove extra variable assigns
>
>  drivers/gpu/drm/mgag200/mgag200_fb.c   | 3 ---
>  drivers/gpu/drm/mgag200/mgag200_main.c | 2 --
>  drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +++----
>  3 files changed, 3 insertions(+), 9 deletions(-)

the drm-next branch is what gets merged into merge windows, right?
http://cgit.freedesktop.org/~airlied/linux/

-- 

Re: [PATCH] mgag200 code cleanup patches

[Paul Menzel]

Dear Christopher,


Am Montag, den 29.04.2013, 14:37 -0400 schrieb Christopher Harvey:
> I submitted these a while ago, but I think they got lost in the
> mailing list. Just wanted to make sure they get a shot at the merge
> window.

as you resend the patches you could have easily amended the commit
message to address my comments.

Thanks again for your patches and let’s hope that they get in with the
next merge window.


Thanks,

Paul

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] mgag200 code cleanup patches

[Dave Airlie]

>>
>> Christopher Harvey (3):
>>   drm/mgag200: Remove pointless call to drm_fb_get_bpp_depth
>>   drm/mgag200: Pass driver specific mga_device in driver functions
>>   drm/mgag200: Remove extra variable assigns
>>
>>  drivers/gpu/drm/mgag200/mgag200_fb.c   | 3 ---
>>  drivers/gpu/drm/mgag200/mgag200_main.c | 2 --
>>  drivers/gpu/drm/mgag200/mgag200_mode.c | 7 +++----
>>  3 files changed, 3 insertions(+), 9 deletions(-)
>
> the drm-next branch is what gets merged into merge windows, right?
> http://cgit.freedesktop.org/~airlied/linux/
>

Yes I just merged them all here now, and pushed out the branch.

Dave.