diff mbox

drm/gma500: Fix Medfield for drm_framebuffer move

Message ID 20180521142449.20800-1-daniels@collabora.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Stone May 21, 2018, 2:24 p.m. UTC
bc61c97502e2 moved the gtt_range structure, from being in
psb_framebuffer and embedding the GEM object, to being placed in the
drm_framebuffer with the gtt_range being derived from the GEM object.

The conversion missed out the Medfield subdriver, which was not being
built in the default drm-misc config. Do the trivial fixup here.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: kbuild test robot <lkp@intel.com>
Fixes: bc61c97502e2 ("drm/gma500: Move GEM BO to drm_framebuffer")
Cc: Thierry Reding <treding@nvidia.com>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
---
 drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thierry Reding May 22, 2018, 9:19 a.m. UTC | #1
On Mon, May 21, 2018 at 03:24:49PM +0100, Daniel Stone wrote:
> bc61c97502e2 moved the gtt_range structure, from being in
> psb_framebuffer and embedding the GEM object, to being placed in the
> drm_framebuffer with the gtt_range being derived from the GEM object.
> 
> The conversion missed out the Medfield subdriver, which was not being
> built in the default drm-misc config. Do the trivial fixup here.
> 
> Signed-off-by: Daniel Stone <daniels@collabora.com>
> Reported-by: kbuild test robot <lkp@intel.com>
> Fixes: bc61c97502e2 ("drm/gma500: Move GEM BO to drm_framebuffer")
> Cc: Thierry Reding <treding@nvidia.com>
> Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
> ---
>  drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Can you send a patch to enable the Medfield subdriver in the drm-misc
default configuration?

This patch:

Reviewed-by: Thierry Reding <treding@nvidia.com>
Daniel Stone May 22, 2018, 9:24 a.m. UTC | #2
On 22 May 2018 at 10:19, Thierry Reding <thierry.reding@gmail.com> wrote:
> On Mon, May 21, 2018 at 03:24:49PM +0100, Daniel Stone wrote:
>> bc61c97502e2 moved the gtt_range structure, from being in
>> psb_framebuffer and embedding the GEM object, to being placed in the
>> drm_framebuffer with the gtt_range being derived from the GEM object.
>>
>> The conversion missed out the Medfield subdriver, which was not being
>> built in the default drm-misc config. Do the trivial fixup here.
>
> Can you send a patch to enable the Medfield subdriver in the drm-misc
> default configuration?

Thanks Thierry! I went one better, and the drm-misc x86 default config
does now build Medfield by default; I pushed that yesterday.

Cheers,
Daniel
Thierry Reding May 22, 2018, 9:31 a.m. UTC | #3
On Tue, May 22, 2018 at 10:24:18AM +0100, Daniel Stone wrote:
> On 22 May 2018 at 10:19, Thierry Reding <thierry.reding@gmail.com> wrote:
> > On Mon, May 21, 2018 at 03:24:49PM +0100, Daniel Stone wrote:
> >> bc61c97502e2 moved the gtt_range structure, from being in
> >> psb_framebuffer and embedding the GEM object, to being placed in the
> >> drm_framebuffer with the gtt_range being derived from the GEM object.
> >>
> >> The conversion missed out the Medfield subdriver, which was not being
> >> built in the default drm-misc config. Do the trivial fixup here.
> >
> > Can you send a patch to enable the Medfield subdriver in the drm-misc
> > default configuration?
> 
> Thanks Thierry! I went one better, and the drm-misc x86 default config
> does now build Medfield by default; I pushed that yesterday.

Excellent, thanks!

Thierry
diff mbox

Patch

diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index 5c066448be5b..881d613cc2e5 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -196,7 +196,7 @@  static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 	if (!gma_power_begin(dev, true))
 		return 0;
 
-	start = psbfb->gtt->offset;
+	start = to_gtt_range(fb->obj[0])->offset;
 	offset = y * fb->pitches[0] + x * fb->format->cpp[0];
 
 	REG_WRITE(map->stride, fb->pitches[0]);